@ariakit/react-core 0.4.24 → 0.4.25

package/esm/__chunks/{5DU47TGY.js → 2G3FRTNH.js}

@@ -1,16 +1,16 @@
 "use client";
 import {
   DialogDescriptionContext
-} from "./67C4K2ZC.js";
+} from "./W43ISTP6.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useId,
   useSafeLayoutEffect
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/dialog/dialog-description.tsx
 import { removeUndefinedValues } from "@ariakit/core/utils/misc";

package/esm/__chunks/{GPNK72HC.js → 2GY5TTXI.js}

@@ -1,11 +1,11 @@
 "use client";
 import {
   useCompositeStoreProps
-} from "./AFNZIDBX.js";
+} from "./ZJG6VNPS.js";
 import {
   useStore,
   useStoreProps
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 
 // src/radio/radio-store.ts
 import * as Core from "@ariakit/core/radio/radio-store";

package/esm/__chunks/{MY4F3SH4.js → 2LK5EC5X.js}

@@ -1,12 +1,12 @@
 "use client";
 import {
   useGroup
-} from "./US7STFPK.js";
+} from "./56JTH7NL.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 
 // src/form/form-group.tsx
 var TagName = "div";

package/esm/__chunks/{IVFWLL4V.js → 3IBURO3G.js}

@@ -6,11 +6,11 @@ import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useId,
   useSafeLayoutEffect
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/group/group-label.tsx
 import { removeUndefinedValues } from "@ariakit/core/utils/misc";

package/esm/__chunks/{JQYZPZOZ.js → 423C32ZY.js}

@@ -1,19 +1,19 @@
 "use client";
 import {
   useHeading
-} from "./VOL6MRTR.js";
+} from "./XTRPVSX2.js";
 import {
   DialogHeadingContext
-} from "./67C4K2ZC.js";
+} from "./W43ISTP6.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useId,
   useSafeLayoutEffect
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/dialog/dialog-heading.tsx
 import { useContext } from "react";

package/esm/__chunks/{U3PAIVHS.js → 47DURVCG.js}

