@ariakit/react-core 0.4.6 → 0.4.8

package/cjs/__chunks/{POFUETU3.cjs → VYADJOAV.cjs}

@@ -1,30 +1,29 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _6ZZYUFPWcjs = require('./6ZZYUFPW.cjs');
+var _BV5PE6PZcjs = require('./BV5PE6PZ.cjs');
 
 
-var _5J6PQR7Ocjs = require('./5J6PQR7O.cjs');
+var _BZ34A7Q7cjs = require('./BZ34A7Q7.cjs');
 
 
 
 
-var _R2YVMKBRcjs = require('./R2YVMKBR.cjs');
+var _AWEKOM65cjs = require('./AWEKOM65.cjs');
 
 
-var _IATQHLZTcjs = require('./IATQHLZT.cjs');
+var _PULY27HQcjs = require('./PULY27HQ.cjs');
 
 
 
-var _QFX6UW2Fcjs = require('./QFX6UW2F.cjs');
+var _OUWHJLQHcjs = require('./OUWHJLQH.cjs');
 
 
 
 
-var _AV6KTKLEcjs = require('./AV6KTKLE.cjs');
+var _3IVNQNIVcjs = require('./3IVNQNIV.cjs');
 
 // src/composite/composite-container.tsx
-var _react = require('react');
 var _dom = require('@ariakit/core/utils/dom');
 var _events = require('@ariakit/core/utils/events');
 
@@ -33,6 +32,7 @@ var _events = require('@ariakit/core/utils/events');
 
 var _focus = require('@ariakit/core/utils/focus');
 var _misc = require('@ariakit/core/utils/misc');
