@ariakit/react-core 0.4.0 → 0.4.2

package/esm/__chunks/{SP3GKE3F.js → OLJGEO2U.js}

@@ -1,22 +1,22 @@
 "use client";
 import {
   useFormContext
-} from "./GEIG6TES.js";
+} from "./HQB73KOV.js";
 import {
   useCollectionItem
-} from "./7YKLTEOQ.js";
+} from "./IFMAUEA7.js";
 import {
   createElement,
   createHook,
   forwardRef,
   memo
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useBooleanEvent,
   useEvent,
   useId,
   useMergeRefs
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{G7KEAOBE.js → OPYM2TWP.js}

@@ -1,12 +1,12 @@
 "use client";
 import {
   useDialogDescription
-} from "./IKU53XMZ.js";
+} from "./TWLEIICG.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 
 // src/popover/popover-description.ts
 var TagName = "p";

package/esm/__chunks/{ZF6ZK5BT.js → PJ7ERAIM.js}

@@ -1,18 +1,18 @@
 "use client";
 import {
   useFocusable
-} from "./VA234QKF.js";
+} from "./7JCFLN3D.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useEvent,
   useMergeRefs,
   useMetadataProps,
   useTagName
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{NOYDL3YS.js → PTPUIM7N.js}

@@ -1,18 +1,19 @@
 "use client";
 import {
   hideElementFromAccessibilityTree
-} from "./BULCTPRV.js";
+} from "./4ZRXV5C7.js";
 import {
   isBackdrop
 } from "./MKDDWKFK.js";
 import {
   walkTreeOutside
-} from "./72E5EPFF.js";
+} from "./5QL6BP6J.js";
 import {
   assignStyle,
+  orchestrate,
   setAttribute,
   setProperty
-} from "./X6WIMZJE.js";
+} from "./53CQGCDZ.js";
 import {
   supportsInert
 } from "./677M2CI3.js";
@@ -31,7 +32,13 @@ function disableTree(element, ignoredElements) {
   const enableElements = tabbableElements.map((element2) => {
     if (ignoredElements == null ? void 0 : ignoredElements.some((el) => el && contains(el, element2)))
       return noop;
-    return setAttribute(element2, "tabindex", "-1");
+    const restoreFocusMethod = orchestrate(element2, "focus", () => {
+      element2.focus = noop;
+      return () => {
+        delete element2.focus;
+      };
+    });
+    return chain(setAttribute(element2, "tabindex", "-1"), restoreFocusMethod);
   });
   return chain(
     ...enableElements,

package/esm/__chunks/{EKQEJRUF.js → PWUXK5IM.js}

@@ -3,7 +3,7 @@ import {
   useEvent,
   useLiveRef,
   useSafeLayoutEffect
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __spreadProps,
   __spreadValues

package/esm/__chunks/{WKBVQ2CE.js → QDVOJENT.js}

@@ -1,26 +1,26 @@
 "use client";
 import {
   useRadioContext
-} from "./ZVFJIYOE.js";
+} from "./MIIHBIKN.js";
 import {
   useCompositeItem
-} from "./VVLSOSIG.js";
+} from "./VGL3CETR.js";
 import {
   createElement,
   createHook,
   forwardRef,
   memo
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useStoreState
-} from "./EKQEJRUF.js";
+} from "./PWUXK5IM.js";
 import {
   useEvent,
   useForceUpdate,
   useId,
   useMergeRefs,
   useTagName
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{3D6OCOHF.js → QFI3MCMR.js}

@@ -2,10 +2,10 @@
 import {
   CollectionContextProvider,
   CollectionScopedContextProvider
-} from "./MADQZZRL.js";
+} from "./6LTHW2TQ.js";
 import {
   createStoreContext
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 
 // src/composite/composite-context.tsx
 import { createContext } from "react";

package/esm/__chunks/{DMSZFK7W.js → QRAMDWD7.js}

@@ -4,15 +4,15 @@ import {
 } from "./3IEDWLST.js";
 import {
   useCompositeContext
-} from "./3D6OCOHF.js";
+} from "./QFI3MCMR.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useEvent
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadProps,
@@ -55,7 +55,11 @@ function getEnabledItems(items) {
 }
 function itemTextStartsWith(item, text) {
   var _a;
-  const itemText = ((_a = item.element) == null ? void 0 : _a.textContent) || item.children;
+  const itemText = ((_a = item.element) == null ? void 0 : _a.textContent) || item.children || // The composite item object itself doesn't include a value property, but
+  // other components like Select do. Since CompositeTypeahead is a generic
+  // component that can be used with those as well, we also consider the value
+  // property as a fallback for the typeahead text content.
+  "value" in item && item.value;
   if (!itemText)
     return false;
   return normalizeString(itemText).trim().toLowerCase().startsWith(text.toLowerCase());
@@ -94,10 +98,12 @@ var useCompositeTypeahead = createHook(function useCompositeTypeahead2(_a) {
       return;
     if (!store)
       return;
-    const { items, activeId } = store.getState();
+    const { renderedItems, items, activeId } = store.getState();
     if (!isValidTypeaheadEvent(event))
       return clearChars();
-    let enabledItems = getEnabledItems(items);
+    let enabledItems = getEnabledItems(
+      renderedItems.length ? renderedItems : items
+    );
     if (!isSelfTargetOrItem(event, enabledItems))
       return clearChars();
     event.preventDefault();

package/esm/__chunks/{CWDOOAGR.js → QY7ICDXC.js}

@@ -6,10 +6,10 @@ import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useWrapElement
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __spreadValues
 } from "./4R3V3JGP.js";

package/esm/__chunks/{TNUQLYBS.js → R6SM2O47.js}

@@ -1,21 +1,21 @@
 "use client";
 import {
   useButton
-} from "./ID4VKXL5.js";
+} from "./CKAOM5LG.js";
 import {
   useDisclosureProviderContext
-} from "./J55AVALY.js";
+} from "./RG6J4TID.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useBooleanEvent,
   useEvent,
   useMergeRefs,
   useMetadataProps
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{BX7FFG2R.js → RAKW656I.js}

