Adding feature flag check for expandable table rows in aria hooks (#4865)

* Adding feature flag check for expandable table rows in aria hooks

* lint

Author: LFDanLu

packages/@react-aria/table/package.json

@@ -31,6 +31,7 @@
     "@react-aria/utils": "^3.18.0",
     "@react-aria/visually-hidden": "^3.8.2",
     "@react-stately/collections": "^3.9.0",
+    "@react-stately/flags": "3.0.0-alpha.0",
     "@react-stately/table": "^3.10.0",
     "@react-stately/virtualizer": "^3.6.0",
     "@react-types/checkbox": "^3.4.4",

packages/@react-aria/table/src/useTable.ts

@@ -20,6 +20,7 @@ import {mergeProps, useDescription, useId, useUpdateEffect} from '@react-aria/ut
 import {Node} from '@react-types/shared';
 import {RefObject, useMemo} from 'react';
 import {TableKeyboardDelegate} from './TableKeyboardDelegate';
+import {tableNestedRows} from '@react-stately/flags';
 import {TableState, TreeGridState} from '@react-stately/table';
 import {useCollator, useLocale, useLocalizedStringFormatter} from '@react-aria/i18n';
 
@@ -70,7 +71,7 @@ export function useTable<T>(props: AriaTableProps<T>, state: TableState<T> | Tre
     gridProps['aria-rowcount'] = state.collection.size + state.collection.headerRows.length;
   }
 
-  if ('expandedKeys' in state) {
+  if (tableNestedRows() && 'expandedKeys' in state) {
     gridProps.role = 'treegrid';
   }
 

packages/@react-aria/table/src/useTableHeaderRow.ts

@@ -13,6 +13,7 @@
 import {DOMAttributes} from '@react-types/shared';
 import {GridRowProps} from '@react-aria/grid';
 import {RefObject} from 'react';
+import {tableNestedRows} from '@react-stately/flags';
 import {TableState} from '@react-stately/table';
 
 export interface TableHeaderRowAria {
@@ -32,7 +33,7 @@ export function useTableHeaderRow<T>(props: GridRowProps<T>, state: TableState<T
     role: 'row'
   };
 
-  if (isVirtualized && !('expandedKeys' in state)) {
+  if (isVirtualized && !(tableNestedRows() && 'expandedKeys' in state)) {
     rowProps['aria-rowindex'] = node.index + 1; // aria-rowindex is 1 based
   }
 

packages/@react-aria/table/src/useTableRow.ts

@@ -18,6 +18,7 @@ import {GridRowAria, GridRowProps, useGridRow} from '@react-aria/grid';
 import {HTMLAttributes, RefObject} from 'react';
 import {mergeProps} from '@react-aria/utils';
 import {TableCollection} from '@react-types/table';
+import {tableNestedRows} from '@react-stately/flags';
 import {TableState, TreeGridState} from '@react-stately/table';
 import {useLocale} from '@react-aria/i18n';
 
@@ -42,14 +43,14 @@ export function useTableRow<T>(props: GridRowProps<T>, state: TableState<T> | Tr
   let {rowProps, ...states} = useGridRow<T, TableCollection<T>, TableState<T>>(props, state, ref);
   let {direction} = useLocale();
 
-  if (isVirtualized && !('expandedKeys' in state)) {
+  if (isVirtualized && !(tableNestedRows() && 'expandedKeys' in state)) {
     rowProps['aria-rowindex'] = node.index + 1 + state.collection.headerRows.length; // aria-rowindex is 1 based
   } else {
     delete rowProps['aria-rowindex'];
   }
 
   let treeGridRowProps: HTMLAttributes<HTMLElement> = {};
-  if ('expandedKeys' in state) {
+  if (tableNestedRows() && 'expandedKeys' in state) {
     let treeNode = state.keyMap.get(node.key);
     if (treeNode != null) {
       let hasChildRows = treeNode.props?.UNSTABLE_childItems || treeNode.props?.children?.length > state.userColumnCount;