@ariakit/react-core 0.2.2 → 0.2.4

package/cjs/utils/store.cjs

@@ -2,12 +2,12 @@
 
 
 
-var _F7HVNVHQcjs = require('../__chunks/F7HVNVHQ.cjs');
-require('../__chunks/NREUHWTU.cjs');
+var _3YYDY5FNcjs = require('../__chunks/3YYDY5FN.cjs');
+require('../__chunks/K4FBPMJ3.cjs');
 require('../__chunks/2X5K3J7Y.cjs');
 require('../__chunks/6455U47T.cjs');
 
 
 
 
-exports.useStore = _F7HVNVHQcjs.useStore; exports.useStoreProps = _F7HVNVHQcjs.useStoreProps; exports.useStoreState = _F7HVNVHQcjs.useStoreState;
+exports.useStore = _3YYDY5FNcjs.useStore; exports.useStoreProps = _3YYDY5FNcjs.useStoreProps; exports.useStoreState = _3YYDY5FNcjs.useStoreState;

package/esm/__chunks/{PPIHKGNC.js → 34WFGKVL.js}

@@ -8,7 +8,7 @@ import {
 } from "./U2LXZPCY.js";
 import {
   useWrapElement
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __spreadValues
 } from "./4BKCJXBM.js";

package/esm/__chunks/{EC5UVTWD.js → 3DWMKQHI.js}

@@ -1,16 +1,16 @@
 import {
   markAncestor
-} from "./BH4YAZB2.js";
+} from "./ACAQG6DN.js";
 import {
   Role
 } from "./R35SLIEE.js";
 import {
   useDisclosureContent
-} from "./NRBO7PPT.js";
+} from "./YJZ2FEUT.js";
 import {
   useForkRef,
   useSafeLayoutEffect
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __spreadProps,
   __spreadValues

package/esm/__chunks/{4H6H5RRM.js → 4GMZGYHX.js}

@@ -1,6 +1,6 @@
 import {
   hideElementFromAccessibilityTree
-} from "./7A3SODQV.js";
+} from "./EKB2TUKR.js";
 import {
   supportsInert
 } from "./KOVUJERF.js";
@@ -11,7 +11,7 @@ import {
 } from "./DJESYNLE.js";
 import {
   walkTreeOutside
-} from "./ISPCL6N4.js";
+} from "./FV23EKJL.js";
 
 // src/dialog/utils/disable-tree-outside.ts
 import { contains } from "@ariakit/core/utils/dom";

package/esm/__chunks/{Q4774GYW.js → 4OUEWDQI.js}