@@ -6,7 +6,7 @@ import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{J55AVALY.js → RG6J4TID.js}

@@ -1,7 +1,7 @@
 "use client";
 import {
   createStoreContext
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 
 // src/disclosure/disclosure-context.tsx
 var ctx = createStoreContext();

package/esm/__chunks/{PW2PHOSG.js → RPGNBKKU.js}

@@ -7,10 +7,10 @@ import {
   createHook,
   forwardRef,
   memo
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useEvent
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{RZWNNUWF.js → RSEU2ZAG.js}

@@ -1,23 +1,23 @@
 "use client";
 import {
   useDialogDisclosure
-} from "./NNMCIH2I.js";
+} from "./LTYBQEWX.js";
 import {
   usePopoverAnchor
-} from "./NLT7LY5Y.js";
+} from "./DYQUE3V3.js";
 import {
   PopoverScopedContextProvider,
   usePopoverProviderContext
-} from "./TE637IA7.js";
+} from "./5B3U64HV.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useEvent,
   useWrapElement
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{GYVFAVAN.js → RTMHTBK3.js}

@@ -1,22 +1,22 @@
 "use client";
 import {
   useCompositeTypeahead
-} from "./DMSZFK7W.js";
+} from "./QRAMDWD7.js";
 import {
   SelectScopedContextProvider,
   useSelectProviderContext
-} from "./TKSBJDO3.js";
+} from "./SYZHUNAU.js";
 import {
   useComposite
-} from "./6WQW7ZIA.js";
+} from "./CDZXDIC7.js";
 import {
   isHidden
-} from "./SOGTNTQC.js";
+} from "./KCMTTTFR.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useAttribute,
   useBooleanEvent,
