react-aria 3.50.0 → 3.51.0

package/dist/private/grid/useGrid.cjs

@@ -42,7 +42,7 @@ $parcel$export(module.exports, "useGrid", function () { return $ef6ed03a6401f944
 
 
 function $ef6ed03a6401f944$export$f6b86a04e5d66d90(props, state, ref) {
-    let { isVirtualized: isVirtualized, disallowTypeAhead: disallowTypeAhead, keyboardDelegate: keyboardDelegate, focusMode: focusMode, scrollRef: scrollRef, getRowText: getRowText, onRowAction: onRowAction, onCellAction: onCellAction, escapeKeyBehavior: escapeKeyBehavior = 'clearSelection', shouldSelectOnPressUp: shouldSelectOnPressUp } = props;
+    let { isVirtualized: isVirtualized, disallowTypeAhead: disallowTypeAhead, keyboardDelegate: keyboardDelegate, focusMode: focusMode, scrollRef: scrollRef, getRowText: getRowText, onRowAction: onRowAction, onCellAction: onCellAction, escapeKeyBehavior: escapeKeyBehavior = 'clearSelection', shouldSelectOnPressUp: shouldSelectOnPressUp, keyboardNavigationBehavior: keyboardNavigationBehavior = 'arrow' } = props;
     let { selectionManager: manager } = state;
     if (!props['aria-label'] && !props['aria-labelledby']) console.warn('An aria-label or aria-labelledby prop is required for accessibility.');
     // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).
@@ -87,7 +87,8 @@ function $ef6ed03a6401f944$export$f6b86a04e5d66d90(props, state, ref) {
             onRowAction: onRowAction,
             onCellAction: onCellAction
         },
-        shouldSelectOnPressUp: shouldSelectOnPressUp
+        shouldSelectOnPressUp: shouldSelectOnPressUp,
+        keyboardNavigationBehavior: keyboardNavigationBehavior
     });
     let descriptionProps = (0, $50ae4f70f9b3767e$exports.useHighlightSelectionDescription)({
         selectionManager: manager,

package/dist/private/grid/useGrid.cjs.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/react-aria/src/grid/useGrid.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {\n  AriaLabelingProps,\n  DOMAttributes,\n  DOMProps,\n  Key,\n  KeyboardDelegate,\n  RefObject\n} from '@react-types/shared';\nimport {filterDOMProps} from '../utils/filterDOMProps';\nimport {FocusEventHandler, useCallback, useMemo} from 'react';\nimport {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';\nimport {IGridCollection as GridCollection} from 'react-stately/private/grid/GridCollection';\nimport {GridKeyboardDelegate} from './GridKeyboardDelegate';\nimport {gridMap} from './utils';\nimport {GridState} from 'react-stately/private/grid/useGridState';\nimport {mergeProps} from '../utils/mergeProps';\nimport {useCollator} from '../i18n/useCollator';\nimport {useGridSelectionAnnouncement} from './useGridSelectionAnnouncement';\nimport {useHasTabbableChild} from '../focus/useHasTabbableChild';\nimport {useHighlightSelectionDescription} from './useHighlightSelectionDescription';\nimport {useId} from '../utils/useId';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSelectableCollection} from '../selection/useSelectableCollection';\n\nexport interface GridProps extends DOMProps, AriaLabelingProps {\n  /** Whether the grid uses virtual scrolling. */\n  isVirtualized?: boolean;\n  /**\n   * Whether typeahead navigation is disabled.\n   *\n   * @default false\n   */\n  disallowTypeAhead?: boolean;\n  /**\n   * An optional keyboard delegate implementation for type to select,\n   * to override the default.\n   */\n  keyboardDelegate?: KeyboardDelegate;\n  /**\n   * Whether initial grid focus should be placed on the grid row or grid cell.\n   *\n   * @default 'row'\n   */\n  focusMode?: 'row' | 'cell';\n  /**\n   * A function that returns the text that should be announced by assistive technology when a row is\n   * added or removed from selection.\n   *\n   * @default (key) => state.collection.getItem(key)?.textValue\n   */\n  getRowText?: (key: Key) => string;\n  /**\n   * The ref attached to the scrollable body. Used to provided automatic scrolling on item focus for\n   * non-virtualized grids.\n   */\n  scrollRef?: RefObject<HTMLElement | null>;\n  /** Handler that is called when a user performs an action on the row. */\n  onRowAction?: (key: Key) => void;\n  /** Handler that is called when a user performs an action on the cell. */\n  onCellAction?: (key: Key) => void;\n  /**\n   * Whether pressing the escape key should clear selection in the grid or not.\n   *\n   * Most experiences should not modify this option as it eliminates a keyboard user's ability to\n   * easily clear selection. Only use if the escape key is being handled externally or should not\n   * trigger selection clearing contextually.\n   *\n   * @default 'clearSelection'\n   */\n  escapeKeyBehavior?: 'clearSelection' | 'none';\n  /** Whether selection should occur on press up instead of press down. */\n  shouldSelectOnPressUp?: boolean;\n}\n\nexport interface GridAria {\n  /** Props for the grid element. */\n  gridProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a grid component. A grid displays data\n * in one or more rows and columns and enables a user to navigate its contents via directional\n * navigation keys.\n *\n * @param props - Props for the grid.\n * @param state - State for the grid, as returned by `useGridState`.\n * @param ref - The ref attached to the grid element.\n */\nexport function useGrid<T>(\n  props: GridProps,\n  state: GridState<T, GridCollection<T>>,\n  ref: RefObject<HTMLElement | null>\n): GridAria {\n  let {\n    isVirtualized,\n    disallowTypeAhead,\n    keyboardDelegate,\n    focusMode,\n    scrollRef,\n    getRowText,\n    onRowAction,\n    onCellAction,\n    escapeKeyBehavior = 'clearSelection',\n    shouldSelectOnPressUp\n  } = props;\n  let {selectionManager: manager} = state;\n\n  if (!props['aria-label'] && !props['aria-labelledby']) {\n    console.warn('An aria-label or aria-labelledby prop is required for accessibility.');\n  }\n\n  // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).\n  // When virtualized, the layout object will be passed in as a prop and override this.\n  let collator = useCollator({usage: 'search', sensitivity: 'base'});\n  let {direction} = useLocale();\n  let disabledBehavior = state.selectionManager.disabledBehavior;\n  let delegate = useMemo(\n    () =>\n      keyboardDelegate ||\n      new GridKeyboardDelegate({\n        collection: state.collection,\n        disabledKeys: state.disabledKeys,\n        disabledBehavior,\n        ref,\n        direction,\n        collator,\n        focusMode\n      }),\n    [\n      keyboardDelegate,\n      state.collection,\n      state.disabledKeys,\n      disabledBehavior,\n      ref,\n      direction,\n      collator,\n      focusMode\n    ]\n  );\n\n  let {collectionProps} = useSelectableCollection({\n    ref,\n    selectionManager: manager,\n    keyboardDelegate: delegate,\n    isVirtualized,\n    scrollRef,\n    disallowTypeAhead,\n    escapeKeyBehavior\n  });\n\n  let id = useId(props.id);\n  gridMap.set(state, {\n    keyboardDelegate: delegate,\n    actions: {onRowAction, onCellAction},\n    shouldSelectOnPressUp\n  });\n\n  let descriptionProps = useHighlightSelectionDescription({\n    selectionManager: manager,\n    hasItemActions: !!(onRowAction || onCellAction)\n  });\n\n  let domProps = filterDOMProps(props, {labelable: true});\n\n  let onFocus: FocusEventHandler = useCallback(\n    e => {\n      if (manager.isFocused) {\n        // If a focus event bubbled through a portal, reset focus state.\n        if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n          manager.setFocused(false);\n        }\n\n        return;\n      }\n\n      // Focus events can bubble through portals. Ignore these events.\n      if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n        return;\n      }\n\n      manager.setFocused(true);\n    },\n    [manager]\n  );\n\n  // Continue to track collection focused state even if keyboard navigation is disabled\n  let navDisabledHandlers = useMemo(\n    () => ({\n      onBlur: collectionProps.onBlur,\n      onFocus\n    }),\n    [onFocus, collectionProps.onBlur]\n  );\n\n  let hasTabbableChild = useHasTabbableChild(ref, {\n    isDisabled: state.collection.size !== 0\n  });\n\n  let gridProps: DOMAttributes = mergeProps(\n    domProps,\n    {\n      role: 'grid',\n      id,\n      'aria-multiselectable': manager.selectionMode === 'multiple' ? 'true' : undefined\n    },\n    state.isKeyboardNavigationDisabled ? navDisabledHandlers : collectionProps,\n    // If collection is empty, make sure the grid is tabbable unless there is a child tabbable element.\n    (state.collection.size === 0 && {tabIndex: hasTabbableChild ? -1 : 0}) || undefined,\n    descriptionProps\n  );\n\n  if (isVirtualized) {\n    gridProps['aria-rowcount'] = state.collection.size;\n    gridProps['aria-colcount'] = state.collection.columnCount;\n  }\n\n  useGridSelectionAnnouncement({getRowText}, state);\n  return {\n    gridProps\n  };\n}\n"],"names":[],"version":3,"file":"useGrid.cjs.map"}
+{"mappings":"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","sources":["packages/react-aria/src/grid/useGrid.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {\n  AriaLabelingProps,\n  DOMAttributes,\n  DOMProps,\n  Key,\n  KeyboardDelegate,\n  RefObject\n} from '@react-types/shared';\nimport {filterDOMProps} from '../utils/filterDOMProps';\nimport {FocusEventHandler, useCallback, useMemo} from 'react';\nimport {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';\nimport {IGridCollection as GridCollection} from 'react-stately/private/grid/GridCollection';\nimport {GridKeyboardDelegate} from './GridKeyboardDelegate';\nimport {gridMap} from './utils';\nimport {GridState} from 'react-stately/private/grid/useGridState';\nimport {mergeProps} from '../utils/mergeProps';\nimport {useCollator} from '../i18n/useCollator';\nimport {useGridSelectionAnnouncement} from './useGridSelectionAnnouncement';\nimport {useHasTabbableChild} from '../focus/useHasTabbableChild';\nimport {useHighlightSelectionDescription} from './useHighlightSelectionDescription';\nimport {useId} from '../utils/useId';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSelectableCollection} from '../selection/useSelectableCollection';\n\nexport interface GridProps extends DOMProps, AriaLabelingProps {\n  /** Whether the grid uses virtual scrolling. */\n  isVirtualized?: boolean;\n  /**\n   * Whether typeahead navigation is disabled.\n   *\n   * @default false\n   */\n  disallowTypeAhead?: boolean;\n  /**\n   * An optional keyboard delegate implementation for type to select,\n   * to override the default.\n   */\n  keyboardDelegate?: KeyboardDelegate;\n  /**\n   * Whether initial grid focus should be placed on the grid row or grid cell.\n   *\n   * @default 'row'\n   */\n  focusMode?: 'row' | 'cell';\n  /**\n   * A function that returns the text that should be announced by assistive technology when a row is\n   * added or removed from selection.\n   *\n   * @default (key) => state.collection.getItem(key)?.textValue\n   */\n  getRowText?: (key: Key) => string;\n  /**\n   * The ref attached to the scrollable body. Used to provided automatic scrolling on item focus for\n   * non-virtualized grids.\n   */\n  scrollRef?: RefObject<HTMLElement | null>;\n  /** Handler that is called when a user performs an action on the row. */\n  onRowAction?: (key: Key) => void;\n  /** Handler that is called when a user performs an action on the cell. */\n  onCellAction?: (key: Key) => void;\n  /**\n   * Whether pressing the escape key should clear selection in the grid or not.\n   *\n   * Most experiences should not modify this option as it eliminates a keyboard user's ability to\n   * easily clear selection. Only use if the escape key is being handled externally or should not\n   * trigger selection clearing contextually.\n   *\n   * @default 'clearSelection'\n   */\n  escapeKeyBehavior?: 'clearSelection' | 'none';\n  /** Whether selection should occur on press up instead of press down. */\n  shouldSelectOnPressUp?: boolean;\n  /**\n   * Whether keyboard navigation to focusable elements within grid cells is\n   * via arrow keys or the tab key.\n   *\n   * @default 'arrow'\n   */\n  keyboardNavigationBehavior?: 'arrow' | 'tab';\n}\n\nexport interface GridAria {\n  /** Props for the grid element. */\n  gridProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a grid component. A grid displays data\n * in one or more rows and columns and enables a user to navigate its contents via directional\n * navigation keys.\n *\n * @param props - Props for the grid.\n * @param state - State for the grid, as returned by `useGridState`.\n * @param ref - The ref attached to the grid element.\n */\nexport function useGrid<T>(\n  props: GridProps,\n  state: GridState<T, GridCollection<T>>,\n  ref: RefObject<HTMLElement | null>\n): GridAria {\n  let {\n    isVirtualized,\n    disallowTypeAhead,\n    keyboardDelegate,\n    focusMode,\n    scrollRef,\n    getRowText,\n    onRowAction,\n    onCellAction,\n    escapeKeyBehavior = 'clearSelection',\n    shouldSelectOnPressUp,\n    keyboardNavigationBehavior = 'arrow'\n  } = props;\n  let {selectionManager: manager} = state;\n\n  if (!props['aria-label'] && !props['aria-labelledby']) {\n    console.warn('An aria-label or aria-labelledby prop is required for accessibility.');\n  }\n\n  // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).\n  // When virtualized, the layout object will be passed in as a prop and override this.\n  let collator = useCollator({usage: 'search', sensitivity: 'base'});\n  let {direction} = useLocale();\n  let disabledBehavior = state.selectionManager.disabledBehavior;\n  let delegate = useMemo(\n    () =>\n      keyboardDelegate ||\n      new GridKeyboardDelegate({\n        collection: state.collection,\n        disabledKeys: state.disabledKeys,\n        disabledBehavior,\n        ref,\n        direction,\n        collator,\n        focusMode\n      }),\n    [\n      keyboardDelegate,\n      state.collection,\n      state.disabledKeys,\n      disabledBehavior,\n      ref,\n      direction,\n      collator,\n      focusMode\n    ]\n  );\n\n  let {collectionProps} = useSelectableCollection({\n    ref,\n    selectionManager: manager,\n    keyboardDelegate: delegate,\n    isVirtualized,\n    scrollRef,\n    disallowTypeAhead,\n    escapeKeyBehavior\n  });\n\n  let id = useId(props.id);\n  gridMap.set(state, {\n    keyboardDelegate: delegate,\n    actions: {onRowAction, onCellAction},\n    shouldSelectOnPressUp,\n    keyboardNavigationBehavior\n  });\n\n  let descriptionProps = useHighlightSelectionDescription({\n    selectionManager: manager,\n    hasItemActions: !!(onRowAction || onCellAction)\n  });\n\n  let domProps = filterDOMProps(props, {labelable: true});\n\n  let onFocus: FocusEventHandler = useCallback(\n    e => {\n      if (manager.isFocused) {\n        // If a focus event bubbled through a portal, reset focus state.\n        if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n          manager.setFocused(false);\n        }\n\n        return;\n      }\n\n      // Focus events can bubble through portals. Ignore these events.\n      if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n        return;\n      }\n\n      manager.setFocused(true);\n    },\n    [manager]\n  );\n\n  // Continue to track collection focused state even if keyboard navigation is disabled\n  let navDisabledHandlers = useMemo(\n    () => ({\n      onBlur: collectionProps.onBlur,\n      onFocus\n    }),\n    [onFocus, collectionProps.onBlur]\n  );\n\n  let hasTabbableChild = useHasTabbableChild(ref, {\n    isDisabled: state.collection.size !== 0\n  });\n\n  let gridProps: DOMAttributes = mergeProps(\n    domProps,\n    {\n      role: 'grid',\n      id,\n      'aria-multiselectable': manager.selectionMode === 'multiple' ? 'true' : undefined\n    },\n    state.isKeyboardNavigationDisabled ? navDisabledHandlers : collectionProps,\n    // If collection is empty, make sure the grid is tabbable unless there is a child tabbable element.\n    (state.collection.size === 0 && {tabIndex: hasTabbableChild ? -1 : 0}) || undefined,\n    descriptionProps\n  );\n\n  if (isVirtualized) {\n    gridProps['aria-rowcount'] = state.collection.size;\n    gridProps['aria-colcount'] = state.collection.columnCount;\n  }\n\n  useGridSelectionAnnouncement({getRowText}, state);\n  return {\n    gridProps\n  };\n}\n"],"names":[],"version":3,"file":"useGrid.cjs.map"}

package/dist/private/grid/useGrid.js

@@ -36,7 +36,7 @@ import {useMemo as $mdvea$useMemo, useCallback as $mdvea$useCallback} from "reac
 
 
 function $4b54785d6bd5a561$export$f6b86a04e5d66d90(props, state, ref) {
-    let { isVirtualized: isVirtualized, disallowTypeAhead: disallowTypeAhead, keyboardDelegate: keyboardDelegate, focusMode: focusMode, scrollRef: scrollRef, getRowText: getRowText, onRowAction: onRowAction, onCellAction: onCellAction, escapeKeyBehavior: escapeKeyBehavior = 'clearSelection', shouldSelectOnPressUp: shouldSelectOnPressUp } = props;
+    let { isVirtualized: isVirtualized, disallowTypeAhead: disallowTypeAhead, keyboardDelegate: keyboardDelegate, focusMode: focusMode, scrollRef: scrollRef, getRowText: getRowText, onRowAction: onRowAction, onCellAction: onCellAction, escapeKeyBehavior: escapeKeyBehavior = 'clearSelection', shouldSelectOnPressUp: shouldSelectOnPressUp, keyboardNavigationBehavior: keyboardNavigationBehavior = 'arrow' } = props;
     let { selectionManager: manager } = state;
     if (!props['aria-label'] && !props['aria-labelledby']) console.warn('An aria-label or aria-labelledby prop is required for accessibility.');
     // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).
@@ -81,7 +81,8 @@ function $4b54785d6bd5a561$export$f6b86a04e5d66d90(props, state, ref) {
             onRowAction: onRowAction,
             onCellAction: onCellAction
         },
-        shouldSelectOnPressUp: shouldSelectOnPressUp
+        shouldSelectOnPressUp: shouldSelectOnPressUp,
+        keyboardNavigationBehavior: keyboardNavigationBehavior
     });
     let descriptionProps = (0, $344ec8680cac6ab0$export$be42ebdab07ae4c2)({
         selectionManager: manager,

package/dist/private/grid/useGrid.js.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/react-aria/src/grid/useGrid.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {\n  AriaLabelingProps,\n  DOMAttributes,\n  DOMProps,\n  Key,\n  KeyboardDelegate,\n  RefObject\n} from '@react-types/shared';\nimport {filterDOMProps} from '../utils/filterDOMProps';\nimport {FocusEventHandler, useCallback, useMemo} from 'react';\nimport {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';\nimport {IGridCollection as GridCollection} from 'react-stately/private/grid/GridCollection';\nimport {GridKeyboardDelegate} from './GridKeyboardDelegate';\nimport {gridMap} from './utils';\nimport {GridState} from 'react-stately/private/grid/useGridState';\nimport {mergeProps} from '../utils/mergeProps';\nimport {useCollator} from '../i18n/useCollator';\nimport {useGridSelectionAnnouncement} from './useGridSelectionAnnouncement';\nimport {useHasTabbableChild} from '../focus/useHasTabbableChild';\nimport {useHighlightSelectionDescription} from './useHighlightSelectionDescription';\nimport {useId} from '../utils/useId';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSelectableCollection} from '../selection/useSelectableCollection';\n\nexport interface GridProps extends DOMProps, AriaLabelingProps {\n  /** Whether the grid uses virtual scrolling. */\n  isVirtualized?: boolean;\n  /**\n   * Whether typeahead navigation is disabled.\n   *\n   * @default false\n   */\n  disallowTypeAhead?: boolean;\n  /**\n   * An optional keyboard delegate implementation for type to select,\n   * to override the default.\n   */\n  keyboardDelegate?: KeyboardDelegate;\n  /**\n   * Whether initial grid focus should be placed on the grid row or grid cell.\n   *\n   * @default 'row'\n   */\n  focusMode?: 'row' | 'cell';\n  /**\n   * A function that returns the text that should be announced by assistive technology when a row is\n   * added or removed from selection.\n   *\n   * @default (key) => state.collection.getItem(key)?.textValue\n   */\n  getRowText?: (key: Key) => string;\n  /**\n   * The ref attached to the scrollable body. Used to provided automatic scrolling on item focus for\n   * non-virtualized grids.\n   */\n  scrollRef?: RefObject<HTMLElement | null>;\n  /** Handler that is called when a user performs an action on the row. */\n  onRowAction?: (key: Key) => void;\n  /** Handler that is called when a user performs an action on the cell. */\n  onCellAction?: (key: Key) => void;\n  /**\n   * Whether pressing the escape key should clear selection in the grid or not.\n   *\n   * Most experiences should not modify this option as it eliminates a keyboard user's ability to\n   * easily clear selection. Only use if the escape key is being handled externally or should not\n   * trigger selection clearing contextually.\n   *\n   * @default 'clearSelection'\n   */\n  escapeKeyBehavior?: 'clearSelection' | 'none';\n  /** Whether selection should occur on press up instead of press down. */\n  shouldSelectOnPressUp?: boolean;\n}\n\nexport interface GridAria {\n  /** Props for the grid element. */\n  gridProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a grid component. A grid displays data\n * in one or more rows and columns and enables a user to navigate its contents via directional\n * navigation keys.\n *\n * @param props - Props for the grid.\n * @param state - State for the grid, as returned by `useGridState`.\n * @param ref - The ref attached to the grid element.\n */\nexport function useGrid<T>(\n  props: GridProps,\n  state: GridState<T, GridCollection<T>>,\n  ref: RefObject<HTMLElement | null>\n): GridAria {\n  let {\n    isVirtualized,\n    disallowTypeAhead,\n    keyboardDelegate,\n    focusMode,\n    scrollRef,\n    getRowText,\n    onRowAction,\n    onCellAction,\n    escapeKeyBehavior = 'clearSelection',\n    shouldSelectOnPressUp\n  } = props;\n  let {selectionManager: manager} = state;\n\n  if (!props['aria-label'] && !props['aria-labelledby']) {\n    console.warn('An aria-label or aria-labelledby prop is required for accessibility.');\n  }\n\n  // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).\n  // When virtualized, the layout object will be passed in as a prop and override this.\n  let collator = useCollator({usage: 'search', sensitivity: 'base'});\n  let {direction} = useLocale();\n  let disabledBehavior = state.selectionManager.disabledBehavior;\n  let delegate = useMemo(\n    () =>\n      keyboardDelegate ||\n      new GridKeyboardDelegate({\n        collection: state.collection,\n        disabledKeys: state.disabledKeys,\n        disabledBehavior,\n        ref,\n        direction,\n        collator,\n        focusMode\n      }),\n    [\n      keyboardDelegate,\n      state.collection,\n      state.disabledKeys,\n      disabledBehavior,\n      ref,\n      direction,\n      collator,\n      focusMode\n    ]\n  );\n\n  let {collectionProps} = useSelectableCollection({\n    ref,\n    selectionManager: manager,\n    keyboardDelegate: delegate,\n    isVirtualized,\n    scrollRef,\n    disallowTypeAhead,\n    escapeKeyBehavior\n  });\n\n  let id = useId(props.id);\n  gridMap.set(state, {\n    keyboardDelegate: delegate,\n    actions: {onRowAction, onCellAction},\n    shouldSelectOnPressUp\n  });\n\n  let descriptionProps = useHighlightSelectionDescription({\n    selectionManager: manager,\n    hasItemActions: !!(onRowAction || onCellAction)\n  });\n\n  let domProps = filterDOMProps(props, {labelable: true});\n\n  let onFocus: FocusEventHandler = useCallback(\n    e => {\n      if (manager.isFocused) {\n        // If a focus event bubbled through a portal, reset focus state.\n        if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n          manager.setFocused(false);\n        }\n\n        return;\n      }\n\n      // Focus events can bubble through portals. Ignore these events.\n      if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n        return;\n      }\n\n      manager.setFocused(true);\n    },\n    [manager]\n  );\n\n  // Continue to track collection focused state even if keyboard navigation is disabled\n  let navDisabledHandlers = useMemo(\n    () => ({\n      onBlur: collectionProps.onBlur,\n      onFocus\n    }),\n    [onFocus, collectionProps.onBlur]\n  );\n\n  let hasTabbableChild = useHasTabbableChild(ref, {\n    isDisabled: state.collection.size !== 0\n  });\n\n  let gridProps: DOMAttributes = mergeProps(\n    domProps,\n    {\n      role: 'grid',\n      id,\n      'aria-multiselectable': manager.selectionMode === 'multiple' ? 'true' : undefined\n    },\n    state.isKeyboardNavigationDisabled ? navDisabledHandlers : collectionProps,\n    // If collection is empty, make sure the grid is tabbable unless there is a child tabbable element.\n    (state.collection.size === 0 && {tabIndex: hasTabbableChild ? -1 : 0}) || undefined,\n    descriptionProps\n  );\n\n  if (isVirtualized) {\n    gridProps['aria-rowcount'] = state.collection.size;\n    gridProps['aria-colcount'] = state.collection.columnCount;\n  }\n\n  useGridSelectionAnnouncement({getRowText}, state);\n  return {\n    gridProps\n  };\n}\n"],"names":[],"version":3,"file":"useGrid.js.map"}
+{"mappings":"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","sources":["packages/react-aria/src/grid/useGrid.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {\n  AriaLabelingProps,\n  DOMAttributes,\n  DOMProps,\n  Key,\n  KeyboardDelegate,\n  RefObject\n} from '@react-types/shared';\nimport {filterDOMProps} from '../utils/filterDOMProps';\nimport {FocusEventHandler, useCallback, useMemo} from 'react';\nimport {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';\nimport {IGridCollection as GridCollection} from 'react-stately/private/grid/GridCollection';\nimport {GridKeyboardDelegate} from './GridKeyboardDelegate';\nimport {gridMap} from './utils';\nimport {GridState} from 'react-stately/private/grid/useGridState';\nimport {mergeProps} from '../utils/mergeProps';\nimport {useCollator} from '../i18n/useCollator';\nimport {useGridSelectionAnnouncement} from './useGridSelectionAnnouncement';\nimport {useHasTabbableChild} from '../focus/useHasTabbableChild';\nimport {useHighlightSelectionDescription} from './useHighlightSelectionDescription';\nimport {useId} from '../utils/useId';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSelectableCollection} from '../selection/useSelectableCollection';\n\nexport interface GridProps extends DOMProps, AriaLabelingProps {\n  /** Whether the grid uses virtual scrolling. */\n  isVirtualized?: boolean;\n  /**\n   * Whether typeahead navigation is disabled.\n   *\n   * @default false\n   */\n  disallowTypeAhead?: boolean;\n  /**\n   * An optional keyboard delegate implementation for type to select,\n   * to override the default.\n   */\n  keyboardDelegate?: KeyboardDelegate;\n  /**\n   * Whether initial grid focus should be placed on the grid row or grid cell.\n   *\n   * @default 'row'\n   */\n  focusMode?: 'row' | 'cell';\n  /**\n   * A function that returns the text that should be announced by assistive technology when a row is\n   * added or removed from selection.\n   *\n   * @default (key) => state.collection.getItem(key)?.textValue\n   */\n  getRowText?: (key: Key) => string;\n  /**\n   * The ref attached to the scrollable body. Used to provided automatic scrolling on item focus for\n   * non-virtualized grids.\n   */\n  scrollRef?: RefObject<HTMLElement | null>;\n  /** Handler that is called when a user performs an action on the row. */\n  onRowAction?: (key: Key) => void;\n  /** Handler that is called when a user performs an action on the cell. */\n  onCellAction?: (key: Key) => void;\n  /**\n   * Whether pressing the escape key should clear selection in the grid or not.\n   *\n   * Most experiences should not modify this option as it eliminates a keyboard user's ability to\n   * easily clear selection. Only use if the escape key is being handled externally or should not\n   * trigger selection clearing contextually.\n   *\n   * @default 'clearSelection'\n   */\n  escapeKeyBehavior?: 'clearSelection' | 'none';\n  /** Whether selection should occur on press up instead of press down. */\n  shouldSelectOnPressUp?: boolean;\n  /**\n   * Whether keyboard navigation to focusable elements within grid cells is\n   * via arrow keys or the tab key.\n   *\n   * @default 'arrow'\n   */\n  keyboardNavigationBehavior?: 'arrow' | 'tab';\n}\n\nexport interface GridAria {\n  /** Props for the grid element. */\n  gridProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a grid component. A grid displays data\n * in one or more rows and columns and enables a user to navigate its contents via directional\n * navigation keys.\n *\n * @param props - Props for the grid.\n * @param state - State for the grid, as returned by `useGridState`.\n * @param ref - The ref attached to the grid element.\n */\nexport function useGrid<T>(\n  props: GridProps,\n  state: GridState<T, GridCollection<T>>,\n  ref: RefObject<HTMLElement | null>\n): GridAria {\n  let {\n    isVirtualized,\n    disallowTypeAhead,\n    keyboardDelegate,\n    focusMode,\n    scrollRef,\n    getRowText,\n    onRowAction,\n    onCellAction,\n    escapeKeyBehavior = 'clearSelection',\n    shouldSelectOnPressUp,\n    keyboardNavigationBehavior = 'arrow'\n  } = props;\n  let {selectionManager: manager} = state;\n\n  if (!props['aria-label'] && !props['aria-labelledby']) {\n    console.warn('An aria-label or aria-labelledby prop is required for accessibility.');\n  }\n\n  // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).\n  // When virtualized, the layout object will be passed in as a prop and override this.\n  let collator = useCollator({usage: 'search', sensitivity: 'base'});\n  let {direction} = useLocale();\n  let disabledBehavior = state.selectionManager.disabledBehavior;\n  let delegate = useMemo(\n    () =>\n      keyboardDelegate ||\n      new GridKeyboardDelegate({\n        collection: state.collection,\n        disabledKeys: state.disabledKeys,\n        disabledBehavior,\n        ref,\n        direction,\n        collator,\n        focusMode\n      }),\n    [\n      keyboardDelegate,\n      state.collection,\n      state.disabledKeys,\n      disabledBehavior,\n      ref,\n      direction,\n      collator,\n      focusMode\n    ]\n  );\n\n  let {collectionProps} = useSelectableCollection({\n    ref,\n    selectionManager: manager,\n    keyboardDelegate: delegate,\n    isVirtualized,\n    scrollRef,\n    disallowTypeAhead,\n    escapeKeyBehavior\n  });\n\n  let id = useId(props.id);\n  gridMap.set(state, {\n    keyboardDelegate: delegate,\n    actions: {onRowAction, onCellAction},\n    shouldSelectOnPressUp,\n    keyboardNavigationBehavior\n  });\n\n  let descriptionProps = useHighlightSelectionDescription({\n    selectionManager: manager,\n    hasItemActions: !!(onRowAction || onCellAction)\n  });\n\n  let domProps = filterDOMProps(props, {labelable: true});\n\n  let onFocus: FocusEventHandler = useCallback(\n    e => {\n      if (manager.isFocused) {\n        // If a focus event bubbled through a portal, reset focus state.\n        if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n          manager.setFocused(false);\n        }\n\n        return;\n      }\n\n      // Focus events can bubble through portals. Ignore these events.\n      if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n        return;\n      }\n\n      manager.setFocused(true);\n    },\n    [manager]\n  );\n\n  // Continue to track collection focused state even if keyboard navigation is disabled\n  let navDisabledHandlers = useMemo(\n    () => ({\n      onBlur: collectionProps.onBlur,\n      onFocus\n    }),\n    [onFocus, collectionProps.onBlur]\n  );\n\n  let hasTabbableChild = useHasTabbableChild(ref, {\n    isDisabled: state.collection.size !== 0\n  });\n\n  let gridProps: DOMAttributes = mergeProps(\n    domProps,\n    {\n      role: 'grid',\n      id,\n      'aria-multiselectable': manager.selectionMode === 'multiple' ? 'true' : undefined\n    },\n    state.isKeyboardNavigationDisabled ? navDisabledHandlers : collectionProps,\n    // If collection is empty, make sure the grid is tabbable unless there is a child tabbable element.\n    (state.collection.size === 0 && {tabIndex: hasTabbableChild ? -1 : 0}) || undefined,\n    descriptionProps\n  );\n\n  if (isVirtualized) {\n    gridProps['aria-rowcount'] = state.collection.size;\n    gridProps['aria-colcount'] = state.collection.columnCount;\n  }\n\n  useGridSelectionAnnouncement({getRowText}, state);\n  return {\n    gridProps\n  };\n}\n"],"names":[],"version":3,"file":"useGrid.js.map"}

package/dist/private/grid/useGrid.mjs

@@ -36,7 +36,7 @@ import {useMemo as $1jEUe$useMemo, useCallback as $1jEUe$useCallback} from "reac
 
 
 function $e9c0503d101e30f9$export$f6b86a04e5d66d90(props, state, ref) {
-    let { isVirtualized: isVirtualized, disallowTypeAhead: disallowTypeAhead, keyboardDelegate: keyboardDelegate, focusMode: focusMode, scrollRef: scrollRef, getRowText: getRowText, onRowAction: onRowAction, onCellAction: onCellAction, escapeKeyBehavior: escapeKeyBehavior = 'clearSelection', shouldSelectOnPressUp: shouldSelectOnPressUp } = props;
+    let { isVirtualized: isVirtualized, disallowTypeAhead: disallowTypeAhead, keyboardDelegate: keyboardDelegate, focusMode: focusMode, scrollRef: scrollRef, getRowText: getRowText, onRowAction: onRowAction, onCellAction: onCellAction, escapeKeyBehavior: escapeKeyBehavior = 'clearSelection', shouldSelectOnPressUp: shouldSelectOnPressUp, keyboardNavigationBehavior: keyboardNavigationBehavior = 'arrow' } = props;
     let { selectionManager: manager } = state;
     if (!props['aria-label'] && !props['aria-labelledby']) console.warn('An aria-label or aria-labelledby prop is required for accessibility.');
     // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).
@@ -81,7 +81,8 @@ function $e9c0503d101e30f9$export$f6b86a04e5d66d90(props, state, ref) {
             onRowAction: onRowAction,
             onCellAction: onCellAction
         },
-        shouldSelectOnPressUp: shouldSelectOnPressUp
+        shouldSelectOnPressUp: shouldSelectOnPressUp,
+        keyboardNavigationBehavior: keyboardNavigationBehavior
     });
     let descriptionProps = (0, $40ae3c60ef0e2e61$export$be42ebdab07ae4c2)({
         selectionManager: manager,

package/dist/private/grid/useGrid.mjs.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/react-aria/src/grid/useGrid.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {\n  AriaLabelingProps,\n  DOMAttributes,\n  DOMProps,\n  Key,\n  KeyboardDelegate,\n  RefObject\n} from '@react-types/shared';\nimport {filterDOMProps} from '../utils/filterDOMProps';\nimport {FocusEventHandler, useCallback, useMemo} from 'react';\nimport {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';\nimport {IGridCollection as GridCollection} from 'react-stately/private/grid/GridCollection';\nimport {GridKeyboardDelegate} from './GridKeyboardDelegate';\nimport {gridMap} from './utils';\nimport {GridState} from 'react-stately/private/grid/useGridState';\nimport {mergeProps} from '../utils/mergeProps';\nimport {useCollator} from '../i18n/useCollator';\nimport {useGridSelectionAnnouncement} from './useGridSelectionAnnouncement';\nimport {useHasTabbableChild} from '../focus/useHasTabbableChild';\nimport {useHighlightSelectionDescription} from './useHighlightSelectionDescription';\nimport {useId} from '../utils/useId';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSelectableCollection} from '../selection/useSelectableCollection';\n\nexport interface GridProps extends DOMProps, AriaLabelingProps {\n  /** Whether the grid uses virtual scrolling. */\n  isVirtualized?: boolean;\n  /**\n   * Whether typeahead navigation is disabled.\n   *\n   * @default false\n   */\n  disallowTypeAhead?: boolean;\n  /**\n   * An optional keyboard delegate implementation for type to select,\n   * to override the default.\n   */\n  keyboardDelegate?: KeyboardDelegate;\n  /**\n   * Whether initial grid focus should be placed on the grid row or grid cell.\n   *\n   * @default 'row'\n   */\n  focusMode?: 'row' | 'cell';\n  /**\n   * A function that returns the text that should be announced by assistive technology when a row is\n   * added or removed from selection.\n   *\n   * @default (key) => state.collection.getItem(key)?.textValue\n   */\n  getRowText?: (key: Key) => string;\n  /**\n   * The ref attached to the scrollable body. Used to provided automatic scrolling on item focus for\n   * non-virtualized grids.\n   */\n  scrollRef?: RefObject<HTMLElement | null>;\n  /** Handler that is called when a user performs an action on the row. */\n  onRowAction?: (key: Key) => void;\n  /** Handler that is called when a user performs an action on the cell. */\n  onCellAction?: (key: Key) => void;\n  /**\n   * Whether pressing the escape key should clear selection in the grid or not.\n   *\n   * Most experiences should not modify this option as it eliminates a keyboard user's ability to\n   * easily clear selection. Only use if the escape key is being handled externally or should not\n   * trigger selection clearing contextually.\n   *\n   * @default 'clearSelection'\n   */\n  escapeKeyBehavior?: 'clearSelection' | 'none';\n  /** Whether selection should occur on press up instead of press down. */\n  shouldSelectOnPressUp?: boolean;\n}\n\nexport interface GridAria {\n  /** Props for the grid element. */\n  gridProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a grid component. A grid displays data\n * in one or more rows and columns and enables a user to navigate its contents via directional\n * navigation keys.\n *\n * @param props - Props for the grid.\n * @param state - State for the grid, as returned by `useGridState`.\n * @param ref - The ref attached to the grid element.\n */\nexport function useGrid<T>(\n  props: GridProps,\n  state: GridState<T, GridCollection<T>>,\n  ref: RefObject<HTMLElement | null>\n): GridAria {\n  let {\n    isVirtualized,\n    disallowTypeAhead,\n    keyboardDelegate,\n    focusMode,\n    scrollRef,\n    getRowText,\n    onRowAction,\n    onCellAction,\n    escapeKeyBehavior = 'clearSelection',\n    shouldSelectOnPressUp\n  } = props;\n  let {selectionManager: manager} = state;\n\n  if (!props['aria-label'] && !props['aria-labelledby']) {\n    console.warn('An aria-label or aria-labelledby prop is required for accessibility.');\n  }\n\n  // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).\n  // When virtualized, the layout object will be passed in as a prop and override this.\n  let collator = useCollator({usage: 'search', sensitivity: 'base'});\n  let {direction} = useLocale();\n  let disabledBehavior = state.selectionManager.disabledBehavior;\n  let delegate = useMemo(\n    () =>\n      keyboardDelegate ||\n      new GridKeyboardDelegate({\n        collection: state.collection,\n        disabledKeys: state.disabledKeys,\n        disabledBehavior,\n        ref,\n        direction,\n        collator,\n        focusMode\n      }),\n    [\n      keyboardDelegate,\n      state.collection,\n      state.disabledKeys,\n      disabledBehavior,\n      ref,\n      direction,\n      collator,\n      focusMode\n    ]\n  );\n\n  let {collectionProps} = useSelectableCollection({\n    ref,\n    selectionManager: manager,\n    keyboardDelegate: delegate,\n    isVirtualized,\n    scrollRef,\n    disallowTypeAhead,\n    escapeKeyBehavior\n  });\n\n  let id = useId(props.id);\n  gridMap.set(state, {\n    keyboardDelegate: delegate,\n    actions: {onRowAction, onCellAction},\n    shouldSelectOnPressUp\n  });\n\n  let descriptionProps = useHighlightSelectionDescription({\n    selectionManager: manager,\n    hasItemActions: !!(onRowAction || onCellAction)\n  });\n\n  let domProps = filterDOMProps(props, {labelable: true});\n\n  let onFocus: FocusEventHandler = useCallback(\n    e => {\n      if (manager.isFocused) {\n        // If a focus event bubbled through a portal, reset focus state.\n        if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n          manager.setFocused(false);\n        }\n\n        return;\n      }\n\n      // Focus events can bubble through portals. Ignore these events.\n      if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n        return;\n      }\n\n      manager.setFocused(true);\n    },\n    [manager]\n  );\n\n  // Continue to track collection focused state even if keyboard navigation is disabled\n  let navDisabledHandlers = useMemo(\n    () => ({\n      onBlur: collectionProps.onBlur,\n      onFocus\n    }),\n    [onFocus, collectionProps.onBlur]\n  );\n\n  let hasTabbableChild = useHasTabbableChild(ref, {\n    isDisabled: state.collection.size !== 0\n  });\n\n  let gridProps: DOMAttributes = mergeProps(\n    domProps,\n    {\n      role: 'grid',\n      id,\n      'aria-multiselectable': manager.selectionMode === 'multiple' ? 'true' : undefined\n    },\n    state.isKeyboardNavigationDisabled ? navDisabledHandlers : collectionProps,\n    // If collection is empty, make sure the grid is tabbable unless there is a child tabbable element.\n    (state.collection.size === 0 && {tabIndex: hasTabbableChild ? -1 : 0}) || undefined,\n    descriptionProps\n  );\n\n  if (isVirtualized) {\n    gridProps['aria-rowcount'] = state.collection.size;\n    gridProps['aria-colcount'] = state.collection.columnCount;\n  }\n\n  useGridSelectionAnnouncement({getRowText}, state);\n  return {\n    gridProps\n  };\n}\n"],"names":[],"version":3,"file":"useGrid.mjs.map"}
+{"mappings":"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","sources":["packages/react-aria/src/grid/useGrid.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {\n  AriaLabelingProps,\n  DOMAttributes,\n  DOMProps,\n  Key,\n  KeyboardDelegate,\n  RefObject\n} from '@react-types/shared';\nimport {filterDOMProps} from '../utils/filterDOMProps';\nimport {FocusEventHandler, useCallback, useMemo} from 'react';\nimport {getEventTarget, nodeContains} from '../utils/shadowdom/DOMFunctions';\nimport {IGridCollection as GridCollection} from 'react-stately/private/grid/GridCollection';\nimport {GridKeyboardDelegate} from './GridKeyboardDelegate';\nimport {gridMap} from './utils';\nimport {GridState} from 'react-stately/private/grid/useGridState';\nimport {mergeProps} from '../utils/mergeProps';\nimport {useCollator} from '../i18n/useCollator';\nimport {useGridSelectionAnnouncement} from './useGridSelectionAnnouncement';\nimport {useHasTabbableChild} from '../focus/useHasTabbableChild';\nimport {useHighlightSelectionDescription} from './useHighlightSelectionDescription';\nimport {useId} from '../utils/useId';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSelectableCollection} from '../selection/useSelectableCollection';\n\nexport interface GridProps extends DOMProps, AriaLabelingProps {\n  /** Whether the grid uses virtual scrolling. */\n  isVirtualized?: boolean;\n  /**\n   * Whether typeahead navigation is disabled.\n   *\n   * @default false\n   */\n  disallowTypeAhead?: boolean;\n  /**\n   * An optional keyboard delegate implementation for type to select,\n   * to override the default.\n   */\n  keyboardDelegate?: KeyboardDelegate;\n  /**\n   * Whether initial grid focus should be placed on the grid row or grid cell.\n   *\n   * @default 'row'\n   */\n  focusMode?: 'row' | 'cell';\n  /**\n   * A function that returns the text that should be announced by assistive technology when a row is\n   * added or removed from selection.\n   *\n   * @default (key) => state.collection.getItem(key)?.textValue\n   */\n  getRowText?: (key: Key) => string;\n  /**\n   * The ref attached to the scrollable body. Used to provided automatic scrolling on item focus for\n   * non-virtualized grids.\n   */\n  scrollRef?: RefObject<HTMLElement | null>;\n  /** Handler that is called when a user performs an action on the row. */\n  onRowAction?: (key: Key) => void;\n  /** Handler that is called when a user performs an action on the cell. */\n  onCellAction?: (key: Key) => void;\n  /**\n   * Whether pressing the escape key should clear selection in the grid or not.\n   *\n   * Most experiences should not modify this option as it eliminates a keyboard user's ability to\n   * easily clear selection. Only use if the escape key is being handled externally or should not\n   * trigger selection clearing contextually.\n   *\n   * @default 'clearSelection'\n   */\n  escapeKeyBehavior?: 'clearSelection' | 'none';\n  /** Whether selection should occur on press up instead of press down. */\n  shouldSelectOnPressUp?: boolean;\n  /**\n   * Whether keyboard navigation to focusable elements within grid cells is\n   * via arrow keys or the tab key.\n   *\n   * @default 'arrow'\n   */\n  keyboardNavigationBehavior?: 'arrow' | 'tab';\n}\n\nexport interface GridAria {\n  /** Props for the grid element. */\n  gridProps: DOMAttributes;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a grid component. A grid displays data\n * in one or more rows and columns and enables a user to navigate its contents via directional\n * navigation keys.\n *\n * @param props - Props for the grid.\n * @param state - State for the grid, as returned by `useGridState`.\n * @param ref - The ref attached to the grid element.\n */\nexport function useGrid<T>(\n  props: GridProps,\n  state: GridState<T, GridCollection<T>>,\n  ref: RefObject<HTMLElement | null>\n): GridAria {\n  let {\n    isVirtualized,\n    disallowTypeAhead,\n    keyboardDelegate,\n    focusMode,\n    scrollRef,\n    getRowText,\n    onRowAction,\n    onCellAction,\n    escapeKeyBehavior = 'clearSelection',\n    shouldSelectOnPressUp,\n    keyboardNavigationBehavior = 'arrow'\n  } = props;\n  let {selectionManager: manager} = state;\n\n  if (!props['aria-label'] && !props['aria-labelledby']) {\n    console.warn('An aria-label or aria-labelledby prop is required for accessibility.');\n  }\n\n  // By default, a KeyboardDelegate is provided which uses the DOM to query layout information (e.g. for page up/page down).\n  // When virtualized, the layout object will be passed in as a prop and override this.\n  let collator = useCollator({usage: 'search', sensitivity: 'base'});\n  let {direction} = useLocale();\n  let disabledBehavior = state.selectionManager.disabledBehavior;\n  let delegate = useMemo(\n    () =>\n      keyboardDelegate ||\n      new GridKeyboardDelegate({\n        collection: state.collection,\n        disabledKeys: state.disabledKeys,\n        disabledBehavior,\n        ref,\n        direction,\n        collator,\n        focusMode\n      }),\n    [\n      keyboardDelegate,\n      state.collection,\n      state.disabledKeys,\n      disabledBehavior,\n      ref,\n      direction,\n      collator,\n      focusMode\n    ]\n  );\n\n  let {collectionProps} = useSelectableCollection({\n    ref,\n    selectionManager: manager,\n    keyboardDelegate: delegate,\n    isVirtualized,\n    scrollRef,\n    disallowTypeAhead,\n    escapeKeyBehavior\n  });\n\n  let id = useId(props.id);\n  gridMap.set(state, {\n    keyboardDelegate: delegate,\n    actions: {onRowAction, onCellAction},\n    shouldSelectOnPressUp,\n    keyboardNavigationBehavior\n  });\n\n  let descriptionProps = useHighlightSelectionDescription({\n    selectionManager: manager,\n    hasItemActions: !!(onRowAction || onCellAction)\n  });\n\n  let domProps = filterDOMProps(props, {labelable: true});\n\n  let onFocus: FocusEventHandler = useCallback(\n    e => {\n      if (manager.isFocused) {\n        // If a focus event bubbled through a portal, reset focus state.\n        if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n          manager.setFocused(false);\n        }\n\n        return;\n      }\n\n      // Focus events can bubble through portals. Ignore these events.\n      if (!nodeContains(e.currentTarget, getEventTarget(e))) {\n        return;\n      }\n\n      manager.setFocused(true);\n    },\n    [manager]\n  );\n\n  // Continue to track collection focused state even if keyboard navigation is disabled\n  let navDisabledHandlers = useMemo(\n    () => ({\n      onBlur: collectionProps.onBlur,\n      onFocus\n    }),\n    [onFocus, collectionProps.onBlur]\n  );\n\n  let hasTabbableChild = useHasTabbableChild(ref, {\n    isDisabled: state.collection.size !== 0\n  });\n\n  let gridProps: DOMAttributes = mergeProps(\n    domProps,\n    {\n      role: 'grid',\n      id,\n      'aria-multiselectable': manager.selectionMode === 'multiple' ? 'true' : undefined\n    },\n    state.isKeyboardNavigationDisabled ? navDisabledHandlers : collectionProps,\n    // If collection is empty, make sure the grid is tabbable unless there is a child tabbable element.\n    (state.collection.size === 0 && {tabIndex: hasTabbableChild ? -1 : 0}) || undefined,\n    descriptionProps\n  );\n\n  if (isVirtualized) {\n    gridProps['aria-rowcount'] = state.collection.size;\n    gridProps['aria-colcount'] = state.collection.columnCount;\n  }\n\n  useGridSelectionAnnouncement({getRowText}, state);\n  return {\n    gridProps\n  };\n}\n"],"names":[],"version":3,"file":"useGrid.mjs.map"}

package/dist/private/grid/useGridCell.cjs

@@ -1,6 +1,7 @@
 var $4a053a4bf25e52fb$exports = require("../interactions/focusSafely.cjs");
 var $da02ee888921bc9e$exports = require("../utils/shadowdom/DOMFunctions.cjs");
 var $9fb4ac1cc58342cc$exports = require("../focus/FocusScope.cjs");
+var $49582955cc364b1c$exports = require("../utils/domHelpers.cjs");
 var $d865e4ff74ef4a73$exports = require("../utils/getScrollParent.cjs");
 var $d558273e57410528$exports = require("./utils.cjs");
 var $d0df89f3abe2c2ca$exports = require("../interactions/useFocusVisible.cjs");
@@ -37,10 +38,12 @@ $parcel$export(module.exports, "useGridCell", function () { return $83fb058f79cd
 
 
 
+
 function $83fb058f79cd147c$export$c7e10bfc0c59f67c(props, state, ref) {
-    let { node: node, isVirtualized: isVirtualized, focusMode: focusMode = 'child', shouldSelectOnPressUp: shouldSelectOnPressUp, onAction: onAction } = props;
+    let { node: node, isVirtualized: isVirtualized, focusMode: focusModeProp, allowsArrowNavigation: allowsArrowNavigation, shouldSelectOnPressUp: shouldSelectOnPressUp, onAction: onAction } = props;
     let { direction: direction } = (0, $2522e612fa919664$exports.useLocale)();
-    let { keyboardDelegate: keyboardDelegate, actions: { onCellAction: onCellAction } } = (0, $d558273e57410528$exports.gridMap).get(state);
+    let { keyboardDelegate: keyboardDelegate, actions: { onCellAction: onCellAction }, keyboardNavigationBehavior: keyboardNavigationBehavior } = (0, $d558273e57410528$exports.gridMap).get(state);
+    let focusMode = focusModeProp ?? (keyboardNavigationBehavior === 'tab' ? 'cell' : 'child');
     // We need to track the key of the item at the time it was last focused so that we force
     // focus to go to the item when the DOM node is reused for a different item in a virtualizer.
     let keyWhenFocused = (0, $erC6p$react.useRef)(null);
@@ -51,7 +54,7 @@ function $83fb058f79cd147c$export$c7e10bfc0c59f67c(props, state, ref) {
             let treeWalker = (0, $9fb4ac1cc58342cc$exports.getFocusableTreeWalker)(ref.current);
             if (focusMode === 'child') {
                 // If focus is already on a focusable child within the cell, early return so we don't shift focus
-                if ((0, $da02ee888921bc9e$exports.isFocusWithin)(ref.current) && ref.current !== (0, $da02ee888921bc9e$exports.getActiveElement)()) return;
+                if ((0, $da02ee888921bc9e$exports.isFocusWithin)(ref.current) && ref.current !== (0, $da02ee888921bc9e$exports.getActiveElement)((0, $49582955cc364b1c$exports.getOwnerDocument)(ref.current))) return;
                 let focusable = state.selectionManager.childFocusStrategy === 'last' ? $83fb058f79cd147c$var$last(treeWalker) : treeWalker.firstChild();
                 if (focusable) {
                     (0, $4a053a4bf25e52fb$exports.focusSafely)(focusable);
@@ -72,7 +75,7 @@ function $83fb058f79cd147c$export$c7e10bfc0c59f67c(props, state, ref) {
         isDisabled: state.collection.size === 0
     });
     let onKeyDownCapture = (e)=>{
-        let activeElement = (0, $da02ee888921bc9e$exports.getActiveElement)();
+        let activeElement = (0, $da02ee888921bc9e$exports.getActiveElement)((0, $49582955cc364b1c$exports.getOwnerDocument)(ref.current));
         if (!(0, $da02ee888921bc9e$exports.nodeContains)(e.currentTarget, (0, $da02ee888921bc9e$exports.getEventTarget)(e)) || state.isKeyboardNavigationDisabled || !ref.current || !activeElement) return;
         let walker = (0, $9fb4ac1cc58342cc$exports.getFocusableTreeWalker)(ref.current);
         walker.currentNode = activeElement;
@@ -173,6 +176,29 @@ function $83fb058f79cd147c$export$c7e10bfc0c59f67c(props, state, ref) {
                 break;
         }
     };
+    let onKeyDown = (e)=>{
+        let activeElement = (0, $da02ee888921bc9e$exports.getActiveElement)((0, $49582955cc364b1c$exports.getOwnerDocument)(ref.current));
+        if (!(0, $da02ee888921bc9e$exports.nodeContains)(e.currentTarget, (0, $da02ee888921bc9e$exports.getEventTarget)(e)) || state.isKeyboardNavigationDisabled || !ref.current || !activeElement) return;
+        if (keyboardNavigationBehavior === 'tab') {
+            if ((0, $da02ee888921bc9e$exports.getEventTarget)(e) !== ref.current && e.key !== 'Tab') {
+                e.stopPropagation();
+                return;
+            }
+        }
+        switch(e.key){
+            case 'Tab':
+                if (keyboardNavigationBehavior === 'tab') {
+                    // If there is another focusable element within this item, stop propagation so the tab key
+                    // is handled by the browser and not by useSelectableCollection (which would take us out of the list).
+                    let walker = (0, $9fb4ac1cc58342cc$exports.getFocusableTreeWalker)(ref.current, {
+                        tabbable: true
+                    });
+                    walker.currentNode = activeElement;
+                    let next = e.shiftKey ? walker.previousNode() : walker.nextNode();
+                    if (next) e.stopPropagation();
+                }
+        }
+    };
     // Grid cells can have focusable elements inside them. In this case, focus should
     // be marshalled to that element rather than focusing the cell itself.
     let onFocus = (e)=>{
@@ -187,19 +213,29 @@ function $83fb058f79cd147c$export$c7e10bfc0c59f67c(props, state, ref) {
             if (!(0, $d0df89f3abe2c2ca$exports.isFocusVisible)()) state.selectionManager.setFocusedKey(node.key);
             return;
         }
-        // If the cell itself is focused, wait a frame so that focus finishes propagatating
+        // if focus goes back to cell from child, make sure we don't refocus the cell if we are in focusMode=child
+        // since that would be a focus trap
+        if (focusMode === 'child' && e.relatedTarget && (0, $da02ee888921bc9e$exports.nodeContains)(ref.current, e.relatedTarget)) return;
+        // If the cell itself is focused, wait a frame so that focus finishes propagating
         // up to the tree, and move focus to a focusable child if possible.
         requestAnimationFrame(()=>{
-            if (focusMode === 'child' && (0, $da02ee888921bc9e$exports.getActiveElement)() === ref.current) focus();
+            if (focusMode === 'child' && (0, $da02ee888921bc9e$exports.getActiveElement)((0, $49582955cc364b1c$exports.getOwnerDocument)(ref.current)) === ref.current) focus();
         });
     };
+    // oxlint-disable-next-line react/react-compiler
     let gridCellProps = (0, $89b39774f3b79dbb$exports.mergeProps)(itemProps, {
         role: 'gridcell',
-        onKeyDownCapture: onKeyDownCapture,
+        onKeyDownCapture: keyboardNavigationBehavior !== 'tab' || allowsArrowNavigation ? onKeyDownCapture : undefined,
+        onKeyDown: keyboardNavigationBehavior === 'tab' ? onKeyDown : undefined,
         'aria-colspan': node.colSpan,
         'aria-colindex': node.colIndex != null ? node.colIndex + 1 : undefined,
         colSpan: isVirtualized ? undefined : node.colSpan,
-        onFocus: onFocus
+        onFocus: onFocus,
+        // make sure shift tabbing from a child of a cell doesnt move focus back to cell if focusMode="child" and in tab nav
+        // consistent with arrow nav and focusMode="child" since you can't go back to the cell there either
+        ...focusMode === 'child' && keyboardNavigationBehavior === 'tab' ? {
+            tabIndex: -1
+        } : {}
     });
     if (isVirtualized) gridCellProps['aria-colindex'] = (node.colIndex ?? node.index) + 1; // aria-colindex is 1-based
     // When pressing with a pointer and cell selection is not enabled, usePress will be applied to the

package/dist/private/grid/useGridCell.cjs.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/react-aria/src/grid/useGridCell.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared';\nimport {focusSafely} from '../interactions/focusSafely';\nimport {\n  getActiveElement,\n  getEventTarget,\n  isFocusWithin,\n  nodeContains\n} from '../utils/shadowdom/DOMFunctions';\nimport {getFocusableTreeWalker} from '../focus/FocusScope';\nimport {getScrollParent} from '../utils/getScrollParent';\nimport {\n  IGridCollection as GridCollection,\n  GridNode\n} from 'react-stately/private/grid/GridCollection';\nimport {gridMap} from './utils';\nimport {GridState} from 'react-stately/private/grid/useGridState';\nimport {isFocusVisible} from '../interactions/useFocusVisible';\nimport {mergeProps} from '../utils/mergeProps';\nimport {KeyboardEvent as ReactKeyboardEvent, useRef} from 'react';\nimport {scrollIntoViewport} from '../utils/scrollIntoView';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSelectableItem} from '../selection/useSelectableItem';\n\nexport interface GridCellProps {\n  /**\n   * An object representing the grid cell. Contains all the relevant information that makes up the\n   * grid cell.\n   */\n  node: GridNode<unknown>;\n  /** Whether the grid cell is contained in a virtual scroller. */\n  isVirtualized?: boolean;\n  /**\n   * Whether the cell or its first focusable child element should be focused when the grid cell is\n   * focused.\n   */\n  focusMode?: 'child' | 'cell';\n  /** Whether selection should occur on press up instead of press down. */\n  shouldSelectOnPressUp?: boolean;\n  /** Indicates how many columns the data cell spans. */\n  colSpan?: number;\n  /**\n   * Handler that is called when a user performs an action on the cell.\n   * Please use onCellAction at the collection level instead.\n   *\n   * @deprecated\n   */\n  onAction?: () => void;\n}\n\nexport interface GridCellAria {\n  /** Props for the grid cell element. */\n  gridCellProps: DOMAttributes;\n  /** Whether the cell is currently in a pressed state. */\n  isPressed: boolean;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a cell in a grid.\n *\n * @param props - Props for the cell.\n * @param state - State of the parent grid, as returned by `useGridState`.\n */\nexport function useGridCell<T, C extends GridCollection<T>>(\n  props: GridCellProps,\n  state: GridState<T, C>,\n  ref: RefObject<FocusableElement | null>\n): GridCellAria {\n  let {node, isVirtualized, focusMode = 'child', shouldSelectOnPressUp, onAction} = props;\n\n  let {direction} = useLocale();\n  let {\n    keyboardDelegate,\n    actions: {onCellAction}\n  } = gridMap.get(state)!;\n\n  // We need to track the key of the item at the time it was last focused so that we force\n  // focus to go to the item when the DOM node is reused for a different item in a virtualizer.\n  let keyWhenFocused = useRef<Key | null>(null);\n\n  // Handles focusing the cell. If there is a focusable child,\n  // it is focused, otherwise the cell itself is focused.\n  let focus = () => {\n    if (ref.current) {\n      let treeWalker = getFocusableTreeWalker(ref.current);\n      if (focusMode === 'child') {\n        // If focus is already on a focusable child within the cell, early return so we don't shift focus\n        if (isFocusWithin(ref.current) && ref.current !== getActiveElement()) {\n          return;\n        }\n\n        let focusable =\n          state.selectionManager.childFocusStrategy === 'last'\n            ? last(treeWalker)\n            : (treeWalker.firstChild() as FocusableElement);\n        if (focusable) {\n          focusSafely(focusable);\n          return;\n        }\n      }\n\n      if (\n        (keyWhenFocused.current != null && node.key !== keyWhenFocused.current) ||\n        !isFocusWithin(ref.current)\n      ) {\n        focusSafely(ref.current);\n      }\n    }\n  };\n\n  let {itemProps, isPressed} = useSelectableItem({\n    selectionManager: state.selectionManager,\n    key: node.key,\n    ref,\n    isVirtualized,\n    focus,\n    shouldSelectOnPressUp,\n    onAction: onCellAction ? () => onCellAction(node.key) : onAction,\n    isDisabled: state.collection.size === 0\n  });\n\n  let onKeyDownCapture = (e: ReactKeyboardEvent) => {\n    let activeElement = getActiveElement();\n    if (\n      !nodeContains(e.currentTarget, getEventTarget(e) as Element) ||\n      state.isKeyboardNavigationDisabled ||\n      !ref.current ||\n      !activeElement\n    ) {\n      return;\n    }\n\n    let walker = getFocusableTreeWalker(ref.current);\n    walker.currentNode = activeElement;\n\n    switch (e.key) {\n      case 'ArrowLeft': {\n        // Find the next focusable element within the cell.\n        let focusable: FocusableElement | null =\n          direction === 'rtl'\n            ? (walker.nextNode() as FocusableElement)\n            : (walker.previousNode() as FocusableElement);\n\n        // Don't focus the cell itself if focusMode is \"child\"\n        if (focusMode === 'child' && focusable === ref.current) {\n          focusable = null;\n        }\n\n        e.preventDefault();\n        e.stopPropagation();\n        if (focusable) {\n          focusSafely(focusable);\n          scrollIntoViewport(focusable, {containingElement: getScrollParent(ref.current)});\n        } else {\n          // If there is no next focusable child, then move to the next cell to the left of this one.\n          // This will be handled by useSelectableCollection. However, if there is no cell to the left\n          // of this one, only one column, and the grid doesn't focus rows, then the next key will be the\n          // same as this one. In that case we need to handle focusing either the cell or the first/last\n          // child, depending on the focus mode.\n          let prev = keyboardDelegate.getKeyLeftOf?.(node.key);\n          if (prev !== node.key) {\n            // We prevent the capturing event from reaching children of the cell, e.g. pickers.\n            // We want arrow keys to navigate to the next cell instead. We need to re-dispatch\n            // the event from a higher parent so it still bubbles and gets handled by useSelectableCollection.\n            ref.current.parentElement?.dispatchEvent(\n              new KeyboardEvent(e.nativeEvent.type, e.nativeEvent)\n            );\n            break;\n          }\n\n          if (focusMode === 'cell' && direction === 'rtl') {\n            focusSafely(ref.current);\n            scrollIntoViewport(ref.current, {containingElement: getScrollParent(ref.current)});\n          } else {\n            walker.currentNode = ref.current;\n            focusable =\n              direction === 'rtl' ? (walker.firstChild() as FocusableElement) : last(walker);\n            if (focusable) {\n              focusSafely(focusable);\n              scrollIntoViewport(focusable, {containingElement: getScrollParent(ref.current)});\n            }\n          }\n        }\n        break;\n      }\n      case 'ArrowRight': {\n        let focusable: FocusableElement | null =\n          direction === 'rtl'\n            ? (walker.previousNode() as FocusableElement)\n            : (walker.nextNode() as FocusableElement);\n\n        if (focusMode === 'child' && focusable === ref.current) {\n          focusable = null;\n        }\n\n        e.preventDefault();\n        e.stopPropagation();\n        if (focusable) {\n          focusSafely(focusable);\n          scrollIntoViewport(focusable, {containingElement: getScrollParent(ref.current)});\n        } else {\n          let next = keyboardDelegate.getKeyRightOf?.(node.key);\n          if (next !== node.key) {\n            // We prevent the capturing event from reaching children of the cell, e.g. pickers.\n            // We want arrow keys to navigate to the next cell instead. We need to re-dispatch\n            // the event from a higher parent so it still bubbles and gets handled by useSelectableCollection.\n            ref.current.parentElement?.dispatchEvent(\n              new KeyboardEvent(e.nativeEvent.type, e.nativeEvent)\n            );\n            break;\n          }\n\n          if (focusMode === 'cell' && direction === 'ltr') {\n            focusSafely(ref.current);\n            scrollIntoViewport(ref.current, {containingElement: getScrollParent(ref.current)});\n          } else {\n            walker.currentNode = ref.current;\n            focusable =\n              direction === 'rtl' ? last(walker) : (walker.firstChild() as FocusableElement);\n            if (focusable) {\n              focusSafely(focusable);\n              scrollIntoViewport(focusable, {containingElement: getScrollParent(ref.current)});\n            }\n          }\n        }\n        break;\n      }\n      case 'ArrowUp':\n      case 'ArrowDown':\n        // Prevent this event from reaching cell children, e.g. menu buttons. We want arrow keys to navigate\n        // to the cell above/below instead. We need to re-dispatch the event from a higher parent so it still\n        // bubbles and gets handled by useSelectableCollection.\n        if (!e.altKey && nodeContains(ref.current, getEventTarget(e) as Element)) {\n          e.stopPropagation();\n          e.preventDefault();\n          ref.current.parentElement?.dispatchEvent(\n            new KeyboardEvent(e.nativeEvent.type, e.nativeEvent)\n          );\n        }\n        break;\n    }\n  };\n\n  // Grid cells can have focusable elements inside them. In this case, focus should\n  // be marshalled to that element rather than focusing the cell itself.\n  let onFocus = e => {\n    keyWhenFocused.current = node.key;\n    if (getEventTarget(e) !== ref.current) {\n      // useSelectableItem only handles setting the focused key when\n      // the focused element is the gridcell itself. We also want to\n      // set the focused key when a child element receives focus.\n      // If focus is currently visible (e.g. the user is navigating with the keyboard),\n      // then skip this. We want to restore focus to the previously focused row/cell\n      // in that case since the table should act like a single tab stop.\n      if (!isFocusVisible()) {\n        state.selectionManager.setFocusedKey(node.key);\n      }\n      return;\n    }\n\n    // If the cell itself is focused, wait a frame so that focus finishes propagatating\n    // up to the tree, and move focus to a focusable child if possible.\n    requestAnimationFrame(() => {\n      if (focusMode === 'child' && getActiveElement() === ref.current) {\n        focus();\n      }\n    });\n  };\n\n  let gridCellProps: DOMAttributes = mergeProps(itemProps, {\n    role: 'gridcell',\n    onKeyDownCapture,\n    'aria-colspan': node.colSpan,\n    'aria-colindex': node.colIndex != null ? node.colIndex + 1 : undefined, // aria-colindex is 1-based\n    colSpan: isVirtualized ? undefined : node.colSpan,\n    onFocus\n  });\n\n  if (isVirtualized) {\n    gridCellProps['aria-colindex'] = (node.colIndex ?? node.index) + 1; // aria-colindex is 1-based\n  }\n\n  // When pressing with a pointer and cell selection is not enabled, usePress will be applied to the\n  // row rather than the cell. However, when the row is draggable, usePress cannot preventDefault\n  // on pointer down, so the browser will try to focus the cell which has a tabIndex applied.\n  // To avoid this, remove the tabIndex from the cell briefly on pointer down.\n  if (\n    shouldSelectOnPressUp &&\n    gridCellProps.tabIndex != null &&\n    gridCellProps.onPointerDown == null\n  ) {\n    gridCellProps.onPointerDown = e => {\n      let el = e.currentTarget;\n      let tabindex = el.getAttribute('tabindex');\n      el.removeAttribute('tabindex');\n      requestAnimationFrame(() => {\n        if (tabindex != null) {\n          el.setAttribute('tabindex', tabindex);\n        }\n      });\n    };\n  }\n\n  return {\n    gridCellProps,\n    isPressed\n  };\n}\n\nfunction last(walker: TreeWalker) {\n  let next: FocusableElement | null = null;\n  let last: FocusableElement | null = null;\n  do {\n    last = walker.lastChild() as FocusableElement | null;\n    if (last) {\n      next = last;\n    }\n  } while (last);\n  return next;\n}\n"],"names":[],"version":3,"file":"useGridCell.cjs.map"}
+{"mappings":"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","sources":["packages/react-aria/src/grid/useGridCell.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared';\nimport {focusSafely} from '../interactions/focusSafely';\nimport {\n  getActiveElement,\n  getEventTarget,\n  isFocusWithin,\n  nodeContains\n} from '../utils/shadowdom/DOMFunctions';\nimport {getFocusableTreeWalker} from '../focus/FocusScope';\nimport {getOwnerDocument} from '../utils/domHelpers';\nimport {getScrollParent} from '../utils/getScrollParent';\nimport {\n  IGridCollection as GridCollection,\n  GridNode\n} from 'react-stately/private/grid/GridCollection';\nimport {gridMap} from './utils';\nimport {GridState} from 'react-stately/private/grid/useGridState';\nimport {isFocusVisible} from '../interactions/useFocusVisible';\nimport {mergeProps} from '../utils/mergeProps';\nimport {KeyboardEvent as ReactKeyboardEvent, useRef} from 'react';\nimport {scrollIntoViewport} from '../utils/scrollIntoView';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSelectableItem} from '../selection/useSelectableItem';\n\nexport interface GridCellProps {\n  /**\n   * An object representing the grid cell. Contains all the relevant information that makes up the\n   * grid cell.\n   */\n  node: GridNode<unknown>;\n  /** Whether the grid cell is contained in a virtual scroller. */\n  isVirtualized?: boolean;\n  /**\n   * Whether the cell or its first focusable child element should be focused when the grid cell is\n   * focused. Defaults to 'child' in arrow keyboard navigation mode and 'cell' in\n   * tab keyboard navigation mode.\n   */\n  focusMode?: 'child' | 'cell';\n  /**\n   * Whether the cell should support arrow key navigation even when the containing collection uses\n   * tab keyboard navigation. Allows users to navigate between rows and cells with arrow keys while\n   * focus is on an interactive child element within the cell.\n   */\n  allowsArrowNavigation?: boolean;\n  /** Whether selection should occur on press up instead of press down. */\n  shouldSelectOnPressUp?: boolean;\n  /** Indicates how many columns the data cell spans. */\n  colSpan?: number;\n  /**\n   * Handler that is called when a user performs an action on the cell.\n   * Please use onCellAction at the collection level instead.\n   *\n   * @deprecated\n   */\n  onAction?: () => void;\n}\n\nexport interface GridCellAria {\n  /** Props for the grid cell element. */\n  gridCellProps: DOMAttributes;\n  /** Whether the cell is currently in a pressed state. */\n  isPressed: boolean;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a cell in a grid.\n *\n * @param props - Props for the cell.\n * @param state - State of the parent grid, as returned by `useGridState`.\n */\nexport function useGridCell<T, C extends GridCollection<T>>(\n  props: GridCellProps,\n  state: GridState<T, C>,\n  ref: RefObject<FocusableElement | null>\n): GridCellAria {\n  let {\n    node,\n    isVirtualized,\n    focusMode: focusModeProp,\n    allowsArrowNavigation,\n    shouldSelectOnPressUp,\n    onAction\n  } = props;\n\n  let {direction} = useLocale();\n  let {\n    keyboardDelegate,\n    actions: {onCellAction},\n    keyboardNavigationBehavior\n  } = gridMap.get(state)!;\n  let focusMode = focusModeProp ?? (keyboardNavigationBehavior === 'tab' ? 'cell' : 'child');\n\n  // We need to track the key of the item at the time it was last focused so that we force\n  // focus to go to the item when the DOM node is reused for a different item in a virtualizer.\n  let keyWhenFocused = useRef<Key | null>(null);\n\n  // Handles focusing the cell. If there is a focusable child,\n  // it is focused, otherwise the cell itself is focused.\n  let focus = () => {\n    if (ref.current) {\n      let treeWalker = getFocusableTreeWalker(ref.current);\n      if (focusMode === 'child') {\n        // If focus is already on a focusable child within the cell, early return so we don't shift focus\n        if (\n          isFocusWithin(ref.current) &&\n          ref.current !== getActiveElement(getOwnerDocument(ref.current))\n        ) {\n          return;\n        }\n\n        let focusable =\n          state.selectionManager.childFocusStrategy === 'last'\n            ? last(treeWalker)\n            : (treeWalker.firstChild() as FocusableElement);\n        if (focusable) {\n          focusSafely(focusable);\n          return;\n        }\n      }\n\n      if (\n        (keyWhenFocused.current != null && node.key !== keyWhenFocused.current) ||\n        !isFocusWithin(ref.current)\n      ) {\n        focusSafely(ref.current);\n      }\n    }\n  };\n\n  let {itemProps, isPressed} = useSelectableItem({\n    selectionManager: state.selectionManager,\n    key: node.key,\n    ref,\n    isVirtualized,\n    focus,\n    shouldSelectOnPressUp,\n    onAction: onCellAction ? () => onCellAction(node.key) : onAction,\n    isDisabled: state.collection.size === 0\n  });\n\n  let onKeyDownCapture = (e: ReactKeyboardEvent) => {\n    let activeElement = getActiveElement(getOwnerDocument(ref.current));\n    if (\n      !nodeContains(e.currentTarget, getEventTarget(e) as Element) ||\n      state.isKeyboardNavigationDisabled ||\n      !ref.current ||\n      !activeElement\n    ) {\n      return;\n    }\n\n    let walker = getFocusableTreeWalker(ref.current);\n    walker.currentNode = activeElement;\n\n    switch (e.key) {\n      case 'ArrowLeft': {\n        // Find the next focusable element within the cell.\n        let focusable: FocusableElement | null =\n          direction === 'rtl'\n            ? (walker.nextNode() as FocusableElement)\n            : (walker.previousNode() as FocusableElement);\n\n        // Don't focus the cell itself if focusMode is \"child\"\n        if (focusMode === 'child' && focusable === ref.current) {\n          focusable = null;\n        }\n\n        e.preventDefault();\n        e.stopPropagation();\n        if (focusable) {\n          focusSafely(focusable);\n          scrollIntoViewport(focusable, {containingElement: getScrollParent(ref.current)});\n        } else {\n          // If there is no next focusable child, then move to the next cell to the left of this one.\n          // This will be handled by useSelectableCollection. However, if there is no cell to the left\n          // of this one, only one column, and the grid doesn't focus rows, then the next key will be the\n          // same as this one. In that case we need to handle focusing either the cell or the first/last\n          // child, depending on the focus mode.\n          let prev = keyboardDelegate.getKeyLeftOf?.(node.key);\n          if (prev !== node.key) {\n            // We prevent the capturing event from reaching children of the cell, e.g. pickers.\n            // We want arrow keys to navigate to the next cell instead. We need to re-dispatch\n            // the event from a higher parent so it still bubbles and gets handled by useSelectableCollection.\n            ref.current.parentElement?.dispatchEvent(\n              new KeyboardEvent(e.nativeEvent.type, e.nativeEvent)\n            );\n            break;\n          }\n\n          if (focusMode === 'cell' && direction === 'rtl') {\n            focusSafely(ref.current);\n            scrollIntoViewport(ref.current, {containingElement: getScrollParent(ref.current)});\n          } else {\n            walker.currentNode = ref.current;\n            focusable =\n              direction === 'rtl' ? (walker.firstChild() as FocusableElement) : last(walker);\n            if (focusable) {\n              focusSafely(focusable);\n              scrollIntoViewport(focusable, {containingElement: getScrollParent(ref.current)});\n            }\n          }\n        }\n        break;\n      }\n      case 'ArrowRight': {\n        let focusable: FocusableElement | null =\n          direction === 'rtl'\n            ? (walker.previousNode() as FocusableElement)\n            : (walker.nextNode() as FocusableElement);\n\n        if (focusMode === 'child' && focusable === ref.current) {\n          focusable = null;\n        }\n\n        e.preventDefault();\n        e.stopPropagation();\n        if (focusable) {\n          focusSafely(focusable);\n          scrollIntoViewport(focusable, {containingElement: getScrollParent(ref.current)});\n        } else {\n          let next = keyboardDelegate.getKeyRightOf?.(node.key);\n          if (next !== node.key) {\n            // We prevent the capturing event from reaching children of the cell, e.g. pickers.\n            // We want arrow keys to navigate to the next cell instead. We need to re-dispatch\n            // the event from a higher parent so it still bubbles and gets handled by useSelectableCollection.\n            ref.current.parentElement?.dispatchEvent(\n              new KeyboardEvent(e.nativeEvent.type, e.nativeEvent)\n            );\n            break;\n          }\n\n          if (focusMode === 'cell' && direction === 'ltr') {\n            focusSafely(ref.current);\n            scrollIntoViewport(ref.current, {containingElement: getScrollParent(ref.current)});\n          } else {\n            walker.currentNode = ref.current;\n            focusable =\n              direction === 'rtl' ? last(walker) : (walker.firstChild() as FocusableElement);\n            if (focusable) {\n              focusSafely(focusable);\n              scrollIntoViewport(focusable, {containingElement: getScrollParent(ref.current)});\n            }\n          }\n        }\n        break;\n      }\n      case 'ArrowUp':\n      case 'ArrowDown':\n        // Prevent this event from reaching cell children, e.g. menu buttons. We want arrow keys to navigate\n        // to the cell above/below instead. We need to re-dispatch the event from a higher parent so it still\n        // bubbles and gets handled by useSelectableCollection.\n        if (!e.altKey && nodeContains(ref.current, getEventTarget(e) as Element)) {\n          e.stopPropagation();\n          e.preventDefault();\n          ref.current.parentElement?.dispatchEvent(\n            new KeyboardEvent(e.nativeEvent.type, e.nativeEvent)\n          );\n        }\n        break;\n    }\n  };\n\n  let onKeyDown = (e: ReactKeyboardEvent) => {\n    let activeElement = getActiveElement(getOwnerDocument(ref.current));\n    if (\n      !nodeContains(e.currentTarget, getEventTarget(e) as Element) ||\n      state.isKeyboardNavigationDisabled ||\n      !ref.current ||\n      !activeElement\n    ) {\n      return;\n    }\n\n    if (keyboardNavigationBehavior === 'tab') {\n      if (getEventTarget(e) !== ref.current && e.key !== 'Tab') {\n        e.stopPropagation();\n        return;\n      }\n    }\n\n    switch (e.key) {\n      case 'Tab': {\n        if (keyboardNavigationBehavior === 'tab') {\n          // If there is another focusable element within this item, stop propagation so the tab key\n          // is handled by the browser and not by useSelectableCollection (which would take us out of the list).\n          let walker = getFocusableTreeWalker(ref.current, {tabbable: true});\n          walker.currentNode = activeElement;\n          let next = e.shiftKey ? walker.previousNode() : walker.nextNode();\n\n          if (next) {\n            e.stopPropagation();\n          }\n        }\n      }\n    }\n  };\n\n  // Grid cells can have focusable elements inside them. In this case, focus should\n  // be marshalled to that element rather than focusing the cell itself.\n  let onFocus = e => {\n    keyWhenFocused.current = node.key;\n    if (getEventTarget(e) !== ref.current) {\n      // useSelectableItem only handles setting the focused key when\n      // the focused element is the gridcell itself. We also want to\n      // set the focused key when a child element receives focus.\n      // If focus is currently visible (e.g. the user is navigating with the keyboard),\n      // then skip this. We want to restore focus to the previously focused row/cell\n      // in that case since the table should act like a single tab stop.\n      if (!isFocusVisible()) {\n        state.selectionManager.setFocusedKey(node.key);\n      }\n      return;\n    }\n\n    // if focus goes back to cell from child, make sure we don't refocus the cell if we are in focusMode=child\n    // since that would be a focus trap\n    if (\n      focusMode === 'child' &&\n      e.relatedTarget &&\n      nodeContains(ref.current, e.relatedTarget as Element)\n    ) {\n      return;\n    }\n\n    // If the cell itself is focused, wait a frame so that focus finishes propagating\n    // up to the tree, and move focus to a focusable child if possible.\n    requestAnimationFrame(() => {\n      if (\n        focusMode === 'child' &&\n        getActiveElement(getOwnerDocument(ref.current)) === ref.current\n      ) {\n        focus();\n      }\n    });\n  };\n\n  // oxlint-disable-next-line react/react-compiler\n  let gridCellProps: DOMAttributes = mergeProps(itemProps, {\n    role: 'gridcell',\n    onKeyDownCapture:\n      keyboardNavigationBehavior !== 'tab' || allowsArrowNavigation ? onKeyDownCapture : undefined,\n    onKeyDown: keyboardNavigationBehavior === 'tab' ? onKeyDown : undefined,\n    'aria-colspan': node.colSpan,\n    'aria-colindex': node.colIndex != null ? node.colIndex + 1 : undefined, // aria-colindex is 1-based\n    colSpan: isVirtualized ? undefined : node.colSpan,\n    onFocus,\n    // make sure shift tabbing from a child of a cell doesnt move focus back to cell if focusMode=\"child\" and in tab nav\n    // consistent with arrow nav and focusMode=\"child\" since you can't go back to the cell there either\n    ...(focusMode === 'child' && keyboardNavigationBehavior === 'tab' ? {tabIndex: -1} : {})\n  });\n\n  if (isVirtualized) {\n    gridCellProps['aria-colindex'] = (node.colIndex ?? node.index) + 1; // aria-colindex is 1-based\n  }\n\n  // When pressing with a pointer and cell selection is not enabled, usePress will be applied to the\n  // row rather than the cell. However, when the row is draggable, usePress cannot preventDefault\n  // on pointer down, so the browser will try to focus the cell which has a tabIndex applied.\n  // To avoid this, remove the tabIndex from the cell briefly on pointer down.\n  if (\n    shouldSelectOnPressUp &&\n    gridCellProps.tabIndex != null &&\n    gridCellProps.onPointerDown == null\n  ) {\n    gridCellProps.onPointerDown = e => {\n      let el = e.currentTarget;\n      let tabindex = el.getAttribute('tabindex');\n      el.removeAttribute('tabindex');\n      requestAnimationFrame(() => {\n        if (tabindex != null) {\n          el.setAttribute('tabindex', tabindex);\n        }\n      });\n    };\n  }\n\n  return {\n    gridCellProps,\n    isPressed\n  };\n}\n\nfunction last(walker: TreeWalker) {\n  let next: FocusableElement | null = null;\n  let last: FocusableElement | null = null;\n  do {\n    last = walker.lastChild() as FocusableElement | null;\n    if (last) {\n      next = last;\n    }\n  } while (last);\n  return next;\n}\n"],"names":[],"version":3,"file":"useGridCell.cjs.map"}

package/dist/private/grid/useGridCell.js

@@ -1,6 +1,7 @@
 import {focusSafely as $56c81cdebdc6a696$export$80f3e147d781571c} from "../interactions/focusSafely.js";
 import {getActiveElement as $d8ac7ed472840322$export$cd4e5573fbe2b576, getEventTarget as $d8ac7ed472840322$export$e58f029f0fbfdb29, isFocusWithin as $d8ac7ed472840322$export$b4f377a2b6254582, nodeContains as $d8ac7ed472840322$export$4282f70798064fe0} from "../utils/shadowdom/DOMFunctions.js";
 import {getFocusableTreeWalker as $903814aeb7d53b38$export$2d6ec8fc375ceafa} from "../focus/FocusScope.js";
+import {getOwnerDocument as $cc3c3666b64debad$export$b204af158042fbac} from "../utils/domHelpers.js";
 import {getScrollParent as $5b46e0a1626c2890$export$cfa2225e87938781} from "../utils/getScrollParent.js";
 import {gridMap as $799c476c47e4a90b$export$e6235c0d09b995d0} from "./utils.js";
 import {isFocusVisible as $b50b1cc8a843ace7$export$b9b3dfddab17db27} from "../interactions/useFocusVisible.js";
@@ -31,10 +32,12 @@ import {useRef as $3c0W1$useRef} from "react";
 
 
 
+
 function $9b19f290bcf2fee1$export$c7e10bfc0c59f67c(props, state, ref) {
-    let { node: node, isVirtualized: isVirtualized, focusMode: focusMode = 'child', shouldSelectOnPressUp: shouldSelectOnPressUp, onAction: onAction } = props;
+    let { node: node, isVirtualized: isVirtualized, focusMode: focusModeProp, allowsArrowNavigation: allowsArrowNavigation, shouldSelectOnPressUp: shouldSelectOnPressUp, onAction: onAction } = props;
     let { direction: direction } = (0, $4defb058003b3e05$export$43bb16f9c6d9e3f7)();
-    let { keyboardDelegate: keyboardDelegate, actions: { onCellAction: onCellAction } } = (0, $799c476c47e4a90b$export$e6235c0d09b995d0).get(state);
+    let { keyboardDelegate: keyboardDelegate, actions: { onCellAction: onCellAction }, keyboardNavigationBehavior: keyboardNavigationBehavior } = (0, $799c476c47e4a90b$export$e6235c0d09b995d0).get(state);
+    let focusMode = focusModeProp !== null && focusModeProp !== void 0 ? focusModeProp : keyboardNavigationBehavior === 'tab' ? 'cell' : 'child';
     // We need to track the key of the item at the time it was last focused so that we force
     // focus to go to the item when the DOM node is reused for a different item in a virtualizer.
     let keyWhenFocused = (0, $3c0W1$useRef)(null);
@@ -45,7 +48,7 @@ function $9b19f290bcf2fee1$export$c7e10bfc0c59f67c(props, state, ref) {
             let treeWalker = (0, $903814aeb7d53b38$export$2d6ec8fc375ceafa)(ref.current);
             if (focusMode === 'child') {
                 // If focus is already on a focusable child within the cell, early return so we don't shift focus
-                if ((0, $d8ac7ed472840322$export$b4f377a2b6254582)(ref.current) && ref.current !== (0, $d8ac7ed472840322$export$cd4e5573fbe2b576)()) return;
+                if ((0, $d8ac7ed472840322$export$b4f377a2b6254582)(ref.current) && ref.current !== (0, $d8ac7ed472840322$export$cd4e5573fbe2b576)((0, $cc3c3666b64debad$export$b204af158042fbac)(ref.current))) return;
                 let focusable = state.selectionManager.childFocusStrategy === 'last' ? $9b19f290bcf2fee1$var$last(treeWalker) : treeWalker.firstChild();
                 if (focusable) {
                     (0, $56c81cdebdc6a696$export$80f3e147d781571c)(focusable);
@@ -66,7 +69,7 @@ function $9b19f290bcf2fee1$export$c7e10bfc0c59f67c(props, state, ref) {
         isDisabled: state.collection.size === 0
     });
     let onKeyDownCapture = (e)=>{
-        let activeElement = (0, $d8ac7ed472840322$export$cd4e5573fbe2b576)();
+        let activeElement = (0, $d8ac7ed472840322$export$cd4e5573fbe2b576)((0, $cc3c3666b64debad$export$b204af158042fbac)(ref.current));
         if (!(0, $d8ac7ed472840322$export$4282f70798064fe0)(e.currentTarget, (0, $d8ac7ed472840322$export$e58f029f0fbfdb29)(e)) || state.isKeyboardNavigationDisabled || !ref.current || !activeElement) return;
         let walker = (0, $903814aeb7d53b38$export$2d6ec8fc375ceafa)(ref.current);
         walker.currentNode = activeElement;
@@ -172,6 +175,29 @@ function $9b19f290bcf2fee1$export$c7e10bfc0c59f67c(props, state, ref) {
                 break;
         }
     };
+    let onKeyDown = (e)=>{
+        let activeElement = (0, $d8ac7ed472840322$export$cd4e5573fbe2b576)((0, $cc3c3666b64debad$export$b204af158042fbac)(ref.current));
+        if (!(0, $d8ac7ed472840322$export$4282f70798064fe0)(e.currentTarget, (0, $d8ac7ed472840322$export$e58f029f0fbfdb29)(e)) || state.isKeyboardNavigationDisabled || !ref.current || !activeElement) return;
+        if (keyboardNavigationBehavior === 'tab') {
+            if ((0, $d8ac7ed472840322$export$e58f029f0fbfdb29)(e) !== ref.current && e.key !== 'Tab') {
+                e.stopPropagation();
+                return;
+            }
+        }
+        switch(e.key){
+            case 'Tab':
+                if (keyboardNavigationBehavior === 'tab') {
+                    // If there is another focusable element within this item, stop propagation so the tab key
+                    // is handled by the browser and not by useSelectableCollection (which would take us out of the list).
+                    let walker = (0, $903814aeb7d53b38$export$2d6ec8fc375ceafa)(ref.current, {
+                        tabbable: true
+                    });
+                    walker.currentNode = activeElement;
+                    let next = e.shiftKey ? walker.previousNode() : walker.nextNode();
+                    if (next) e.stopPropagation();
+                }
+        }
+    };
     // Grid cells can have focusable elements inside them. In this case, focus should
     // be marshalled to that element rather than focusing the cell itself.
     let onFocus = (e)=>{
@@ -186,19 +212,29 @@ function $9b19f290bcf2fee1$export$c7e10bfc0c59f67c(props, state, ref) {
             if (!(0, $b50b1cc8a843ace7$export$b9b3dfddab17db27)()) state.selectionManager.setFocusedKey(node.key);
             return;
         }
-        // If the cell itself is focused, wait a frame so that focus finishes propagatating
+        // if focus goes back to cell from child, make sure we don't refocus the cell if we are in focusMode=child
+        // since that would be a focus trap
+        if (focusMode === 'child' && e.relatedTarget && (0, $d8ac7ed472840322$export$4282f70798064fe0)(ref.current, e.relatedTarget)) return;
+        // If the cell itself is focused, wait a frame so that focus finishes propagating
         // up to the tree, and move focus to a focusable child if possible.
         requestAnimationFrame(()=>{
-            if (focusMode === 'child' && (0, $d8ac7ed472840322$export$cd4e5573fbe2b576)() === ref.current) focus();
+            if (focusMode === 'child' && (0, $d8ac7ed472840322$export$cd4e5573fbe2b576)((0, $cc3c3666b64debad$export$b204af158042fbac)(ref.current)) === ref.current) focus();
         });
     };
+    // oxlint-disable-next-line react/react-compiler
     let gridCellProps = (0, $64c36edd757dfa16$export$9d1611c77c2fe928)(itemProps, {
         role: 'gridcell',
-        onKeyDownCapture: onKeyDownCapture,
+        onKeyDownCapture: keyboardNavigationBehavior !== 'tab' || allowsArrowNavigation ? onKeyDownCapture : undefined,
+        onKeyDown: keyboardNavigationBehavior === 'tab' ? onKeyDown : undefined,
         'aria-colspan': node.colSpan,
         'aria-colindex': node.colIndex != null ? node.colIndex + 1 : undefined,
         colSpan: isVirtualized ? undefined : node.colSpan,
-        onFocus: onFocus
+        onFocus: onFocus,
+        // make sure shift tabbing from a child of a cell doesnt move focus back to cell if focusMode="child" and in tab nav
+        // consistent with arrow nav and focusMode="child" since you can't go back to the cell there either
+        ...focusMode === 'child' && keyboardNavigationBehavior === 'tab' ? {
+            tabIndex: -1
+        } : {}
     });
     var _node_colIndex;
     if (isVirtualized) gridCellProps['aria-colindex'] = ((_node_colIndex = node.colIndex) !== null && _node_colIndex !== void 0 ? _node_colIndex : node.index) + 1; // aria-colindex is 1-based