@@ -1,36 +1,36 @@
 import {
   DialogBackdrop
-} from "./EC5UVTWD.js";
+} from "./3DWMKQHI.js";
 import {
   disableTreeOutside
-} from "./4H6H5RRM.js";
+} from "./4GMZGYHX.js";
 import {
   disableAccessibilityTreeOutside
-} from "./7A3SODQV.js";
+} from "./EKB2TUKR.js";
 import {
   usePreventBodyScroll
-} from "./RBUEJWRA.js";
+} from "./LMWFU6EQ.js";
 import {
   useNestedDialogs
-} from "./T3WBUAHU.js";
+} from "./NOIOBRWH.js";
 import {
   useHideOnInteractOutside
-} from "./KUXENZYT.js";
+} from "./H2CSFGIT.js";
 import {
   prependHiddenDismiss
 } from "./62DFK33R.js";
 import {
   markTreeOutside
-} from "./BH4YAZB2.js";
+} from "./ACAQG6DN.js";
 import {
   useFocusableContainer
-} from "./FYVEOR7R.js";
+} from "./URYSNCDU.js";
 import {
   HeadingLevel
 } from "./6OMX4H3W.js";
 import {
   usePortal
-} from "./HNQXN4AI.js";
+} from "./56DUJ462.js";
 import {
   DialogContext,
   DialogDescriptionContext,
@@ -39,10 +39,10 @@ import {
 import {
   isHidden,
   useDisclosureContent
-} from "./NRBO7PPT.js";
+} from "./YJZ2FEUT.js";
 import {
   useFocusable
-} from "./K4QQOEEY.js";
+} from "./IMP6LK4U.js";
 import {
   createComponent,
   createElement,
@@ -56,7 +56,7 @@ import {
   usePortalRef,
   useSafeLayoutEffect,
   useWrapElement
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,
@@ -89,9 +89,7 @@ function isAlreadyFocusingAnotherElement(dialog) {
   const activeElement = getActiveElement();
   if (!activeElement)
     return false;
-  if (contains(dialog, activeElement))
-    return false;
-  if (activeElement.hasAttribute("data-dialog"))
+  if (dialog && contains(dialog, activeElement))
     return false;
   if (isFocusable(activeElement))
     return true;
@@ -228,9 +226,16 @@ var useDialog = createHook(
       if (!open)
         return;
       const { disclosureElement } = store.getState();
-      const element = portal ? portalNode : ref.current;
+      const dialog = ref.current;
       const persistentElements = getPersistentElementsProp() || [];
-      const allElements = [element, ...nestedDialogs, ...persistentElements];
+      const allElements = [
+        // In addition to the dialog element, we also include the portal node here
+        // so nested dialogs are considered as well.
+        dialog,
+        portalNode,
+        ...nestedDialogs,
+        ...persistentElements
+      ];
       if (!shouldDisableAccessibilityTree) {
         return markTreeOutside(id, disclosureElement, ...allElements);
       }
@@ -310,8 +315,6 @@ var useDialog = createHook(
         return;
       const dialog = ref.current;
       const focusOnHide = (retry = true) => {
-        if (!dialog)
-          return;
         if (isAlreadyFocusingAnotherElement(dialog))
           return;
         const { disclosureElement } = store.getState();
@@ -344,7 +347,7 @@ var useDialog = createHook(
           return;
         if (!isElementFocusable)
           return;
-        queueMicrotask(() => element == null ? void 0 : element.focus());
+        element == null ? void 0 : element.focus();
       };
       if (!open) {
         return focusOnHide();

package/esm/__chunks/{HNQXN4AI.js → 56DUJ462.js}

@@ -13,7 +13,7 @@ import {
   useForkRef,
   useSafeLayoutEffect,
   useWrapElement
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   setRef
 } from "./SXC6BPOF.js";

package/esm/__chunks/{F6CM5SN4.js → 5JAOITB6.js}

@@ -7,10 +7,10 @@ import {
 } from "./W7JXAQKF.js";
 import {
   useCompositeHover
-} from "./Y2V2DFHD.js";
+} from "./WNWUDBP3.js";
 import {
   useCompositeItem
-} from "./X4UE5ZYC.js";
+} from "./OTKCW3PM.js";
 import {
   createElement,
   createHook,
@@ -18,11 +18,11 @@ import {
 } from "./U2LXZPCY.js";
 import {
   useStoreState
-} from "./AV5WE37O.js";
+} from "./FY2SXATP.js";
 import {
   useBooleanEvent,
   useEvent
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{OBNQHP6V.js → 5KT3GDTM.js}

@@ -1,10 +1,10 @@
 import {
   useDisclosureStoreOptions,
   useDisclosureStoreProps
-} from "./HN4VMOUI.js";
+} from "./JX7L6AQW.js";
 import {
   useStore
-} from "./AV5WE37O.js";
+} from "./FY2SXATP.js";
 import {
   __spreadValues
 } from "./4BKCJXBM.js";

package/esm/__chunks/{NC4VIH2L.js → 6BBYWAIS.js}

@@ -1,6 +1,6 @@
 import {
   useFocusable
-} from "./K4QQOEEY.js";
+} from "./IMP6LK4U.js";
 import {
   createComponent,
   createElement,
@@ -11,7 +11,7 @@ import {
   useEvent,
   useForkRef,
   useIsMouseMoving
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{KCAKBKAU.js → 6RRCHXOA.js}

@@ -1,7 +1,7 @@
 import {
   useStore,
   useStoreProps
-} from "./AV5WE37O.js";
+} from "./FY2SXATP.js";
 
 // src/checkbox/checkbox-store.ts
 import * as Core from "@ariakit/core/checkbox/checkbox-store";

package/esm/__chunks/{PI5KZQST.js → 76X52BLD.js}

@@ -1,6 +1,6 @@
 import {
   useDisclosure
-} from "./UR3V2CXC.js";
+} from "./GGPLUQQY.js";
 import {
   createComponent,
   createElement,

package/esm/__chunks/{2A7SHVQX.js → 7GX7Z4RT.js}

@@ -1,6 +1,6 @@
 import {
   useGroup
-} from "./PPIHKGNC.js";
+} from "./34WFGKVL.js";
 import {
   createComponent,
   createElement,

package/esm/__chunks/{THRMCR5V.js → A5P4XOHC.js}

@@ -1,6 +1,6 @@
 import {
   useDialogHeading
-} from "./RQE3AIUU.js";
+} from "./G5LGVBEX.js";
 import {
   createComponent,
   createElement,

package/esm/__chunks/{BH4YAZB2.js → ACAQG6DN.js}

@@ -3,7 +3,7 @@ import {
 } from "./DJESYNLE.js";
 import {
   walkTreeOutside
-} from "./ISPCL6N4.js";
+} from "./FV23EKJL.js";
 
 // src/dialog/utils/mark-tree-outside.ts
 import { chain } from "@ariakit/core/utils/misc";

package/esm/__chunks/{V47YM6O6.js → BBUDEDX6.js}

@@ -1,6 +1,6 @@
 import {
   useDialogDismiss
-} from "./TTOXS6BI.js";
+} from "./QDEVTSDD.js";
 import {
   createComponent,
   createElement,

package/esm/__chunks/{NNCIS2B6.js → CTBUXM7K.js}

@@ -9,7 +9,7 @@ import {
 import {
   useForkRef,
   useTagName
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __spreadProps,
   __spreadValues

package/esm/__chunks/{ODHF3YE7.js → CV7JBVJO.js}

@@ -11,11 +11,11 @@ import {
 } from "./U2LXZPCY.js";
 import {
   useStoreState
-} from "./AV5WE37O.js";
+} from "./FY2SXATP.js";
 import {
   useEvent,
   useForkRef
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{2VSLIXPB.js → CWGC7RDD.js}

@@ -9,7 +9,7 @@ import {
 import {
   useForkRef,
   useId
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{S6KGTG3E.js → EEZDONXU.js}

@@ -1,6 +1,6 @@
 import {
   useCompositeItem
-} from "./X4UE5ZYC.js";
+} from "./OTKCW3PM.js";
 import {
   createElement,
   createHook,

package/esm/__chunks/{7A3SODQV.js → EKB2TUKR.js}

@@ -3,7 +3,7 @@ import {
 } from "./DJESYNLE.js";
 import {
   walkTreeOutside
-} from "./ISPCL6N4.js";
+} from "./FV23EKJL.js";
 
 // src/dialog/utils/disable-accessibility-tree-outside.ts
 function hideElementFromAccessibilityTree(element) {

package/esm/__chunks/{YD5EOSG3.js → EZKI7X4G.js}

@@ -1,6 +1,6 @@
 import {
   useDialogDescription
-} from "./GQ73PJK4.js";
+} from "./HWYCCPYU.js";
 import {
   createComponent,
   createElement,

package/esm/__chunks/{5SUMII6J.js → FETTDVY4.js}

@@ -1,27 +1,28 @@
 import {
   useCompositeTypeahead
-} from "./GRNO2YNE.js";
+} from "./XXMIY262.js";
 import {
   SelectContext
 } from "./EEVSGAZW.js";
 import {
   useComposite
-} from "./JM74EEHT.js";
+} from "./YBDXDAKQ.js";
 import {
   isHidden
-} from "./NRBO7PPT.js";
+} from "./YJZ2FEUT.js";
 import {
   createComponent,
   createElement,
   createHook
 } from "./U2LXZPCY.js";
 import {
+  useAttribute,
   useBooleanEvent,
   useEvent,
   useForkRef,
   useId,
   useWrapElement
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,
@@ -39,7 +40,7 @@ var useSelectList = createHook(
       resetOnEscape = true,
       hideOnEnter = true,
       focusOnMove = true,
-      composite = true,
+      composite,
       alwaysVisible
     } = _b, props = __objRest(_b, [
       "store",
@@ -87,17 +88,20 @@ var useSelectList = createHook(
       var _a2;
       return (_a2 = state.labelElement) == null ? void 0 : _a2.id;
     });
-    const hidden = isHidden(mounted, props.hidden, alwaysVisible);
-    const style = hidden ? __spreadProps(__spreadValues({}, props.style), { display: "none" }) : props.style;
+    const hasCombobox = store.useState("combobox");
+    composite = composite != null ? composite : !hasCombobox;
     if (composite) {
-      props = __spreadValues({
-        role: "listbox",
-        "aria-multiselectable": multiSelectable ? true : void 0
-      }, props);
+      props = __spreadValues({ role: "listbox" }, props);
     }
+    const role = useAttribute(ref, "role", props.role);
+    const isCompositeRole = role === "listbox" || role === "menu" || role === "tree" || role === "grid";
+    const ariaMultiSelectable = composite || isCompositeRole ? multiSelectable || void 0 : void 0;
+    const hidden = isHidden(mounted, props.hidden, alwaysVisible);
+    const style = hidden ? __spreadProps(__spreadValues({}, props.style), { display: "none" }) : props.style;
     props = __spreadProps(__spreadValues({
       id,
       "aria-labelledby": labelId,
+      "aria-multiselectable": ariaMultiSelectable,
       hidden
     }, props), {
       ref: useForkRef(id ? store.setContentElement : null, ref, props.ref),
@@ -113,7 +117,7 @@ var useSelectList = createHook(
       composite,
       focusOnMove: canFocusOnMove
     }));
-    props = useCompositeTypeahead(__spreadValues({ store }, props));
+    props = useCompositeTypeahead(__spreadValues({ store, typeahead: !hasCombobox }, props));
     return props;
   }
 );

package/esm/__chunks/{ISPCL6N4.js → FV23EKJL.js}

@@ -19,14 +19,14 @@ function walkTreeOutside(elements, callback, ancestorCallback) {
         return false;
       return maybeAncestor.contains(element);
     });
-    if (hasAncestorAlready)
-      continue;
     const doc = getDocument(element);
     while (element.parentElement && element !== doc.body) {
       ancestorCallback == null ? void 0 : ancestorCallback(element.parentElement);
-      for (const child of element.parentElement.children) {
-        if (isValidElement(child, elements)) {
-          callback(child);
+      if (!hasAncestorAlready) {
+        for (const child of element.parentElement.children) {
+          if (isValidElement(child, elements)) {
+            callback(child);
+          }
         }
       }
       element = element.parentElement;

package/esm/__chunks/{AV5WE37O.js → FY2SXATP.js}

@@ -1,9 +1,8 @@
 import {
   useLazyValue,
   useLiveRef,
-  useSafeLayoutEffect,
-  useUpdateLayoutEffect
-} from "./ASYR66PQ.js";
+  useSafeLayoutEffect
+} from "./JSNCZ2E2.js";
 import {
   __spreadProps,
   __spreadValues
@@ -59,16 +58,10 @@ function useStoreProps(store, props, key, setKey) {
   }, [store, key]);
   useSafeLayoutEffect(() => {
     return store.sync(() => {
-      const { value: value2 } = propsRef.current;
-      if (value2 === void 0)
+      if (value === void 0)
         return;
-      store.setState(key, value2);
+      store.setState(key, value);
     }, [key]);
-  }, [store, key]);
-  useUpdateLayoutEffect(() => {
-    if (value === void 0)
-      return;
-    store.setState(key, value);
   }, [store, key, value]);
 }
 function useStore(createStore) {

package/esm/__chunks/{RQE3AIUU.js → G5LGVBEX.js}

@@ -1,6 +1,6 @@
 import {
   useHeading
-} from "./NNCIS2B6.js";
+} from "./CTBUXM7K.js";
 import {
   DialogHeadingContext
 } from "./LNHZLQEK.js";
@@ -12,7 +12,7 @@ import {
 import {
   useId,
   useSafeLayoutEffect
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadValues

package/esm/__chunks/{SSM4B45D.js → GFYEEYL2.js}

@@ -1,11 +1,11 @@
 import {
   useCollectionStoreOptions,
   useCollectionStoreProps
-} from "./MEYEPL2D.js";
+} from "./NVLKN7BK.js";
 import {
   useStore,
   useStoreProps
-} from "./AV5WE37O.js";
+} from "./FY2SXATP.js";
 import {
   __spreadValues
 } from "./4BKCJXBM.js";

package/esm/__chunks/{UR3V2CXC.js → GGPLUQQY.js}

@@ -1,6 +1,6 @@
 import {
   useButton
-} from "./Q4TAYJGL.js";
+} from "./WPWRDZX3.js";
 import {
   createComponent,
   createElement,
@@ -9,9 +9,8 @@ import {
 import {
   useBooleanEvent,
   useEvent,
-  useForkRef,
-  useSafeLayoutEffect
-} from "./ASYR66PQ.js";
+  useForkRef
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,
@@ -19,7 +18,7 @@ import {
 } from "./4BKCJXBM.js";
 
 // src/disclosure/disclosure.ts
-import { useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 var useDisclosure = createHook(
   (_a) => {
     var _b = _a, { store, toggleOnClick = true } = _b, props = __objRest(_b, ["store", "toggleOnClick"]);
@@ -27,7 +26,7 @@ var useDisclosure = createHook(
     const [expanded, setExpanded] = useState(false);
     const disclosureElement = store.useState("disclosureElement");
     const open = store.useState("open");
-    useSafeLayoutEffect(() => {
+    useEffect(() => {
       let isCurrentDisclosure = disclosureElement === ref.current;
       if (!disclosureElement || !disclosureElement.isConnected) {
         store.setDisclosureElement(ref.current);

package/esm/__chunks/{U5AZX35N.js → GJAZZDOH.js}

@@ -4,13 +4,13 @@ import {
 } from "./HVBRRKV4.js";
 import {
   useCompositeTypeahead
-} from "./GRNO2YNE.js";
+} from "./XXMIY262.js";
 import {
   useComposite
-} from "./JM74EEHT.js";
+} from "./YBDXDAKQ.js";
 import {
   isHidden
-} from "./NRBO7PPT.js";
+} from "./YJZ2FEUT.js";
 import {
   createComponent,
   createElement,
@@ -18,13 +18,13 @@ import {
 } from "./U2LXZPCY.js";
 import {
   useStoreState
-} from "./AV5WE37O.js";
+} from "./FY2SXATP.js";
 import {
   useEvent,
   useForkRef,
   useId,
   useWrapElement
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{5KLYDORO.js → GKEHNDOU.js}

@@ -1,6 +1,6 @@
 import {
   useFocusable
-} from "./K4QQOEEY.js";
+} from "./IMP6LK4U.js";
 import {
   createComponent,
   createElement,
@@ -10,7 +10,7 @@ import {
   useEvent,
   useForkRef,
   useTagName
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,
@@ -30,7 +30,13 @@ function isNativeClick(event) {
   if (!event.isTrusted)
     return false;
   const element = event.currentTarget;
-  return isButton(element) || element.tagName === "SUMMARY" || element.tagName === "INPUT" || element.tagName === "TEXTAREA" || element.tagName === "A" || element.tagName === "SELECT";
+  if (event.key === "Enter") {
+    return isButton(element) || element.tagName === "SUMMARY" || element.tagName === "A";
+  }
+  if (event.key === " ") {
+    return isButton(element) || element.tagName === "SUMMARY" || element.tagName === "INPUT" || element.tagName === "SELECT";
+  }
+  return false;
 }
 var useCommand = createHook(
   (_a) => {

package/esm/__chunks/{KUXENZYT.js → H2CSFGIT.js}

@@ -1,12 +1,12 @@
 import {
   isElementMarked
-} from "./BH4YAZB2.js";
+} from "./ACAQG6DN.js";
 import {
   usePreviousMouseDownRef
 } from "./7JNF6I52.js";
 import {
   useEvent
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __spreadProps,
   __spreadValues