@@ -3,25 +3,25 @@ import {
   getElementPolygon,
   getEventPoint,
   isPointInPolygon
-} from "./X7QOZUD3.js";
+} from "./PYFWN42T.js";
 import {
   HovercardScopedContextProvider,
   useHovercardProviderContext
-} from "./VI2TRTYW.js";
+} from "./GLWQDZNX.js";
 import {
   usePopover
-} from "./4IWMRS2E.js";
+} from "./JVH3F2PI.js";
 import {
   createDialogComponent
-} from "./GKPFMPRM.js";
+} from "./7WPPMYFR.js";
 import {
   useStoreState
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useBooleanEvent,
   useEvent,
@@ -31,7 +31,7 @@ import {
   usePortalRef,
   useSafeLayoutEffect,
   useWrapElement
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/hovercard/hovercard.tsx
 import { contains } from "@ariakit/core/utils/dom";

package/esm/__chunks/{BHXH7MKB.js → 4QASCBBU.js}

@@ -1,11 +1,11 @@
 "use client";
 import {
   useHovercardStoreProps
-} from "./LNZKURLD.js";
+} from "./NV5OUTYH.js";
 import {
   useStore,
   useStoreProps
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 
 // src/tooltip/tooltip-store.ts
 import * as Core from "@ariakit/core/tooltip/tooltip-store";

package/esm/__chunks/{KM5GWTMX.js → 4RILL52W.js}

@@ -3,24 +3,24 @@ import {
   SelectHeadingContext,
   SelectScopedContextProvider,
   useSelectContext
-} from "./OFU5CPWY.js";
+} from "./OIOLJY4L.js";
 import {
   useCompositeTypeahead
-} from "./2UJVL4WQ.js";
+} from "./HOV66IHV.js";
 import {
   isHidden
-} from "./BDQ7RGF6.js";
+} from "./WLLNEL2X.js";
 import {
   useComposite
-} from "./TQQOMENK.js";
+} from "./6PX47O7P.js";
 import {
   useStoreState
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useAttribute,
   useBooleanEvent,
@@ -29,7 +29,7 @@ import {
   useMergeRefs,
   useTransactionState,
   useWrapElement
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/select/select-list.tsx
 import { isSelfTarget } from "@ariakit/core/utils/events";
@@ -124,7 +124,7 @@ var useSelectList = createHook(
       }
     );
     props = {
-      "aria-labelledby": labelId,
+      "aria-labelledby": props["aria-label"] != null ? void 0 : labelId,
       hidden,
       ...props,
       id,

package/esm/__chunks/{57GJCRRF.js → 55FNNNML.js}

@@ -2,10 +2,10 @@
 import {
   CollectionContextProvider,
   CollectionScopedContextProvider
-} from "./4ODJH2Y5.js";
+} from "./FQHJBBMI.js";
 import {
   createStoreContext
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 
 // src/composite/composite-context.tsx
 import { createContext } from "react";

package/esm/__chunks/{US7STFPK.js → 56JTH7NL.js}

@@ -6,10 +6,10 @@ import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useWrapElement
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/group/group.tsx
 import { removeUndefinedValues } from "@ariakit/core/utils/misc";
@@ -26,7 +26,7 @@ var useGroup = createHook(
     );
     props = {
       role: "group",
-      "aria-labelledby": labelId,
+      "aria-labelledby": props["aria-label"] != null ? void 0 : labelId,
       ...props
     };
     return removeUndefinedValues(props);

package/esm/__chunks/{7LKOJ7WL.js → 6FORXC3J.js}

@@ -1,25 +1,25 @@
 "use client";
 import {
   useFormContext
-} from "./5QCILLRJ.js";
+} from "./T67KCLW2.js";
 import {
   useCollectionItem
-} from "./HFFZYOO5.js";
+} from "./IKWLDXMV.js";
 import {
   useStoreState
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 import {
   createElement,
   createHook,
   forwardRef,
   memo
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useBooleanEvent,
   useEvent,
   useId,
   useMergeRefs
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/form/form-control.tsx
 import { getDocument } from "@ariakit/core/utils/dom";
@@ -98,7 +98,7 @@ var useFormControl = createHook(
       () => !!(store == null ? void 0 : store.getError(name)) && store.getFieldTouched(name)
     );
     props = {
-      "aria-labelledby": label == null ? void 0 : label.id,
+      "aria-labelledby": props["aria-label"] != null ? void 0 : label == null ? void 0 : label.id,
       "aria-invalid": invalid,
       ...props,
       id,

package/esm/__chunks/{LDOHOQAR.js → 6NMVLB7R.js}

@@ -1,12 +1,12 @@
 "use client";
 import {
   usePopoverDescription
-} from "./YCHWWI4J.js";
+} from "./BJR4VBGJ.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 
 // src/hovercard/hovercard-description.tsx
 var TagName = "p";

package/esm/__chunks/{TQQOMENK.js → 6PX47O7P.js}

@@ -9,18 +9,18 @@ import {
 import {
   CompositeContextProvider,
   useCompositeProviderContext
-} from "./57GJCRRF.js";
+} from "./55FNNNML.js";
 import {
   useFocusable
-} from "./C7ZLNJMM.js";
+} from "./GR523XJ6.js";
 import {
   useStoreState
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useBooleanEvent,
   useEvent,
@@ -28,7 +28,7 @@ import {
   useSafeLayoutEffect,
   useTransactionState,
   useWrapElement
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/composite/composite.tsx
 import { flatten2DArray, reverseArray } from "@ariakit/core/utils/array";

package/esm/__chunks/{EV7SAVXM.js → 6S37ITHJ.js}

@@ -2,10 +2,10 @@
 import {
   useStore,
   useStoreProps
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 import {
   useUpdateEffect
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/collection/collection-store.ts
 import * as Core from "@ariakit/core/collection/collection-store";

package/esm/__chunks/{E3ED7D32.js → 7R5FH5N5.js}

@@ -1,21 +1,21 @@
 "use client";
 import {
   usePopoverStoreProps
-} from "./6AOPHM6J.js";
+} from "./RPKQBJCW.js";
 import {
   useCompositeStoreOptions,
   useCompositeStoreProps
-} from "./AFNZIDBX.js";
+} from "./ZJG6VNPS.js";
 import {
   useComboboxProviderContext
-} from "./YXOTZ32N.js";
+} from "./H55QERR5.js";
 import {
   useStore,
   useStoreProps
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 import {
   useUpdateEffect
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/select/select-store.ts
 import * as Core from "@ariakit/core/select/select-store";

package/esm/__chunks/{GKPFMPRM.js → 7WPPMYFR.js}

@@ -1,25 +1,25 @@
 "use client";
 import {
   usePortal
-} from "./EKSBXE4P.js";
+} from "./NOHE2KUO.js";
 import {
   HeadingLevel
 } from "./5M6RIVE2.js";
 import {
   useFocusableContainer
-} from "./PONOZD7A.js";
+} from "./QJNORFLZ.js";
 import {
   prependHiddenDismiss
 } from "./6GXEOXGT.js";
 import {
   useHideOnInteractOutside
-} from "./YA3YOKXH.js";
+} from "./UWTV2ZWL.js";
 import {
   useNestedDialogs
-} from "./YYYHIDZC.js";
+} from "./TKBSBKEC.js";
 import {
   usePreventBodyScroll
-} from "./A4D5O6EK.js";
+} from "./YJTK2J3H.js";
 import {
   disableTree,
   disableTreeOutside
@@ -29,7 +29,7 @@ import {
 } from "./677M2CI3.js";
 import {
   DialogBackdrop
-} from "./3BBVQAZ3.js";
+} from "./CZY7XL6S.js";
 import {
   isElementMarked,
   markTreeOutside
@@ -40,27 +40,27 @@ import {
 import {
   isHidden,
   useDisclosureContent
-} from "./BDQ7RGF6.js";
+} from "./WLLNEL2X.js";
 import {
   useDialogStore
-} from "./3MLRVWUK.js";
+} from "./EX4LS7ZU.js";
 import {
   DialogDescriptionContext,
   DialogHeadingContext,
   DialogScopedContextProvider,
   useDialogProviderContext
-} from "./67C4K2ZC.js";
+} from "./W43ISTP6.js";
 import {
   useFocusable
-} from "./C7ZLNJMM.js";
+} from "./GR523XJ6.js";
 import {
   useStoreState
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useBooleanEvent,
   useEvent,
@@ -69,27 +69,20 @@ import {
   usePortalRef,
   useSafeLayoutEffect,
   useWrapElement
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/dialog/dialog.tsx
 import {
   contains,
   getActiveElement,
   getDocument,
-  getWindow,
-  isButton
+  getWindow
 } from "@ariakit/core/utils/dom";
-import {
-  addGlobalEventListener,
-  queueBeforeEvent
-} from "@ariakit/core/utils/events";
-import {
-  focusIfNeeded,
-  getFirstTabbableIn,
-  isFocusable
-} from "@ariakit/core/utils/focus";
+import { addGlobalEventListener } from "@ariakit/core/utils/events";
+import { getFirstTabbableIn, isFocusable } from "@ariakit/core/utils/focus";
 import { chain } from "@ariakit/core/utils/misc";
 import { isSafari } from "@ariakit/core/utils/platform";
+import { sync } from "@ariakit/core/utils/store";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 var TagName = "div";
@@ -158,43 +151,54 @@ var useDialog = createHook(function useDialog2({
   const contentElement = useStoreState(store, "contentElement");
   const hidden = isHidden(mounted, props.hidden, props.alwaysVisible);
   usePreventBodyScroll(contentElement, id, preventBodyScroll && !hidden);
-  useHideOnInteractOutside(store, hideOnInteractOutside, domReady);
+  const interactedOutsideRef = useRef(false);
+  useSafeLayoutEffect(() => {
+    return sync(store, ["open"], (state) => {
+      if (!state.open) return;
+      interactedOutsideRef.current = false;
+    });
+  }, [store]);
+  useHideOnInteractOutside(
+    store,
+    hideOnInteractOutside,
+    domReady,
+    interactedOutsideRef
+  );
   const { wrapElement, nestedDialogs } = useNestedDialogs(store);
   props = useWrapElement(props, wrapElement, [wrapElement]);
+  const lastMousedownRef = useRef(null);
+  if (isSafariBrowser) {
+    useEffect(() => {
+      if (!domReady) return;
+      const dialog = ref.current;
+      if (!dialog) return;
+      const doc = getDocument(dialog);
+      const onMousedown = (event) => {
+        lastMousedownRef.current = event.target;
+      };
+      doc.addEventListener("mousedown", onMousedown, true);
+      return () => {
+        doc.removeEventListener("mousedown", onMousedown, true);
+      };
+    }, [domReady]);
+  }
   useSafeLayoutEffect(() => {
     if (!open) return;
     const dialog = ref.current;
     const activeElement = getActiveElement(dialog, true);
     if (!activeElement) return;
-    if (activeElement.tagName === "BODY") return;
+    if (activeElement.tagName === "BODY") {
+      const fallback = lastMousedownRef.current;
+      lastMousedownRef.current = null;
+      if (!(fallback == null ? void 0 : fallback.isConnected)) return;
+      if (!isFocusable(fallback)) return;
+      if (dialog && contains(dialog, fallback)) return;
+      store.setDisclosureElement(fallback);
+      return;
+    }
     if (dialog && contains(dialog, activeElement)) return;
     store.setDisclosureElement(activeElement);
   }, [store, open]);
-  if (isSafariBrowser) {
-    useEffect(() => {
-      if (!mounted) return;
-      const { disclosureElement } = store.getState();
-      if (!disclosureElement) return;
-      if (!isButton(disclosureElement)) return;
-      const onMouseDown = () => {
-        let receivedFocus = false;
-        const onFocus = () => {
-          receivedFocus = true;
-        };
-        const options = { capture: true, once: true };
-        disclosureElement.addEventListener("focusin", onFocus, options);
-        queueBeforeEvent(disclosureElement, "mouseup", () => {
-          disclosureElement.removeEventListener("focusin", onFocus, true);
-          if (receivedFocus) return;
-          focusIfNeeded(disclosureElement);
-        });
-      };
-      disclosureElement.addEventListener("mousedown", onMouseDown);
-      return () => {
-        disclosureElement.removeEventListener("mousedown", onMouseDown);
-      };
-    }, [store, mounted]);
-  }
   useEffect(() => {
     if (!mounted) return;
     if (!domReady) return;
@@ -291,6 +295,7 @@ var useDialog = createHook(function useDialog2({
     if (!autoFocusOnShowProp(isElementFocusable ? element : null)) return;
     setAutoFocusEnabled(true);
     queueMicrotask(() => {
+      if (!store.getState().open) return;
       element.focus();
       if (!isSafariBrowser) return;
       if (!isElementFocusable) return;
@@ -304,6 +309,7 @@ var useDialog = createHook(function useDialog2({
     initialFocus,
     portal,
     preserveTabOrder,
+    store,
     autoFocusOnShowProp
   ]);
   const mayAutoFocusOnHide = !!autoFocusOnHide;
@@ -316,6 +322,7 @@ var useDialog = createHook(function useDialog2({
   }, [open]);
   const focusOnHide = useCallback(
     (dialog, retry = true) => {
+      if (interactedOutsideRef.current) return;
       const { disclosureElement } = store.getState();
       if (isAlreadyFocusingAnotherElement(dialog)) return;
       let element = getElementFromProp(finalFocus) || disclosureElement;
@@ -345,7 +352,7 @@ var useDialog = createHook(function useDialog2({
       }
       if (!autoFocusOnHideProp(isElementFocusable ? element : null)) return;
       if (!isElementFocusable) return;
-      element == null ? void 0 : element.focus({ preventScroll: true });
+      element == null ? void 0 : element.focus();
     },
     [store, finalFocus, autoFocusOnHideProp]
   );
@@ -433,7 +440,7 @@ var useDialog = createHook(function useDialog2({
     "data-dialog": "",
     role: "dialog",
     tabIndex: focusable ? -1 : void 0,
-    "aria-labelledby": headingId,
+    "aria-labelledby": props["aria-label"] != null ? void 0 : headingId,
     "aria-describedby": descriptionId,
     ...props,
     id,

package/esm/__chunks/{OQWWYG3J.js → A2TITI2Y.js}

@@ -3,7 +3,7 @@ import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 
 // src/visually-hidden/visually-hidden.tsx
 var TagName = "span";

package/esm/__chunks/{AY4MU2OE.js → AMCJTO4G.js}

@@ -1,21 +1,21 @@
 "use client";
 import {
   useHovercardProviderContext
-} from "./VI2TRTYW.js";
+} from "./GLWQDZNX.js";
 import {
   useFocusable
-} from "./C7ZLNJMM.js";
+} from "./GR523XJ6.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useBooleanEvent,
   useEvent,
   useIsMouseMoving,
   useMergeRefs
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/hovercard/hovercard-anchor.tsx
 import { addGlobalEventListener } from "@ariakit/core/utils/events";

package/esm/__chunks/{2ZPKR5QW.js → AWT5BUVI.js}

@@ -2,30 +2,30 @@
 import {
   MenuScopedContextProvider,
   useMenuProviderContext
-} from "./Q35TXJTU.js";
+} from "./KTCTUSE6.js";
 import {
   useCompositeTypeahead
-} from "./2UJVL4WQ.js";
+} from "./HOV66IHV.js";
 import {
   isHidden
-} from "./BDQ7RGF6.js";
+} from "./WLLNEL2X.js";
 import {
   useComposite
-} from "./TQQOMENK.js";
+} from "./6PX47O7P.js";
 import {
   useStoreState
-} from "./XYGGOF6W.js";
+} from "./YAS7X7HB.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./ZNLX6YSC.js";
+} from "./TVXRYIJB.js";
 import {
   useEvent,
   useId,
   useMergeRefs,
   useWrapElement
-} from "./G47ZC7SD.js";
+} from "./CEM7J6TT.js";
 
 // src/menu/menu-list.tsx
 import { invariant } from "@ariakit/core/utils/misc";