@ariakit/react-core 0.4.23 → 0.4.25

package/cjs/__chunks/{5GHA7P5F.cjs → 6CXWEW5O.cjs}

@@ -1,23 +1,23 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _62RIM242cjs = require('./62RIM242.cjs');
+var _LH55DG7Mcjs = require('./LH55DG7M.cjs');
 
 
 
 
-var _743QABRAcjs = require('./743QABRA.cjs');
+var _PTOCUU2Dcjs = require('./PTOCUU2D.cjs');
 
 // src/composite/composite-group.tsx
 var TagName = "div";
-var useCompositeGroup = _743QABRAcjs.createHook.call(void 0, 
+var useCompositeGroup = _PTOCUU2Dcjs.createHook.call(void 0, 
   function useCompositeGroup2({ store, ...props }) {
-    props = _62RIM242cjs.useGroup.call(void 0, props);
+    props = _LH55DG7Mcjs.useGroup.call(void 0, props);
     return props;
   }
 );
-var CompositeGroup = _743QABRAcjs.forwardRef.call(void 0, function CompositeGroup2(props) {
+var CompositeGroup = _PTOCUU2Dcjs.forwardRef.call(void 0, function CompositeGroup2(props) {
   const htmlProps = useCompositeGroup(props);
-  return _743QABRAcjs.createElement.call(void 0, TagName, htmlProps);
+  return _PTOCUU2Dcjs.createElement.call(void 0, TagName, htmlProps);
 });
 
 

package/cjs/__chunks/{YTQONGS5.cjs → 6E4BBKC4.cjs}

@@ -4,27 +4,30 @@
 
 
 
-var _MIBORXQWcjs = require('./MIBORXQW.cjs');
+var _2XVCJUVBcjs = require('./2XVCJUVB.cjs');
 
 
 
-var _WI7QXQL7cjs = require('./WI7QXQL7.cjs');
+var _UCZW3OGHcjs = require('./UCZW3OGH.cjs');
 
 
-var _4JH5Q6AQcjs = require('./4JH5Q6AQ.cjs');
+var _MWXEIKZXcjs = require('./MWXEIKZX.cjs');
 
 
+var _FH6HQ5JNcjs = require('./FH6HQ5JN.cjs');
 
 
-var _743QABRAcjs = require('./743QABRA.cjs');
 
 
+var _PTOCUU2Dcjs = require('./PTOCUU2D.cjs');
 
 
 
 
 
-var _KGFTRA3Ccjs = require('./KGFTRA3C.cjs');
+
+
+var _3BSDKDKDcjs = require('./3BSDKDKD.cjs');
 
 // src/composite/composite.tsx
 var _array = require('@ariakit/core/utils/array');
@@ -51,7 +54,7 @@ function isModifierKey(event) {
   return event.key === "Shift" || event.key === "Control" || event.key === "Alt" || event.key === "Meta";
 }
 function useKeyboardEventProxy(store, onKeyboardEvent, previousElementRef) {
-  return _KGFTRA3Ccjs.useEvent.call(void 0, (event) => {
+  return _3BSDKDKDcjs.useEvent.call(void 0, (event) => {
     var _a;
     onKeyboardEvent == null ? void 0 : onKeyboardEvent(event);
     if (event.defaultPrevented) return;
@@ -60,7 +63,7 @@ function useKeyboardEventProxy(store, onKeyboardEvent, previousElementRef) {
     if (isModifierKey(event)) return;
     if (isPrintableKey(event)) return;
     const state = store.getState();
-    const activeElement = (_a = _MIBORXQWcjs.getEnabledItem.call(void 0, store, state.activeId)) == null ? void 0 : _a.element;
+    const activeElement = (_a = _2XVCJUVBcjs.getEnabledItem.call(void 0, store, state.activeId)) == null ? void 0 : _a.element;
     if (!activeElement) return;
     const { view, ...eventInit } = event;
     const previousElement = previousElementRef == null ? void 0 : previousElementRef.current;
@@ -76,26 +79,41 @@ function useKeyboardEventProxy(store, onKeyboardEvent, previousElementRef) {
   });
 }
 function findFirstEnabledItemInTheLastRow(items) {
-  return _MIBORXQWcjs.findFirstEnabledItem.call(void 0, 
-    _array.flatten2DArray.call(void 0, _array.reverseArray.call(void 0, _MIBORXQWcjs.groupItemsByRows.call(void 0, items)))
+  return _2XVCJUVBcjs.findFirstEnabledItem.call(void 0, 
+    _array.flatten2DArray.call(void 0, _array.reverseArray.call(void 0, _2XVCJUVBcjs.groupItemsByRows.call(void 0, items)))
   );
 }
+function withBaseScrollPreserved(store, callback) {
+  const { virtualFocus, baseElement } = store.getState();
+  if (!virtualFocus || !baseElement || !_dom.isTextField.call(void 0, baseElement)) {
+    callback();
+    return;
+  }
+  const savedScrollLeft = baseElement.scrollLeft;
+  const savedScrollTop = baseElement.scrollTop;
+  callback();
+  baseElement.scrollLeft = savedScrollLeft;
+  baseElement.scrollTop = savedScrollTop;
+}
 function useScheduleFocus(store) {
   const [scheduled, setScheduled] = _react.useState.call(void 0, false);
   const schedule = _react.useCallback.call(void 0, () => setScheduled(true), []);
-  const activeItem = store.useState(
-    (state) => _MIBORXQWcjs.getEnabledItem.call(void 0, store, state.activeId)
+  const activeItem = _FH6HQ5JNcjs.useStoreState.call(void 0, 
+    store,
+    (state) => _2XVCJUVBcjs.getEnabledItem.call(void 0, store, state.activeId)
   );
   _react.useEffect.call(void 0, () => {
     const activeElement = activeItem == null ? void 0 : activeItem.element;
     if (!scheduled) return;
     if (!activeElement) return;
     setScheduled(false);
-    activeElement.focus({ preventScroll: true });
-  }, [activeItem, scheduled]);
+    withBaseScrollPreserved(store, () => {
+      activeElement.focus({ preventScroll: true });
+    });
+  }, [store, activeItem, scheduled]);
   return schedule;
 }
-var useComposite = _743QABRAcjs.createHook.call(void 0, 
+var useComposite = _PTOCUU2Dcjs.createHook.call(void 0, 
   function useComposite2({
     store,
     composite = true,
@@ -103,7 +121,7 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
     moveOnKeyPress = true,
     ...props
   }) {
-    const context = _WI7QXQL7cjs.useCompositeProviderContext.call(void 0, );
+    const context = _UCZW3OGHcjs.useCompositeProviderContext.call(void 0, );
     store = store || context;
     _misc.invariant.call(void 0, 
       store,
@@ -112,8 +130,8 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
     const ref = _react.useRef.call(void 0, null);
     const previousElementRef = _react.useRef.call(void 0, null);
     const scheduleFocus = useScheduleFocus(store);
-    const moves = store.useState("moves");
-    const [, setBaseElement] = _KGFTRA3Ccjs.useTransactionState.call(void 0, 
+    const moves = _FH6HQ5JNcjs.useStoreState.call(void 0, store, "moves");
+    const [, setBaseElement] = _3BSDKDKDcjs.useTransactionState.call(void 0, 
       composite ? store.setBaseElement : null
     );
     _react.useEffect.call(void 0, () => {
@@ -123,11 +141,11 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
       if (!composite) return;
       if (!focusOnMove) return;
       const { activeId: activeId2 } = store.getState();
-      const itemElement = (_a = _MIBORXQWcjs.getEnabledItem.call(void 0, store, activeId2)) == null ? void 0 : _a.element;
+      const itemElement = (_a = _2XVCJUVBcjs.getEnabledItem.call(void 0, store, activeId2)) == null ? void 0 : _a.element;
       if (!itemElement) return;
-      _focus.focusIntoView.call(void 0, itemElement);
+      withBaseScrollPreserved(store, () => _focus.focusIntoView.call(void 0, itemElement));
     }, [store, moves, composite, focusOnMove]);
-    _KGFTRA3Ccjs.useSafeLayoutEffect.call(void 0, () => {
+    _3BSDKDKDcjs.useSafeLayoutEffect.call(void 0, () => {
       if (!store) return;
       if (!moves) return;
       if (!composite) return;
@@ -144,9 +162,9 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
         baseElement.focus();
       }
     }, [store, moves, composite]);
-    const activeId = store.useState("activeId");
-    const virtualFocus = store.useState("virtualFocus");
-    _KGFTRA3Ccjs.useSafeLayoutEffect.call(void 0, () => {
+    const activeId = _FH6HQ5JNcjs.useStoreState.call(void 0, store, "activeId");
+    const virtualFocus = _FH6HQ5JNcjs.useStoreState.call(void 0, store, "virtualFocus");
+    _3BSDKDKDcjs.useSafeLayoutEffect.call(void 0, () => {
       var _a;
       if (!store) return;
       if (!composite) return;
@@ -154,7 +172,7 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
       const previousElement = previousElementRef.current;
       previousElementRef.current = null;
       if (!previousElement) return;
-      const activeElement = (_a = _MIBORXQWcjs.getEnabledItem.call(void 0, store, activeId)) == null ? void 0 : _a.element;
+      const activeElement = (_a = _2XVCJUVBcjs.getEnabledItem.call(void 0, store, activeId)) == null ? void 0 : _a.element;
       const relatedTarget = activeElement || _dom.getActiveElement.call(void 0, previousElement);
       if (relatedTarget === previousElement) return;
       _events.fireBlurEvent.call(void 0, previousElement, { relatedTarget });
@@ -170,21 +188,21 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
       previousElementRef
     );
     const onFocusCaptureProp = props.onFocusCapture;
-    const onFocusCapture = _KGFTRA3Ccjs.useEvent.call(void 0, (event) => {
+    const onFocusCapture = _3BSDKDKDcjs.useEvent.call(void 0, (event) => {
       onFocusCaptureProp == null ? void 0 : onFocusCaptureProp(event);
       if (event.defaultPrevented) return;
       if (!store) return;
       const { virtualFocus: virtualFocus2 } = store.getState();
       if (!virtualFocus2) return;
       const previousActiveElement = event.relatedTarget;
-      const isSilentlyFocused = _MIBORXQWcjs.silentlyFocused.call(void 0, event.currentTarget);
+      const isSilentlyFocused = _2XVCJUVBcjs.silentlyFocused.call(void 0, event.currentTarget);
       if (_events.isSelfTarget.call(void 0, event) && isSilentlyFocused) {
         event.stopPropagation();
         previousElementRef.current = previousActiveElement;
       }
     });
     const onFocusProp = props.onFocus;
-    const onFocus = _KGFTRA3Ccjs.useEvent.call(void 0, (event) => {
+    const onFocus = _3BSDKDKDcjs.useEvent.call(void 0, (event) => {
       onFocusProp == null ? void 0 : onFocusProp(event);
       if (event.defaultPrevented) return;
       if (!composite) return;
@@ -192,7 +210,7 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
       const { relatedTarget } = event;
       const { virtualFocus: virtualFocus2 } = store.getState();
       if (virtualFocus2) {
-        if (_events.isSelfTarget.call(void 0, event) && !_MIBORXQWcjs.isItem.call(void 0, store, relatedTarget)) {
+        if (_events.isSelfTarget.call(void 0, event) && !_2XVCJUVBcjs.isItem.call(void 0, store, relatedTarget)) {
           queueMicrotask(scheduleFocus);
         }
       } else if (_events.isSelfTarget.call(void 0, event)) {
@@ -200,16 +218,16 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
       }
     });
     const onBlurCaptureProp = props.onBlurCapture;
-    const onBlurCapture = _KGFTRA3Ccjs.useEvent.call(void 0, (event) => {
+    const onBlurCapture = _3BSDKDKDcjs.useEvent.call(void 0, (event) => {
       var _a;
       onBlurCaptureProp == null ? void 0 : onBlurCaptureProp(event);
       if (event.defaultPrevented) return;
       if (!store) return;
       const { virtualFocus: virtualFocus2, activeId: activeId2 } = store.getState();
       if (!virtualFocus2) return;
-      const activeElement = (_a = _MIBORXQWcjs.getEnabledItem.call(void 0, store, activeId2)) == null ? void 0 : _a.element;
+      const activeElement = (_a = _2XVCJUVBcjs.getEnabledItem.call(void 0, store, activeId2)) == null ? void 0 : _a.element;
       const nextActiveElement = event.relatedTarget;
-      const nextActiveElementIsItem = _MIBORXQWcjs.isItem.call(void 0, store, nextActiveElement);
+      const nextActiveElementIsItem = _2XVCJUVBcjs.isItem.call(void 0, store, nextActiveElement);
       const previousElement = previousElementRef.current;
       previousElementRef.current = null;
       if (_events.isSelfTarget.call(void 0, event) && nextActiveElementIsItem) {
@@ -224,15 +242,15 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
         }
         event.stopPropagation();
       } else {
-        const targetIsItem = _MIBORXQWcjs.isItem.call(void 0, store, event.target);
+        const targetIsItem = _2XVCJUVBcjs.isItem.call(void 0, store, event.target);
         if (!targetIsItem && activeElement) {
           _events.fireBlurEvent.call(void 0, activeElement, event);
         }
       }
     });
     const onKeyDownProp = props.onKeyDown;
-    const moveOnKeyPressProp = _KGFTRA3Ccjs.useBooleanEvent.call(void 0, moveOnKeyPress);
-    const onKeyDown = _KGFTRA3Ccjs.useEvent.call(void 0, (event) => {
+    const moveOnKeyPressProp = _3BSDKDKDcjs.useBooleanEvent.call(void 0, moveOnKeyPress);
+    const onKeyDown = _3BSDKDKDcjs.useEvent.call(void 0, (event) => {
       var _a;
       onKeyDownProp == null ? void 0 : onKeyDownProp(event);
       if (event.nativeEvent.isComposing) return;
@@ -240,7 +258,7 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
       if (!store) return;
       if (!_events.isSelfTarget.call(void 0, event)) return;
       const { orientation, renderedItems, activeId: activeId2 } = store.getState();
-      const activeItem = _MIBORXQWcjs.getEnabledItem.call(void 0, store, activeId2);
+      const activeItem = _2XVCJUVBcjs.getEnabledItem.call(void 0, store, activeId2);
       if ((_a = activeItem == null ? void 0 : activeItem.element) == null ? void 0 : _a.isConnected) return;
       const isVertical = orientation !== "horizontal";
       const isHorizontal = orientation !== "vertical";
@@ -274,22 +292,22 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
         }
       }
     });
-    props = _KGFTRA3Ccjs.useWrapElement.call(void 0, 
+    props = _3BSDKDKDcjs.useWrapElement.call(void 0, 
       props,
-      (element) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _WI7QXQL7cjs.CompositeContextProvider, { value: store, children: element }),
+      (element) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _UCZW3OGHcjs.CompositeContextProvider, { value: store, children: element }),
       [store]
     );
-    const activeDescendant = store.useState((state) => {
+    const activeDescendant = _FH6HQ5JNcjs.useStoreState.call(void 0, store, (state) => {
       var _a;
       if (!store) return;
       if (!composite) return;
       if (!state.virtualFocus) return;
-      return (_a = _MIBORXQWcjs.getEnabledItem.call(void 0, store, state.activeId)) == null ? void 0 : _a.id;
+      return (_a = _2XVCJUVBcjs.getEnabledItem.call(void 0, store, state.activeId)) == null ? void 0 : _a.id;
     });
     props = {
       "aria-activedescendant": activeDescendant,
       ...props,
-      ref: _KGFTRA3Ccjs.useMergeRefs.call(void 0, ref, setBaseElement, props.ref),
+      ref: _3BSDKDKDcjs.useMergeRefs.call(void 0, ref, setBaseElement, props.ref),
       onKeyDownCapture,
       onKeyUpCapture,
       onFocusCapture,
@@ -297,16 +315,17 @@ var useComposite = _743QABRAcjs.createHook.call(void 0,
       onBlurCapture,
       onKeyDown
     };
-    const focusable = store.useState(
+    const focusable = _FH6HQ5JNcjs.useStoreState.call(void 0, 
+      store,
       (state) => composite && (state.virtualFocus || state.activeId === null)
     );
-    props = _4JH5Q6AQcjs.useFocusable.call(void 0, { focusable, ...props });
+    props = _MWXEIKZXcjs.useFocusable.call(void 0, { focusable, ...props });
     return props;
   }
 );
-var Composite = _743QABRAcjs.forwardRef.call(void 0, function Composite2(props) {
+var Composite = _PTOCUU2Dcjs.forwardRef.call(void 0, function Composite2(props) {
   const htmlProps = useComposite(props);
-  return _743QABRAcjs.createElement.call(void 0, TagName, htmlProps);
+  return _PTOCUU2Dcjs.createElement.call(void 0, TagName, htmlProps);
 });
 
 

package/cjs/__chunks/{GX66UERW.cjs → 6IFEN2M3.cjs}

@@ -3,19 +3,19 @@
 var _26P4PLHIcjs = require('./26P4PLHI.cjs');
 
 
-var _3ZDSDKC6cjs = require('./3ZDSDKC6.cjs');
+var _KEDCOTT4cjs = require('./KEDCOTT4.cjs');
 
 
-var _HQBHIWZXcjs = require('./HQBHIWZX.cjs');
+var _OJZKTJL7cjs = require('./OJZKTJL7.cjs');
 
 
-var _L22B4P6Ycjs = require('./L22B4P6Y.cjs');
+var _VYZTFWCGcjs = require('./VYZTFWCG.cjs');
 
 
-var _YY2UXBEBcjs = require('./YY2UXBEB.cjs');
+var _FH6HQ5JNcjs = require('./FH6HQ5JN.cjs');
 
 
-var _KGFTRA3Ccjs = require('./KGFTRA3C.cjs');
+var _3BSDKDKDcjs = require('./3BSDKDKD.cjs');
 
 // src/dialog/dialog-backdrop.tsx
 var _react = require('react');
@@ -27,8 +27,8 @@ function DialogBackdrop({
   hidden
 }) {
   const ref = _react.useRef.call(void 0, null);
-  const disclosure = _HQBHIWZXcjs.useDisclosureStore.call(void 0, { disclosure: store });
-  const contentElement = _YY2UXBEBcjs.useStoreState.call(void 0, store, "contentElement");
+  const disclosure = _OJZKTJL7cjs.useDisclosureStore.call(void 0, { disclosure: store });
+  const contentElement = _FH6HQ5JNcjs.useStoreState.call(void 0, store, "contentElement");
   _react.useEffect.call(void 0, () => {
     const backdrop2 = ref.current;
     const dialog = contentElement;
@@ -36,14 +36,14 @@ function DialogBackdrop({
     if (!dialog) return;
     backdrop2.style.zIndex = getComputedStyle(dialog).zIndex;
   }, [contentElement]);
-  _KGFTRA3Ccjs.useSafeLayoutEffect.call(void 0, () => {
+  _3BSDKDKDcjs.useSafeLayoutEffect.call(void 0, () => {
     const id = contentElement == null ? void 0 : contentElement.id;
     if (!id) return;
     const backdrop2 = ref.current;
     if (!backdrop2) return;
     return _26P4PLHIcjs.markAncestor.call(void 0, backdrop2, id);
   }, [contentElement]);
-  const props = _3ZDSDKC6cjs.useDisclosureContent.call(void 0, {
+  const props = _KEDCOTT4cjs.useDisclosureContent.call(void 0, {
     ref,
     store: disclosure,
     role: "presentation",
@@ -60,10 +60,10 @@ function DialogBackdrop({
   });
   if (!backdrop) return null;
   if (_react.isValidElement.call(void 0, backdrop)) {
-    return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _L22B4P6Ycjs.Role, { ...props, render: backdrop });
+    return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _VYZTFWCGcjs.Role, { ...props, render: backdrop });
   }
   const Component = typeof backdrop !== "boolean" ? backdrop : "div";
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _L22B4P6Ycjs.Role, { ...props, render: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Component, {}) });
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _VYZTFWCGcjs.Role, { ...props, render: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Component, {}) });
 }
 
 

package/cjs/__chunks/{ZO6DH46K.cjs → 6P52IAFY.cjs}

@@ -1,15 +1,15 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _5BVSKVUNcjs = require('./5BVSKVUN.cjs');
+var _PFM4PJSGcjs = require('./PFM4PJSG.cjs');
 
 
-var _743QABRAcjs = require('./743QABRA.cjs');
+var _PTOCUU2Dcjs = require('./PTOCUU2D.cjs');
 
 // src/popover/popover-context.tsx
-var ctx = _743QABRAcjs.createStoreContext.call(void 0, 
-  [_5BVSKVUNcjs.DialogContextProvider],
-  [_5BVSKVUNcjs.DialogScopedContextProvider]
+var ctx = _PTOCUU2Dcjs.createStoreContext.call(void 0, 
+  [_PFM4PJSGcjs.DialogContextProvider],
+  [_PFM4PJSGcjs.DialogScopedContextProvider]
 );
 var usePopoverContext = ctx.useContext;
 var usePopoverScopedContext = ctx.useScopedContext;

package/cjs/__chunks/{5OPFFDFG.cjs → 6Y44Y5UF.cjs}

@@ -1,20 +1,20 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } }
 
-var _77IUZSUBcjs = require('./77IUZSUB.cjs');
+var _NKGUWTUCcjs = require('./NKGUWTUC.cjs');
 
 
 
-var _YY2UXBEBcjs = require('./YY2UXBEB.cjs');
+var _FH6HQ5JNcjs = require('./FH6HQ5JN.cjs');
 
 // src/tooltip/tooltip-store.ts
 var _tooltipstore = require('@ariakit/core/tooltip/tooltip-store'); var Core = _interopRequireWildcard(_tooltipstore);
 function useTooltipStoreProps(store, update, props) {
-  _YY2UXBEBcjs.useStoreProps.call(void 0, store, props, "type");
-  _YY2UXBEBcjs.useStoreProps.call(void 0, store, props, "skipTimeout");
-  return _77IUZSUBcjs.useHovercardStoreProps.call(void 0, store, update, props);
+  _FH6HQ5JNcjs.useStoreProps.call(void 0, store, props, "type");
+  _FH6HQ5JNcjs.useStoreProps.call(void 0, store, props, "skipTimeout");
+  return _NKGUWTUCcjs.useHovercardStoreProps.call(void 0, store, update, props);
 }
 function useTooltipStore(props = {}) {
-  const [store, update] = _YY2UXBEBcjs.useStore.call(void 0, Core.createTooltipStore, props);
+  const [store, update] = _FH6HQ5JNcjs.useStore.call(void 0, Core.createTooltipStore, props);
   return useTooltipStoreProps(store, update, props);
 }
 

package/cjs/__chunks/{OLXEI7QX.cjs → 7AMN26AR.cjs}

@@ -6,14 +6,11 @@ var _6GRO3ZM4cjs = require('./6GRO3ZM4.cjs');
 var _26P4PLHIcjs = require('./26P4PLHI.cjs');
 
 
-var _4JH5Q6AQcjs = require('./4JH5Q6AQ.cjs');
+var _FH6HQ5JNcjs = require('./FH6HQ5JN.cjs');
 
 
-var _YY2UXBEBcjs = require('./YY2UXBEB.cjs');
 
-
-
-var _KGFTRA3Ccjs = require('./KGFTRA3C.cjs');
+var _3BSDKDKDcjs = require('./3BSDKDKD.cjs');
 
 // src/dialog/utils/use-hide-on-interact-outside.ts
 var _dom = require('@ariakit/core/utils/dom');
@@ -48,10 +45,10 @@ function useEventOutside({
   capture,
   domReady
 }) {
-  const callListener = _KGFTRA3Ccjs.useEvent.call(void 0, listener);
-  const open = _YY2UXBEBcjs.useStoreState.call(void 0, store, "open");
+  const callListener = _3BSDKDKDcjs.useEvent.call(void 0, listener);
+  const open = _FH6HQ5JNcjs.useStoreState.call(void 0, store, "open");
   const focusedRef = _react.useRef.call(void 0, false);
-  _KGFTRA3Ccjs.useSafeLayoutEffect.call(void 0, () => {
+  _3BSDKDKDcjs.useSafeLayoutEffect.call(void 0, () => {
     if (!open) return;
     if (!domReady) return;
     const { contentElement } = store.getState();
@@ -76,11 +73,10 @@ function useEventOutside({
       if (isMouseEventOnDialog(event, contentElement)) return;
       const focused = focusedRef.current;
       if (focused && !_26P4PLHIcjs.isElementMarked.call(void 0, target, contentElement.id)) return;
-      if (_4JH5Q6AQcjs.isSafariFocusAncestor.call(void 0, target)) return;
       callListener(event);
     };
     return _events.addGlobalEventListener.call(void 0, type, onEvent, capture);
-  }, [open, capture]);
+  }, [open, capture, store, type, callListener]);
 }
 function shouldHideOnInteractOutside(hideOnInteractOutside, event) {
   if (typeof hideOnInteractOutside === "function") {
@@ -88,8 +84,8 @@ function shouldHideOnInteractOutside(hideOnInteractOutside, event) {
   }
   return !!hideOnInteractOutside;
 }
-function useHideOnInteractOutside(store, hideOnInteractOutside, domReady) {
-  const open = _YY2UXBEBcjs.useStoreState.call(void 0, store, "open");
+function useHideOnInteractOutside(store, hideOnInteractOutside, domReady, interactedOutsideRef) {
+  const open = _FH6HQ5JNcjs.useStoreState.call(void 0, store, "open");
   const previousMouseDownRef = _6GRO3ZM4cjs.usePreviousMouseDownRef.call(void 0, open);
   const props = { store, domReady, capture: true };
   useEventOutside({
@@ -99,9 +95,11 @@ function useHideOnInteractOutside(store, hideOnInteractOutside, domReady) {
       const { contentElement } = store.getState();
       const previousMouseDown = previousMouseDownRef.current;
       if (!previousMouseDown) return;
-      if (!_dom.isVisible.call(void 0, previousMouseDown)) return;
       if (!_26P4PLHIcjs.isElementMarked.call(void 0, previousMouseDown, contentElement == null ? void 0 : contentElement.id)) return;
       if (!shouldHideOnInteractOutside(hideOnInteractOutside, event)) return;
+      if (interactedOutsideRef) {
+        interactedOutsideRef.current = true;
+      }
       store.hide();
     }
   });
@@ -121,6 +119,9 @@ function useHideOnInteractOutside(store, hideOnInteractOutside, domReady) {
     type: "contextmenu",
     listener: (event) => {
       if (!shouldHideOnInteractOutside(hideOnInteractOutside, event)) return;
+      if (interactedOutsideRef) {
+        interactedOutsideRef.current = true;
+      }
       store.hide();
     }
   });

package/cjs/__chunks/{RAME3APW.cjs → 7DAL4U2W.cjs}

@@ -1,15 +1,15 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _WI7QXQL7cjs = require('./WI7QXQL7.cjs');
+var _UCZW3OGHcjs = require('./UCZW3OGH.cjs');
 
 
-var _743QABRAcjs = require('./743QABRA.cjs');
+var _PTOCUU2Dcjs = require('./PTOCUU2D.cjs');
 
 // src/toolbar/toolbar-context.tsx
-var ctx = _743QABRAcjs.createStoreContext.call(void 0, 
-  [_WI7QXQL7cjs.CompositeContextProvider],
-  [_WI7QXQL7cjs.CompositeScopedContextProvider]
+var ctx = _PTOCUU2Dcjs.createStoreContext.call(void 0, 
+  [_UCZW3OGHcjs.CompositeContextProvider],
+  [_UCZW3OGHcjs.CompositeScopedContextProvider]
 );
 var useToolbarContext = ctx.useContext;
 var useToolbarScopedContext = ctx.useScopedContext;

package/cjs/__chunks/{NRJF3KTK.cjs → 7JL3CCPE.cjs}

@@ -1,29 +1,32 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _HHXD2YNZcjs = require('./HHXD2YNZ.cjs');
+var _SARAALGAcjs = require('./SARAALGA.cjs');
 
 
-var _DIWKSV34cjs = require('./DIWKSV34.cjs');
+var _MPIQVHCBcjs = require('./MPIQVHCB.cjs');
 
 
+var _FH6HQ5JNcjs = require('./FH6HQ5JN.cjs');
 
 
-var _743QABRAcjs = require('./743QABRA.cjs');
 
 
+var _PTOCUU2Dcjs = require('./PTOCUU2D.cjs');
 
 
 
-var _KGFTRA3Ccjs = require('./KGFTRA3C.cjs');
+
+
+var _3BSDKDKDcjs = require('./3BSDKDKD.cjs');
 
 // src/disclosure/disclosure.tsx
 var _misc = require('@ariakit/core/utils/misc');
 var _react = require('react');
 var TagName = "button";
-var symbol = Symbol("disclosure");
-var useDisclosure = _743QABRAcjs.createHook.call(void 0, 
+var symbol = /* @__PURE__ */ Symbol("disclosure");
+var useDisclosure = _PTOCUU2Dcjs.createHook.call(void 0, 
   function useDisclosure2({ store, toggleOnClick = true, ...props }) {
-    const context = _HHXD2YNZcjs.useDisclosureProviderContext.call(void 0, );
+    const context = _SARAALGAcjs.useDisclosureProviderContext.call(void 0, );
     store = store || context;
     _misc.invariant.call(void 0, 
       store,
@@ -31,8 +34,8 @@ var useDisclosure = _743QABRAcjs.createHook.call(void 0,
     );
     const ref = _react.useRef.call(void 0, null);
     const [expanded, setExpanded] = _react.useState.call(void 0, false);
-    const disclosureElement = store.useState("disclosureElement");
-    const open = store.useState("open");
+    const disclosureElement = _FH6HQ5JNcjs.useStoreState.call(void 0, store, "disclosureElement");
+    const open = _FH6HQ5JNcjs.useStoreState.call(void 0, store, "open");
     _react.useEffect.call(void 0, () => {
       let isCurrentDisclosure = disclosureElement === ref.current;
       if (!(disclosureElement == null ? void 0 : disclosureElement.isConnected)) {
@@ -42,9 +45,9 @@ var useDisclosure = _743QABRAcjs.createHook.call(void 0,
       setExpanded(open && isCurrentDisclosure);
     }, [disclosureElement, store, open]);
     const onClickProp = props.onClick;
-    const toggleOnClickProp = _KGFTRA3Ccjs.useBooleanEvent.call(void 0, toggleOnClick);
-    const [isDuplicate, metadataProps] = _KGFTRA3Ccjs.useMetadataProps.call(void 0, props, symbol, true);
-    const onClick = _KGFTRA3Ccjs.useEvent.call(void 0, (event) => {
+    const toggleOnClickProp = _3BSDKDKDcjs.useBooleanEvent.call(void 0, toggleOnClick);
+    const [isDuplicate, metadataProps] = _3BSDKDKDcjs.useMetadataProps.call(void 0, props, symbol, true);
+    const onClick = _3BSDKDKDcjs.useEvent.call(void 0, (event) => {
       onClickProp == null ? void 0 : onClickProp(event);
       if (event.defaultPrevented) return;
       if (isDuplicate) return;
@@ -52,22 +55,22 @@ var useDisclosure = _743QABRAcjs.createHook.call(void 0,
       store == null ? void 0 : store.setDisclosureElement(event.currentTarget);
       store == null ? void 0 : store.toggle();
     });
-    const contentElement = store.useState("contentElement");
+    const contentElement = _FH6HQ5JNcjs.useStoreState.call(void 0, store, "contentElement");
     props = {
       "aria-expanded": expanded,
       "aria-controls": contentElement == null ? void 0 : contentElement.id,
       ...metadataProps,
       ...props,
-      ref: _KGFTRA3Ccjs.useMergeRefs.call(void 0, ref, props.ref),
+      ref: _3BSDKDKDcjs.useMergeRefs.call(void 0, ref, props.ref),
       onClick
     };
-    props = _DIWKSV34cjs.useButton.call(void 0, props);
+    props = _MPIQVHCBcjs.useButton.call(void 0, props);
     return props;
   }
 );
-var Disclosure = _743QABRAcjs.forwardRef.call(void 0, function Disclosure2(props) {
+var Disclosure = _PTOCUU2Dcjs.forwardRef.call(void 0, function Disclosure2(props) {
   const htmlProps = useDisclosure(props);
-  return _743QABRAcjs.createElement.call(void 0, TagName, htmlProps);
+  return _PTOCUU2Dcjs.createElement.call(void 0, TagName, htmlProps);
 });