@@ -24,7 +24,7 @@ import {
   useId,
   useMergeRefs,
   useWrapElement
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{MAMNGFY7.js → RVW6STLZ.js}

@@ -1,26 +1,26 @@
 "use client";
 import {
   useMenuContext
-} from "./IG6NVGLB.js";
+} from "./3HX4ZAOG.js";
 import {
   useMenubarContext
-} from "./VBF5EZBB.js";
+} from "./UY6VBRVY.js";
 import {
   useComboboxProviderContext
-} from "./UNDSQXBK.js";
+} from "./N4X7J4OQ.js";
 import {
   useCompositeStoreProps
-} from "./7GBW5FLS.js";
+} from "./ZR5N62ZV.js";
 import {
   useHovercardStoreProps
-} from "./E5E7G32I.js";
+} from "./MSUE5EQ4.js";
 import {
   useStore,
   useStoreProps
-} from "./EKQEJRUF.js";
+} from "./PWUXK5IM.js";
 import {
   useUpdateEffect
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __spreadProps,
   __spreadValues

package/esm/__chunks/{Y44K72CZ.js → S6XGPA3F.js}

@@ -1,10 +1,10 @@
 "use client";
-import {
-  MenubarContextProvider
-} from "./VBF5EZBB.js";
 import {
   useMenubarStore
-} from "./HVBNG5AF.js";
+} from "./BCMSBQTU.js";
+import {
+  MenubarContextProvider
+} from "./UY6VBRVY.js";
 
 // src/menubar/menubar-provider.tsx
 import { jsx } from "react/jsx-runtime";

package/esm/__chunks/{TTFA75QD.js → SKM4ZW3Y.js}

@@ -1,23 +1,25 @@
 "use client";
 import {
+  ComboboxListRoleContext,
   ComboboxScopedContextProvider,
-  useComboboxProviderContext
-} from "./UNDSQXBK.js";
+  useComboboxContext,
+  useComboboxScopedContext
+} from "./N4X7J4OQ.js";
 import {
   isHidden
-} from "./SOGTNTQC.js";
+} from "./KCMTTTFR.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useAttribute,
-  useEvent,
   useId,
   useMergeRefs,
+  useSafeLayoutEffect,
   useWrapElement
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadProps,
@@ -25,35 +27,23 @@ import {
 } from "./4R3V3JGP.js";
 
 // src/combobox/combobox-list.tsx
-import { useRef } from "react";
+import { useRef, useState } from "react";
 import { invariant, removeUndefinedValues } from "@ariakit/core/utils/misc";
 import { jsx } from "react/jsx-runtime";
 var TagName = "div";
 var useComboboxList = createHook(
   function useComboboxList2(_a) {
     var _b = _a, { store, alwaysVisible } = _b, props = __objRest(_b, ["store", "alwaysVisible"]);
-    const context = useComboboxProviderContext();
+    const scopedContext = useComboboxScopedContext(true);
+    const context = useComboboxContext();
     store = store || context;
+    const scopedContextSameStore = !!store && store === scopedContext;
     invariant(
       store,
       process.env.NODE_ENV !== "production" && "ComboboxList must receive a `store` prop or be wrapped in a ComboboxProvider component."
     );
     const ref = useRef(null);
     const id = useId(props.id);
-    const onKeyDownProp = props.onKeyDown;
-    const onKeyDown = useEvent((event) => {
-      onKeyDownProp == null ? void 0 : onKeyDownProp(event);
-      if (event.defaultPrevented)
-        return;
-      if (event.key === "Escape") {
-        store == null ? void 0 : store.move(null);
-      }
-    });
-    props = useWrapElement(
-      props,
-      (element) => /* @__PURE__ */ jsx(ComboboxScopedContextProvider, { value: store, children: element }),
-      [store]
-    );
     const mounted = store.useState("mounted");
     const hidden = isHidden(mounted, props.hidden, alwaysVisible);
     const style = hidden ? __spreadProps(__spreadValues({}, props.style), { display: "none" }) : props.style;
@@ -63,15 +53,46 @@ var useComboboxList = createHook(
     const role = useAttribute(ref, "role", props.role);
     const isCompositeRole = role === "listbox" || role === "tree" || role === "grid";
     const ariaMultiSelectable = isCompositeRole ? multiSelectable || void 0 : void 0;
+    const [hasListboxInside, setHasListboxInside] = useState(false);
+    const contentElement = store.useState("contentElement");
+    useSafeLayoutEffect(() => {
+      if (!mounted)
+        return;
+      const element = ref.current;
+      if (!element)
+        return;
+      if (contentElement !== element)
+        return;
+      const callback = () => {
+        setHasListboxInside(!!element.querySelector("[role='listbox']"));
+      };
+      const observer = new MutationObserver(callback);
+      observer.observe(element, {
+        subtree: true,
+        childList: true,
+        attributeFilter: ["role"]
+      });
+      callback();
+      return () => observer.disconnect();
+    }, [mounted, contentElement]);
+    if (!hasListboxInside) {
+      props = __spreadValues({
+        role: "listbox",
+        "aria-multiselectable": ariaMultiSelectable
+      }, props);
+    }
+    props = useWrapElement(
+      props,
+      (element) => /* @__PURE__ */ jsx(ComboboxScopedContextProvider, { value: store, children: /* @__PURE__ */ jsx(ComboboxListRoleContext.Provider, { value: role, children: element }) }),
+      [store, role]
+    );
+    const setContentElement = id && (!scopedContext || !scopedContextSameStore) ? store.setContentElement : null;
     props = __spreadProps(__spreadValues({
       id,
-      hidden,
-      role: "listbox",
-      "aria-multiselectable": ariaMultiSelectable
+      hidden
     }, props), {
-      ref: useMergeRefs(id ? store.setContentElement : null, ref, props.ref),
-      style,
-      onKeyDown
+      ref: useMergeRefs(setContentElement, ref, props.ref),
+      style
     });
     return removeUndefinedValues(props);
   }

package/esm/__chunks/{SS66VZAQ.js → SQ5LSFI6.js}

@@ -1,14 +1,14 @@
 "use client";
 import {
   useCollectionStoreProps
-} from "./Y6GYTNQ2.js";
+} from "./LGWSZOP2.js";
 import {
   useStore,
   useStoreProps
-} from "./EKQEJRUF.js";
+} from "./PWUXK5IM.js";
 import {
   useEvent
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __spreadProps,
   __spreadValues

package/esm/__chunks/{TKSBJDO3.js → SYZHUNAU.js}

@@ -2,14 +2,14 @@
 import {
   CompositeContextProvider,
   CompositeScopedContextProvider
-} from "./3D6OCOHF.js";
+} from "./QFI3MCMR.js";
 import {
   PopoverContextProvider,
   PopoverScopedContextProvider
-} from "./TE637IA7.js";
+} from "./5B3U64HV.js";
 import {
   createStoreContext
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 
 // src/select/select-context.tsx
 import { createContext } from "react";

package/esm/__chunks/{K3QOUHVI.js → T2FNH4GQ.js}

@@ -1,12 +1,12 @@
 "use client";
 import {
   useGroup
-} from "./CWDOOAGR.js";
+} from "./QY7ICDXC.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   __objRest
 } from "./4R3V3JGP.js";

