react-aria 3.49.0 → 3.51.0

package/dist/private/menu/useMenuTrigger.cjs

@@ -1,9 +1,13 @@
 var $4b9e9ed3f006ad27$exports = require("../utils/focusWithoutScrolling.cjs");
+var $da02ee888921bc9e$exports = require("../utils/shadowdom/DOMFunctions.cjs");
 var $81146576c7bb61f6$exports = require("./intlStrings.cjs");
+var $9c80670f8abbe5f2$exports = require("../interactions/useContextMenu.cjs");
 var $7ac82d1fee77eb8a$exports = require("../utils/useId.cjs");
+var $6d2f10bb8b359da5$exports = require("../interactions/useKeyboard.cjs");
 var $d4e8e26182baab6e$exports = require("../i18n/useLocalizedStringFormatter.cjs");
 var $8615756fee3bdacc$exports = require("../interactions/useLongPress.cjs");
 var $d97027197a3758b1$exports = require("../overlays/useOverlayTrigger.cjs");
+var $55aFl$react = require("react");
 
 
 function $parcel$interopDefault(a) {
@@ -31,40 +35,56 @@ $parcel$export(module.exports, "useMenuTrigger", function () { return $5b639fe01
 
 
 
+
+
+
+
 function $5b639fe010c6782f$export$dc9c12ed27dd1b49(props, state, ref) {
     let { type: type = 'menu', isDisabled: isDisabled, trigger: trigger = 'press' } = props;
     let menuTriggerId = (0, $7ac82d1fee77eb8a$exports.useId)();
     let { triggerProps: triggerProps, overlayProps: overlayProps } = (0, $d97027197a3758b1$exports.useOverlayTrigger)({
         type: type
     }, state, ref);
-    let onKeyDown = (e)=>{
-        if (isDisabled) return;
-        if (trigger === 'longPress' && !e.altKey) return;
-        if (ref && ref.current) switch(e.key){
-            case 'Enter':
-            case ' ':
-                // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.
-                // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.
-                // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.
-                // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.
-                if (trigger === 'longPress' || e.isDefaultPrevented()) return;
-            // fallthrough
-            case 'ArrowDown':
-                // Stop propagation, unless it would already be handled by useKeyboard.
-                if (!('continuePropagation' in e)) e.stopPropagation();
-                e.preventDefault();
-                state.toggle('first');
-                break;
-            case 'ArrowUp':
-                if (!('continuePropagation' in e)) e.stopPropagation();
-                e.preventDefault();
-                state.toggle('last');
-                break;
-            default:
-                // Allow other keys.
-                if ('continuePropagation' in e) e.continuePropagation();
-        }
+    let open = (shouldOpen, e, focusStrategy = 'first')=>{
+        if (!shouldOpen || e.isDefaultPrevented()) return false;
+        state.toggle(focusStrategy);
     };
+    // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.
+    // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.
+    // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.
+    // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.
+    let { keyboardProps: keyboardProps } = (0, $6d2f10bb8b359da5$exports.useKeyboard)({
+        isDisabled: isDisabled,
+        shortcuts: {
+            Enter: (e)=>{
+                return open(trigger !== 'longPress', e, 'first');
+            },
+            ' ': (e)=>{
+                return open(trigger !== 'longPress', e, 'first');
+            },
+            ArrowDown: (e)=>{
+                return open(trigger !== 'longPress', e, 'first');
+            },
+            ArrowUp: (e)=>{
+                return open(trigger !== 'longPress', e, 'last');
+            },
+            'Alt+Enter': (e)=>{
+                return open(trigger === 'longPress', e, 'first');
+            },
+            'Alt+ ': (e)=>{
+                return open(trigger === 'longPress', e, 'first');
+            },
+            // Alt+Arrow* must open for both trigger modes: for `press` it matches the same `e.key` cases as
+            // plain Arrow*; for `longPress`, plain arrows are ignored elsewhere and Alt+Arrow is the opener
+            // (see legacy `if (trigger === 'longPress' && !e.altKey) return` before the ArrowDown/Up switch).
+            'Alt+ArrowDown': (e)=>{
+                return open(true, e, 'first');
+            },
+            'Alt+ArrowUp': (e)=>{
+                return open(true, e, 'last');
+            }
+        }
+    });
     let stringFormatter = (0, $d4e8e26182baab6e$exports.useLocalizedStringFormatter)((0, ($parcel$interopDefault($81146576c7bb61f6$exports))), '@react-aria/menu');
     let { longPressProps: longPressProps } = (0, $8615756fee3bdacc$exports.useLongPress)({
         isDisabled: isDisabled || trigger !== 'longPress',
@@ -97,14 +117,60 @@ function $5b639fe010c6782f$export$dc9c12ed27dd1b49(props, state, ref) {
         }
     };
     // omit onPress from triggerProps since we override it above.
+    // oxlint-disable-next-line react/react-compiler
     delete triggerProps.onPress;
+    let { contextMenuProps: contextMenuProps } = (0, $9c80670f8abbe5f2$exports.useContextMenu)({
+        onContextMenu (e) {
+            // This is not a DOM event, so the linter is incorrect.
+            // eslint-disable-next-line rsp-rules/safe-event-target
+            let rect = e.target.getBoundingClientRect();
+            state.setPoint({
+                x: rect.x + e.x,
+                y: rect.y + e.y
+            });
+            state.open();
+        }
+    });
+    (0, $55aFl$react.useEffect)(()=>{
+        // Close context menus when right clicking outside. The browser's context menu will appear instead.
+        if (state.isOpen && trigger === 'contextMenu') {
+            let onContextMenu = (e)=>{
+                // Checking if the target is the body works because everything outside the menu is inert.
+                if ((e.button === 2 || e.button === 0 && e.ctrlKey === true) && (0, $da02ee888921bc9e$exports.getEventTarget)(e) === document.body) state.close();
+            };
+            document.addEventListener('mousedown', onContextMenu);
+            return ()=>document.removeEventListener('mousedown', onContextMenu);
+        }
+    }, [
+        state,
+        trigger
+    ]);
+    let interactionProps;
+    if (trigger === 'press') interactionProps = {
+        ...pressProps,
+        ...keyboardProps
+    };
+    else if (trigger === 'longPress') interactionProps = {
+        ...longPressProps,
+        ...keyboardProps
+    };
+    else if (trigger === 'contextMenu') {
+        interactionProps = contextMenuProps;
+        // Remove aria-haspopup and associated attributes from context menu triggers.
+        // aria-haspopup indicates that the trigger opens a menu on activation (i.e. click/Enter),
+        // which is not the case for context menus, so this would lead to confusing announcements.
+        // Context menus are equally discoverable (or not) by sighted and non-sighted users,
+        // so we don't need a screen reader specific announcement.
+        // See https://github.com/w3c/aria/issues/1971 for further discussion.
+        let { 'aria-haspopup': _a, 'aria-expanded': _b, 'aria-controls': _c, ...rest } = triggerProps;
+        triggerProps = rest;
+    }
     return {
         // @ts-ignore - TODO we pass out both DOMAttributes AND AriaButtonProps, but useButton will discard the longPress event handlers, it's only through PressResponder magic that this works for RSP and RAC. it does not work in aria examples
         menuTriggerProps: {
             ...triggerProps,
-            ...trigger === 'press' ? pressProps : longPressProps,
-            id: menuTriggerId,
-            onKeyDown: onKeyDown
+            ...interactionProps,
+            id: menuTriggerId
         },
         menuProps: {
             ...overlayProps,

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

@@ -1 +1 @@
-{"mappings":";;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;;AAwCM,SAAS,0CACd,KAA2B,EAC3B,KAAuB,EACvB,GAA8B;IAE9B,IAAI,QAAC,OAAO,oBAAQ,UAAU,WAAE,UAAU,SAAQ,GAAG;IAErD,IAAI,gBAAgB,CAAA,GAAA,+BAAI;IACxB,IAAI,gBAAC,YAAY,gBAAE,YAAY,EAAC,GAAG,CAAA,GAAA,2CAAgB,EAAE;cAAC;IAAI,GAAG,OAAO;IAEpE,IAAI,YAAY,CAAA;QACd,IAAI,YACF;QAGF,IAAI,YAAY,eAAe,CAAC,EAAE,MAAM,EACtC;QAGF,IAAI,OAAO,IAAI,OAAO,EACpB,OAAQ,EAAE,GAAG;YACX,KAAK;YACL,KAAK;gBACH,sHAAsH;gBACtH,qHAAqH;gBACrH,yHAAyH;gBACzH,2HAA2H;gBAC3H,IAAI,YAAY,eAAe,EAAE,kBAAkB,IACjD;YAEJ,cAAc;YACd,KAAK;gBACH,uEAAuE;gBACvE,IAAI,CAAE,CAAA,yBAAyB,CAAA,GAC7B,EAAE,eAAe;gBAEnB,EAAE,cAAc;gBAChB,MAAM,MAAM,CAAC;gBACb;YACF,KAAK;gBACH,IAAI,CAAE,CAAA,yBAAyB,CAAA,GAC7B,EAAE,eAAe;gBAEnB,EAAE,cAAc;gBAChB,MAAM,MAAM,CAAC;gBACb;YACF;gBACE,oBAAoB;gBACpB,IAAI,yBAAyB,GAC3B,EAAE,mBAAmB;QAE3B;IAEJ;IAEA,IAAI,kBAAkB,CAAA,GAAA,qDAA0B,EAAE,CAAA,GAAA,mDAAW,GAAG;IAChE,IAAI,kBAAC,cAAc,EAAC,GAAG,CAAA,GAAA,sCAAW,EAAE;QAClC,YAAY,cAAc,YAAY;QACtC,0BAA0B,gBAAgB,MAAM,CAAC;QACjD;YACE,MAAM,KAAK;QACb;QACA;YACE,MAAM,IAAI,CAAC;QACb;IACF;IAEA,IAAI,aAAyB;QAC3B,qBAAqB;QACrB,cAAa,CAAC;YACZ,8EAA8E;YAC9E,IAAI,EAAE,WAAW,KAAK,WAAW,EAAE,WAAW,KAAK,cAAc,CAAC,YAAY;gBAC5E,iGAAiG;gBACjG,CAAA,GAAA,+CAAoB,EAAE,EAAE,MAAM;gBAE9B,6DAA6D;gBAC7D,8CAA8C;gBAC9C,MAAM,IAAI,CAAC,EAAE,WAAW,KAAK,YAAY,UAAU;YACrD;QACF;QACA,SAAQ,CAAC;YACP,IAAI,EAAE,WAAW,KAAK,WAAW,CAAC,YAAY;gBAC5C,iGAAiG;gBACjG,CAAA,GAAA,+CAAoB,EAAE,EAAE,MAAM;gBAE9B,MAAM,MAAM;YACd;QACF;IACF;IAEA,6DAA6D;IAC7D,OAAO,aAAa,OAAO;IAE3B,OAAO;QACL,2OAA2O;QAC3O,kBAAkB;YAChB,GAAG,YAAY;YACf,GAAI,YAAY,UAAU,aAAa,cAAc;YACrD,IAAI;uBACJ;QACF;QACA,WAAW;YACT,GAAG,YAAY;YACf,mBAAmB;YACnB,WAAW,MAAM,aAAa,IAAI;YAClC,SAAS,MAAM,KAAK;QACtB;IACF;AACF","sources":["packages/react-aria/src/menu/useMenuTrigger.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 {AriaButtonProps} from '../button/useButton';\n\nimport {AriaMenuOptions} from './useMenu';\nimport {FocusableElement, RefObject} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport intlMessages from '../../intl/menu/*.json';\n// @ts-ignore\nimport {MenuTriggerState, MenuTriggerType} from 'react-stately/useMenuTriggerState';\nimport {PressProps} from '../interactions/usePress';\nimport {useId} from '../utils/useId';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\nimport {useLongPress} from '../interactions/useLongPress';\nimport {useOverlayTrigger} from '../overlays/useOverlayTrigger';\n\nexport interface AriaMenuTriggerProps {\n  /** The type of menu that the menu trigger opens. */\n  type?: 'menu' | 'listbox';\n  /** Whether menu trigger is disabled. */\n  isDisabled?: boolean;\n  /** How menu is triggered. */\n  trigger?: MenuTriggerType;\n}\n\nexport interface MenuTriggerAria<T> {\n  /** Props for the menu trigger element. */\n  menuTriggerProps: AriaButtonProps;\n\n  /** Props for the menu. */\n  menuProps: AriaMenuOptions<T>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a menu trigger.\n *\n * @param props - Props for the menu trigger.\n * @param state - State for the menu trigger.\n * @param ref - Ref to the HTML element trigger for the menu.\n */\nexport function useMenuTrigger<T>(\n  props: AriaMenuTriggerProps,\n  state: MenuTriggerState,\n  ref: RefObject<Element | null>\n): MenuTriggerAria<T> {\n  let {type = 'menu', isDisabled, trigger = 'press'} = props;\n\n  let menuTriggerId = useId();\n  let {triggerProps, overlayProps} = useOverlayTrigger({type}, state, ref);\n\n  let onKeyDown = e => {\n    if (isDisabled) {\n      return;\n    }\n\n    if (trigger === 'longPress' && !e.altKey) {\n      return;\n    }\n\n    if (ref && ref.current) {\n      switch (e.key) {\n        case 'Enter':\n        case ' ':\n          // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.\n          // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.\n          // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.\n          // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.\n          if (trigger === 'longPress' || e.isDefaultPrevented()) {\n            return;\n          }\n        // fallthrough\n        case 'ArrowDown':\n          // Stop propagation, unless it would already be handled by useKeyboard.\n          if (!('continuePropagation' in e)) {\n            e.stopPropagation();\n          }\n          e.preventDefault();\n          state.toggle('first');\n          break;\n        case 'ArrowUp':\n          if (!('continuePropagation' in e)) {\n            e.stopPropagation();\n          }\n          e.preventDefault();\n          state.toggle('last');\n          break;\n        default:\n          // Allow other keys.\n          if ('continuePropagation' in e) {\n            e.continuePropagation();\n          }\n      }\n    }\n  };\n\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/menu');\n  let {longPressProps} = useLongPress({\n    isDisabled: isDisabled || trigger !== 'longPress',\n    accessibilityDescription: stringFormatter.format('longPressMessage'),\n    onLongPressStart() {\n      state.close();\n    },\n    onLongPress() {\n      state.open('first');\n    }\n  });\n\n  let pressProps: PressProps = {\n    preventFocusOnPress: true,\n    onPressStart(e) {\n      // For consistency with native, open the menu on mouse/key down, but touch up.\n      if (e.pointerType !== 'touch' && e.pointerType !== 'keyboard' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        // If opened with a screen reader, auto focus the first item.\n        // Otherwise, the menu itself will be focused.\n        state.open(e.pointerType === 'virtual' ? 'first' : null);\n      }\n    },\n    onPress(e) {\n      if (e.pointerType === 'touch' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        state.toggle();\n      }\n    }\n  };\n\n  // omit onPress from triggerProps since we override it above.\n  delete triggerProps.onPress;\n\n  return {\n    // @ts-ignore - TODO we pass out both DOMAttributes AND AriaButtonProps, but useButton will discard the longPress event handlers, it's only through PressResponder magic that this works for RSP and RAC. it does not work in aria examples\n    menuTriggerProps: {\n      ...triggerProps,\n      ...(trigger === 'press' ? pressProps : longPressProps),\n      id: menuTriggerId,\n      onKeyDown\n    },\n    menuProps: {\n      ...overlayProps,\n      'aria-labelledby': menuTriggerId,\n      autoFocus: state.focusStrategy || true,\n      onClose: state.close\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useMenuTrigger.cjs.map"}
+{"mappings":"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","sources":["packages/react-aria/src/menu/useMenuTrigger.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 {AriaButtonProps} from '../button/useButton';\nimport {AriaMenuOptions} from './useMenu';\nimport {FocusableElement, FocusStrategy, KeyboardEvent, RefObject} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport {getEventTarget} from '../utils/shadowdom/DOMFunctions';\nimport intlMessages from '../../intl/menu/*.json';\nimport {MenuTriggerState, MenuTriggerType} from 'react-stately/useMenuTriggerState';\nimport {PressProps} from '../interactions/usePress';\nimport {useContextMenu} from '../interactions/useContextMenu';\nimport {useEffect} from 'react';\nimport {useId} from '../utils/useId';\nimport {useKeyboard} from '../interactions/useKeyboard';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\nimport {useLongPress} from '../interactions/useLongPress';\nimport {useOverlayTrigger} from '../overlays/useOverlayTrigger';\n\nexport interface AriaMenuTriggerProps {\n  /** The type of menu that the menu trigger opens. */\n  type?: 'menu' | 'listbox';\n  /** Whether menu trigger is disabled. */\n  isDisabled?: boolean;\n  /** How menu is triggered. */\n  trigger?: MenuTriggerType;\n}\n\nexport interface MenuTriggerAria<T> {\n  /** Props for the menu trigger element. */\n  menuTriggerProps: AriaButtonProps;\n\n  /** Props for the menu. */\n  menuProps: AriaMenuOptions<T>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a menu trigger.\n *\n * @param props - Props for the menu trigger.\n * @param state - State for the menu trigger.\n * @param ref - Ref to the HTML element trigger for the menu.\n */\nexport function useMenuTrigger<T>(\n  props: AriaMenuTriggerProps,\n  state: MenuTriggerState,\n  ref: RefObject<Element | null>\n): MenuTriggerAria<T> {\n  let {type = 'menu', isDisabled, trigger = 'press'} = props;\n\n  let menuTriggerId = useId();\n  let {triggerProps, overlayProps} = useOverlayTrigger({type}, state, ref);\n\n  let open = (\n    shouldOpen: boolean,\n    e: KeyboardEvent,\n    focusStrategy: FocusStrategy = 'first'\n  ): boolean | void => {\n    if (!shouldOpen || e.isDefaultPrevented()) {\n      return false;\n    }\n    state.toggle(focusStrategy);\n  };\n\n  // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.\n  // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.\n  // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.\n  // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.\n  let {keyboardProps} = useKeyboard({\n    isDisabled,\n    shortcuts: {\n      Enter: e => {\n        return open(trigger !== 'longPress', e, 'first');\n      },\n      ' ': e => {\n        return open(trigger !== 'longPress', e, 'first');\n      },\n      ArrowDown: e => {\n        return open(trigger !== 'longPress', e, 'first');\n      },\n      ArrowUp: e => {\n        return open(trigger !== 'longPress', e, 'last');\n      },\n      'Alt+Enter': e => {\n        return open(trigger === 'longPress', e, 'first');\n      },\n      'Alt+ ': e => {\n        return open(trigger === 'longPress', e, 'first');\n      },\n      // Alt+Arrow* must open for both trigger modes: for `press` it matches the same `e.key` cases as\n      // plain Arrow*; for `longPress`, plain arrows are ignored elsewhere and Alt+Arrow is the opener\n      // (see legacy `if (trigger === 'longPress' && !e.altKey) return` before the ArrowDown/Up switch).\n      'Alt+ArrowDown': e => {\n        return open(true, e, 'first');\n      },\n      'Alt+ArrowUp': e => {\n        return open(true, e, 'last');\n      }\n    }\n  });\n\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/menu');\n  let {longPressProps} = useLongPress({\n    isDisabled: isDisabled || trigger !== 'longPress',\n    accessibilityDescription: stringFormatter.format('longPressMessage'),\n    onLongPressStart() {\n      state.close();\n    },\n    onLongPress() {\n      state.open('first');\n    }\n  });\n\n  let pressProps: PressProps = {\n    preventFocusOnPress: true,\n    onPressStart(e) {\n      // For consistency with native, open the menu on mouse/key down, but touch up.\n      if (e.pointerType !== 'touch' && e.pointerType !== 'keyboard' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        // If opened with a screen reader, auto focus the first item.\n        // Otherwise, the menu itself will be focused.\n        state.open(e.pointerType === 'virtual' ? 'first' : null);\n      }\n    },\n    onPress(e) {\n      if (e.pointerType === 'touch' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        state.toggle();\n      }\n    }\n  };\n\n  // omit onPress from triggerProps since we override it above.\n  // oxlint-disable-next-line react/react-compiler\n  delete triggerProps.onPress;\n\n  let {contextMenuProps} = useContextMenu({\n    onContextMenu(e) {\n      // This is not a DOM event, so the linter is incorrect.\n      // eslint-disable-next-line rsp-rules/safe-event-target\n      let rect = e.target.getBoundingClientRect();\n      state.setPoint({x: rect.x + e.x, y: rect.y + e.y});\n      state.open();\n    }\n  });\n\n  useEffect(() => {\n    // Close context menus when right clicking outside. The browser's context menu will appear instead.\n    if (state.isOpen && trigger === 'contextMenu') {\n      let onContextMenu = (e: MouseEvent) => {\n        // Checking if the target is the body works because everything outside the menu is inert.\n        if (\n          (e.button === 2 || (e.button === 0 && e.ctrlKey === true)) &&\n          getEventTarget(e) === document.body\n        ) {\n          state.close();\n        }\n      };\n      document.addEventListener('mousedown', onContextMenu);\n      return () => document.removeEventListener('mousedown', onContextMenu);\n    }\n  }, [state, trigger]);\n\n  let interactionProps;\n  if (trigger === 'press') {\n    interactionProps = {...pressProps, ...keyboardProps};\n  } else if (trigger === 'longPress') {\n    interactionProps = {...longPressProps, ...keyboardProps};\n  } else if (trigger === 'contextMenu') {\n    interactionProps = contextMenuProps;\n\n    // Remove aria-haspopup and associated attributes from context menu triggers.\n    // aria-haspopup indicates that the trigger opens a menu on activation (i.e. click/Enter),\n    // which is not the case for context menus, so this would lead to confusing announcements.\n    // Context menus are equally discoverable (or not) by sighted and non-sighted users,\n    // so we don't need a screen reader specific announcement.\n    // See https://github.com/w3c/aria/issues/1971 for further discussion.\n    let {'aria-haspopup': _a, 'aria-expanded': _b, 'aria-controls': _c, ...rest} = triggerProps;\n    triggerProps = rest;\n  }\n\n  return {\n    // @ts-ignore - TODO we pass out both DOMAttributes AND AriaButtonProps, but useButton will discard the longPress event handlers, it's only through PressResponder magic that this works for RSP and RAC. it does not work in aria examples\n    menuTriggerProps: {\n      ...triggerProps,\n      ...interactionProps,\n      id: menuTriggerId\n    },\n    menuProps: {\n      ...overlayProps,\n      'aria-labelledby': menuTriggerId,\n      autoFocus: state.focusStrategy || true,\n      onClose: state.close\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useMenuTrigger.cjs.map"}

package/dist/private/menu/useMenuTrigger.js

@@ -1,9 +1,13 @@
 import {focusWithoutScrolling as $d559d872031c749f$export$de79e2c695e052f3} from "../utils/focusWithoutScrolling.js";
+import {getEventTarget as $d8ac7ed472840322$export$e58f029f0fbfdb29} from "../utils/shadowdom/DOMFunctions.js";
 import $3fdgD$intlStringsjs from "./intlStrings.js";
+import {useContextMenu as $6ed66bff9bbb75e5$export$2464060fb1e12fa6} from "../interactions/useContextMenu.js";
 import {useId as $0292efe68908de6b$export$f680877a34711e37} from "../utils/useId.js";
+import {useKeyboard as $bf74df7506f65576$export$8f71654801c2f7cd} from "../interactions/useKeyboard.js";
 import {useLocalizedStringFormatter as $1adfa757ef3cd864$export$f12b703ca79dfbb1} from "../i18n/useLocalizedStringFormatter.js";
 import {useLongPress as $4a63d38d4cd3f004$export$c24ed0104d07eab9} from "../interactions/useLongPress.js";
 import {useOverlayTrigger as $46a6876c66a2b764$export$f9d5c8beee7d008d} from "../overlays/useOverlayTrigger.js";
+import {useEffect as $3fdgD$useEffect} from "react";
 
 
 function $parcel$interopDefault(a) {
@@ -25,40 +29,56 @@ function $parcel$interopDefault(a) {
 
 
 
+
+
+
+
 function $5b0efffb5b3e0cc9$export$dc9c12ed27dd1b49(props, state, ref) {
     let { type: type = 'menu', isDisabled: isDisabled, trigger: trigger = 'press' } = props;
     let menuTriggerId = (0, $0292efe68908de6b$export$f680877a34711e37)();
     let { triggerProps: triggerProps, overlayProps: overlayProps } = (0, $46a6876c66a2b764$export$f9d5c8beee7d008d)({
         type: type
     }, state, ref);
-    let onKeyDown = (e)=>{
-        if (isDisabled) return;
-        if (trigger === 'longPress' && !e.altKey) return;
-        if (ref && ref.current) switch(e.key){
-            case 'Enter':
-            case ' ':
-                // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.
-                // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.
-                // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.
-                // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.
-                if (trigger === 'longPress' || e.isDefaultPrevented()) return;
-            // fallthrough
-            case 'ArrowDown':
-                // Stop propagation, unless it would already be handled by useKeyboard.
-                if (!('continuePropagation' in e)) e.stopPropagation();
-                e.preventDefault();
-                state.toggle('first');
-                break;
-            case 'ArrowUp':
-                if (!('continuePropagation' in e)) e.stopPropagation();
-                e.preventDefault();
-                state.toggle('last');
-                break;
-            default:
-                // Allow other keys.
-                if ('continuePropagation' in e) e.continuePropagation();
-        }
+    let open = (shouldOpen, e, focusStrategy = 'first')=>{
+        if (!shouldOpen || e.isDefaultPrevented()) return false;
+        state.toggle(focusStrategy);
     };
+    // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.
+    // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.
+    // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.
+    // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.
+    let { keyboardProps: keyboardProps } = (0, $bf74df7506f65576$export$8f71654801c2f7cd)({
+        isDisabled: isDisabled,
+        shortcuts: {
+            Enter: (e)=>{
+                return open(trigger !== 'longPress', e, 'first');
+            },
+            ' ': (e)=>{
+                return open(trigger !== 'longPress', e, 'first');
+            },
+            ArrowDown: (e)=>{
+                return open(trigger !== 'longPress', e, 'first');
+            },
+            ArrowUp: (e)=>{
+                return open(trigger !== 'longPress', e, 'last');
+            },
+            'Alt+Enter': (e)=>{
+                return open(trigger === 'longPress', e, 'first');
+            },
+            'Alt+ ': (e)=>{
+                return open(trigger === 'longPress', e, 'first');
+            },
+            // Alt+Arrow* must open for both trigger modes: for `press` it matches the same `e.key` cases as
+            // plain Arrow*; for `longPress`, plain arrows are ignored elsewhere and Alt+Arrow is the opener
+            // (see legacy `if (trigger === 'longPress' && !e.altKey) return` before the ArrowDown/Up switch).
+            'Alt+ArrowDown': (e)=>{
+                return open(true, e, 'first');
+            },
+            'Alt+ArrowUp': (e)=>{
+                return open(true, e, 'last');
+            }
+        }
+    });
     let stringFormatter = (0, $1adfa757ef3cd864$export$f12b703ca79dfbb1)((0, ($parcel$interopDefault($3fdgD$intlStringsjs))), '@react-aria/menu');
     let { longPressProps: longPressProps } = (0, $4a63d38d4cd3f004$export$c24ed0104d07eab9)({
         isDisabled: isDisabled || trigger !== 'longPress',
@@ -91,14 +111,60 @@ function $5b0efffb5b3e0cc9$export$dc9c12ed27dd1b49(props, state, ref) {
         }
     };
     // omit onPress from triggerProps since we override it above.
+    // oxlint-disable-next-line react/react-compiler
     delete triggerProps.onPress;
+    let { contextMenuProps: contextMenuProps } = (0, $6ed66bff9bbb75e5$export$2464060fb1e12fa6)({
+        onContextMenu (e) {
+            // This is not a DOM event, so the linter is incorrect.
+            // eslint-disable-next-line rsp-rules/safe-event-target
+            let rect = e.target.getBoundingClientRect();
+            state.setPoint({
+                x: rect.x + e.x,
+                y: rect.y + e.y
+            });
+            state.open();
+        }
+    });
+    (0, $3fdgD$useEffect)(()=>{
+        // Close context menus when right clicking outside. The browser's context menu will appear instead.
+        if (state.isOpen && trigger === 'contextMenu') {
+            let onContextMenu = (e)=>{
+                // Checking if the target is the body works because everything outside the menu is inert.
+                if ((e.button === 2 || e.button === 0 && e.ctrlKey === true) && (0, $d8ac7ed472840322$export$e58f029f0fbfdb29)(e) === document.body) state.close();
+            };
+            document.addEventListener('mousedown', onContextMenu);
+            return ()=>document.removeEventListener('mousedown', onContextMenu);
+        }
+    }, [
+        state,
+        trigger
+    ]);
+    let interactionProps;
+    if (trigger === 'press') interactionProps = {
+        ...pressProps,
+        ...keyboardProps
+    };
+    else if (trigger === 'longPress') interactionProps = {
+        ...longPressProps,
+        ...keyboardProps
+    };
+    else if (trigger === 'contextMenu') {
+        interactionProps = contextMenuProps;
+        // Remove aria-haspopup and associated attributes from context menu triggers.
+        // aria-haspopup indicates that the trigger opens a menu on activation (i.e. click/Enter),
+        // which is not the case for context menus, so this would lead to confusing announcements.
+        // Context menus are equally discoverable (or not) by sighted and non-sighted users,
+        // so we don't need a screen reader specific announcement.
+        // See https://github.com/w3c/aria/issues/1971 for further discussion.
+        let { 'aria-haspopup': _a, 'aria-expanded': _b, 'aria-controls': _c, ...rest } = triggerProps;
+        triggerProps = rest;
+    }
     return {
         // @ts-ignore - TODO we pass out both DOMAttributes AND AriaButtonProps, but useButton will discard the longPress event handlers, it's only through PressResponder magic that this works for RSP and RAC. it does not work in aria examples
         menuTriggerProps: {
             ...triggerProps,
-            ...trigger === 'press' ? pressProps : longPressProps,
-            id: menuTriggerId,
-            onKeyDown: onKeyDown
+            ...interactionProps,
+            id: menuTriggerId
         },
         menuProps: {
             ...overlayProps,

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

@@ -1 +1 @@
-{"mappings":";;;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;;AAwCM,SAAS,0CACd,KAA2B,EAC3B,KAAuB,EACvB,GAA8B;IAE9B,IAAI,QAAC,OAAO,oBAAQ,UAAU,WAAE,UAAU,SAAQ,GAAG;IAErD,IAAI,gBAAgB,CAAA,GAAA,yCAAI;IACxB,IAAI,gBAAC,YAAY,gBAAE,YAAY,EAAC,GAAG,CAAA,GAAA,yCAAgB,EAAE;cAAC;IAAI,GAAG,OAAO;IAEpE,IAAI,YAAY,CAAA;QACd,IAAI,YACF;QAGF,IAAI,YAAY,eAAe,CAAC,EAAE,MAAM,EACtC;QAGF,IAAI,OAAO,IAAI,OAAO,EACpB,OAAQ,EAAE,GAAG;YACX,KAAK;YACL,KAAK;gBACH,sHAAsH;gBACtH,qHAAqH;gBACrH,yHAAyH;gBACzH,2HAA2H;gBAC3H,IAAI,YAAY,eAAe,EAAE,kBAAkB,IACjD;YAEJ,cAAc;YACd,KAAK;gBACH,uEAAuE;gBACvE,IAAI,CAAE,CAAA,yBAAyB,CAAA,GAC7B,EAAE,eAAe;gBAEnB,EAAE,cAAc;gBAChB,MAAM,MAAM,CAAC;gBACb;YACF,KAAK;gBACH,IAAI,CAAE,CAAA,yBAAyB,CAAA,GAC7B,EAAE,eAAe;gBAEnB,EAAE,cAAc;gBAChB,MAAM,MAAM,CAAC;gBACb;YACF;gBACE,oBAAoB;gBACpB,IAAI,yBAAyB,GAC3B,EAAE,mBAAmB;QAE3B;IAEJ;IAEA,IAAI,kBAAkB,CAAA,GAAA,yCAA0B,EAAE,CAAA,GAAA,8CAAW,GAAG;IAChE,IAAI,kBAAC,cAAc,EAAC,GAAG,CAAA,GAAA,yCAAW,EAAE;QAClC,YAAY,cAAc,YAAY;QACtC,0BAA0B,gBAAgB,MAAM,CAAC;QACjD;YACE,MAAM,KAAK;QACb;QACA;YACE,MAAM,IAAI,CAAC;QACb;IACF;IAEA,IAAI,aAAyB;QAC3B,qBAAqB;QACrB,cAAa,CAAC;YACZ,8EAA8E;YAC9E,IAAI,EAAE,WAAW,KAAK,WAAW,EAAE,WAAW,KAAK,cAAc,CAAC,YAAY;gBAC5E,iGAAiG;gBACjG,CAAA,GAAA,yCAAoB,EAAE,EAAE,MAAM;gBAE9B,6DAA6D;gBAC7D,8CAA8C;gBAC9C,MAAM,IAAI,CAAC,EAAE,WAAW,KAAK,YAAY,UAAU;YACrD;QACF;QACA,SAAQ,CAAC;YACP,IAAI,EAAE,WAAW,KAAK,WAAW,CAAC,YAAY;gBAC5C,iGAAiG;gBACjG,CAAA,GAAA,yCAAoB,EAAE,EAAE,MAAM;gBAE9B,MAAM,MAAM;YACd;QACF;IACF;IAEA,6DAA6D;IAC7D,OAAO,aAAa,OAAO;IAE3B,OAAO;QACL,2OAA2O;QAC3O,kBAAkB;YAChB,GAAG,YAAY;YACf,GAAI,YAAY,UAAU,aAAa,cAAc;YACrD,IAAI;uBACJ;QACF;QACA,WAAW;YACT,GAAG,YAAY;YACf,mBAAmB;YACnB,WAAW,MAAM,aAAa,IAAI;YAClC,SAAS,MAAM,KAAK;QACtB;IACF;AACF","sources":["packages/react-aria/src/menu/useMenuTrigger.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 {AriaButtonProps} from '../button/useButton';\n\nimport {AriaMenuOptions} from './useMenu';\nimport {FocusableElement, RefObject} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport intlMessages from '../../intl/menu/*.json';\n// @ts-ignore\nimport {MenuTriggerState, MenuTriggerType} from 'react-stately/useMenuTriggerState';\nimport {PressProps} from '../interactions/usePress';\nimport {useId} from '../utils/useId';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\nimport {useLongPress} from '../interactions/useLongPress';\nimport {useOverlayTrigger} from '../overlays/useOverlayTrigger';\n\nexport interface AriaMenuTriggerProps {\n  /** The type of menu that the menu trigger opens. */\n  type?: 'menu' | 'listbox';\n  /** Whether menu trigger is disabled. */\n  isDisabled?: boolean;\n  /** How menu is triggered. */\n  trigger?: MenuTriggerType;\n}\n\nexport interface MenuTriggerAria<T> {\n  /** Props for the menu trigger element. */\n  menuTriggerProps: AriaButtonProps;\n\n  /** Props for the menu. */\n  menuProps: AriaMenuOptions<T>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a menu trigger.\n *\n * @param props - Props for the menu trigger.\n * @param state - State for the menu trigger.\n * @param ref - Ref to the HTML element trigger for the menu.\n */\nexport function useMenuTrigger<T>(\n  props: AriaMenuTriggerProps,\n  state: MenuTriggerState,\n  ref: RefObject<Element | null>\n): MenuTriggerAria<T> {\n  let {type = 'menu', isDisabled, trigger = 'press'} = props;\n\n  let menuTriggerId = useId();\n  let {triggerProps, overlayProps} = useOverlayTrigger({type}, state, ref);\n\n  let onKeyDown = e => {\n    if (isDisabled) {\n      return;\n    }\n\n    if (trigger === 'longPress' && !e.altKey) {\n      return;\n    }\n\n    if (ref && ref.current) {\n      switch (e.key) {\n        case 'Enter':\n        case ' ':\n          // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.\n          // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.\n          // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.\n          // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.\n          if (trigger === 'longPress' || e.isDefaultPrevented()) {\n            return;\n          }\n        // fallthrough\n        case 'ArrowDown':\n          // Stop propagation, unless it would already be handled by useKeyboard.\n          if (!('continuePropagation' in e)) {\n            e.stopPropagation();\n          }\n          e.preventDefault();\n          state.toggle('first');\n          break;\n        case 'ArrowUp':\n          if (!('continuePropagation' in e)) {\n            e.stopPropagation();\n          }\n          e.preventDefault();\n          state.toggle('last');\n          break;\n        default:\n          // Allow other keys.\n          if ('continuePropagation' in e) {\n            e.continuePropagation();\n          }\n      }\n    }\n  };\n\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/menu');\n  let {longPressProps} = useLongPress({\n    isDisabled: isDisabled || trigger !== 'longPress',\n    accessibilityDescription: stringFormatter.format('longPressMessage'),\n    onLongPressStart() {\n      state.close();\n    },\n    onLongPress() {\n      state.open('first');\n    }\n  });\n\n  let pressProps: PressProps = {\n    preventFocusOnPress: true,\n    onPressStart(e) {\n      // For consistency with native, open the menu on mouse/key down, but touch up.\n      if (e.pointerType !== 'touch' && e.pointerType !== 'keyboard' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        // If opened with a screen reader, auto focus the first item.\n        // Otherwise, the menu itself will be focused.\n        state.open(e.pointerType === 'virtual' ? 'first' : null);\n      }\n    },\n    onPress(e) {\n      if (e.pointerType === 'touch' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        state.toggle();\n      }\n    }\n  };\n\n  // omit onPress from triggerProps since we override it above.\n  delete triggerProps.onPress;\n\n  return {\n    // @ts-ignore - TODO we pass out both DOMAttributes AND AriaButtonProps, but useButton will discard the longPress event handlers, it's only through PressResponder magic that this works for RSP and RAC. it does not work in aria examples\n    menuTriggerProps: {\n      ...triggerProps,\n      ...(trigger === 'press' ? pressProps : longPressProps),\n      id: menuTriggerId,\n      onKeyDown\n    },\n    menuProps: {\n      ...overlayProps,\n      'aria-labelledby': menuTriggerId,\n      autoFocus: state.focusStrategy || true,\n      onClose: state.close\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useMenuTrigger.js.map"}
+{"mappings":"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","sources":["packages/react-aria/src/menu/useMenuTrigger.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 {AriaButtonProps} from '../button/useButton';\nimport {AriaMenuOptions} from './useMenu';\nimport {FocusableElement, FocusStrategy, KeyboardEvent, RefObject} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport {getEventTarget} from '../utils/shadowdom/DOMFunctions';\nimport intlMessages from '../../intl/menu/*.json';\nimport {MenuTriggerState, MenuTriggerType} from 'react-stately/useMenuTriggerState';\nimport {PressProps} from '../interactions/usePress';\nimport {useContextMenu} from '../interactions/useContextMenu';\nimport {useEffect} from 'react';\nimport {useId} from '../utils/useId';\nimport {useKeyboard} from '../interactions/useKeyboard';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\nimport {useLongPress} from '../interactions/useLongPress';\nimport {useOverlayTrigger} from '../overlays/useOverlayTrigger';\n\nexport interface AriaMenuTriggerProps {\n  /** The type of menu that the menu trigger opens. */\n  type?: 'menu' | 'listbox';\n  /** Whether menu trigger is disabled. */\n  isDisabled?: boolean;\n  /** How menu is triggered. */\n  trigger?: MenuTriggerType;\n}\n\nexport interface MenuTriggerAria<T> {\n  /** Props for the menu trigger element. */\n  menuTriggerProps: AriaButtonProps;\n\n  /** Props for the menu. */\n  menuProps: AriaMenuOptions<T>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a menu trigger.\n *\n * @param props - Props for the menu trigger.\n * @param state - State for the menu trigger.\n * @param ref - Ref to the HTML element trigger for the menu.\n */\nexport function useMenuTrigger<T>(\n  props: AriaMenuTriggerProps,\n  state: MenuTriggerState,\n  ref: RefObject<Element | null>\n): MenuTriggerAria<T> {\n  let {type = 'menu', isDisabled, trigger = 'press'} = props;\n\n  let menuTriggerId = useId();\n  let {triggerProps, overlayProps} = useOverlayTrigger({type}, state, ref);\n\n  let open = (\n    shouldOpen: boolean,\n    e: KeyboardEvent,\n    focusStrategy: FocusStrategy = 'first'\n  ): boolean | void => {\n    if (!shouldOpen || e.isDefaultPrevented()) {\n      return false;\n    }\n    state.toggle(focusStrategy);\n  };\n\n  // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.\n  // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.\n  // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.\n  // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.\n  let {keyboardProps} = useKeyboard({\n    isDisabled,\n    shortcuts: {\n      Enter: e => {\n        return open(trigger !== 'longPress', e, 'first');\n      },\n      ' ': e => {\n        return open(trigger !== 'longPress', e, 'first');\n      },\n      ArrowDown: e => {\n        return open(trigger !== 'longPress', e, 'first');\n      },\n      ArrowUp: e => {\n        return open(trigger !== 'longPress', e, 'last');\n      },\n      'Alt+Enter': e => {\n        return open(trigger === 'longPress', e, 'first');\n      },\n      'Alt+ ': e => {\n        return open(trigger === 'longPress', e, 'first');\n      },\n      // Alt+Arrow* must open for both trigger modes: for `press` it matches the same `e.key` cases as\n      // plain Arrow*; for `longPress`, plain arrows are ignored elsewhere and Alt+Arrow is the opener\n      // (see legacy `if (trigger === 'longPress' && !e.altKey) return` before the ArrowDown/Up switch).\n      'Alt+ArrowDown': e => {\n        return open(true, e, 'first');\n      },\n      'Alt+ArrowUp': e => {\n        return open(true, e, 'last');\n      }\n    }\n  });\n\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/menu');\n  let {longPressProps} = useLongPress({\n    isDisabled: isDisabled || trigger !== 'longPress',\n    accessibilityDescription: stringFormatter.format('longPressMessage'),\n    onLongPressStart() {\n      state.close();\n    },\n    onLongPress() {\n      state.open('first');\n    }\n  });\n\n  let pressProps: PressProps = {\n    preventFocusOnPress: true,\n    onPressStart(e) {\n      // For consistency with native, open the menu on mouse/key down, but touch up.\n      if (e.pointerType !== 'touch' && e.pointerType !== 'keyboard' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        // If opened with a screen reader, auto focus the first item.\n        // Otherwise, the menu itself will be focused.\n        state.open(e.pointerType === 'virtual' ? 'first' : null);\n      }\n    },\n    onPress(e) {\n      if (e.pointerType === 'touch' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        state.toggle();\n      }\n    }\n  };\n\n  // omit onPress from triggerProps since we override it above.\n  // oxlint-disable-next-line react/react-compiler\n  delete triggerProps.onPress;\n\n  let {contextMenuProps} = useContextMenu({\n    onContextMenu(e) {\n      // This is not a DOM event, so the linter is incorrect.\n      // eslint-disable-next-line rsp-rules/safe-event-target\n      let rect = e.target.getBoundingClientRect();\n      state.setPoint({x: rect.x + e.x, y: rect.y + e.y});\n      state.open();\n    }\n  });\n\n  useEffect(() => {\n    // Close context menus when right clicking outside. The browser's context menu will appear instead.\n    if (state.isOpen && trigger === 'contextMenu') {\n      let onContextMenu = (e: MouseEvent) => {\n        // Checking if the target is the body works because everything outside the menu is inert.\n        if (\n          (e.button === 2 || (e.button === 0 && e.ctrlKey === true)) &&\n          getEventTarget(e) === document.body\n        ) {\n          state.close();\n        }\n      };\n      document.addEventListener('mousedown', onContextMenu);\n      return () => document.removeEventListener('mousedown', onContextMenu);\n    }\n  }, [state, trigger]);\n\n  let interactionProps;\n  if (trigger === 'press') {\n    interactionProps = {...pressProps, ...keyboardProps};\n  } else if (trigger === 'longPress') {\n    interactionProps = {...longPressProps, ...keyboardProps};\n  } else if (trigger === 'contextMenu') {\n    interactionProps = contextMenuProps;\n\n    // Remove aria-haspopup and associated attributes from context menu triggers.\n    // aria-haspopup indicates that the trigger opens a menu on activation (i.e. click/Enter),\n    // which is not the case for context menus, so this would lead to confusing announcements.\n    // Context menus are equally discoverable (or not) by sighted and non-sighted users,\n    // so we don't need a screen reader specific announcement.\n    // See https://github.com/w3c/aria/issues/1971 for further discussion.\n    let {'aria-haspopup': _a, 'aria-expanded': _b, 'aria-controls': _c, ...rest} = triggerProps;\n    triggerProps = rest;\n  }\n\n  return {\n    // @ts-ignore - TODO we pass out both DOMAttributes AND AriaButtonProps, but useButton will discard the longPress event handlers, it's only through PressResponder magic that this works for RSP and RAC. it does not work in aria examples\n    menuTriggerProps: {\n      ...triggerProps,\n      ...interactionProps,\n      id: menuTriggerId\n    },\n    menuProps: {\n      ...overlayProps,\n      'aria-labelledby': menuTriggerId,\n      autoFocus: state.focusStrategy || true,\n      onClose: state.close\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useMenuTrigger.js.map"}

package/dist/private/menu/useMenuTrigger.mjs

@@ -1,9 +1,13 @@
 import {focusWithoutScrolling as $1969ac565cfec8d0$export$de79e2c695e052f3} from "../utils/focusWithoutScrolling.mjs";
+import {getEventTarget as $23f2114a1b82827e$export$e58f029f0fbfdb29} from "../utils/shadowdom/DOMFunctions.mjs";
 import $1SpDQ$intlStringsmjs from "./intlStrings.mjs";
+import {useContextMenu as $00dce70c89c7306c$export$2464060fb1e12fa6} from "../interactions/useContextMenu.mjs";
 import {useId as $390e54f620492c70$export$f680877a34711e37} from "../utils/useId.mjs";
+import {useKeyboard as $8296dad1a4c5e0dc$export$8f71654801c2f7cd} from "../interactions/useKeyboard.mjs";
 import {useLocalizedStringFormatter as $cf2482eff2eeeec2$export$f12b703ca79dfbb1} from "../i18n/useLocalizedStringFormatter.mjs";
 import {useLongPress as $7b01448eaad0fe7c$export$c24ed0104d07eab9} from "../interactions/useLongPress.mjs";
 import {useOverlayTrigger as $f282e36c29c025e8$export$f9d5c8beee7d008d} from "../overlays/useOverlayTrigger.mjs";
+import {useEffect as $1SpDQ$useEffect} from "react";
 
 
 function $parcel$interopDefault(a) {
@@ -25,40 +29,56 @@ function $parcel$interopDefault(a) {
 
 
 
+
+
+
+
 function $f19b83c1486f45cc$export$dc9c12ed27dd1b49(props, state, ref) {
     let { type: type = 'menu', isDisabled: isDisabled, trigger: trigger = 'press' } = props;
     let menuTriggerId = (0, $390e54f620492c70$export$f680877a34711e37)();
     let { triggerProps: triggerProps, overlayProps: overlayProps } = (0, $f282e36c29c025e8$export$f9d5c8beee7d008d)({
         type: type
     }, state, ref);
-    let onKeyDown = (e)=>{
-        if (isDisabled) return;
-        if (trigger === 'longPress' && !e.altKey) return;
-        if (ref && ref.current) switch(e.key){
-            case 'Enter':
-            case ' ':
-                // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.
-                // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.
-                // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.
-                // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.
-                if (trigger === 'longPress' || e.isDefaultPrevented()) return;
-            // fallthrough
-            case 'ArrowDown':
-                // Stop propagation, unless it would already be handled by useKeyboard.
-                if (!('continuePropagation' in e)) e.stopPropagation();
-                e.preventDefault();
-                state.toggle('first');
-                break;
-            case 'ArrowUp':
-                if (!('continuePropagation' in e)) e.stopPropagation();
-                e.preventDefault();
-                state.toggle('last');
-                break;
-            default:
-                // Allow other keys.
-                if ('continuePropagation' in e) e.continuePropagation();
-        }
+    let open = (shouldOpen, e, focusStrategy = 'first')=>{
+        if (!shouldOpen || e.isDefaultPrevented()) return false;
+        state.toggle(focusStrategy);
     };
+    // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.
+    // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.
+    // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.
+    // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.
+    let { keyboardProps: keyboardProps } = (0, $8296dad1a4c5e0dc$export$8f71654801c2f7cd)({
+        isDisabled: isDisabled,
+        shortcuts: {
+            Enter: (e)=>{
+                return open(trigger !== 'longPress', e, 'first');
+            },
+            ' ': (e)=>{
+                return open(trigger !== 'longPress', e, 'first');
+            },
+            ArrowDown: (e)=>{
+                return open(trigger !== 'longPress', e, 'first');
+            },
+            ArrowUp: (e)=>{
+                return open(trigger !== 'longPress', e, 'last');
+            },
+            'Alt+Enter': (e)=>{
+                return open(trigger === 'longPress', e, 'first');
+            },
+            'Alt+ ': (e)=>{
+                return open(trigger === 'longPress', e, 'first');
+            },
+            // Alt+Arrow* must open for both trigger modes: for `press` it matches the same `e.key` cases as
+            // plain Arrow*; for `longPress`, plain arrows are ignored elsewhere and Alt+Arrow is the opener
+            // (see legacy `if (trigger === 'longPress' && !e.altKey) return` before the ArrowDown/Up switch).
+            'Alt+ArrowDown': (e)=>{
+                return open(true, e, 'first');
+            },
+            'Alt+ArrowUp': (e)=>{
+                return open(true, e, 'last');
+            }
+        }
+    });
     let stringFormatter = (0, $cf2482eff2eeeec2$export$f12b703ca79dfbb1)((0, ($parcel$interopDefault($1SpDQ$intlStringsmjs))), '@react-aria/menu');
     let { longPressProps: longPressProps } = (0, $7b01448eaad0fe7c$export$c24ed0104d07eab9)({
         isDisabled: isDisabled || trigger !== 'longPress',
@@ -91,14 +111,60 @@ function $f19b83c1486f45cc$export$dc9c12ed27dd1b49(props, state, ref) {
         }
     };
     // omit onPress from triggerProps since we override it above.
+    // oxlint-disable-next-line react/react-compiler
     delete triggerProps.onPress;
+    let { contextMenuProps: contextMenuProps } = (0, $00dce70c89c7306c$export$2464060fb1e12fa6)({
+        onContextMenu (e) {
+            // This is not a DOM event, so the linter is incorrect.
+            // eslint-disable-next-line rsp-rules/safe-event-target
+            let rect = e.target.getBoundingClientRect();
+            state.setPoint({
+                x: rect.x + e.x,
+                y: rect.y + e.y
+            });
+            state.open();
+        }
+    });
+    (0, $1SpDQ$useEffect)(()=>{
+        // Close context menus when right clicking outside. The browser's context menu will appear instead.
+        if (state.isOpen && trigger === 'contextMenu') {
+            let onContextMenu = (e)=>{
+                // Checking if the target is the body works because everything outside the menu is inert.
+                if ((e.button === 2 || e.button === 0 && e.ctrlKey === true) && (0, $23f2114a1b82827e$export$e58f029f0fbfdb29)(e) === document.body) state.close();
+            };
+            document.addEventListener('mousedown', onContextMenu);
+            return ()=>document.removeEventListener('mousedown', onContextMenu);
+        }
+    }, [
+        state,
+        trigger
+    ]);
+    let interactionProps;
+    if (trigger === 'press') interactionProps = {
+        ...pressProps,
+        ...keyboardProps
+    };
+    else if (trigger === 'longPress') interactionProps = {
+        ...longPressProps,
+        ...keyboardProps
+    };
+    else if (trigger === 'contextMenu') {
+        interactionProps = contextMenuProps;
+        // Remove aria-haspopup and associated attributes from context menu triggers.
+        // aria-haspopup indicates that the trigger opens a menu on activation (i.e. click/Enter),
+        // which is not the case for context menus, so this would lead to confusing announcements.
+        // Context menus are equally discoverable (or not) by sighted and non-sighted users,
+        // so we don't need a screen reader specific announcement.
+        // See https://github.com/w3c/aria/issues/1971 for further discussion.
+        let { 'aria-haspopup': _a, 'aria-expanded': _b, 'aria-controls': _c, ...rest } = triggerProps;
+        triggerProps = rest;
+    }
     return {
         // @ts-ignore - TODO we pass out both DOMAttributes AND AriaButtonProps, but useButton will discard the longPress event handlers, it's only through PressResponder magic that this works for RSP and RAC. it does not work in aria examples
         menuTriggerProps: {
             ...triggerProps,
-            ...trigger === 'press' ? pressProps : longPressProps,
-            id: menuTriggerId,
-            onKeyDown: onKeyDown
+            ...interactionProps,
+            id: menuTriggerId
         },
         menuProps: {
             ...overlayProps,

package/dist/private/menu/useMenuTrigger.mjs.map

@@ -1 +1 @@
-{"mappings":";;;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;;AAwCM,SAAS,0CACd,KAA2B,EAC3B,KAAuB,EACvB,GAA8B;IAE9B,IAAI,QAAC,OAAO,oBAAQ,UAAU,WAAE,UAAU,SAAQ,GAAG;IAErD,IAAI,gBAAgB,CAAA,GAAA,yCAAI;IACxB,IAAI,gBAAC,YAAY,gBAAE,YAAY,EAAC,GAAG,CAAA,GAAA,yCAAgB,EAAE;cAAC;IAAI,GAAG,OAAO;IAEpE,IAAI,YAAY,CAAA;QACd,IAAI,YACF;QAGF,IAAI,YAAY,eAAe,CAAC,EAAE,MAAM,EACtC;QAGF,IAAI,OAAO,IAAI,OAAO,EACpB,OAAQ,EAAE,GAAG;YACX,KAAK;YACL,KAAK;gBACH,sHAAsH;gBACtH,qHAAqH;gBACrH,yHAAyH;gBACzH,2HAA2H;gBAC3H,IAAI,YAAY,eAAe,EAAE,kBAAkB,IACjD;YAEJ,cAAc;YACd,KAAK;gBACH,uEAAuE;gBACvE,IAAI,CAAE,CAAA,yBAAyB,CAAA,GAC7B,EAAE,eAAe;gBAEnB,EAAE,cAAc;gBAChB,MAAM,MAAM,CAAC;gBACb;YACF,KAAK;gBACH,IAAI,CAAE,CAAA,yBAAyB,CAAA,GAC7B,EAAE,eAAe;gBAEnB,EAAE,cAAc;gBAChB,MAAM,MAAM,CAAC;gBACb;YACF;gBACE,oBAAoB;gBACpB,IAAI,yBAAyB,GAC3B,EAAE,mBAAmB;QAE3B;IAEJ;IAEA,IAAI,kBAAkB,CAAA,GAAA,yCAA0B,EAAE,CAAA,GAAA,+CAAW,GAAG;IAChE,IAAI,kBAAC,cAAc,EAAC,GAAG,CAAA,GAAA,yCAAW,EAAE;QAClC,YAAY,cAAc,YAAY;QACtC,0BAA0B,gBAAgB,MAAM,CAAC;QACjD;YACE,MAAM,KAAK;QACb;QACA;YACE,MAAM,IAAI,CAAC;QACb;IACF;IAEA,IAAI,aAAyB;QAC3B,qBAAqB;QACrB,cAAa,CAAC;YACZ,8EAA8E;YAC9E,IAAI,EAAE,WAAW,KAAK,WAAW,EAAE,WAAW,KAAK,cAAc,CAAC,YAAY;gBAC5E,iGAAiG;gBACjG,CAAA,GAAA,yCAAoB,EAAE,EAAE,MAAM;gBAE9B,6DAA6D;gBAC7D,8CAA8C;gBAC9C,MAAM,IAAI,CAAC,EAAE,WAAW,KAAK,YAAY,UAAU;YACrD;QACF;QACA,SAAQ,CAAC;YACP,IAAI,EAAE,WAAW,KAAK,WAAW,CAAC,YAAY;gBAC5C,iGAAiG;gBACjG,CAAA,GAAA,yCAAoB,EAAE,EAAE,MAAM;gBAE9B,MAAM,MAAM;YACd;QACF;IACF;IAEA,6DAA6D;IAC7D,OAAO,aAAa,OAAO;IAE3B,OAAO;QACL,2OAA2O;QAC3O,kBAAkB;YAChB,GAAG,YAAY;YACf,GAAI,YAAY,UAAU,aAAa,cAAc;YACrD,IAAI;uBACJ;QACF;QACA,WAAW;YACT,GAAG,YAAY;YACf,mBAAmB;YACnB,WAAW,MAAM,aAAa,IAAI;YAClC,SAAS,MAAM,KAAK;QACtB;IACF;AACF","sources":["packages/react-aria/src/menu/useMenuTrigger.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 {AriaButtonProps} from '../button/useButton';\n\nimport {AriaMenuOptions} from './useMenu';\nimport {FocusableElement, RefObject} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport intlMessages from '../../intl/menu/*.json';\n// @ts-ignore\nimport {MenuTriggerState, MenuTriggerType} from 'react-stately/useMenuTriggerState';\nimport {PressProps} from '../interactions/usePress';\nimport {useId} from '../utils/useId';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\nimport {useLongPress} from '../interactions/useLongPress';\nimport {useOverlayTrigger} from '../overlays/useOverlayTrigger';\n\nexport interface AriaMenuTriggerProps {\n  /** The type of menu that the menu trigger opens. */\n  type?: 'menu' | 'listbox';\n  /** Whether menu trigger is disabled. */\n  isDisabled?: boolean;\n  /** How menu is triggered. */\n  trigger?: MenuTriggerType;\n}\n\nexport interface MenuTriggerAria<T> {\n  /** Props for the menu trigger element. */\n  menuTriggerProps: AriaButtonProps;\n\n  /** Props for the menu. */\n  menuProps: AriaMenuOptions<T>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a menu trigger.\n *\n * @param props - Props for the menu trigger.\n * @param state - State for the menu trigger.\n * @param ref - Ref to the HTML element trigger for the menu.\n */\nexport function useMenuTrigger<T>(\n  props: AriaMenuTriggerProps,\n  state: MenuTriggerState,\n  ref: RefObject<Element | null>\n): MenuTriggerAria<T> {\n  let {type = 'menu', isDisabled, trigger = 'press'} = props;\n\n  let menuTriggerId = useId();\n  let {triggerProps, overlayProps} = useOverlayTrigger({type}, state, ref);\n\n  let onKeyDown = e => {\n    if (isDisabled) {\n      return;\n    }\n\n    if (trigger === 'longPress' && !e.altKey) {\n      return;\n    }\n\n    if (ref && ref.current) {\n      switch (e.key) {\n        case 'Enter':\n        case ' ':\n          // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.\n          // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.\n          // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.\n          // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.\n          if (trigger === 'longPress' || e.isDefaultPrevented()) {\n            return;\n          }\n        // fallthrough\n        case 'ArrowDown':\n          // Stop propagation, unless it would already be handled by useKeyboard.\n          if (!('continuePropagation' in e)) {\n            e.stopPropagation();\n          }\n          e.preventDefault();\n          state.toggle('first');\n          break;\n        case 'ArrowUp':\n          if (!('continuePropagation' in e)) {\n            e.stopPropagation();\n          }\n          e.preventDefault();\n          state.toggle('last');\n          break;\n        default:\n          // Allow other keys.\n          if ('continuePropagation' in e) {\n            e.continuePropagation();\n          }\n      }\n    }\n  };\n\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/menu');\n  let {longPressProps} = useLongPress({\n    isDisabled: isDisabled || trigger !== 'longPress',\n    accessibilityDescription: stringFormatter.format('longPressMessage'),\n    onLongPressStart() {\n      state.close();\n    },\n    onLongPress() {\n      state.open('first');\n    }\n  });\n\n  let pressProps: PressProps = {\n    preventFocusOnPress: true,\n    onPressStart(e) {\n      // For consistency with native, open the menu on mouse/key down, but touch up.\n      if (e.pointerType !== 'touch' && e.pointerType !== 'keyboard' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        // If opened with a screen reader, auto focus the first item.\n        // Otherwise, the menu itself will be focused.\n        state.open(e.pointerType === 'virtual' ? 'first' : null);\n      }\n    },\n    onPress(e) {\n      if (e.pointerType === 'touch' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        state.toggle();\n      }\n    }\n  };\n\n  // omit onPress from triggerProps since we override it above.\n  delete triggerProps.onPress;\n\n  return {\n    // @ts-ignore - TODO we pass out both DOMAttributes AND AriaButtonProps, but useButton will discard the longPress event handlers, it's only through PressResponder magic that this works for RSP and RAC. it does not work in aria examples\n    menuTriggerProps: {\n      ...triggerProps,\n      ...(trigger === 'press' ? pressProps : longPressProps),\n      id: menuTriggerId,\n      onKeyDown\n    },\n    menuProps: {\n      ...overlayProps,\n      'aria-labelledby': menuTriggerId,\n      autoFocus: state.focusStrategy || true,\n      onClose: state.close\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useMenuTrigger.mjs.map"}
+{"mappings":"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","sources":["packages/react-aria/src/menu/useMenuTrigger.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 {AriaButtonProps} from '../button/useButton';\nimport {AriaMenuOptions} from './useMenu';\nimport {FocusableElement, FocusStrategy, KeyboardEvent, RefObject} from '@react-types/shared';\nimport {focusWithoutScrolling} from '../utils/focusWithoutScrolling';\nimport {getEventTarget} from '../utils/shadowdom/DOMFunctions';\nimport intlMessages from '../../intl/menu/*.json';\nimport {MenuTriggerState, MenuTriggerType} from 'react-stately/useMenuTriggerState';\nimport {PressProps} from '../interactions/usePress';\nimport {useContextMenu} from '../interactions/useContextMenu';\nimport {useEffect} from 'react';\nimport {useId} from '../utils/useId';\nimport {useKeyboard} from '../interactions/useKeyboard';\nimport {useLocalizedStringFormatter} from '../i18n/useLocalizedStringFormatter';\nimport {useLongPress} from '../interactions/useLongPress';\nimport {useOverlayTrigger} from '../overlays/useOverlayTrigger';\n\nexport interface AriaMenuTriggerProps {\n  /** The type of menu that the menu trigger opens. */\n  type?: 'menu' | 'listbox';\n  /** Whether menu trigger is disabled. */\n  isDisabled?: boolean;\n  /** How menu is triggered. */\n  trigger?: MenuTriggerType;\n}\n\nexport interface MenuTriggerAria<T> {\n  /** Props for the menu trigger element. */\n  menuTriggerProps: AriaButtonProps;\n\n  /** Props for the menu. */\n  menuProps: AriaMenuOptions<T>;\n}\n\n/**\n * Provides the behavior and accessibility implementation for a menu trigger.\n *\n * @param props - Props for the menu trigger.\n * @param state - State for the menu trigger.\n * @param ref - Ref to the HTML element trigger for the menu.\n */\nexport function useMenuTrigger<T>(\n  props: AriaMenuTriggerProps,\n  state: MenuTriggerState,\n  ref: RefObject<Element | null>\n): MenuTriggerAria<T> {\n  let {type = 'menu', isDisabled, trigger = 'press'} = props;\n\n  let menuTriggerId = useId();\n  let {triggerProps, overlayProps} = useOverlayTrigger({type}, state, ref);\n\n  let open = (\n    shouldOpen: boolean,\n    e: KeyboardEvent,\n    focusStrategy: FocusStrategy = 'first'\n  ): boolean | void => {\n    if (!shouldOpen || e.isDefaultPrevented()) {\n      return false;\n    }\n    state.toggle(focusStrategy);\n  };\n\n  // React puts listeners on the same root, so even if propagation was stopped, immediate propagation is still possible.\n  // useTypeSelect will handle the spacebar first if it's running, so we don't want to open if it's handled it already.\n  // We use isDefaultPrevented() instead of isPropagationStopped() because createEventHandler stops propagation by default.\n  // And default prevented means that the event was handled by something else (typeahead), so we don't want to open the menu.\n  let {keyboardProps} = useKeyboard({\n    isDisabled,\n    shortcuts: {\n      Enter: e => {\n        return open(trigger !== 'longPress', e, 'first');\n      },\n      ' ': e => {\n        return open(trigger !== 'longPress', e, 'first');\n      },\n      ArrowDown: e => {\n        return open(trigger !== 'longPress', e, 'first');\n      },\n      ArrowUp: e => {\n        return open(trigger !== 'longPress', e, 'last');\n      },\n      'Alt+Enter': e => {\n        return open(trigger === 'longPress', e, 'first');\n      },\n      'Alt+ ': e => {\n        return open(trigger === 'longPress', e, 'first');\n      },\n      // Alt+Arrow* must open for both trigger modes: for `press` it matches the same `e.key` cases as\n      // plain Arrow*; for `longPress`, plain arrows are ignored elsewhere and Alt+Arrow is the opener\n      // (see legacy `if (trigger === 'longPress' && !e.altKey) return` before the ArrowDown/Up switch).\n      'Alt+ArrowDown': e => {\n        return open(true, e, 'first');\n      },\n      'Alt+ArrowUp': e => {\n        return open(true, e, 'last');\n      }\n    }\n  });\n\n  let stringFormatter = useLocalizedStringFormatter(intlMessages, '@react-aria/menu');\n  let {longPressProps} = useLongPress({\n    isDisabled: isDisabled || trigger !== 'longPress',\n    accessibilityDescription: stringFormatter.format('longPressMessage'),\n    onLongPressStart() {\n      state.close();\n    },\n    onLongPress() {\n      state.open('first');\n    }\n  });\n\n  let pressProps: PressProps = {\n    preventFocusOnPress: true,\n    onPressStart(e) {\n      // For consistency with native, open the menu on mouse/key down, but touch up.\n      if (e.pointerType !== 'touch' && e.pointerType !== 'keyboard' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        // If opened with a screen reader, auto focus the first item.\n        // Otherwise, the menu itself will be focused.\n        state.open(e.pointerType === 'virtual' ? 'first' : null);\n      }\n    },\n    onPress(e) {\n      if (e.pointerType === 'touch' && !isDisabled) {\n        // Ensure trigger has focus before opening the menu so it can be restored by FocusScope on close.\n        focusWithoutScrolling(e.target as FocusableElement);\n\n        state.toggle();\n      }\n    }\n  };\n\n  // omit onPress from triggerProps since we override it above.\n  // oxlint-disable-next-line react/react-compiler\n  delete triggerProps.onPress;\n\n  let {contextMenuProps} = useContextMenu({\n    onContextMenu(e) {\n      // This is not a DOM event, so the linter is incorrect.\n      // eslint-disable-next-line rsp-rules/safe-event-target\n      let rect = e.target.getBoundingClientRect();\n      state.setPoint({x: rect.x + e.x, y: rect.y + e.y});\n      state.open();\n    }\n  });\n\n  useEffect(() => {\n    // Close context menus when right clicking outside. The browser's context menu will appear instead.\n    if (state.isOpen && trigger === 'contextMenu') {\n      let onContextMenu = (e: MouseEvent) => {\n        // Checking if the target is the body works because everything outside the menu is inert.\n        if (\n          (e.button === 2 || (e.button === 0 && e.ctrlKey === true)) &&\n          getEventTarget(e) === document.body\n        ) {\n          state.close();\n        }\n      };\n      document.addEventListener('mousedown', onContextMenu);\n      return () => document.removeEventListener('mousedown', onContextMenu);\n    }\n  }, [state, trigger]);\n\n  let interactionProps;\n  if (trigger === 'press') {\n    interactionProps = {...pressProps, ...keyboardProps};\n  } else if (trigger === 'longPress') {\n    interactionProps = {...longPressProps, ...keyboardProps};\n  } else if (trigger === 'contextMenu') {\n    interactionProps = contextMenuProps;\n\n    // Remove aria-haspopup and associated attributes from context menu triggers.\n    // aria-haspopup indicates that the trigger opens a menu on activation (i.e. click/Enter),\n    // which is not the case for context menus, so this would lead to confusing announcements.\n    // Context menus are equally discoverable (or not) by sighted and non-sighted users,\n    // so we don't need a screen reader specific announcement.\n    // See https://github.com/w3c/aria/issues/1971 for further discussion.\n    let {'aria-haspopup': _a, 'aria-expanded': _b, 'aria-controls': _c, ...rest} = triggerProps;\n    triggerProps = rest;\n  }\n\n  return {\n    // @ts-ignore - TODO we pass out both DOMAttributes AND AriaButtonProps, but useButton will discard the longPress event handlers, it's only through PressResponder magic that this works for RSP and RAC. it does not work in aria examples\n    menuTriggerProps: {\n      ...triggerProps,\n      ...interactionProps,\n      id: menuTriggerId\n    },\n    menuProps: {\n      ...overlayProps,\n      'aria-labelledby': menuTriggerId,\n      autoFocus: state.focusStrategy || true,\n      onClose: state.close\n    }\n  };\n}\n"],"names":[],"version":3,"file":"useMenuTrigger.mjs.map"}