Skip to content

fix: gridlist section accessibility updates #8932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2025
+14 −14
Merged

fix: gridlist section accessibility updates #8932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e22f27f
fix: gridlist section accessibility updates pt2
yihuiliao Sep 25, 2025
4ad8cc9
remove unused import
yihuiliao Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions packages/react-aria-components/src/GridList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {DraggableCollectionState, DroppableCollectionState, Collection as IColle
import {FieldInputContext, SelectableCollectionContext} from './context';
import {filterDOMProps, inertValue, LoadMoreSentinelProps, useLoadMoreSentinel, useObjectRef} from '@react-aria/utils';
import {forwardRefType, GlobalDOMAttributes, HoverEvents, Key, LinkDOMProps, PressEvents, RefObject} from '@react-types/shared';
import {HeaderContext} from './Header';
import {ListStateContext} from './ListBox';
import React, {createContext, ForwardedRef, forwardRef, HTMLAttributes, JSX, ReactNode, useContext, useEffect, useMemo, useRef} from 'react';
import {SelectionIndicatorContext} from './SelectionIndicator';
Expand Down Expand Up @@ -585,11 +584,11 @@ export interface GridListSectionProps<T> extends SectionProps<T> {}
/**
* A GridListSection represents a section within a GridList.
*/
export const GridListSection = /*#__PURE__*/ createBranchComponent(SectionNode, <T extends object>(props: GridListSectionProps<T>, ref: ForwardedRef<HTMLElement>, item: Node<T>) => {
export const GridListSection = /*#__PURE__*/ createBranchComponent(SectionNode, <T extends object>(props: GridListSectionProps<T>, ref: ForwardedRef<HTMLDivElement>, item: Node<T>) => {
let state = useContext(ListStateContext)!;
let {CollectionBranch} = useContext(CollectionRendererContext);
let headingRef = useRef(null);
ref = useObjectRef<HTMLElement>(ref);
ref = useObjectRef<HTMLDivElement>(ref);
let {rowHeaderProps, rowProps, rowGroupProps} = useGridListSection({
'aria-label': props['aria-label'] ?? undefined
}, state, ref);
Expand All @@ -604,33 +603,34 @@ export const GridListSection = /*#__PURE__*/ createBranchComponent(SectionNode,
delete DOMProps.id;

return (
<section
<div
{...mergeProps(DOMProps, renderProps, rowGroupProps)}
ref={ref}>
<Provider
values={[
[HeaderContext, {...rowProps, ref: headingRef}],
[GridListHeaderContext, {...rowHeaderProps}]
[GridListHeaderContext, {...rowProps, ref: headingRef}],
[GridListHeaderInnerContext, {...rowHeaderProps}]
]}>
<CollectionBranch
collection={state.collection}
parent={item} />
</Provider>
</section>
</div>
);
});

const GridListHeaderContext = createContext<HTMLAttributes<HTMLElement> | null>(null);
export const GridListHeaderContext = createContext<ContextValue<HTMLAttributes<HTMLDivElement>, HTMLDivElement>>({});
const GridListHeaderInnerContext = createContext<HTMLAttributes<HTMLElement> | null>(null);

export const GridListHeader = /*#__PURE__*/ createLeafComponent(HeaderNode, function Header(props: HTMLAttributes<HTMLElement>, ref: ForwardedRef<HTMLElement>) {
[props, ref] = useContextProps(props, ref, HeaderContext);
let rowHeaderProps = useContext(GridListHeaderContext);
export const GridListHeader = /*#__PURE__*/ createLeafComponent(HeaderNode, function Header(props: HTMLAttributes<HTMLElement>, ref: ForwardedRef<HTMLDivElement>) {
[props, ref] = useContextProps(props, ref, GridListHeaderContext);
let rowHeaderProps = useContext(GridListHeaderInnerContext);

return (
<header className="react-aria-GridListHeader" ref={ref} {...props}>
<div className="react-aria-GridListHeader" ref={ref} {...props}>
<div {...rowHeaderProps} style={{display: 'contents'}}>
{props.children}
</div>
</header>
</div>
);
});
2 changes: 1 addition & 1 deletion packages/react-aria-components/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export {DropZone, DropZoneContext} from './DropZone';
export {FieldError, FieldErrorContext} from './FieldError';
export {FileTrigger} from './FileTrigger';
export {Form, FormContext} from './Form';
export {GridListLoadMoreItem, GridList, GridListItem, GridListContext, GridListHeader, GridListSection} from './GridList';
export {GridListLoadMoreItem, GridList, GridListItem, GridListContext, GridListHeader, GridListHeaderContext, GridListSection} from './GridList';
export {Group, GroupContext} from './Group';
export {Header, HeaderContext} from './Header';
export {Heading} from './Heading';
Expand Down