package/esm/__chunks/{IKU53XMZ.js → TWLEIICG.js}

@@ -1,16 +1,16 @@
 "use client";
 import {
   DialogDescriptionContext
-} from "./XXVAHUAO.js";
+} from "./IWHI6Y45.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useId,
   useSafeLayoutEffect
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadValues

package/esm/__chunks/{2O7COXT7.js → TZ7AP4RP.js}

@@ -2,16 +2,16 @@
 import {
   CompositeRowContext,
   useCompositeContext
-} from "./3D6OCOHF.js";
+} from "./QFI3MCMR.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useId,
   useWrapElement
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest,
   __spreadValues

package/esm/__chunks/{6BJGLK2C.js → U2L67A6K.js}

@@ -1,11 +1,11 @@
 "use client";
 import {
   useRootDialog
-} from "./CS347UVZ.js";
+} from "./4KKLZMKS.js";
 import {
   assignStyle,
   setCSSProperty
-} from "./X6WIMZJE.js";
+} from "./53CQGCDZ.js";
 
 // src/dialog/utils/use-prevent-body-scroll.ts
 import { useEffect } from "react";

package/esm/__chunks/{IBZ5GRML.js → U6NWMU2A.js}

@@ -1,12 +1,12 @@
 "use client";
 import {
   usePopoverHeading
-} from "./ZXBIDNZ3.js";
+} from "./I6CJRIAG.js";
 import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 
 // src/hovercard/hovercard-heading.ts
 var TagName = "h1";

package/esm/__chunks/{WCIYB4YS.js → UHSH3H5I.js}

@@ -6,10 +6,10 @@ import {
   createElement,
   createHook,
   forwardRef
-} from "./5M6RSQEC.js";
+} from "./GUCZNEAD.js";
 import {
   useWrapElement
-} from "./6O5OEQGF.js";
+} from "./WOWUAP42.js";
 import {
   __objRest
 } from "./4R3V3JGP.js";