remove aria-rolindex for headers

Author: yihuiliao

packages/@react-aria/gridlist/src/useGridListSection.ts

@@ -10,17 +10,12 @@
  * governing permissions and limitations under the License.
  */
 
-import {DOMAttributes, Node as RSNode} from '@react-types/shared';
-import type {ListState} from '@react-stately/list';
+import {DOMAttributes} from '@react-types/shared';
 import {useLabels, useSlotId} from '@react-aria/utils';
 
 export interface AriaGridListSectionProps {
   /** An accessibility label for the section. Required if `heading` is not present. */
-  'aria-label'?: string,
-  /** Whether the list row is contained in a virtual scroller. */
-  isVirtualized?: boolean,
-  /** An object representing the list item. Contains all the relevant information that makes up the list row. */
-  node: RSNode<unknown>
+  'aria-label'?: string
 }
 
 export interface GridListSectionAria {
@@ -39,26 +34,16 @@ export interface GridListSectionAria {
  * See `useGridList` for more details about grid list.
  * @param props - Props for the section.
  */
-export function useGridListSection<T>(props: AriaGridListSectionProps, state: ListState<T>): GridListSectionAria {
-  let {'aria-label': ariaLabel, isVirtualized, node} = props;
+export function useGridListSection(props: AriaGridListSectionProps): GridListSectionAria {
+  let {'aria-label': ariaLabel} = props;
   let headingId = useSlotId();
   let labelProps = useLabels({
     'aria-label': ariaLabel,
     'aria-labelledby': headingId
   });
-  let rowIndex: number | undefined =  undefined;
-
-  if (isVirtualized) {
-    let {collection} = state;
-    let filteredCollection = [...collection.getKeys()].filter((key) => collection.getItem(key)?.type !== 'header');
-    let prevItem = node.prevKey ? state.collection.getItem(node.prevKey) : undefined;
-    rowIndex = prevItem ? filteredCollection.findIndex((key) => key === prevItem.key) + 2 : node.index + 1;
-  }
-  
   return {
     rowProps: {
-      role: 'row',
-      'aria-rowindex': rowIndex
+      role: 'row'
     },
     rowHeaderProps: {
       id: headingId,

packages/react-aria-components/src/GridList.tsx

@@ -571,13 +571,11 @@ export interface GridListSectionProps<T> extends SectionProps<T> {}
 export const GridListSection = /*#__PURE__*/ createBranchComponent('section', <T extends object>(props: GridListSectionProps<T>, ref: ForwardedRef<HTMLElement>, item: Node<T>) => {
   let state = useContext(ListStateContext)!;
   let {dragAndDropHooks, dropState} = useContext(DragAndDropContext)!;
-  let {CollectionBranch, isVirtualized} = useContext(CollectionRendererContext);
+  let {CollectionBranch} = useContext(CollectionRendererContext);
   let headingRef = useRef(null);
   let {rowHeaderProps, rowProps, rowGroupProps} = useGridListSection({
-    'aria-label': props['aria-label'] ?? undefined,
-    isVirtualized,
-    node: item
-  }, state);
+    'aria-label': props['aria-label'] ?? undefined
+  });
   let renderProps = useRenderProps({
     defaultClassName: 'react-aria-GridListSection',
     className: props.className,