react-aria 3.49.0 → 3.51.0

package/dist/private/menu/useSubmenuTrigger.cjs

@@ -2,6 +2,7 @@ var $4b9e9ed3f006ad27$exports = require("../utils/focusWithoutScrolling.cjs");
 var $da02ee888921bc9e$exports = require("../utils/shadowdom/DOMFunctions.cjs");
 var $6e76e65001bbcda2$exports = require("../utils/useEvent.cjs");
 var $7ac82d1fee77eb8a$exports = require("../utils/useId.cjs");
+var $6d2f10bb8b359da5$exports = require("../interactions/useKeyboard.cjs");
 var $429333cab433657c$exports = require("../utils/useLayoutEffect.cjs");
 var $2522e612fa919664$exports = require("../i18n/I18nProvider.cjs");
 var $654d0dc3db8fecae$exports = require("./useSafelyMouseToSubmenu.cjs");
@@ -31,6 +32,7 @@ $parcel$export(module.exports, "useSubmenuTrigger", function () { return $205b9b
 
 
 
+
 function $205b9b8d44a53639$export$7138b0d059a6e743(props, state, ref) {
     let { parentMenuRef: parentMenuRef, submenuRef: submenuRef, type: type = 'menu', isDisabled: isDisabled, delay: delay = 200, shouldUseVirtualFocus: shouldUseVirtualFocus } = props;
     let submenuTriggerId = (0, $7ac82d1fee77eb8a$exports.useId)();
@@ -66,37 +68,39 @@ function $205b9b8d44a53639$export$7138b0d059a6e743(props, state, ref) {
     }, [
         cancelOpenTimeout
     ]);
-    let submenuKeyDown = (e)=>{
-        // If focus is not within the menu, assume virtual focus is being used.
-        // This means some other input element is also within the popover, so we shouldn't close the menu.
-        if (!(0, $da02ee888921bc9e$exports.isFocusWithin)(e.currentTarget)) return;
-        switch(e.key){
-            case 'ArrowLeft':
+    let { keyboardProps: keyboardProps } = (0, $6d2f10bb8b359da5$exports.useKeyboard)({
+        shortcuts: {
+            ArrowLeft: (e)=>{
+                // If focus is not within the menu, assume virtual focus is being used.
+                // This means some other input element is also within the popover, so we shouldn't close the menu.
+                if (!(0, $da02ee888921bc9e$exports.isFocusWithin)(e.currentTarget)) return false;
                 if (direction === 'ltr' && (0, $da02ee888921bc9e$exports.nodeContains)(e.currentTarget, (0, $da02ee888921bc9e$exports.getEventTarget)(e))) {
-                    e.preventDefault();
-                    e.stopPropagation();
                     onSubmenuClose();
                     if (!shouldUseVirtualFocus && ref.current) (0, $4b9e9ed3f006ad27$exports.focusWithoutScrolling)(ref.current);
+                    return;
                 }
-                break;
-            case 'ArrowRight':
+                return false;
+            },
+            ArrowRight: (e)=>{
+                if (!(0, $da02ee888921bc9e$exports.isFocusWithin)(e.currentTarget)) return false;
                 if (direction === 'rtl' && (0, $da02ee888921bc9e$exports.nodeContains)(e.currentTarget, (0, $da02ee888921bc9e$exports.getEventTarget)(e))) {
-                    e.preventDefault();
-                    e.stopPropagation();
                     onSubmenuClose();
                     if (!shouldUseVirtualFocus && ref.current) (0, $4b9e9ed3f006ad27$exports.focusWithoutScrolling)(ref.current);
+                    return;
                 }
-                break;
-            case 'Escape':
-                // TODO: can remove this when we fix collection event leaks
+                return false;
+            },
+            Escape: (e)=>{
+                if (!(0, $da02ee888921bc9e$exports.isFocusWithin)(e.currentTarget)) return false;
                 if ((0, $da02ee888921bc9e$exports.nodeContains)(submenuRef.current, (0, $da02ee888921bc9e$exports.getEventTarget)(e))) {
-                    e.stopPropagation();
                     onSubmenuClose();
                     if (!shouldUseVirtualFocus && ref.current) (0, $4b9e9ed3f006ad27$exports.focusWithoutScrolling)(ref.current);
+                    return;
                 }
-                break;
+                return false;
+            }
         }
-    };
+    });
     let submenuProps = {
         id: overlayId,
         'aria-labelledby': submenuTriggerId,
@@ -104,36 +108,39 @@ function $205b9b8d44a53639$export$7138b0d059a6e743(props, state, ref) {
         ...type === 'menu' && {
             onClose: state.closeAll,
             autoFocus: state.focusStrategy ?? undefined,
-            onKeyDown: submenuKeyDown
+            ...keyboardProps
         }
     };
-    let submenuTriggerKeyDown = (e)=>{
-        switch(e.key){
-            case 'ArrowRight':
+    let { keyboardProps: submenuTriggerKeyboardProps } = (0, $6d2f10bb8b359da5$exports.useKeyboard)({
+        shortcuts: {
+            ArrowRight: ()=>{
                 if (!isDisabled) {
                     if (direction === 'ltr') {
-                        e.preventDefault();
                         if (!state.isOpen) onSubmenuOpen('first');
                         if (type === 'menu' && !!submenuRef?.current && (0, $da02ee888921bc9e$exports.getActiveElement)() === ref?.current) (0, $4b9e9ed3f006ad27$exports.focusWithoutScrolling)(submenuRef.current);
-                    } else if (state.isOpen) onSubmenuClose();
-                    else e.continuePropagation();
+                        return;
+                    } else if (state.isOpen) {
+                        onSubmenuClose();
+                        return;
+                    } else return false;
                 }
-                break;
-            case 'ArrowLeft':
+                return false;
+            },
+            ArrowLeft: ()=>{
                 if (!isDisabled) {
                     if (direction === 'rtl') {
-                        e.preventDefault();
                         if (!state.isOpen) onSubmenuOpen('first');
                         if (type === 'menu' && !!submenuRef?.current && (0, $da02ee888921bc9e$exports.getActiveElement)() === ref?.current) (0, $4b9e9ed3f006ad27$exports.focusWithoutScrolling)(submenuRef.current);
-                    } else if (state.isOpen) onSubmenuClose();
-                    else e.continuePropagation();
+                        return;
+                    } else if (state.isOpen) {
+                        onSubmenuClose();
+                        return;
+                    } else return false;
                 }
-                break;
-            default:
-                e.continuePropagation();
-                break;
+                return false;
+            }
         }
-    };
+    });
     let onPressStart = (e)=>{
         if (!isDisabled && (e.pointerType === 'virtual' || e.pointerType === 'keyboard')) // If opened with a screen reader or keyboard, auto focus the first submenu item.
         onSubmenuOpen('first');
@@ -169,6 +176,8 @@ function $205b9b8d44a53639$export$7138b0d059a6e743(props, state, ref) {
     });
     return {
         submenuTriggerProps: {
+            onKeyDown: submenuTriggerKeyboardProps.onKeyDown,
+            onKeyUp: submenuTriggerKeyboardProps.onKeyUp,
             id: submenuTriggerId,
             'aria-controls': state.isOpen ? overlayId : undefined,
             'aria-haspopup': !isDisabled ? type : undefined,
@@ -176,7 +185,6 @@ function $205b9b8d44a53639$export$7138b0d059a6e743(props, state, ref) {
             onPressStart: onPressStart,
             onPress: onPress,
             onHoverChange: onHoverChange,
-            onKeyDown: submenuTriggerKeyDown,
             isOpen: state.isOpen
         },
         submenuProps: submenuProps,

package/dist/private/menu/useSubmenuTrigger.cjs.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/react-aria/src/menu/useSubmenuTrigger.ts"],"sourcesContent":["/*\n * Copyright 2023 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 {AriaMenuItemProps} from './useMenuItem';\nimport {AriaMenuOptions} from './useMenu';\nimport type {AriaPopoverProps} from '../overlays/usePopover';\nimport {\n  FocusableElement,\n  FocusStrategy,\n  KeyboardEvent,\n  Node,\n  PressEvent,\n  RefObject\n} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport {\n  getActiveElement,\n  getEventTarget,\n  isFocusWithin,\n  nodeContains\n} from '../utils/shadowdom/DOMFunctions';\nimport type {OverlayProps} from '../overlays/Overlay';\nimport type {SubmenuTriggerState} from 'react-stately/useMenuTriggerState';\nimport {useCallback, useRef} from 'react';\nimport {useEvent} from '../utils/useEvent';\nimport {useId} from '../utils/useId';\nimport {useLayoutEffect} from '../utils/useLayoutEffect';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSafelyMouseToSubmenu} from './useSafelyMouseToSubmenu';\n\nexport interface AriaSubmenuTriggerProps {\n  /**\n   * An object representing the submenu trigger menu item. Contains all the relevant information\n   * that makes up the menu item.\n   *\n   * @deprecated\n   */\n  node?: Node<unknown>;\n  /** Whether the submenu trigger is disabled. */\n  isDisabled?: boolean;\n  /** The type of the contents that the submenu trigger opens. */\n  type?: 'dialog' | 'menu';\n  /** Ref of the menu that contains the submenu trigger. */\n  parentMenuRef: RefObject<HTMLElement | null>;\n  /** Ref of the submenu opened by the submenu trigger. */\n  submenuRef: RefObject<HTMLElement | null>;\n  /**\n   * The delay time in milliseconds for the submenu to appear after hovering over the trigger.\n   *\n   * @default 200\n   */\n  delay?: number;\n  /** Whether the submenu trigger uses virtual focus. */\n  shouldUseVirtualFocus?: boolean;\n}\n\ninterface SubmenuTriggerProps extends Omit<AriaMenuItemProps, 'key' | 'onAction'> {\n  /** Whether the submenu trigger is in an expanded state. */\n  isOpen: boolean;\n}\n\ninterface SubmenuProps<T> extends AriaMenuOptions<T> {\n  /** The level of the submenu. */\n  submenuLevel: number;\n}\n\nexport interface SubmenuTriggerAria<T> {\n  /** Props for the submenu trigger menu item. */\n  submenuTriggerProps: SubmenuTriggerProps;\n  /** Props for the submenu controlled by the submenu trigger menu item. */\n  submenuProps: SubmenuProps<T>;\n  /** Props for the submenu's popover container. */\n  popoverProps: Pick<AriaPopoverProps, 'isNonModal' | 'shouldCloseOnInteractOutside'> &\n    Pick<OverlayProps, 'disableFocusManagement'>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a submenu trigger and its associated\n * submenu.\n *\n * @param props - Props for the submenu trigger and refs attach to its submenu and parent menu.\n * @param state - State for the submenu trigger.\n * @param ref - Ref to the submenu trigger element.\n */\nexport function useSubmenuTrigger<T>(\n  props: AriaSubmenuTriggerProps,\n  state: SubmenuTriggerState,\n  ref: RefObject<FocusableElement | null>\n): SubmenuTriggerAria<T> {\n  let {\n    parentMenuRef,\n    submenuRef,\n    type = 'menu',\n    isDisabled,\n    delay = 200,\n    shouldUseVirtualFocus\n  } = props;\n  let submenuTriggerId = useId();\n  let overlayId = useId();\n  let {direction} = useLocale();\n  let openTimeout = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);\n  let cancelOpenTimeout = useCallback(() => {\n    if (openTimeout.current) {\n      clearTimeout(openTimeout.current);\n      openTimeout.current = undefined;\n    }\n  }, [openTimeout]);\n\n  let onSubmenuOpen = useCallback(\n    (focusStrategy?: FocusStrategy) => {\n      cancelOpenTimeout();\n      state.open(focusStrategy);\n    },\n    [state, cancelOpenTimeout]\n  );\n\n  let onSubmenuClose = useCallback(() => {\n    cancelOpenTimeout();\n    state.close();\n  }, [state, cancelOpenTimeout]);\n\n  useLayoutEffect(() => {\n    return () => {\n      cancelOpenTimeout();\n    };\n  }, [cancelOpenTimeout]);\n\n  let submenuKeyDown = (e: KeyboardEvent) => {\n    // If focus is not within the menu, assume virtual focus is being used.\n    // This means some other input element is also within the popover, so we shouldn't close the menu.\n    if (!isFocusWithin(e.currentTarget)) {\n      return;\n    }\n\n    switch (e.key) {\n      case 'ArrowLeft':\n        if (direction === 'ltr' && nodeContains(e.currentTarget, getEventTarget(e) as Element)) {\n          e.preventDefault();\n          e.stopPropagation();\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n        }\n        break;\n      case 'ArrowRight':\n        if (direction === 'rtl' && nodeContains(e.currentTarget, getEventTarget(e) as Element)) {\n          e.preventDefault();\n          e.stopPropagation();\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n        }\n        break;\n      case 'Escape':\n        // TODO: can remove this when we fix collection event leaks\n        if (nodeContains(submenuRef.current, getEventTarget(e) as Element)) {\n          e.stopPropagation();\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n        }\n        break;\n    }\n  };\n\n  let submenuProps = {\n    id: overlayId,\n    'aria-labelledby': submenuTriggerId,\n    submenuLevel: state.submenuLevel,\n    ...(type === 'menu' && {\n      onClose: state.closeAll,\n      autoFocus: state.focusStrategy ?? undefined,\n      onKeyDown: submenuKeyDown\n    })\n  };\n\n  let submenuTriggerKeyDown = (e: KeyboardEvent) => {\n    switch (e.key) {\n      case 'ArrowRight':\n        if (!isDisabled) {\n          if (direction === 'ltr') {\n            e.preventDefault();\n            if (!state.isOpen) {\n              onSubmenuOpen('first');\n            }\n\n            if (type === 'menu' && !!submenuRef?.current && getActiveElement() === ref?.current) {\n              focusWithoutScrolling(submenuRef.current);\n            }\n          } else if (state.isOpen) {\n            onSubmenuClose();\n          } else {\n            e.continuePropagation();\n          }\n        }\n\n        break;\n      case 'ArrowLeft':\n        if (!isDisabled) {\n          if (direction === 'rtl') {\n            e.preventDefault();\n            if (!state.isOpen) {\n              onSubmenuOpen('first');\n            }\n\n            if (type === 'menu' && !!submenuRef?.current && getActiveElement() === ref?.current) {\n              focusWithoutScrolling(submenuRef.current);\n            }\n          } else if (state.isOpen) {\n            onSubmenuClose();\n          } else {\n            e.continuePropagation();\n          }\n        }\n        break;\n      default:\n        e.continuePropagation();\n        break;\n    }\n  };\n\n  let onPressStart = (e: PressEvent) => {\n    if (!isDisabled && (e.pointerType === 'virtual' || e.pointerType === 'keyboard')) {\n      // If opened with a screen reader or keyboard, auto focus the first submenu item.\n      onSubmenuOpen('first');\n    }\n  };\n\n  let onPress = (e: PressEvent) => {\n    if (!isDisabled && (e.pointerType === 'touch' || e.pointerType === 'mouse')) {\n      // For touch or on a desktop device with a small screen open on press up to possible problems with\n      // press up happening on the newly opened tray items\n      onSubmenuOpen();\n    }\n  };\n\n  let onHoverChange = isHovered => {\n    if (!isDisabled) {\n      if (isHovered && !state.isOpen) {\n        if (!openTimeout.current) {\n          openTimeout.current = setTimeout(() => {\n            onSubmenuOpen();\n          }, delay);\n        }\n      } else if (!isHovered) {\n        cancelOpenTimeout();\n      }\n    }\n  };\n\n  useEvent(parentMenuRef, 'focusin', e => {\n    // If we detect focus moved to a different item in the same menu that the currently open submenu trigger is in\n    // then close the submenu. This is for a case where the user hovers a root menu item when multiple submenus are open\n    if (\n      state.isOpen &&\n      nodeContains(parentMenuRef.current, getEventTarget(e) as HTMLElement) &&\n      getEventTarget(e) !== ref.current\n    ) {\n      onSubmenuClose();\n    }\n  });\n\n  let shouldCloseOnInteractOutside = target => {\n    if (target !== ref.current) {\n      return true;\n    }\n\n    return false;\n  };\n\n  useSafelyMouseToSubmenu({\n    menuRef: parentMenuRef,\n    submenuRef,\n    isOpen: state.isOpen,\n    isDisabled: isDisabled\n  });\n\n  return {\n    submenuTriggerProps: {\n      id: submenuTriggerId,\n      'aria-controls': state.isOpen ? overlayId : undefined,\n      'aria-haspopup': !isDisabled ? type : undefined,\n      'aria-expanded': state.isOpen ? 'true' : 'false',\n      onPressStart,\n      onPress,\n      onHoverChange,\n      onKeyDown: submenuTriggerKeyDown,\n      isOpen: state.isOpen\n    },\n    submenuProps,\n    popoverProps: {\n      isNonModal: true,\n      shouldCloseOnInteractOutside\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useSubmenuTrigger.cjs.map"}
+{"mappings":"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","sources":["packages/react-aria/src/menu/useSubmenuTrigger.ts"],"sourcesContent":["/*\n * Copyright 2023 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 {AriaMenuItemProps} from './useMenuItem';\nimport {AriaMenuOptions} from './useMenu';\nimport type {AriaPopoverProps} from '../overlays/usePopover';\nimport {FocusableElement, FocusStrategy, Node, PressEvent, RefObject} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport {\n  getActiveElement,\n  getEventTarget,\n  isFocusWithin,\n  nodeContains\n} from '../utils/shadowdom/DOMFunctions';\nimport type {OverlayProps} from '../overlays/Overlay';\nimport type {SubmenuTriggerState} from 'react-stately/useMenuTriggerState';\nimport {useCallback, useRef} from 'react';\nimport {useEvent} from '../utils/useEvent';\nimport {useId} from '../utils/useId';\nimport {useKeyboard} from '../interactions/useKeyboard';\nimport {useLayoutEffect} from '../utils/useLayoutEffect';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSafelyMouseToSubmenu} from './useSafelyMouseToSubmenu';\n\nexport interface AriaSubmenuTriggerProps {\n  /**\n   * An object representing the submenu trigger menu item. Contains all the relevant information\n   * that makes up the menu item.\n   *\n   * @deprecated\n   */\n  node?: Node<unknown>;\n  /** Whether the submenu trigger is disabled. */\n  isDisabled?: boolean;\n  /** The type of the contents that the submenu trigger opens. */\n  type?: 'dialog' | 'menu';\n  /** Ref of the menu that contains the submenu trigger. */\n  parentMenuRef: RefObject<HTMLElement | null>;\n  /** Ref of the submenu opened by the submenu trigger. */\n  submenuRef: RefObject<HTMLElement | null>;\n  /**\n   * The delay time in milliseconds for the submenu to appear after hovering over the trigger.\n   *\n   * @default 200\n   */\n  delay?: number;\n  /** Whether the submenu trigger uses virtual focus. */\n  shouldUseVirtualFocus?: boolean;\n}\n\ninterface SubmenuTriggerProps extends Omit<AriaMenuItemProps, 'key' | 'onAction'> {\n  /** Whether the submenu trigger is in an expanded state. */\n  isOpen: boolean;\n}\n\ninterface SubmenuProps<T> extends AriaMenuOptions<T> {\n  /** The level of the submenu. */\n  submenuLevel: number;\n}\n\nexport interface SubmenuTriggerAria<T> {\n  /** Props for the submenu trigger menu item. */\n  submenuTriggerProps: SubmenuTriggerProps;\n  /** Props for the submenu controlled by the submenu trigger menu item. */\n  submenuProps: SubmenuProps<T>;\n  /** Props for the submenu's popover container. */\n  popoverProps: Pick<AriaPopoverProps, 'isNonModal' | 'shouldCloseOnInteractOutside'> &\n    Pick<OverlayProps, 'disableFocusManagement'>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a submenu trigger and its associated\n * submenu.\n *\n * @param props - Props for the submenu trigger and refs attach to its submenu and parent menu.\n * @param state - State for the submenu trigger.\n * @param ref - Ref to the submenu trigger element.\n */\nexport function useSubmenuTrigger<T>(\n  props: AriaSubmenuTriggerProps,\n  state: SubmenuTriggerState,\n  ref: RefObject<FocusableElement | null>\n): SubmenuTriggerAria<T> {\n  let {\n    parentMenuRef,\n    submenuRef,\n    type = 'menu',\n    isDisabled,\n    delay = 200,\n    shouldUseVirtualFocus\n  } = props;\n  let submenuTriggerId = useId();\n  let overlayId = useId();\n  let {direction} = useLocale();\n  let openTimeout = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);\n  let cancelOpenTimeout = useCallback(() => {\n    if (openTimeout.current) {\n      clearTimeout(openTimeout.current);\n      openTimeout.current = undefined;\n    }\n  }, [openTimeout]);\n\n  let onSubmenuOpen = useCallback(\n    (focusStrategy?: FocusStrategy) => {\n      cancelOpenTimeout();\n      state.open(focusStrategy);\n    },\n    [state, cancelOpenTimeout]\n  );\n\n  let onSubmenuClose = useCallback(() => {\n    cancelOpenTimeout();\n    state.close();\n  }, [state, cancelOpenTimeout]);\n\n  useLayoutEffect(() => {\n    return () => {\n      cancelOpenTimeout();\n    };\n  }, [cancelOpenTimeout]);\n\n  let {keyboardProps} = useKeyboard({\n    shortcuts: {\n      ArrowLeft: e => {\n        // If focus is not within the menu, assume virtual focus is being used.\n        // This means some other input element is also within the popover, so we shouldn't close the menu.\n        if (!isFocusWithin(e.currentTarget)) {\n          return false;\n        }\n        if (direction === 'ltr' && nodeContains(e.currentTarget, getEventTarget(e) as Element)) {\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n          return;\n        }\n        return false;\n      },\n      ArrowRight: e => {\n        if (!isFocusWithin(e.currentTarget)) {\n          return false;\n        }\n        if (direction === 'rtl' && nodeContains(e.currentTarget, getEventTarget(e) as Element)) {\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n          return;\n        }\n        return false;\n      },\n      Escape: e => {\n        if (!isFocusWithin(e.currentTarget)) {\n          return false;\n        }\n        if (nodeContains(submenuRef.current, getEventTarget(e) as Element)) {\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n          return;\n        }\n        return false;\n      }\n    }\n  });\n\n  let submenuProps = {\n    id: overlayId,\n    'aria-labelledby': submenuTriggerId,\n    submenuLevel: state.submenuLevel,\n    ...(type === 'menu' && {\n      onClose: state.closeAll,\n      autoFocus: state.focusStrategy ?? undefined,\n      ...keyboardProps\n    })\n  };\n\n  let {keyboardProps: submenuTriggerKeyboardProps} = useKeyboard({\n    shortcuts: {\n      ArrowRight: () => {\n        if (!isDisabled) {\n          if (direction === 'ltr') {\n            if (!state.isOpen) {\n              onSubmenuOpen('first');\n            }\n\n            if (type === 'menu' && !!submenuRef?.current && getActiveElement() === ref?.current) {\n              focusWithoutScrolling(submenuRef.current);\n            }\n            return;\n          } else if (state.isOpen) {\n            onSubmenuClose();\n            return;\n          } else {\n            return false;\n          }\n        }\n        return false;\n      },\n      ArrowLeft: () => {\n        if (!isDisabled) {\n          if (direction === 'rtl') {\n            if (!state.isOpen) {\n              onSubmenuOpen('first');\n            }\n\n            if (type === 'menu' && !!submenuRef?.current && getActiveElement() === ref?.current) {\n              focusWithoutScrolling(submenuRef.current);\n            }\n            return;\n          } else if (state.isOpen) {\n            onSubmenuClose();\n            return;\n          } else {\n            return false;\n          }\n        }\n        return false;\n      }\n    }\n  });\n\n  let onPressStart = (e: PressEvent) => {\n    if (!isDisabled && (e.pointerType === 'virtual' || e.pointerType === 'keyboard')) {\n      // If opened with a screen reader or keyboard, auto focus the first submenu item.\n      onSubmenuOpen('first');\n    }\n  };\n\n  let onPress = (e: PressEvent) => {\n    if (!isDisabled && (e.pointerType === 'touch' || e.pointerType === 'mouse')) {\n      // For touch or on a desktop device with a small screen open on press up to possible problems with\n      // press up happening on the newly opened tray items\n      onSubmenuOpen();\n    }\n  };\n\n  let onHoverChange = isHovered => {\n    if (!isDisabled) {\n      if (isHovered && !state.isOpen) {\n        if (!openTimeout.current) {\n          openTimeout.current = setTimeout(() => {\n            onSubmenuOpen();\n          }, delay);\n        }\n      } else if (!isHovered) {\n        cancelOpenTimeout();\n      }\n    }\n  };\n\n  useEvent(parentMenuRef, 'focusin', e => {\n    // If we detect focus moved to a different item in the same menu that the currently open submenu trigger is in\n    // then close the submenu. This is for a case where the user hovers a root menu item when multiple submenus are open\n    if (\n      state.isOpen &&\n      nodeContains(parentMenuRef.current, getEventTarget(e) as HTMLElement) &&\n      getEventTarget(e) !== ref.current\n    ) {\n      onSubmenuClose();\n    }\n  });\n\n  let shouldCloseOnInteractOutside = target => {\n    if (target !== ref.current) {\n      return true;\n    }\n\n    return false;\n  };\n\n  useSafelyMouseToSubmenu({\n    menuRef: parentMenuRef,\n    submenuRef,\n    isOpen: state.isOpen,\n    isDisabled: isDisabled\n  });\n\n  return {\n    submenuTriggerProps: {\n      onKeyDown: submenuTriggerKeyboardProps.onKeyDown,\n      onKeyUp: submenuTriggerKeyboardProps.onKeyUp,\n      id: submenuTriggerId,\n      'aria-controls': state.isOpen ? overlayId : undefined,\n      'aria-haspopup': !isDisabled ? type : undefined,\n      'aria-expanded': state.isOpen ? 'true' : 'false',\n      onPressStart,\n      onPress,\n      onHoverChange,\n      isOpen: state.isOpen\n    },\n    submenuProps,\n    popoverProps: {\n      isNonModal: true,\n      shouldCloseOnInteractOutside\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useSubmenuTrigger.cjs.map"}

package/dist/private/menu/useSubmenuTrigger.js

@@ -2,6 +2,7 @@ import {focusWithoutScrolling as $d559d872031c749f$export$de79e2c695e052f3} from
 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 {useEvent as $c3cab330536504ec$export$90fc3a17d93f704c} from "../utils/useEvent.js";
 import {useId as $0292efe68908de6b$export$f680877a34711e37} from "../utils/useId.js";
+import {useKeyboard as $bf74df7506f65576$export$8f71654801c2f7cd} from "../interactions/useKeyboard.js";
 import {useLayoutEffect as $53fed047b798be36$export$e5c5a5f917a5871c} from "../utils/useLayoutEffect.js";
 import {useLocale as $4defb058003b3e05$export$43bb16f9c6d9e3f7} from "../i18n/I18nProvider.js";
 import {useSafelyMouseToSubmenu as $43575285b6c61e86$export$85ec83e04c95f50a} from "./useSafelyMouseToSubmenu.js";
@@ -25,6 +26,7 @@ import {useRef as $iVOpM$useRef, useCallback as $iVOpM$useCallback} from "react"
 
 
 
+
 function $fe3245d1ec1813d3$export$7138b0d059a6e743(props, state, ref) {
     let { parentMenuRef: parentMenuRef, submenuRef: submenuRef, type: type = 'menu', isDisabled: isDisabled, delay: delay = 200, shouldUseVirtualFocus: shouldUseVirtualFocus } = props;
     let submenuTriggerId = (0, $0292efe68908de6b$export$f680877a34711e37)();
@@ -60,37 +62,39 @@ function $fe3245d1ec1813d3$export$7138b0d059a6e743(props, state, ref) {
     }, [
         cancelOpenTimeout
     ]);
-    let submenuKeyDown = (e)=>{
-        // If focus is not within the menu, assume virtual focus is being used.
-        // This means some other input element is also within the popover, so we shouldn't close the menu.
-        if (!(0, $d8ac7ed472840322$export$b4f377a2b6254582)(e.currentTarget)) return;
-        switch(e.key){
-            case 'ArrowLeft':
+    let { keyboardProps: keyboardProps } = (0, $bf74df7506f65576$export$8f71654801c2f7cd)({
+        shortcuts: {
+            ArrowLeft: (e)=>{
+                // If focus is not within the menu, assume virtual focus is being used.
+                // This means some other input element is also within the popover, so we shouldn't close the menu.
+                if (!(0, $d8ac7ed472840322$export$b4f377a2b6254582)(e.currentTarget)) return false;
                 if (direction === 'ltr' && (0, $d8ac7ed472840322$export$4282f70798064fe0)(e.currentTarget, (0, $d8ac7ed472840322$export$e58f029f0fbfdb29)(e))) {
-                    e.preventDefault();
-                    e.stopPropagation();
                     onSubmenuClose();
                     if (!shouldUseVirtualFocus && ref.current) (0, $d559d872031c749f$export$de79e2c695e052f3)(ref.current);
+                    return;
                 }
-                break;
-            case 'ArrowRight':
+                return false;
+            },
+            ArrowRight: (e)=>{
+                if (!(0, $d8ac7ed472840322$export$b4f377a2b6254582)(e.currentTarget)) return false;
                 if (direction === 'rtl' && (0, $d8ac7ed472840322$export$4282f70798064fe0)(e.currentTarget, (0, $d8ac7ed472840322$export$e58f029f0fbfdb29)(e))) {
-                    e.preventDefault();
-                    e.stopPropagation();
                     onSubmenuClose();
                     if (!shouldUseVirtualFocus && ref.current) (0, $d559d872031c749f$export$de79e2c695e052f3)(ref.current);
+                    return;
                 }
-                break;
-            case 'Escape':
-                // TODO: can remove this when we fix collection event leaks
+                return false;
+            },
+            Escape: (e)=>{
+                if (!(0, $d8ac7ed472840322$export$b4f377a2b6254582)(e.currentTarget)) return false;
                 if ((0, $d8ac7ed472840322$export$4282f70798064fe0)(submenuRef.current, (0, $d8ac7ed472840322$export$e58f029f0fbfdb29)(e))) {
-                    e.stopPropagation();
                     onSubmenuClose();
                     if (!shouldUseVirtualFocus && ref.current) (0, $d559d872031c749f$export$de79e2c695e052f3)(ref.current);
+                    return;
                 }
-                break;
+                return false;
+            }
         }
-    };
+    });
     var _state_focusStrategy;
     let submenuProps = {
         id: overlayId,
@@ -99,36 +103,39 @@ function $fe3245d1ec1813d3$export$7138b0d059a6e743(props, state, ref) {
         ...type === 'menu' && {
             onClose: state.closeAll,
             autoFocus: (_state_focusStrategy = state.focusStrategy) !== null && _state_focusStrategy !== void 0 ? _state_focusStrategy : undefined,
-            onKeyDown: submenuKeyDown
+            ...keyboardProps
         }
     };
-    let submenuTriggerKeyDown = (e)=>{
-        switch(e.key){
-            case 'ArrowRight':
+    let { keyboardProps: submenuTriggerKeyboardProps } = (0, $bf74df7506f65576$export$8f71654801c2f7cd)({
+        shortcuts: {
+            ArrowRight: ()=>{
                 if (!isDisabled) {
                     if (direction === 'ltr') {
-                        e.preventDefault();
                         if (!state.isOpen) onSubmenuOpen('first');
                         if (type === 'menu' && !!(submenuRef === null || submenuRef === void 0 ? void 0 : submenuRef.current) && (0, $d8ac7ed472840322$export$cd4e5573fbe2b576)() === (ref === null || ref === void 0 ? void 0 : ref.current)) (0, $d559d872031c749f$export$de79e2c695e052f3)(submenuRef.current);
-                    } else if (state.isOpen) onSubmenuClose();
-                    else e.continuePropagation();
+                        return;
+                    } else if (state.isOpen) {
+                        onSubmenuClose();
+                        return;
+                    } else return false;
                 }
-                break;
-            case 'ArrowLeft':
+                return false;
+            },
+            ArrowLeft: ()=>{
                 if (!isDisabled) {
                     if (direction === 'rtl') {
-                        e.preventDefault();
                         if (!state.isOpen) onSubmenuOpen('first');
                         if (type === 'menu' && !!(submenuRef === null || submenuRef === void 0 ? void 0 : submenuRef.current) && (0, $d8ac7ed472840322$export$cd4e5573fbe2b576)() === (ref === null || ref === void 0 ? void 0 : ref.current)) (0, $d559d872031c749f$export$de79e2c695e052f3)(submenuRef.current);
-                    } else if (state.isOpen) onSubmenuClose();
-                    else e.continuePropagation();
+                        return;
+                    } else if (state.isOpen) {
+                        onSubmenuClose();
+                        return;
+                    } else return false;
                 }
-                break;
-            default:
-                e.continuePropagation();
-                break;
+                return false;
+            }
         }
-    };
+    });
     let onPressStart = (e)=>{
         if (!isDisabled && (e.pointerType === 'virtual' || e.pointerType === 'keyboard')) // If opened with a screen reader or keyboard, auto focus the first submenu item.
         onSubmenuOpen('first');
@@ -164,6 +171,8 @@ function $fe3245d1ec1813d3$export$7138b0d059a6e743(props, state, ref) {
     });
     return {
         submenuTriggerProps: {
+            onKeyDown: submenuTriggerKeyboardProps.onKeyDown,
+            onKeyUp: submenuTriggerKeyboardProps.onKeyUp,
             id: submenuTriggerId,
             'aria-controls': state.isOpen ? overlayId : undefined,
             'aria-haspopup': !isDisabled ? type : undefined,
@@ -171,7 +180,6 @@ function $fe3245d1ec1813d3$export$7138b0d059a6e743(props, state, ref) {
             onPressStart: onPressStart,
             onPress: onPress,
             onHoverChange: onHoverChange,
-            onKeyDown: submenuTriggerKeyDown,
             isOpen: state.isOpen
         },
         submenuProps: submenuProps,

package/dist/private/menu/useSubmenuTrigger.js.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/react-aria/src/menu/useSubmenuTrigger.ts"],"sourcesContent":["/*\n * Copyright 2023 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 {AriaMenuItemProps} from './useMenuItem';\nimport {AriaMenuOptions} from './useMenu';\nimport type {AriaPopoverProps} from '../overlays/usePopover';\nimport {\n  FocusableElement,\n  FocusStrategy,\n  KeyboardEvent,\n  Node,\n  PressEvent,\n  RefObject\n} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport {\n  getActiveElement,\n  getEventTarget,\n  isFocusWithin,\n  nodeContains\n} from '../utils/shadowdom/DOMFunctions';\nimport type {OverlayProps} from '../overlays/Overlay';\nimport type {SubmenuTriggerState} from 'react-stately/useMenuTriggerState';\nimport {useCallback, useRef} from 'react';\nimport {useEvent} from '../utils/useEvent';\nimport {useId} from '../utils/useId';\nimport {useLayoutEffect} from '../utils/useLayoutEffect';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSafelyMouseToSubmenu} from './useSafelyMouseToSubmenu';\n\nexport interface AriaSubmenuTriggerProps {\n  /**\n   * An object representing the submenu trigger menu item. Contains all the relevant information\n   * that makes up the menu item.\n   *\n   * @deprecated\n   */\n  node?: Node<unknown>;\n  /** Whether the submenu trigger is disabled. */\n  isDisabled?: boolean;\n  /** The type of the contents that the submenu trigger opens. */\n  type?: 'dialog' | 'menu';\n  /** Ref of the menu that contains the submenu trigger. */\n  parentMenuRef: RefObject<HTMLElement | null>;\n  /** Ref of the submenu opened by the submenu trigger. */\n  submenuRef: RefObject<HTMLElement | null>;\n  /**\n   * The delay time in milliseconds for the submenu to appear after hovering over the trigger.\n   *\n   * @default 200\n   */\n  delay?: number;\n  /** Whether the submenu trigger uses virtual focus. */\n  shouldUseVirtualFocus?: boolean;\n}\n\ninterface SubmenuTriggerProps extends Omit<AriaMenuItemProps, 'key' | 'onAction'> {\n  /** Whether the submenu trigger is in an expanded state. */\n  isOpen: boolean;\n}\n\ninterface SubmenuProps<T> extends AriaMenuOptions<T> {\n  /** The level of the submenu. */\n  submenuLevel: number;\n}\n\nexport interface SubmenuTriggerAria<T> {\n  /** Props for the submenu trigger menu item. */\n  submenuTriggerProps: SubmenuTriggerProps;\n  /** Props for the submenu controlled by the submenu trigger menu item. */\n  submenuProps: SubmenuProps<T>;\n  /** Props for the submenu's popover container. */\n  popoverProps: Pick<AriaPopoverProps, 'isNonModal' | 'shouldCloseOnInteractOutside'> &\n    Pick<OverlayProps, 'disableFocusManagement'>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a submenu trigger and its associated\n * submenu.\n *\n * @param props - Props for the submenu trigger and refs attach to its submenu and parent menu.\n * @param state - State for the submenu trigger.\n * @param ref - Ref to the submenu trigger element.\n */\nexport function useSubmenuTrigger<T>(\n  props: AriaSubmenuTriggerProps,\n  state: SubmenuTriggerState,\n  ref: RefObject<FocusableElement | null>\n): SubmenuTriggerAria<T> {\n  let {\n    parentMenuRef,\n    submenuRef,\n    type = 'menu',\n    isDisabled,\n    delay = 200,\n    shouldUseVirtualFocus\n  } = props;\n  let submenuTriggerId = useId();\n  let overlayId = useId();\n  let {direction} = useLocale();\n  let openTimeout = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);\n  let cancelOpenTimeout = useCallback(() => {\n    if (openTimeout.current) {\n      clearTimeout(openTimeout.current);\n      openTimeout.current = undefined;\n    }\n  }, [openTimeout]);\n\n  let onSubmenuOpen = useCallback(\n    (focusStrategy?: FocusStrategy) => {\n      cancelOpenTimeout();\n      state.open(focusStrategy);\n    },\n    [state, cancelOpenTimeout]\n  );\n\n  let onSubmenuClose = useCallback(() => {\n    cancelOpenTimeout();\n    state.close();\n  }, [state, cancelOpenTimeout]);\n\n  useLayoutEffect(() => {\n    return () => {\n      cancelOpenTimeout();\n    };\n  }, [cancelOpenTimeout]);\n\n  let submenuKeyDown = (e: KeyboardEvent) => {\n    // If focus is not within the menu, assume virtual focus is being used.\n    // This means some other input element is also within the popover, so we shouldn't close the menu.\n    if (!isFocusWithin(e.currentTarget)) {\n      return;\n    }\n\n    switch (e.key) {\n      case 'ArrowLeft':\n        if (direction === 'ltr' && nodeContains(e.currentTarget, getEventTarget(e) as Element)) {\n          e.preventDefault();\n          e.stopPropagation();\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n        }\n        break;\n      case 'ArrowRight':\n        if (direction === 'rtl' && nodeContains(e.currentTarget, getEventTarget(e) as Element)) {\n          e.preventDefault();\n          e.stopPropagation();\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n        }\n        break;\n      case 'Escape':\n        // TODO: can remove this when we fix collection event leaks\n        if (nodeContains(submenuRef.current, getEventTarget(e) as Element)) {\n          e.stopPropagation();\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n        }\n        break;\n    }\n  };\n\n  let submenuProps = {\n    id: overlayId,\n    'aria-labelledby': submenuTriggerId,\n    submenuLevel: state.submenuLevel,\n    ...(type === 'menu' && {\n      onClose: state.closeAll,\n      autoFocus: state.focusStrategy ?? undefined,\n      onKeyDown: submenuKeyDown\n    })\n  };\n\n  let submenuTriggerKeyDown = (e: KeyboardEvent) => {\n    switch (e.key) {\n      case 'ArrowRight':\n        if (!isDisabled) {\n          if (direction === 'ltr') {\n            e.preventDefault();\n            if (!state.isOpen) {\n              onSubmenuOpen('first');\n            }\n\n            if (type === 'menu' && !!submenuRef?.current && getActiveElement() === ref?.current) {\n              focusWithoutScrolling(submenuRef.current);\n            }\n          } else if (state.isOpen) {\n            onSubmenuClose();\n          } else {\n            e.continuePropagation();\n          }\n        }\n\n        break;\n      case 'ArrowLeft':\n        if (!isDisabled) {\n          if (direction === 'rtl') {\n            e.preventDefault();\n            if (!state.isOpen) {\n              onSubmenuOpen('first');\n            }\n\n            if (type === 'menu' && !!submenuRef?.current && getActiveElement() === ref?.current) {\n              focusWithoutScrolling(submenuRef.current);\n            }\n          } else if (state.isOpen) {\n            onSubmenuClose();\n          } else {\n            e.continuePropagation();\n          }\n        }\n        break;\n      default:\n        e.continuePropagation();\n        break;\n    }\n  };\n\n  let onPressStart = (e: PressEvent) => {\n    if (!isDisabled && (e.pointerType === 'virtual' || e.pointerType === 'keyboard')) {\n      // If opened with a screen reader or keyboard, auto focus the first submenu item.\n      onSubmenuOpen('first');\n    }\n  };\n\n  let onPress = (e: PressEvent) => {\n    if (!isDisabled && (e.pointerType === 'touch' || e.pointerType === 'mouse')) {\n      // For touch or on a desktop device with a small screen open on press up to possible problems with\n      // press up happening on the newly opened tray items\n      onSubmenuOpen();\n    }\n  };\n\n  let onHoverChange = isHovered => {\n    if (!isDisabled) {\n      if (isHovered && !state.isOpen) {\n        if (!openTimeout.current) {\n          openTimeout.current = setTimeout(() => {\n            onSubmenuOpen();\n          }, delay);\n        }\n      } else if (!isHovered) {\n        cancelOpenTimeout();\n      }\n    }\n  };\n\n  useEvent(parentMenuRef, 'focusin', e => {\n    // If we detect focus moved to a different item in the same menu that the currently open submenu trigger is in\n    // then close the submenu. This is for a case where the user hovers a root menu item when multiple submenus are open\n    if (\n      state.isOpen &&\n      nodeContains(parentMenuRef.current, getEventTarget(e) as HTMLElement) &&\n      getEventTarget(e) !== ref.current\n    ) {\n      onSubmenuClose();\n    }\n  });\n\n  let shouldCloseOnInteractOutside = target => {\n    if (target !== ref.current) {\n      return true;\n    }\n\n    return false;\n  };\n\n  useSafelyMouseToSubmenu({\n    menuRef: parentMenuRef,\n    submenuRef,\n    isOpen: state.isOpen,\n    isDisabled: isDisabled\n  });\n\n  return {\n    submenuTriggerProps: {\n      id: submenuTriggerId,\n      'aria-controls': state.isOpen ? overlayId : undefined,\n      'aria-haspopup': !isDisabled ? type : undefined,\n      'aria-expanded': state.isOpen ? 'true' : 'false',\n      onPressStart,\n      onPress,\n      onHoverChange,\n      onKeyDown: submenuTriggerKeyDown,\n      isOpen: state.isOpen\n    },\n    submenuProps,\n    popoverProps: {\n      isNonModal: true,\n      shouldCloseOnInteractOutside\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useSubmenuTrigger.js.map"}
+{"mappings":"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","sources":["packages/react-aria/src/menu/useSubmenuTrigger.ts"],"sourcesContent":["/*\n * Copyright 2023 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 {AriaMenuItemProps} from './useMenuItem';\nimport {AriaMenuOptions} from './useMenu';\nimport type {AriaPopoverProps} from '../overlays/usePopover';\nimport {FocusableElement, FocusStrategy, Node, PressEvent, RefObject} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport {\n  getActiveElement,\n  getEventTarget,\n  isFocusWithin,\n  nodeContains\n} from '../utils/shadowdom/DOMFunctions';\nimport type {OverlayProps} from '../overlays/Overlay';\nimport type {SubmenuTriggerState} from 'react-stately/useMenuTriggerState';\nimport {useCallback, useRef} from 'react';\nimport {useEvent} from '../utils/useEvent';\nimport {useId} from '../utils/useId';\nimport {useKeyboard} from '../interactions/useKeyboard';\nimport {useLayoutEffect} from '../utils/useLayoutEffect';\nimport {useLocale} from '../i18n/I18nProvider';\nimport {useSafelyMouseToSubmenu} from './useSafelyMouseToSubmenu';\n\nexport interface AriaSubmenuTriggerProps {\n  /**\n   * An object representing the submenu trigger menu item. Contains all the relevant information\n   * that makes up the menu item.\n   *\n   * @deprecated\n   */\n  node?: Node<unknown>;\n  /** Whether the submenu trigger is disabled. */\n  isDisabled?: boolean;\n  /** The type of the contents that the submenu trigger opens. */\n  type?: 'dialog' | 'menu';\n  /** Ref of the menu that contains the submenu trigger. */\n  parentMenuRef: RefObject<HTMLElement | null>;\n  /** Ref of the submenu opened by the submenu trigger. */\n  submenuRef: RefObject<HTMLElement | null>;\n  /**\n   * The delay time in milliseconds for the submenu to appear after hovering over the trigger.\n   *\n   * @default 200\n   */\n  delay?: number;\n  /** Whether the submenu trigger uses virtual focus. */\n  shouldUseVirtualFocus?: boolean;\n}\n\ninterface SubmenuTriggerProps extends Omit<AriaMenuItemProps, 'key' | 'onAction'> {\n  /** Whether the submenu trigger is in an expanded state. */\n  isOpen: boolean;\n}\n\ninterface SubmenuProps<T> extends AriaMenuOptions<T> {\n  /** The level of the submenu. */\n  submenuLevel: number;\n}\n\nexport interface SubmenuTriggerAria<T> {\n  /** Props for the submenu trigger menu item. */\n  submenuTriggerProps: SubmenuTriggerProps;\n  /** Props for the submenu controlled by the submenu trigger menu item. */\n  submenuProps: SubmenuProps<T>;\n  /** Props for the submenu's popover container. */\n  popoverProps: Pick<AriaPopoverProps, 'isNonModal' | 'shouldCloseOnInteractOutside'> &\n    Pick<OverlayProps, 'disableFocusManagement'>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a submenu trigger and its associated\n * submenu.\n *\n * @param props - Props for the submenu trigger and refs attach to its submenu and parent menu.\n * @param state - State for the submenu trigger.\n * @param ref - Ref to the submenu trigger element.\n */\nexport function useSubmenuTrigger<T>(\n  props: AriaSubmenuTriggerProps,\n  state: SubmenuTriggerState,\n  ref: RefObject<FocusableElement | null>\n): SubmenuTriggerAria<T> {\n  let {\n    parentMenuRef,\n    submenuRef,\n    type = 'menu',\n    isDisabled,\n    delay = 200,\n    shouldUseVirtualFocus\n  } = props;\n  let submenuTriggerId = useId();\n  let overlayId = useId();\n  let {direction} = useLocale();\n  let openTimeout = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);\n  let cancelOpenTimeout = useCallback(() => {\n    if (openTimeout.current) {\n      clearTimeout(openTimeout.current);\n      openTimeout.current = undefined;\n    }\n  }, [openTimeout]);\n\n  let onSubmenuOpen = useCallback(\n    (focusStrategy?: FocusStrategy) => {\n      cancelOpenTimeout();\n      state.open(focusStrategy);\n    },\n    [state, cancelOpenTimeout]\n  );\n\n  let onSubmenuClose = useCallback(() => {\n    cancelOpenTimeout();\n    state.close();\n  }, [state, cancelOpenTimeout]);\n\n  useLayoutEffect(() => {\n    return () => {\n      cancelOpenTimeout();\n    };\n  }, [cancelOpenTimeout]);\n\n  let {keyboardProps} = useKeyboard({\n    shortcuts: {\n      ArrowLeft: e => {\n        // If focus is not within the menu, assume virtual focus is being used.\n        // This means some other input element is also within the popover, so we shouldn't close the menu.\n        if (!isFocusWithin(e.currentTarget)) {\n          return false;\n        }\n        if (direction === 'ltr' && nodeContains(e.currentTarget, getEventTarget(e) as Element)) {\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n          return;\n        }\n        return false;\n      },\n      ArrowRight: e => {\n        if (!isFocusWithin(e.currentTarget)) {\n          return false;\n        }\n        if (direction === 'rtl' && nodeContains(e.currentTarget, getEventTarget(e) as Element)) {\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n          return;\n        }\n        return false;\n      },\n      Escape: e => {\n        if (!isFocusWithin(e.currentTarget)) {\n          return false;\n        }\n        if (nodeContains(submenuRef.current, getEventTarget(e) as Element)) {\n          onSubmenuClose();\n          if (!shouldUseVirtualFocus && ref.current) {\n            focusWithoutScrolling(ref.current);\n          }\n          return;\n        }\n        return false;\n      }\n    }\n  });\n\n  let submenuProps = {\n    id: overlayId,\n    'aria-labelledby': submenuTriggerId,\n    submenuLevel: state.submenuLevel,\n    ...(type === 'menu' && {\n      onClose: state.closeAll,\n      autoFocus: state.focusStrategy ?? undefined,\n      ...keyboardProps\n    })\n  };\n\n  let {keyboardProps: submenuTriggerKeyboardProps} = useKeyboard({\n    shortcuts: {\n      ArrowRight: () => {\n        if (!isDisabled) {\n          if (direction === 'ltr') {\n            if (!state.isOpen) {\n              onSubmenuOpen('first');\n            }\n\n            if (type === 'menu' && !!submenuRef?.current && getActiveElement() === ref?.current) {\n              focusWithoutScrolling(submenuRef.current);\n            }\n            return;\n          } else if (state.isOpen) {\n            onSubmenuClose();\n            return;\n          } else {\n            return false;\n          }\n        }\n        return false;\n      },\n      ArrowLeft: () => {\n        if (!isDisabled) {\n          if (direction === 'rtl') {\n            if (!state.isOpen) {\n              onSubmenuOpen('first');\n            }\n\n            if (type === 'menu' && !!submenuRef?.current && getActiveElement() === ref?.current) {\n              focusWithoutScrolling(submenuRef.current);\n            }\n            return;\n          } else if (state.isOpen) {\n            onSubmenuClose();\n            return;\n          } else {\n            return false;\n          }\n        }\n        return false;\n      }\n    }\n  });\n\n  let onPressStart = (e: PressEvent) => {\n    if (!isDisabled && (e.pointerType === 'virtual' || e.pointerType === 'keyboard')) {\n      // If opened with a screen reader or keyboard, auto focus the first submenu item.\n      onSubmenuOpen('first');\n    }\n  };\n\n  let onPress = (e: PressEvent) => {\n    if (!isDisabled && (e.pointerType === 'touch' || e.pointerType === 'mouse')) {\n      // For touch or on a desktop device with a small screen open on press up to possible problems with\n      // press up happening on the newly opened tray items\n      onSubmenuOpen();\n    }\n  };\n\n  let onHoverChange = isHovered => {\n    if (!isDisabled) {\n      if (isHovered && !state.isOpen) {\n        if (!openTimeout.current) {\n          openTimeout.current = setTimeout(() => {\n            onSubmenuOpen();\n          }, delay);\n        }\n      } else if (!isHovered) {\n        cancelOpenTimeout();\n      }\n    }\n  };\n\n  useEvent(parentMenuRef, 'focusin', e => {\n    // If we detect focus moved to a different item in the same menu that the currently open submenu trigger is in\n    // then close the submenu. This is for a case where the user hovers a root menu item when multiple submenus are open\n    if (\n      state.isOpen &&\n      nodeContains(parentMenuRef.current, getEventTarget(e) as HTMLElement) &&\n      getEventTarget(e) !== ref.current\n    ) {\n      onSubmenuClose();\n    }\n  });\n\n  let shouldCloseOnInteractOutside = target => {\n    if (target !== ref.current) {\n      return true;\n    }\n\n    return false;\n  };\n\n  useSafelyMouseToSubmenu({\n    menuRef: parentMenuRef,\n    submenuRef,\n    isOpen: state.isOpen,\n    isDisabled: isDisabled\n  });\n\n  return {\n    submenuTriggerProps: {\n      onKeyDown: submenuTriggerKeyboardProps.onKeyDown,\n      onKeyUp: submenuTriggerKeyboardProps.onKeyUp,\n      id: submenuTriggerId,\n      'aria-controls': state.isOpen ? overlayId : undefined,\n      'aria-haspopup': !isDisabled ? type : undefined,\n      'aria-expanded': state.isOpen ? 'true' : 'false',\n      onPressStart,\n      onPress,\n      onHoverChange,\n      isOpen: state.isOpen\n    },\n    submenuProps,\n    popoverProps: {\n      isNonModal: true,\n      shouldCloseOnInteractOutside\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useSubmenuTrigger.js.map"}

package/dist/private/menu/useSubmenuTrigger.mjs

@@ -2,6 +2,7 @@ import {focusWithoutScrolling as $1969ac565cfec8d0$export$de79e2c695e052f3} from
 import {getActiveElement as $23f2114a1b82827e$export$cd4e5573fbe2b576, getEventTarget as $23f2114a1b82827e$export$e58f029f0fbfdb29, isFocusWithin as $23f2114a1b82827e$export$b4f377a2b6254582, nodeContains as $23f2114a1b82827e$export$4282f70798064fe0} from "../utils/shadowdom/DOMFunctions.mjs";
 import {useEvent as $600b3cf69ae46262$export$90fc3a17d93f704c} from "../utils/useEvent.mjs";
 import {useId as $390e54f620492c70$export$f680877a34711e37} from "../utils/useId.mjs";
+import {useKeyboard as $8296dad1a4c5e0dc$export$8f71654801c2f7cd} from "../interactions/useKeyboard.mjs";
 import {useLayoutEffect as $c4867b2f328c2698$export$e5c5a5f917a5871c} from "../utils/useLayoutEffect.mjs";
 import {useLocale as $2eb8e6d23f3d0cb0$export$43bb16f9c6d9e3f7} from "../i18n/I18nProvider.mjs";
 import {useSafelyMouseToSubmenu as $eac5d44fa99b2e3b$export$85ec83e04c95f50a} from "./useSafelyMouseToSubmenu.mjs";
@@ -25,6 +26,7 @@ import {useRef as $5jLBO$useRef, useCallback as $5jLBO$useCallback} from "react"
 
 
 
+
 function $8794213c1141208f$export$7138b0d059a6e743(props, state, ref) {
     let { parentMenuRef: parentMenuRef, submenuRef: submenuRef, type: type = 'menu', isDisabled: isDisabled, delay: delay = 200, shouldUseVirtualFocus: shouldUseVirtualFocus } = props;
     let submenuTriggerId = (0, $390e54f620492c70$export$f680877a34711e37)();
@@ -60,37 +62,39 @@ function $8794213c1141208f$export$7138b0d059a6e743(props, state, ref) {
     }, [
         cancelOpenTimeout
     ]);
-    let submenuKeyDown = (e)=>{
-        // If focus is not within the menu, assume virtual focus is being used.
-        // This means some other input element is also within the popover, so we shouldn't close the menu.
-        if (!(0, $23f2114a1b82827e$export$b4f377a2b6254582)(e.currentTarget)) return;
-        switch(e.key){
-            case 'ArrowLeft':
+    let { keyboardProps: keyboardProps } = (0, $8296dad1a4c5e0dc$export$8f71654801c2f7cd)({
+        shortcuts: {
+            ArrowLeft: (e)=>{
+                // If focus is not within the menu, assume virtual focus is being used.
+                // This means some other input element is also within the popover, so we shouldn't close the menu.
+                if (!(0, $23f2114a1b82827e$export$b4f377a2b6254582)(e.currentTarget)) return false;
                 if (direction === 'ltr' && (0, $23f2114a1b82827e$export$4282f70798064fe0)(e.currentTarget, (0, $23f2114a1b82827e$export$e58f029f0fbfdb29)(e))) {
-                    e.preventDefault();
-                    e.stopPropagation();
                     onSubmenuClose();
                     if (!shouldUseVirtualFocus && ref.current) (0, $1969ac565cfec8d0$export$de79e2c695e052f3)(ref.current);
+                    return;
                 }
-                break;
-            case 'ArrowRight':
+                return false;
+            },
+            ArrowRight: (e)=>{
+                if (!(0, $23f2114a1b82827e$export$b4f377a2b6254582)(e.currentTarget)) return false;
                 if (direction === 'rtl' && (0, $23f2114a1b82827e$export$4282f70798064fe0)(e.currentTarget, (0, $23f2114a1b82827e$export$e58f029f0fbfdb29)(e))) {
-                    e.preventDefault();
-                    e.stopPropagation();
                     onSubmenuClose();
                     if (!shouldUseVirtualFocus && ref.current) (0, $1969ac565cfec8d0$export$de79e2c695e052f3)(ref.current);
+                    return;
                 }
-                break;
-            case 'Escape':
-                // TODO: can remove this when we fix collection event leaks
+                return false;
+            },
+            Escape: (e)=>{
+                if (!(0, $23f2114a1b82827e$export$b4f377a2b6254582)(e.currentTarget)) return false;
                 if ((0, $23f2114a1b82827e$export$4282f70798064fe0)(submenuRef.current, (0, $23f2114a1b82827e$export$e58f029f0fbfdb29)(e))) {
-                    e.stopPropagation();
                     onSubmenuClose();
                     if (!shouldUseVirtualFocus && ref.current) (0, $1969ac565cfec8d0$export$de79e2c695e052f3)(ref.current);
+                    return;
                 }
-                break;
+                return false;
+            }
         }
-    };
+    });
     let submenuProps = {
         id: overlayId,
         'aria-labelledby': submenuTriggerId,
@@ -98,36 +102,39 @@ function $8794213c1141208f$export$7138b0d059a6e743(props, state, ref) {
         ...type === 'menu' && {
             onClose: state.closeAll,
             autoFocus: state.focusStrategy ?? undefined,
-            onKeyDown: submenuKeyDown
+            ...keyboardProps
         }
     };
-    let submenuTriggerKeyDown = (e)=>{
-        switch(e.key){
-            case 'ArrowRight':
+    let { keyboardProps: submenuTriggerKeyboardProps } = (0, $8296dad1a4c5e0dc$export$8f71654801c2f7cd)({
+        shortcuts: {
+            ArrowRight: ()=>{
                 if (!isDisabled) {
                     if (direction === 'ltr') {
-                        e.preventDefault();
                         if (!state.isOpen) onSubmenuOpen('first');
                         if (type === 'menu' && !!submenuRef?.current && (0, $23f2114a1b82827e$export$cd4e5573fbe2b576)() === ref?.current) (0, $1969ac565cfec8d0$export$de79e2c695e052f3)(submenuRef.current);
-                    } else if (state.isOpen) onSubmenuClose();
-                    else e.continuePropagation();
+                        return;
+                    } else if (state.isOpen) {
+                        onSubmenuClose();
+                        return;
+                    } else return false;
                 }
-                break;
-            case 'ArrowLeft':
+                return false;
+            },
+            ArrowLeft: ()=>{
                 if (!isDisabled) {
                     if (direction === 'rtl') {
-                        e.preventDefault();
                         if (!state.isOpen) onSubmenuOpen('first');
                         if (type === 'menu' && !!submenuRef?.current && (0, $23f2114a1b82827e$export$cd4e5573fbe2b576)() === ref?.current) (0, $1969ac565cfec8d0$export$de79e2c695e052f3)(submenuRef.current);
-                    } else if (state.isOpen) onSubmenuClose();
-                    else e.continuePropagation();
+                        return;
+                    } else if (state.isOpen) {
+                        onSubmenuClose();
+                        return;
+                    } else return false;
                 }
-                break;
-            default:
-                e.continuePropagation();
-                break;
+                return false;
+            }
         }
-    };
+    });
     let onPressStart = (e)=>{
         if (!isDisabled && (e.pointerType === 'virtual' || e.pointerType === 'keyboard')) // If opened with a screen reader or keyboard, auto focus the first submenu item.
         onSubmenuOpen('first');
@@ -163,6 +170,8 @@ function $8794213c1141208f$export$7138b0d059a6e743(props, state, ref) {
     });
     return {
         submenuTriggerProps: {
+            onKeyDown: submenuTriggerKeyboardProps.onKeyDown,
+            onKeyUp: submenuTriggerKeyboardProps.onKeyUp,
             id: submenuTriggerId,
             'aria-controls': state.isOpen ? overlayId : undefined,
             'aria-haspopup': !isDisabled ? type : undefined,
@@ -170,7 +179,6 @@ function $8794213c1141208f$export$7138b0d059a6e743(props, state, ref) {
             onPressStart: onPressStart,
             onPress: onPress,
             onHoverChange: onHoverChange,
-            onKeyDown: submenuTriggerKeyDown,
             isOpen: state.isOpen
         },
         submenuProps: submenuProps,