+var _react = require('react');
 var TagName = "div";
 function getFirstTabbable(container) {
   _focus.restoreFocusIn.call(void 0, container);
@@ -40,16 +40,15 @@ function getFirstTabbable(container) {
   _focus.disableFocusIn.call(void 0, container);
   return tabbable;
 }
-var useCompositeContainer = _R2YVMKBRcjs.createHook.call(void 0, function useCompositeContainer2(_a) {
-  var _b = _a, { store } = _b, props = _AV6KTKLEcjs.__objRest.call(void 0, _b, ["store"]);
-  const context = _5J6PQR7Ocjs.useCompositeContext.call(void 0, );
+var useCompositeContainer = _AWEKOM65cjs.createHook.call(void 0, function useCompositeContainer2(_a) {
+  var _b = _a, { store } = _b, props = _3IVNQNIVcjs.__objRest.call(void 0, _b, ["store"]);
+  const context = _BZ34A7Q7cjs.useCompositeContext.call(void 0, );
   store = store || context;
   const ref = _react.useRef.call(void 0, null);
   const isOpenRef = _react.useRef.call(void 0, false);
   const open = (collapseToEnd = false) => {
     const container = ref.current;
-    if (!container)
-      return;
+    if (!container) return;
     _focus.restoreFocusIn.call(void 0, container);
     const tabbable = _focus.getFirstTabbableIn.call(void 0, container);
     if (!tabbable) {
@@ -60,34 +59,30 @@ var useCompositeContainer = _R2YVMKBRcjs.createHook.call(void 0, function useCom
     queueMicrotask(() => {
       tabbable.focus();
       if (_dom.isTextField.call(void 0, tabbable) || tabbable.isContentEditable) {
-        _6ZZYUFPWcjs.selectTextField.call(void 0, tabbable, collapseToEnd);
+        _BV5PE6PZcjs.selectTextField.call(void 0, tabbable, collapseToEnd);
       }
     });
   };
   const close = () => {
     const container = ref.current;
-    if (!container)
-      return;
+    if (!container) return;
     isOpenRef.current = false;
     _focus.disableFocusIn.call(void 0, container);
   };
-  const renderedItems = _IATQHLZTcjs.useStoreState.call(void 0, store, "renderedItems");
+  const renderedItems = _PULY27HQcjs.useStoreState.call(void 0, store, "renderedItems");
   _react.useEffect.call(void 0, () => {
     const container = ref.current;
-    if (!container)
-      return;
+    if (!container) return;
     const isOpen = isOpenRef.current;
     if (!isOpen && (renderedItems == null ? void 0 : renderedItems.length)) {
       _focus.disableFocusIn.call(void 0, container);
     }
   }, [renderedItems]);
   const onFocusProp = props.onFocus;
-  const onFocus = _QFX6UW2Fcjs.useEvent.call(void 0, (event) => {
+  const onFocus = _OUWHJLQHcjs.useEvent.call(void 0, (event) => {
     onFocusProp == null ? void 0 : onFocusProp(event);
-    if (event.defaultPrevented)
-      return;
-    if (!store)
-      return;
+    if (event.defaultPrevented) return;
+    if (!store) return;
     const isOpen = isOpenRef.current;
     if (_events.isSelfTarget.call(void 0, event)) {
       isOpenRef.current = false;
@@ -95,7 +90,11 @@ var useCompositeContainer = _R2YVMKBRcjs.createHook.call(void 0, function useCom
       const composite = baseElement;
       const selector = "[data-composite-container]";
       const containers = composite == null ? void 0 : composite.querySelectorAll(selector);
-      containers == null ? void 0 : containers.forEach((container) => _focus.disableFocusIn.call(void 0, container));
+      if (containers) {
+        for (const container of containers) {
+          _focus.disableFocusIn.call(void 0, container);
+        }
+      }
     } else if (!isOpen) {
       isOpenRef.current = true;
       _focus.restoreFocusIn.call(void 0, event.currentTarget);
@@ -103,41 +102,33 @@ var useCompositeContainer = _R2YVMKBRcjs.createHook.call(void 0, function useCom
     }
   });
   const onBlurProp = props.onBlur;
-  const onBlur = _QFX6UW2Fcjs.useEvent.call(void 0, (event) => {
+  const onBlur = _OUWHJLQHcjs.useEvent.call(void 0, (event) => {
     onBlurProp == null ? void 0 : onBlurProp(event);
-    if (event.defaultPrevented)
-      return;
+    if (event.defaultPrevented) return;
     if (_events.isFocusEventOutside.call(void 0, event)) {
       close();
     }
   });
   const onKeyDownProp = props.onKeyDown;
-  const onKeyDown = _QFX6UW2Fcjs.useEvent.call(void 0, (event) => {
+  const onKeyDown = _OUWHJLQHcjs.useEvent.call(void 0, (event) => {
     onKeyDownProp == null ? void 0 : onKeyDownProp(event);
-    if (event.defaultPrevented)
-      return;
-    if (event.altKey)
-      return;
-    if (event.ctrlKey)
-      return;
-    if (event.metaKey)
-      return;
-    if (event.shiftKey)
-      return;
+    if (event.defaultPrevented) return;
+    if (event.altKey) return;
+    if (event.ctrlKey) return;
+    if (event.metaKey) return;
+    if (event.shiftKey) return;
     const container = event.currentTarget;
     if (_events.isSelfTarget.call(void 0, event)) {
       if (event.key.length === 1 && event.key !== " ") {
         const tabbable = getFirstTabbable(container);
-        if (!tabbable)
-          return;
+        if (!tabbable) return;
         if (_dom.isTextField.call(void 0, tabbable) || tabbable.isContentEditable) {
           event.stopPropagation();
           open();
         }
       } else if (event.key === "Delete" || event.key === "Backspace") {
         const tabbable = getFirstTabbable(container);
-        if (!tabbable)
-          return;
+        if (!tabbable) return;
         if (_dom.isTextField.call(void 0, tabbable) || tabbable.isContentEditable) {
           open();
           const onInput = () => queueMicrotask(() => container.focus());
@@ -156,18 +147,17 @@ var useCompositeContainer = _R2YVMKBRcjs.createHook.call(void 0, function useCom
     }
   });
   const onClickProp = props.onClick;
-  const onClick = _QFX6UW2Fcjs.useEvent.call(void 0, (event) => {
+  const onClick = _OUWHJLQHcjs.useEvent.call(void 0, (event) => {
     onClickProp == null ? void 0 : onClickProp(event);
-    if (event.defaultPrevented)
-      return;
+    if (event.defaultPrevented) return;
     if (_events.isSelfTarget.call(void 0, event) && !event.detail) {
       open(true);
     }
   });
-  props = _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
+  props = _3IVNQNIVcjs.__spreadProps.call(void 0, _3IVNQNIVcjs.__spreadValues.call(void 0, {
     "data-composite-container": ""
   }, props), {
-    ref: _QFX6UW2Fcjs.useMergeRefs.call(void 0, ref, props.ref),
+    ref: _OUWHJLQHcjs.useMergeRefs.call(void 0, ref, props.ref),
     onFocus,
     onBlur,
     onKeyDown,
@@ -175,9 +165,9 @@ var useCompositeContainer = _R2YVMKBRcjs.createHook.call(void 0, function useCom
   });
   return _misc.removeUndefinedValues.call(void 0, props);
 });
-var CompositeContainer = _R2YVMKBRcjs.forwardRef.call(void 0, function CompositeContainer2(props) {
+var CompositeContainer = _AWEKOM65cjs.forwardRef.call(void 0, function CompositeContainer2(props) {
   const htmlProps = useCompositeContainer(props);
-  return _R2YVMKBRcjs.createElement.call(void 0, TagName, htmlProps);
+  return _AWEKOM65cjs.createElement.call(void 0, TagName, htmlProps);
 });
 
 

package/cjs/__chunks/{4LX2WIBK.cjs → VYTT2R6P.cjs}

@@ -1,33 +1,30 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _7TN63K2Tcjs = require('./7TN63K2T.cjs');
+var _PNSA4OTLcjs = require('./PNSA4OTL.cjs');
 
 
-var _JKERATCGcjs = require('./JKERATCG.cjs');
+var _MUQXBDURcjs = require('./MUQXBDUR.cjs');
 
 
 
-var _QFX6UW2Fcjs = require('./QFX6UW2F.cjs');
+var _OUWHJLQHcjs = require('./OUWHJLQH.cjs');
 
 
 
-var _AV6KTKLEcjs = require('./AV6KTKLE.cjs');
+var _3IVNQNIVcjs = require('./3IVNQNIV.cjs');
 
 // src/dialog/utils/use-hide-on-interact-outside.ts
-var _react = require('react');
 var _dom = require('@ariakit/core/utils/dom');
 var _events = require('@ariakit/core/utils/events');
+var _react = require('react');
 function isInDocument(target) {
-  if (target.tagName === "HTML")
-    return true;
+  if (target.tagName === "HTML") return true;
   return _dom.contains.call(void 0, _dom.getDocument.call(void 0, target).body, target);
 }
 function isDisclosure(disclosure, target) {
-  if (!disclosure)
-    return false;
-  if (_dom.contains.call(void 0, disclosure, target))
-    return true;
+  if (!disclosure) return false;
+  if (_dom.contains.call(void 0, disclosure, target)) return true;
   const activeId = target.getAttribute("aria-activedescendant");
   if (activeId) {
     const activeElement = _dom.getDocument.call(void 0, disclosure).getElementById(activeId);
@@ -38,11 +35,9 @@ function isDisclosure(disclosure, target) {
   return false;
 }
 function isMouseEventOnDialog(event, dialog) {
-  if (!("clientY" in event))
-    return false;
+  if (!("clientY" in event)) return false;
   const rect = dialog.getBoundingClientRect();
-  if (rect.width === 0 || rect.height === 0)
-    return false;
+  if (rect.width === 0 || rect.height === 0) return false;
   return rect.top <= event.clientY && event.clientY <= rect.top + rect.height && rect.left <= event.clientX && event.clientX <= rect.left + rect.width;
 }
 function useEventOutside({
@@ -52,17 +47,14 @@ function useEventOutside({
   capture,
   domReady
 }) {
-  const callListener = _QFX6UW2Fcjs.useEvent.call(void 0, listener);
+  const callListener = _OUWHJLQHcjs.useEvent.call(void 0, listener);
   const open = store.useState("open");
   const focusedRef = _react.useRef.call(void 0, false);
-  _QFX6UW2Fcjs.useSafeLayoutEffect.call(void 0, () => {
-    if (!open)
-      return;
-    if (!domReady)
-      return;
+  _OUWHJLQHcjs.useSafeLayoutEffect.call(void 0, () => {
+    if (!open) return;
+    if (!domReady) return;
     const { contentElement } = store.getState();
-    if (!contentElement)
-      return;
+    if (!contentElement) return;
     const onFocus = () => {
       focusedRef.current = true;
     };
@@ -70,28 +62,19 @@ function useEventOutside({
     return () => contentElement.removeEventListener("focusin", onFocus, true);
   }, [store, open, domReady]);
   _react.useEffect.call(void 0, () => {
-    if (!open)
-      return;
+    if (!open) return;
     const onEvent = (event) => {
       const { contentElement, disclosureElement } = store.getState();
       const target = event.target;
-      if (!contentElement)
-        return;
-      if (!target)
-        return;
-      if (!isInDocument(target))
-        return;
-      if (_dom.contains.call(void 0, contentElement, target))
-        return;
-      if (isDisclosure(disclosureElement, target))
-        return;
-      if (target.hasAttribute("data-focus-trap"))
-        return;
-      if (isMouseEventOnDialog(event, contentElement))
-        return;
+      if (!contentElement) return;
+      if (!target) return;
+      if (!isInDocument(target)) return;
+      if (_dom.contains.call(void 0, contentElement, target)) return;
+      if (isDisclosure(disclosureElement, target)) return;
+      if (target.hasAttribute("data-focus-trap")) return;
+      if (isMouseEventOnDialog(event, contentElement)) return;
       const focused = focusedRef.current;
-      if (focused && !_JKERATCGcjs.isElementMarked.call(void 0, target, contentElement.id))
-        return;
+      if (focused && !_MUQXBDURcjs.isElementMarked.call(void 0, target, contentElement.id)) return;
       callListener(event);
     };
     return _events.addGlobalEventListener.call(void 0, type, onEvent, capture);
@@ -105,42 +88,34 @@ function shouldHideOnInteractOutside(hideOnInteractOutside, event) {
 }
 function useHideOnInteractOutside(store, hideOnInteractOutside, domReady) {
   const open = store.useState("open");
-  const previousMouseDownRef = _7TN63K2Tcjs.usePreviousMouseDownRef.call(void 0, open);
+  const previousMouseDownRef = _PNSA4OTLcjs.usePreviousMouseDownRef.call(void 0, open);
   const props = { store, domReady, capture: true };
-  useEventOutside(_AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {}, props), {
+  useEventOutside(_3IVNQNIVcjs.__spreadProps.call(void 0, _3IVNQNIVcjs.__spreadValues.call(void 0, {}, props), {
     type: "click",
     listener: (event) => {
       const { contentElement } = store.getState();
       const previousMouseDown = previousMouseDownRef.current;
-      if (!previousMouseDown)
-        return;
-      if (!_dom.isVisible.call(void 0, previousMouseDown))
-        return;
-      if (!_JKERATCGcjs.isElementMarked.call(void 0, previousMouseDown, contentElement == null ? void 0 : contentElement.id))
-        return;
-      if (!shouldHideOnInteractOutside(hideOnInteractOutside, event))
-        return;
+      if (!previousMouseDown) return;
+      if (!_dom.isVisible.call(void 0, previousMouseDown)) return;
+      if (!_MUQXBDURcjs.isElementMarked.call(void 0, previousMouseDown, contentElement == null ? void 0 : contentElement.id)) return;
+      if (!shouldHideOnInteractOutside(hideOnInteractOutside, event)) return;
       store.hide();
     }
   }));
-  useEventOutside(_AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {}, props), {
+  useEventOutside(_3IVNQNIVcjs.__spreadProps.call(void 0, _3IVNQNIVcjs.__spreadValues.call(void 0, {}, props), {
     type: "focusin",
     listener: (event) => {
       const { contentElement } = store.getState();
-      if (!contentElement)
-        return;
-      if (event.target === _dom.getDocument.call(void 0, contentElement))
-        return;
-      if (!shouldHideOnInteractOutside(hideOnInteractOutside, event))
-        return;
+      if (!contentElement) return;
+      if (event.target === _dom.getDocument.call(void 0, contentElement)) return;
+      if (!shouldHideOnInteractOutside(hideOnInteractOutside, event)) return;
       store.hide();
     }
   }));
-  useEventOutside(_AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {}, props), {
+  useEventOutside(_3IVNQNIVcjs.__spreadProps.call(void 0, _3IVNQNIVcjs.__spreadValues.call(void 0, {}, props), {
     type: "contextmenu",
     listener: (event) => {
-      if (!shouldHideOnInteractOutside(hideOnInteractOutside, event))
-        return;
+      if (!shouldHideOnInteractOutside(hideOnInteractOutside, event)) return;
       store.hide();
     }
   }));

package/cjs/__chunks/{XCBGJNG4.cjs → VZGX2ILJ.cjs}

@@ -6,37 +6,37 @@ var _ZJMEXN3Ncjs = require('./ZJMEXN3N.cjs');
 
 
 
-var _R2YVMKBRcjs = require('./R2YVMKBR.cjs');
+var _AWEKOM65cjs = require('./AWEKOM65.cjs');
 
 
 
-var _QFX6UW2Fcjs = require('./QFX6UW2F.cjs');
+var _OUWHJLQHcjs = require('./OUWHJLQH.cjs');
 
 
-var _AV6KTKLEcjs = require('./AV6KTKLE.cjs');
+var _3IVNQNIVcjs = require('./3IVNQNIV.cjs');
 
 // src/group/group-label.tsx
-var _react = require('react');
 var _misc = require('@ariakit/core/utils/misc');
+var _react = require('react');
 var TagName = "div";
-var useGroupLabel = _R2YVMKBRcjs.createHook.call(void 0, 
+var useGroupLabel = _AWEKOM65cjs.createHook.call(void 0, 
   function useGroupLabel2(props) {
     const setLabelId = _react.useContext.call(void 0, _ZJMEXN3Ncjs.GroupLabelContext);
-    const id = _QFX6UW2Fcjs.useId.call(void 0, props.id);
-    _QFX6UW2Fcjs.useSafeLayoutEffect.call(void 0, () => {
+    const id = _OUWHJLQHcjs.useId.call(void 0, props.id);
+    _OUWHJLQHcjs.useSafeLayoutEffect.call(void 0, () => {
       setLabelId == null ? void 0 : setLabelId(id);
       return () => setLabelId == null ? void 0 : setLabelId(void 0);
     }, [setLabelId, id]);
-    props = _AV6KTKLEcjs.__spreadValues.call(void 0, {
+    props = _3IVNQNIVcjs.__spreadValues.call(void 0, {
       id,
       "aria-hidden": true
     }, props);
     return _misc.removeUndefinedValues.call(void 0, props);
   }
 );
-var GroupLabel = _R2YVMKBRcjs.forwardRef.call(void 0, function GroupLabel2(props) {
+var GroupLabel = _AWEKOM65cjs.forwardRef.call(void 0, function GroupLabel2(props) {
   const htmlProps = useGroupLabel(props);
-  return _R2YVMKBRcjs.createElement.call(void 0, TagName, htmlProps);
+  return _AWEKOM65cjs.createElement.call(void 0, TagName, htmlProps);
 });
 
 

package/cjs/__chunks/{ZE2OFDPH.cjs → W3DXC3KC.cjs}

@@ -6,29 +6,29 @@ var _DYIDES27cjs = require('./DYIDES27.cjs');
 
 
 
-var _R2YVMKBRcjs = require('./R2YVMKBR.cjs');
+var _AWEKOM65cjs = require('./AWEKOM65.cjs');
 
 
-var _QFX6UW2Fcjs = require('./QFX6UW2F.cjs');
+var _OUWHJLQHcjs = require('./OUWHJLQH.cjs');
 
 
-var _AV6KTKLEcjs = require('./AV6KTKLE.cjs');
+var _3IVNQNIVcjs = require('./3IVNQNIV.cjs');
 
 // src/focusable/focusable-container.tsx
 var _jsxruntime = require('react/jsx-runtime');
 var TagName = "div";
-var useFocusableContainer = _R2YVMKBRcjs.createHook.call(void 0, function useFocusableContainer2(_a) {
-  var _b = _a, { autoFocusOnShow = true } = _b, props = _AV6KTKLEcjs.__objRest.call(void 0, _b, ["autoFocusOnShow"]);
-  props = _QFX6UW2Fcjs.useWrapElement.call(void 0, 
+var useFocusableContainer = _AWEKOM65cjs.createHook.call(void 0, function useFocusableContainer2(_a) {
+  var _b = _a, { autoFocusOnShow = true } = _b, props = _3IVNQNIVcjs.__objRest.call(void 0, _b, ["autoFocusOnShow"]);
+  props = _OUWHJLQHcjs.useWrapElement.call(void 0, 
     props,
     (element) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _DYIDES27cjs.FocusableContext.Provider, { value: autoFocusOnShow, children: element }),
     [autoFocusOnShow]
   );
   return props;
 });
-var FocusableContainer = _R2YVMKBRcjs.forwardRef.call(void 0, function FocusableContainer2(props) {
+var FocusableContainer = _AWEKOM65cjs.forwardRef.call(void 0, function FocusableContainer2(props) {
   const htmlProps = useFocusableContainer(props);
-  return _R2YVMKBRcjs.createElement.call(void 0, TagName, htmlProps);
+  return _AWEKOM65cjs.createElement.call(void 0, TagName, htmlProps);
 });
 
 

package/cjs/__chunks/{UO5OI2QG.cjs → WBUSMWPW.cjs}

@@ -1,34 +1,34 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _7NTQGNM3cjs = require('./7NTQGNM3.cjs');
+var _55IP6UF7cjs = require('./55IP6UF7.cjs');
 
 
-var _W24USSK5cjs = require('./W24USSK5.cjs');
+var _IHRK7HOTcjs = require('./IHRK7HOT.cjs');
 
 
-var _DZCUHWKIcjs = require('./DZCUHWKI.cjs');
+var _XV4AOZNFcjs = require('./XV4AOZNF.cjs');
 
 
-var _X7NPMBM4cjs = require('./X7NPMBM4.cjs');
+var _CINY3Q6Qcjs = require('./CINY3Q6Q.cjs');
 
 
 
 
 
-var _R2YVMKBRcjs = require('./R2YVMKBR.cjs');
+var _AWEKOM65cjs = require('./AWEKOM65.cjs');
 
 
-var _IATQHLZTcjs = require('./IATQHLZT.cjs');
+var _PULY27HQcjs = require('./PULY27HQ.cjs');
 
 
 
-var _QFX6UW2Fcjs = require('./QFX6UW2F.cjs');
+var _OUWHJLQHcjs = require('./OUWHJLQH.cjs');
 
 
 
 
-var _AV6KTKLEcjs = require('./AV6KTKLE.cjs');
+var _3IVNQNIVcjs = require('./3IVNQNIV.cjs');
 
 // src/menu/menu-item.tsx
 var _dom = require('@ariakit/core/utils/dom');
@@ -38,28 +38,22 @@ var _misc = require('@ariakit/core/utils/misc');
 var TagName = "div";
 function menuHasFocus(baseElement, items, currentTarget) {
   var _a;
-  if (!baseElement)
-    return false;
-  if (_focus.hasFocusWithin.call(void 0, baseElement))
-    return true;
+  if (!baseElement) return false;
+  if (_focus.hasFocusWithin.call(void 0, baseElement)) return true;
   const expandedItem = items == null ? void 0 : items.find((item) => {
     var _a2;
-    if (item.element === currentTarget)
-      return false;
+    if (item.element === currentTarget) return false;
     return ((_a2 = item.element) == null ? void 0 : _a2.getAttribute("aria-expanded")) === "true";
   });
   const expandedMenuId = (_a = expandedItem == null ? void 0 : expandedItem.element) == null ? void 0 : _a.getAttribute("aria-controls");
-  if (!expandedMenuId)
-    return false;
+  if (!expandedMenuId) return false;
   const doc = _dom.getDocument.call(void 0, baseElement);
   const expandedMenu = doc.getElementById(expandedMenuId);
-  if (!expandedMenu)
-    return false;
-  if (_focus.hasFocusWithin.call(void 0, expandedMenu))
-    return true;
+  if (!expandedMenu) return false;
+  if (_focus.hasFocusWithin.call(void 0, expandedMenu)) return true;
   return !!expandedMenu.querySelector("[role=menuitem][aria-expanded=true]");
 }
-var useMenuItem = _R2YVMKBRcjs.createHook.call(void 0, 
+var useMenuItem = _AWEKOM65cjs.createHook.call(void 0, 
   function useMenuItem2(_a) {
     var _b = _a, {
       store,
@@ -67,70 +61,60 @@ var useMenuItem = _R2YVMKBRcjs.createHook.call(void 0,
       preventScrollOnKeyDown = true,
       focusOnHover,
       blurOnHoverEnd
-    } = _b, props = _AV6KTKLEcjs.__objRest.call(void 0, _b, [
+    } = _b, props = _3IVNQNIVcjs.__objRest.call(void 0, _b, [
       "store",
       "hideOnClick",
       "preventScrollOnKeyDown",
       "focusOnHover",
       "blurOnHoverEnd"
     ]);
-    const menuContext = _7NTQGNM3cjs.useMenuScopedContext.call(void 0, true);
-    const menubarContext = _W24USSK5cjs.useMenubarScopedContext.call(void 0, );
+    const menuContext = _55IP6UF7cjs.useMenuScopedContext.call(void 0, true);
+    const menubarContext = _IHRK7HOTcjs.useMenubarScopedContext.call(void 0, );
     store = store || menuContext || menubarContext;
     _misc.invariant.call(void 0, 
       store,
       process.env.NODE_ENV !== "production" && "MenuItem must be wrapped in a MenuList, Menu or Menubar component"
     );
     const onClickProp = props.onClick;
-    const hideOnClickProp = _QFX6UW2Fcjs.useBooleanEvent.call(void 0, hideOnClick);
+    const hideOnClickProp = _OUWHJLQHcjs.useBooleanEvent.call(void 0, hideOnClick);
     const hideMenu = "hideAll" in store ? store.hideAll : void 0;
     const isWithinMenu = !!hideMenu;
-    const onClick = _QFX6UW2Fcjs.useEvent.call(void 0, (event) => {
+    const onClick = _OUWHJLQHcjs.useEvent.call(void 0, (event) => {
       onClickProp == null ? void 0 : onClickProp(event);
-      if (event.defaultPrevented)
-        return;
-      if (_events.isDownloading.call(void 0, event))
-        return;
-      if (_events.isOpeningInNewTab.call(void 0, event))
-        return;
-      if (!hideMenu)
-        return;
+      if (event.defaultPrevented) return;
+      if (_events.isDownloading.call(void 0, event)) return;
+      if (_events.isOpeningInNewTab.call(void 0, event)) return;
+      if (!hideMenu) return;
       const popupType = event.currentTarget.getAttribute("aria-haspopup");
-      if (popupType === "menu")
-        return;
-      if (!hideOnClickProp(event))
-        return;
+      if (popupType === "menu") return;
+      if (!hideOnClickProp(event)) return;
       hideMenu();
     });
-    const contentElement = _IATQHLZTcjs.useStoreState.call(void 0, 
+    const contentElement = _PULY27HQcjs.useStoreState.call(void 0, 
       store,
       (state) => "contentElement" in state ? state.contentElement : null
     );
     const role = _dom.getPopupItemRole.call(void 0, contentElement, "menuitem");
-    props = _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
+    props = _3IVNQNIVcjs.__spreadProps.call(void 0, _3IVNQNIVcjs.__spreadValues.call(void 0, {
       role
     }, props), {
       onClick
     });
-    props = _X7NPMBM4cjs.useCompositeItem.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
+    props = _CINY3Q6Qcjs.useCompositeItem.call(void 0, _3IVNQNIVcjs.__spreadValues.call(void 0, {
       store,
       preventScrollOnKeyDown
     }, props));
-    props = _DZCUHWKIcjs.useCompositeHover.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
+    props = _XV4AOZNFcjs.useCompositeHover.call(void 0, _3IVNQNIVcjs.__spreadProps.call(void 0, _3IVNQNIVcjs.__spreadValues.call(void 0, {
       store
     }, props), {
       focusOnHover(event) {
         const getFocusOnHover = () => {
-          if (typeof focusOnHover === "function")
-            return focusOnHover(event);
-          if (focusOnHover != null)
-            return focusOnHover;
+          if (typeof focusOnHover === "function") return focusOnHover(event);
+          if (focusOnHover != null) return focusOnHover;
           return true;
         };
-        if (!store)
-          return false;
-        if (!getFocusOnHover())
-          return false;
+        if (!store) return false;
+        if (!getFocusOnHover()) return false;
         const { baseElement, items } = store.getState();
         if (isWithinMenu) {
           if (event.currentTarget.hasAttribute("aria-expanded")) {
@@ -145,20 +129,18 @@ var useMenuItem = _R2YVMKBRcjs.createHook.call(void 0,
         return false;
       },
       blurOnHoverEnd(event) {
-        if (typeof blurOnHoverEnd === "function")
-          return blurOnHoverEnd(event);
-        if (blurOnHoverEnd != null)
-          return blurOnHoverEnd;
+        if (typeof blurOnHoverEnd === "function") return blurOnHoverEnd(event);
+        if (blurOnHoverEnd != null) return blurOnHoverEnd;
         return isWithinMenu;
       }
     }));
     return props;
   }
 );
-var MenuItem = _R2YVMKBRcjs.memo.call(void 0, 
-  _R2YVMKBRcjs.forwardRef.call(void 0, function MenuItem2(props) {
+var MenuItem = _AWEKOM65cjs.memo.call(void 0, 
+  _AWEKOM65cjs.forwardRef.call(void 0, function MenuItem2(props) {
     const htmlProps = useMenuItem(props);
-    return _R2YVMKBRcjs.createElement.call(void 0, TagName, htmlProps);
+    return _AWEKOM65cjs.createElement.call(void 0, TagName, htmlProps);
   })
 );