@ariakit/react-core 0.1.8 → 0.2.1

package/cjs/__chunks/{HVQRVCAS.cjs → NHKHREF4.cjs}

@@ -8,7 +8,7 @@ var _NVMBKFRBcjs = require('./NVMBKFRB.cjs');
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 var _NREUHWTUcjs = require('./NREUHWTU.cjs');
@@ -70,7 +70,7 @@ function getSameInitialItems(items, char, activeId) {
     activeId
   ).filter((item) => item.id !== activeId);
 }
-var useCompositeTypeahead = _7NAIPZYNcjs.createHook.call(void 0, 
+var useCompositeTypeahead = _5U7AP6Y2cjs.createHook.call(void 0, 
   (_a) => {
     var _b = _a, { store, typeahead = true } = _b, props = _6455U47Tcjs.__objRest.call(void 0, _b, ["store", "typeahead"]);
     const context = _react.useContext.call(void 0, _NVMBKFRBcjs.CompositeContext);
@@ -120,10 +120,10 @@ var useCompositeTypeahead = _7NAIPZYNcjs.createHook.call(void 0,
     return props;
   }
 );
-var CompositeTypeahead = _7NAIPZYNcjs.createComponent.call(void 0, 
+var CompositeTypeahead = _5U7AP6Y2cjs.createComponent.call(void 0, 
   (props) => {
     const htmlProps = useCompositeTypeahead(props);
-    return _7NAIPZYNcjs.createElement.call(void 0, "div", htmlProps);
+    return _5U7AP6Y2cjs.createElement.call(void 0, "div", htmlProps);
   }
 );
 if (process.env.NODE_ENV !== "production") {

package/cjs/__chunks/{NUMCUPYT.cjs → NOCSLP5T.cjs}

@@ -3,12 +3,12 @@
 var _FO6MB5HFcjs = require('./FO6MB5HF.cjs');
 
 
-var _DASOL6J2cjs = require('./DASOL6J2.cjs');
+var _Y7U2HALIcjs = require('./Y7U2HALI.cjs');
 
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 var _F7HVNVHQcjs = require('./F7HVNVHQ.cjs');
@@ -37,7 +37,7 @@ function setMixed(element, mixed) {
 function isNativeCheckbox(tagName, type) {
   return tagName === "input" && (!type || type === "checkbox");
 }
-var useCheckbox = _7NAIPZYNcjs.createHook.call(void 0, 
+var useCheckbox = _5U7AP6Y2cjs.createHook.call(void 0, 
   (_a) => {
     var _b = _a, {
       store,
@@ -131,16 +131,16 @@ var useCheckbox = _7NAIPZYNcjs.createHook.call(void 0,
       onChange,
       onClick
     });
-    props = _DASOL6J2cjs.useCommand.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { clickOnEnter: !nativeCheckbox }, props));
+    props = _Y7U2HALIcjs.useCommand.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { clickOnEnter: !nativeCheckbox }, props));
     return _6455U47Tcjs.__spreadValues.call(void 0, {
       value: nativeCheckbox ? valueProp : void 0,
       checked: isChecked
     }, props);
   }
 );
-var Checkbox = _7NAIPZYNcjs.createComponent.call(void 0, (props) => {
+var Checkbox = _5U7AP6Y2cjs.createComponent.call(void 0, (props) => {
   const htmlProps = useCheckbox(props);
-  return _7NAIPZYNcjs.createElement.call(void 0, "input", htmlProps);
+  return _5U7AP6Y2cjs.createElement.call(void 0, "input", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   Checkbox.displayName = "Checkbox";

package/cjs/__chunks/{ASQZCUUA.cjs → O4HKL5U2.cjs}

@@ -1,17 +1,17 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _HVQRVCAScjs = require('./HVQRVCAS.cjs');
+var _NHKHREF4cjs = require('./NHKHREF4.cjs');
 
 
 var _RCGSDYWJcjs = require('./RCGSDYWJ.cjs');
 
 
-var _5I6IQHKQcjs = require('./5I6IQHKQ.cjs');
+var _7OTXWQQXcjs = require('./7OTXWQQX.cjs');
 
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 
@@ -29,7 +29,7 @@ var _6455U47Tcjs = require('./6455U47T.cjs');
 var _react = require('react');
 var _events = require('@ariakit/core/utils/events');
 var _jsxruntime = require('react/jsx-runtime');
-var useSelectList = _7NAIPZYNcjs.createHook.call(void 0, 
+var useSelectList = _5U7AP6Y2cjs.createHook.call(void 0, 
   (_a) => {
     var _b = _a, {
       store,
@@ -101,19 +101,19 @@ var useSelectList = _7NAIPZYNcjs.createHook.call(void 0,
     const canFocusOnMove = store.useState(
       (state) => state.open && !state.animating && focusOnMove
     );
-    props = _5I6IQHKQcjs.useComposite.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, {
+    props = _7OTXWQQXcjs.useComposite.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, {
       store
     }, props), {
       composite,
       focusOnMove: canFocusOnMove
     }));
-    props = _HVQRVCAScjs.useCompositeTypeahead.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { store }, props));
+    props = _NHKHREF4cjs.useCompositeTypeahead.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { store }, props));
     return props;
   }
 );
-var SelectList = _7NAIPZYNcjs.createComponent.call(void 0, (props) => {
+var SelectList = _5U7AP6Y2cjs.createComponent.call(void 0, (props) => {
   const htmlProps = useSelectList(props);
-  return _7NAIPZYNcjs.createElement.call(void 0, "div", htmlProps);
+  return _5U7AP6Y2cjs.createElement.call(void 0, "div", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   SelectList.displayName = "SelectList";

package/cjs/__chunks/{3BSEASER.cjs → Q4GKCYFF.cjs}

@@ -6,7 +6,7 @@ var _NVMBKFRBcjs = require('./NVMBKFRB.cjs');
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 
@@ -20,7 +20,7 @@ var _6455U47Tcjs = require('./6455U47T.cjs');
 var _react = require('react');
 var _misc = require('@ariakit/core/utils/misc');
 var _jsxruntime = require('react/jsx-runtime');
-var useCompositeRow = _7NAIPZYNcjs.createHook.call(void 0, 
+var useCompositeRow = _5U7AP6Y2cjs.createHook.call(void 0, 
   (_a) => {
     var _b = _a, { store } = _b, props = _6455U47Tcjs.__objRest.call(void 0, _b, ["store"]);
     const context = _react.useContext.call(void 0, _NVMBKFRBcjs.CompositeContext);
@@ -46,9 +46,9 @@ var useCompositeRow = _7NAIPZYNcjs.createHook.call(void 0,
     return props;
   }
 );
-var CompositeRow = _7NAIPZYNcjs.createComponent.call(void 0, (props) => {
+var CompositeRow = _5U7AP6Y2cjs.createComponent.call(void 0, (props) => {
   const htmlProps = useCompositeRow(props);
-  return _7NAIPZYNcjs.createElement.call(void 0, "div", htmlProps);
+  return _5U7AP6Y2cjs.createElement.call(void 0, "div", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   CompositeRow.displayName = "CompositeRow";

package/cjs/__chunks/{IUMXLBMB.cjs → RJLMJD4U.cjs}

@@ -3,12 +3,12 @@
 var _OTRABJ4Ycjs = require('./OTRABJ4Y.cjs');
 
 
-var _3FTPSHLHcjs = require('./3FTPSHLH.cjs');
+var _VBOBU7EMcjs = require('./VBOBU7EM.cjs');
 
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 
@@ -42,7 +42,7 @@ function useItem(store, name, type) {
     (state) => state.items.find((item) => item.type === type && item.name === name)
   );
 }
-var useFormField = _7NAIPZYNcjs.createHook.call(void 0, 
+var useFormField = _5U7AP6Y2cjs.createHook.call(void 0, 
   (_a) => {
     var _b = _a, {
       store,
@@ -113,13 +113,13 @@ var useFormField = _7NAIPZYNcjs.createHook.call(void 0,
       ref: _NREUHWTUcjs.useForkRef.call(void 0, ref, props.ref),
       onBlur
     });
-    props = _3FTPSHLHcjs.useCollectionItem.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { store }, props), { name, getItem }));
+    props = _VBOBU7EMcjs.useCollectionItem.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { store }, props), { name, getItem }));
     return props;
   }
 );
-var FormField = _7NAIPZYNcjs.createMemoComponent.call(void 0, (props) => {
+var FormField = _5U7AP6Y2cjs.createMemoComponent.call(void 0, (props) => {
   const htmlProps = useFormField(props);
-  return _7NAIPZYNcjs.createElement.call(void 0, "input", htmlProps);
+  return _5U7AP6Y2cjs.createElement.call(void 0, "input", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   FormField.displayName = "FormField";

package/cjs/__chunks/{J3YGFEJT.cjs → RUGBTZ2E.cjs}

@@ -1,22 +1,22 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _DG7HSSDPcjs = require('./DG7HSSDP.cjs');
+var _XMSON7SBcjs = require('./XMSON7SB.cjs');
 
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 // src/hovercard/hovercard-description.ts
-var useHovercardDescription = _7NAIPZYNcjs.createHook.call(void 0, 
+var useHovercardDescription = _5U7AP6Y2cjs.createHook.call(void 0, 
   (props) => {
-    props = _DG7HSSDPcjs.usePopoverDescription.call(void 0, props);
+    props = _XMSON7SBcjs.usePopoverDescription.call(void 0, props);
     return props;
   }
 );
-var HovercardDescription = _7NAIPZYNcjs.createComponent.call(void 0, (props) => {
+var HovercardDescription = _5U7AP6Y2cjs.createComponent.call(void 0, (props) => {
   const htmlProps = useHovercardDescription(props);
-  return _7NAIPZYNcjs.createElement.call(void 0, "p", htmlProps);
+  return _5U7AP6Y2cjs.createElement.call(void 0, "p", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   HovercardDescription.displayName = "HovercardDescription";

package/cjs/__chunks/{IRSBF3C5.cjs → TUFFT567.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _OMM6PC3Acjs = require('./OMM6PC3A.cjs');
+var _XUWGEELZcjs = require('./XUWGEELZ.cjs');
 
 
 var _O45IXGJWcjs = require('./O45IXGJW.cjs');
@@ -24,29 +24,29 @@ var _W32FX7DMcjs = require('./W32FX7DM.cjs');
 var _CARNFZQTcjs = require('./CARNFZQT.cjs');
 
 
-var _GHWBKA6Hcjs = require('./GHWBKA6H.cjs');
+var _4OQMTZXWcjs = require('./4OQMTZXW.cjs');
 
 
 var _SOPRUU56cjs = require('./SOPRUU56.cjs');
 
 
+var _UVIQSLIVcjs = require('./UVIQSLIV.cjs');
 
 
-var _N2VCZZLPcjs = require('./N2VCZZLP.cjs');
 
 
-var _NVBNDB5Bcjs = require('./NVBNDB5B.cjs');
+var _N2VCZZLPcjs = require('./N2VCZZLP.cjs');
 
 
-var _PFD4TS6Bcjs = require('./PFD4TS6B.cjs');
+var _BICG74YFcjs = require('./BICG74YF.cjs');
 
 
-var _EM2PMFEWcjs = require('./EM2PMFEW.cjs');
+var _FXWXPSLIcjs = require('./FXWXPSLI.cjs');
 
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 
@@ -106,7 +106,7 @@ function getElementFromProp(prop, focusable = false) {
     return _focus.isFocusable.call(void 0, element) ? element : null;
   return element;
 }
-var useDialog = _7NAIPZYNcjs.createHook.call(void 0, 
+var useDialog = _5U7AP6Y2cjs.createHook.call(void 0, 
   (_a) => {
     var _b = _a, {
       store,
@@ -152,7 +152,11 @@ var useDialog = _7NAIPZYNcjs.createHook.call(void 0,
     const open = store.useState("open");
     const mounted = store.useState("mounted");
     const contentElement = store.useState("contentElement");
-    _QRAQT522cjs.usePreventBodyScroll.call(void 0, store, mounted && preventBodyScroll);
+    const hiddenProp = props.hidden;
+    _QRAQT522cjs.usePreventBodyScroll.call(void 0, 
+      store,
+      (mounted || hiddenProp === false) && preventBodyScroll
+    );
     _E5VOJWDRcjs.useHideOnInteractOutside.call(void 0, store, hideOnInteractOutside);
     const { wrapElement, nestedDialogs } = _NZYGNCZLcjs.useNestedDialogs.call(void 0, store);
     props = _NREUHWTUcjs.useWrapElement.call(void 0, props, wrapElement, [wrapElement]);
@@ -392,21 +396,22 @@ var useDialog = _7NAIPZYNcjs.createHook.call(void 0,
       (element) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _SOPRUU56cjs.HeadingLevel, { level: modal ? 1 : void 0, children: element }),
       [modal]
     );
-    const hiddenProp = props.hidden;
     props = _NREUHWTUcjs.useWrapElement.call(void 0, 
       props,
       (element) => {
         if (backdrop) {
-          return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-            _OMM6PC3Acjs.DialogBackdrop,
-            {
-              store,
-              backdrop,
-              backdropProps,
-              hidden: hiddenProp,
-              children: element
-            }
-          );
+          return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
+            backdrop && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+              _XUWGEELZcjs.DialogBackdrop,
+              {
+                store,
+                backdrop,
+                backdropProps,
+                hidden: hiddenProp
+              }
+            ),
+            element
+          ] });
         }
         return element;
       },
@@ -429,18 +434,18 @@ var useDialog = _7NAIPZYNcjs.createHook.call(void 0,
     }, props), {
       ref: _NREUHWTUcjs.useForkRef.call(void 0, ref, props.ref)
     });
-    props = _GHWBKA6Hcjs.useFocusableContainer.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, {}, props), {
+    props = _4OQMTZXWcjs.useFocusableContainer.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, {}, props), {
       autoFocusOnShow: autoFocusEnabled
     }));
-    props = _EM2PMFEWcjs.useDisclosureContent.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { store }, props));
-    props = _NVBNDB5Bcjs.useFocusable.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, {}, props), { focusable }));
-    props = _PFD4TS6Bcjs.usePortal.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { portal }, props), { portalRef, preserveTabOrder }));
+    props = _BICG74YFcjs.useDisclosureContent.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { store }, props));
+    props = _FXWXPSLIcjs.useFocusable.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, {}, props), { focusable }));
+    props = _UVIQSLIVcjs.usePortal.call(void 0, _6455U47Tcjs.__spreadProps.call(void 0, _6455U47Tcjs.__spreadValues.call(void 0, { portal }, props), { portalRef, preserveTabOrder }));
     return props;
   }
 );
-var Dialog = _7NAIPZYNcjs.createComponent.call(void 0, (props) => {
+var Dialog = _5U7AP6Y2cjs.createComponent.call(void 0, (props) => {
   const htmlProps = useDialog(props);
-  return _7NAIPZYNcjs.createElement.call(void 0, "div", htmlProps);
+  return _5U7AP6Y2cjs.createElement.call(void 0, "div", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   Dialog.displayName = "Dialog";

package/cjs/__chunks/{64OSK6KA.cjs → UGGV7MMI.cjs}

@@ -1,27 +1,27 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _2G35RG62cjs = require('./2G35RG62.cjs');
+var _C4JVXWWXcjs = require('./C4JVXWWX.cjs');
 
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 var _6455U47Tcjs = require('./6455U47T.cjs');
 
 // src/composite/composite-group.ts
-var useCompositeGroup = _7NAIPZYNcjs.createHook.call(void 0, 
+var useCompositeGroup = _5U7AP6Y2cjs.createHook.call(void 0, 
   (_a) => {
     var _b = _a, { store } = _b, props = _6455U47Tcjs.__objRest.call(void 0, _b, ["store"]);
-    props = _2G35RG62cjs.useGroup.call(void 0, props);
+    props = _C4JVXWWXcjs.useGroup.call(void 0, props);
     return props;
   }
 );
-var CompositeGroup = _7NAIPZYNcjs.createComponent.call(void 0, 
+var CompositeGroup = _5U7AP6Y2cjs.createComponent.call(void 0, 
   (props) => {
     const htmlProps = useCompositeGroup(props);
-    return _7NAIPZYNcjs.createElement.call(void 0, "div", htmlProps);
+    return _5U7AP6Y2cjs.createElement.call(void 0, "div", htmlProps);
   }
 );
 if (process.env.NODE_ENV !== "production") {

package/cjs/__chunks/{4OKO2MSE.cjs → UJFOQV7S.cjs}

@@ -1,23 +1,23 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _WA6EKMULcjs = require('./WA6EKMUL.cjs');
+var _Y6SMXA3Ocjs = require('./Y6SMXA3O.cjs');
 
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 // src/hovercard/hovercard-dismiss.ts
-var useHovercardDismiss = _7NAIPZYNcjs.createHook.call(void 0, 
+var useHovercardDismiss = _5U7AP6Y2cjs.createHook.call(void 0, 
   (props) => {
-    props = _WA6EKMULcjs.usePopoverDismiss.call(void 0, props);
+    props = _Y6SMXA3Ocjs.usePopoverDismiss.call(void 0, props);
     return props;
   }
 );
-var HovercardDismiss = _7NAIPZYNcjs.createComponent.call(void 0, 
+var HovercardDismiss = _5U7AP6Y2cjs.createComponent.call(void 0, 
   (props) => {
     const htmlProps = useHovercardDismiss(props);
-    return _7NAIPZYNcjs.createElement.call(void 0, "button", htmlProps);
+    return _5U7AP6Y2cjs.createElement.call(void 0, "button", htmlProps);
   }
 );
 if (process.env.NODE_ENV !== "production") {

package/cjs/__chunks/{PFD4TS6B.cjs → UVIQSLIV.cjs}

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _C7Y26CUVcjs = require('./C7Y26CUV.cjs');
+var _E33OSNZRcjs = require('./E33OSNZR.cjs');
 
 
 var _NS56XHXGcjs = require('./NS56XHXG.cjs');
@@ -8,7 +8,7 @@ var _NS56XHXGcjs = require('./NS56XHXG.cjs');
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 
@@ -55,17 +55,17 @@ function queueFocus(element) {
     element == null ? void 0 : element.focus();
   });
 }
-var usePortal = _7NAIPZYNcjs.createHook.call(void 0, 
+var usePortal = _5U7AP6Y2cjs.createHook.call(void 0, 
   (_a) => {
     var _b = _a, { preserveTabOrder, portalElement, portalRef, portal = true } = _b, props = _6455U47Tcjs.__objRest.call(void 0, _b, ["preserveTabOrder", "portalElement", "portalRef", "portal"]);
     const ref = _react.useRef.call(void 0, null);
     const refProp = _NREUHWTUcjs.useForkRef.call(void 0, ref, props.ref);
     const context = _react.useContext.call(void 0, _NS56XHXGcjs.PortalContext);
     const [portalNode, setPortalNode] = _react.useState.call(void 0, null);
-    const beforeOutsideRef = _react.useRef.call(void 0, null);
-    const beforeInsideRef = _react.useRef.call(void 0, null);
-    const afterInsideRef = _react.useRef.call(void 0, null);
-    const afterOutsideRef = _react.useRef.call(void 0, null);
+    const outerBeforeRef = _react.useRef.call(void 0, null);
+    const innerBeforeRef = _react.useRef.call(void 0, null);
+    const innerAfterRef = _react.useRef.call(void 0, null);
+    const outerAfterRef = _react.useRef.call(void 0, null);
     _NREUHWTUcjs.useSafeLayoutEffect.call(void 0, () => {
       const element = ref.current;
       if (!element || !portal) {
@@ -83,7 +83,7 @@ var usePortal = _7NAIPZYNcjs.createHook.call(void 0,
         rootElement.appendChild(portalEl);
       }
       if (!portalEl.id) {
-        portalEl.id = element.id ? `${element.id}-portal` : getRandomId();
+        portalEl.id = element.id ? `portal/${element.id}` : getRandomId();
       }
       setPortalNode(portalEl);
       _2X5K3J7Ycjs.setRef.call(void 0, portalRef, portalEl);
@@ -140,28 +140,30 @@ var usePortal = _7NAIPZYNcjs.createHook.call(void 0,
         }
         element = /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
           preserveTabOrder && portalNode && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-            _C7Y26CUVcjs.FocusTrap,
+            _E33OSNZRcjs.FocusTrap,
             {
-              ref: beforeInsideRef,
+              ref: innerBeforeRef,
+              className: "__focus-trap-inner-before",
               onFocus: (event) => {
                 if (_events.isFocusEventOutside.call(void 0, event, portalNode)) {
                   queueFocus(_focus.getNextTabbable.call(void 0, ));
                 } else {
-                  queueFocus(beforeOutsideRef.current);
+                  queueFocus(outerBeforeRef.current);
                 }
               }
             }
           ),
           element,
           preserveTabOrder && portalNode && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-            _C7Y26CUVcjs.FocusTrap,
+            _E33OSNZRcjs.FocusTrap,
             {
-              ref: afterInsideRef,
+              ref: innerAfterRef,
+              className: "__focus-trap-inner-after",
               onFocus: (event) => {
                 if (_events.isFocusEventOutside.call(void 0, event, portalNode)) {
                   queueFocus(_focus.getPreviousTabbable.call(void 0, ));
                 } else {
-                  queueFocus(afterOutsideRef.current);
+                  queueFocus(outerAfterRef.current);
                 }
               }
             }
@@ -172,12 +174,14 @@ var usePortal = _7NAIPZYNcjs.createHook.call(void 0,
         }
         element = /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
           preserveTabOrder && portalNode && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-            _C7Y26CUVcjs.FocusTrap,
+            _E33OSNZRcjs.FocusTrap,
             {
-              ref: beforeOutsideRef,
+              ref: outerBeforeRef,
+              className: "__focus-trap-outer-before",
               onFocus: (event) => {
-                if (_events.isFocusEventOutside.call(void 0, event, portalNode)) {
-                  queueFocus(beforeInsideRef.current);
+                const fromOuter = event.relatedTarget === outerAfterRef.current;
+                if (!fromOuter && _events.isFocusEventOutside.call(void 0, event, portalNode)) {
+                  queueFocus(innerBeforeRef.current);
                 } else {
                   queueFocus(_focus.getPreviousTabbable.call(void 0, ));
                 }
@@ -189,14 +193,23 @@ var usePortal = _7NAIPZYNcjs.createHook.call(void 0,
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { "aria-owns": portalNode == null ? void 0 : portalNode.id, style: { position: "fixed" } }),
           element,
           preserveTabOrder && portalNode && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-            _C7Y26CUVcjs.FocusTrap,
+            _E33OSNZRcjs.FocusTrap,
             {
-              ref: afterOutsideRef,
+              ref: outerAfterRef,
+              className: "__focus-trap-outer-after",
               onFocus: (event) => {
                 if (_events.isFocusEventOutside.call(void 0, event, portalNode)) {
-                  queueFocus(afterInsideRef.current);
+                  queueFocus(innerAfterRef.current);
                 } else {
-                  queueFocus(_focus.getNextTabbable.call(void 0, ));
+                  const nextTabbable = _focus.getNextTabbable.call(void 0, );
+                  if (nextTabbable === innerBeforeRef.current) {
+                    requestAnimationFrame(() => {
+                      var _a2;
+                      return (_a2 = _focus.getNextTabbable.call(void 0, )) == null ? void 0 : _a2.focus();
+                    });
+                    return;
+                  }
+                  queueFocus(nextTabbable);
                 }
               }
             }
@@ -212,9 +225,9 @@ var usePortal = _7NAIPZYNcjs.createHook.call(void 0,
     return props;
   }
 );
-var Portal = _7NAIPZYNcjs.createComponent.call(void 0, (props) => {
+var Portal = _5U7AP6Y2cjs.createComponent.call(void 0, (props) => {
   const htmlProps = usePortal(props);
-  return _7NAIPZYNcjs.createElement.call(void 0, "div", htmlProps);
+  return _5U7AP6Y2cjs.createElement.call(void 0, "div", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   Portal.displayName = "Portal";

package/cjs/__chunks/{2DVMVYK2.cjs → UXA5NJZK.cjs}

@@ -1,11 +1,11 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _DASOL6J2cjs = require('./DASOL6J2.cjs');
+var _Y7U2HALIcjs = require('./Y7U2HALI.cjs');
 
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 
@@ -18,7 +18,7 @@ var _6455U47Tcjs = require('./6455U47T.cjs');
 // src/button/button.ts
 var _react = require('react');
 var _dom = require('@ariakit/core/utils/dom');
-var useButton = _7NAIPZYNcjs.createHook.call(void 0, (props) => {
+var useButton = _5U7AP6Y2cjs.createHook.call(void 0, (props) => {
   const ref = _react.useRef.call(void 0, null);
   const tagName = _NREUHWTUcjs.useTagName.call(void 0, ref, props.as || "button");
   const [isNativeButton, setIsNativeButton] = _react.useState.call(void 0, 
@@ -34,12 +34,12 @@ var useButton = _7NAIPZYNcjs.createHook.call(void 0, (props) => {
   }, props), {
     ref: _NREUHWTUcjs.useForkRef.call(void 0, ref, props.ref)
   });
-  props = _DASOL6J2cjs.useCommand.call(void 0, props);
+  props = _Y7U2HALIcjs.useCommand.call(void 0, props);
   return props;
 });
-var Button = _7NAIPZYNcjs.createComponent.call(void 0, (props) => {
+var Button = _5U7AP6Y2cjs.createComponent.call(void 0, (props) => {
   const htmlProps = useButton(props);
-  return _7NAIPZYNcjs.createElement.call(void 0, "button", htmlProps);
+  return _5U7AP6Y2cjs.createElement.call(void 0, "button", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   Button.displayName = "Button";

package/cjs/__chunks/{3FTPSHLH.cjs → VBOBU7EM.cjs}

@@ -5,7 +5,7 @@ var _ZQAFJQIScjs = require('./ZQAFJQIS.cjs');
 
 
 
-var _7NAIPZYNcjs = require('./7NAIPZYN.cjs');
+var _5U7AP6Y2cjs = require('./5U7AP6Y2.cjs');
 
 
 
@@ -19,7 +19,7 @@ var _6455U47Tcjs = require('./6455U47T.cjs');
 // src/collection/collection-item.ts
 var _react = require('react');
 var _misc = require('@ariakit/core/utils/misc');
-var useCollectionItem = _7NAIPZYNcjs.createHook.call(void 0, 
+var useCollectionItem = _5U7AP6Y2cjs.createHook.call(void 0, 
   (_a) => {
     var _b = _a, { store, shouldRegisterItem = true, getItem = _misc.identity } = _b, props = _6455U47Tcjs.__objRest.call(void 0, _b, ["store", "shouldRegisterItem", "getItem"]);
     const context = _react.useContext.call(void 0, _ZQAFJQIScjs.CollectionContext);
@@ -43,10 +43,10 @@ var useCollectionItem = _7NAIPZYNcjs.createHook.call(void 0,
     return props;
   }
 );
-var CollectionItem = _7NAIPZYNcjs.createComponent.call(void 0, 
+var CollectionItem = _5U7AP6Y2cjs.createComponent.call(void 0, 
   (props) => {
     const htmlProps = useCollectionItem(props);
-    return _7NAIPZYNcjs.createElement.call(void 0, "div", htmlProps);
+    return _5U7AP6Y2cjs.createElement.call(void 0, "div", htmlProps);
   }
 );
 if (process.env.NODE_ENV !== "production") {