@ariakit/react-core 0.2.2 → 0.2.3

package/esm/__chunks/{QRJCFBOI.js → PXJHIBDO.js}

@@ -1,11 +1,11 @@
 import {
   usePopoverStoreOptions,
   usePopoverStoreProps
-} from "./5PIH3SMS.js";
+} from "./T4YP7E6T.js";
 import {
   useStore,
   useStoreProps
-} from "./AV5WE37O.js";
+} from "./FY2SXATP.js";
 import {
   __spreadValues
 } from "./4BKCJXBM.js";

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

@@ -4,13 +4,13 @@ import {
 } from "./HVBRRKV4.js";
 import {
   useCompositeTypeahead
-} from "./GRNO2YNE.js";
+} from "./ZYTXNZCP.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/{7SVOWQTM.js → SPQB36IP.js}

@@ -1,6 +1,6 @@
 import {
   useGroupLabel
-} from "./RGAE7WHK.js";
+} from "./XO22PNQJ.js";
 import {
   createComponent,
   createElement,

package/esm/__chunks/{EC5UVTWD.js → SSEF6EVJ.js}

@@ -6,11 +6,11 @@ import {
 } 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/{T3IC7FMC.js → SUXGXJIC.js}

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

package/esm/__chunks/{K35D42HN.js → T2QG6N7V.js}

@@ -3,7 +3,10 @@ import {
 } from "./5VGBBGF5.js";
 import {
   isHidden
-} from "./NRBO7PPT.js";
+} from "./YJZ2FEUT.js";
+import {
+  useFocusable
+} from "./IMP6LK4U.js";
 import {
   createComponent,
   createElement,
@@ -14,7 +17,7 @@ import {
   useForkRef,
   useId,
   useWrapElement
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,
@@ -23,10 +26,11 @@ import {
 
 // src/combobox/combobox-list.tsx
 import { useRef } from "react";
+import { isFocusEventOutside } from "@ariakit/core/utils/events";
 import { jsx } from "react/jsx-runtime";
 var useComboboxList = createHook(
   (_a) => {
-    var _b = _a, { store, alwaysVisible } = _b, props = __objRest(_b, ["store", "alwaysVisible"]);
+    var _b = _a, { store, focusable = true, alwaysVisible } = _b, props = __objRest(_b, ["store", "focusable", "alwaysVisible"]);
     const ref = useRef(null);
     const id = useId(props.id);
     const onKeyDownProp = props.onKeyDown;
@@ -38,6 +42,35 @@ var useComboboxList = createHook(
         store.move(null);
       }
     });
+    const restoreVirtualFocus = useRef(false);
+    const onFocusVisibleProp = props.onFocusVisible;
+    const onFocusVisible = useEvent((event) => {
+      onFocusVisibleProp == null ? void 0 : onFocusVisibleProp(event);
+      if (event.defaultPrevented)
+        return;
+      if (event.type !== "focus")
+        return;
+      const { virtualFocus } = store.getState();
+      if (!virtualFocus)
+        return;
+      const { relatedTarget, currentTarget } = event;
+      if (relatedTarget && currentTarget.contains(relatedTarget))
+        return;
+      restoreVirtualFocus.current = true;
+      store.setState("virtualFocus", false);
+    });
+    const onBlurProp = props.onBlur;
+    const onBlur = useEvent((event) => {
+      onBlurProp == null ? void 0 : onBlurProp(event);
+      if (event.defaultPrevented)
+        return;
+      if (!restoreVirtualFocus.current)
+        return;
+      if (!isFocusEventOutside(event))
+        return;
+      restoreVirtualFocus.current = false;
+      store.setState("virtualFocus", true);
+    });
     props = useWrapElement(
       props,
       (element) => /* @__PURE__ */ jsx(ComboboxContext.Provider, { value: store, children: element }),
@@ -48,13 +81,17 @@ var useComboboxList = createHook(
     const style = hidden ? __spreadProps(__spreadValues({}, props.style), { display: "none" }) : props.style;
     props = __spreadProps(__spreadValues({
       id,
+      hidden,
       role: "listbox",
-      hidden
+      tabIndex: focusable ? -1 : void 0
     }, props), {
       ref: useForkRef(id ? store.setContentElement : null, ref, props.ref),
       style,
-      onKeyDown
+      onKeyDown,
+      onFocusVisible,
+      onBlur
     });
+    props = useFocusable(__spreadValues({ focusable }, props));
     return props;
   }
 );

package/esm/__chunks/{5PIH3SMS.js → T4YP7E6T.js}

@@ -1,11 +1,11 @@
 import {
   useDialogStoreOptions,
   useDialogStoreProps
-} from "./OBNQHP6V.js";
+} from "./5KT3GDTM.js";
 import {
   useStore,
   useStoreProps
-} from "./AV5WE37O.js";
+} from "./FY2SXATP.js";
 import {
   __spreadValues
 } from "./4BKCJXBM.js";

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

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

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

@@ -1,6 +1,6 @@
 import {
   useButton
-} from "./Q4TAYJGL.js";
+} from "./4UNPWQYT.js";
 import {
   createComponent,
   createElement,
@@ -11,7 +11,7 @@ import {
   useEvent,
   useForkRef,
   useSafeLayoutEffect
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{FYVEOR7R.js → URYSNCDU.js}

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

package/esm/__chunks/{NBC642OI.js → UYBDYDBM.js}

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

package/esm/__chunks/{IMFOFYLN.js → UZWTAYHH.js}

@@ -3,7 +3,7 @@ import {
 } from "./P3I4MECH.js";
 import {
   useCollectionItem
-} from "./2VSLIXPB.js";
+} from "./CWGC7RDD.js";
 import {
   createElement,
   createHook,
@@ -14,7 +14,7 @@ import {
   useEvent,
   useForkRef,
   useId
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,

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

@@ -1,27 +1,28 @@
 import {
   useCompositeTypeahead
-} from "./GRNO2YNE.js";
+} from "./ZYTXNZCP.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/{GHFGDKVL.js → XIW77V4E.js}

@@ -1,6 +1,6 @@
 import {
   usePopoverHeading
-} from "./THRMCR5V.js";
+} from "./A5P4XOHC.js";
 import {
   createComponent,
   createElement,

package/esm/__chunks/{RGAE7WHK.js → XO22PNQJ.js}

@@ -9,7 +9,7 @@ import {
 import {
   useId,
   useSafeLayoutEffect
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __spreadValues
 } from "./4BKCJXBM.js";

package/esm/__chunks/{KNDB2OYV.js → XURV7VPV.js}

@@ -8,7 +8,7 @@ import {
 } from "./U2LXZPCY.js";
 import {
   useEvent
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,

package/esm/__chunks/{JM74EEHT.js → YBDXDAKQ.js}

@@ -10,7 +10,7 @@ import {
 } from "./Z3X3QN6P.js";
 import {
   useFocusable
-} from "./K4QQOEEY.js";
+} from "./IMP6LK4U.js";
 import {
   createComponent,
   createElement,
@@ -22,7 +22,7 @@ import {
   useForkRef,
   useSafeLayoutEffect,
   useWrapElement
-} from "./ASYR66PQ.js";
+} from "./JSNCZ2E2.js";
 import {
   __objRest,
   __spreadProps,
@@ -308,7 +308,7 @@ var useComposite = createHook(
     const activeDescendant = store.useState(
       (state) => {
         var _a2;
-        return state.virtualFocus ? (_a2 = getEnabledItem(store, state.activeId)) == null ? void 0 : _a2.id : void 0;
+        return composite && state.virtualFocus ? (_a2 = getEnabledItem(store, state.activeId)) == null ? void 0 : _a2.id : void 0;
       }
     );
     props = __spreadProps(__spreadValues({

package/esm/__chunks/{NRBO7PPT.js → YJZ2FEUT.js}

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

package/esm/__chunks/{GRNO2YNE.js → ZYTXNZCP.js}

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

package/esm/button/button.js

@@ -1,12 +1,12 @@
 import {
   Button,
   useButton
-} from "../__chunks/Q4TAYJGL.js";
-import "../__chunks/5KLYDORO.js";
-import "../__chunks/K4QQOEEY.js";
+} from "../__chunks/4UNPWQYT.js";
+import "../__chunks/DNPURXZF.js";
+import "../__chunks/IMP6LK4U.js";
 import "../__chunks/BMLNRUFQ.js";
 import "../__chunks/U2LXZPCY.js";
-import "../__chunks/ASYR66PQ.js";
+import "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import "../__chunks/4BKCJXBM.js";
 export {

package/esm/checkbox/checkbox-store.js

@@ -2,9 +2,9 @@ import {
   useCheckboxStore,
   useCheckboxStoreOptions,
   useCheckboxStoreProps
-} from "../__chunks/KCAKBKAU.js";
-import "../__chunks/AV5WE37O.js";
-import "../__chunks/ASYR66PQ.js";
+} from "../__chunks/6RRCHXOA.js";
+import "../__chunks/FY2SXATP.js";
+import "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import "../__chunks/4BKCJXBM.js";
 export {

package/esm/checkbox/checkbox.js

@@ -1,14 +1,14 @@
 import {
   Checkbox,
   useCheckbox
-} from "../__chunks/C2EK56NQ.js";
+} from "../__chunks/EGINZ4IG.js";
 import "../__chunks/M5KYRTQG.js";
-import "../__chunks/5KLYDORO.js";
-import "../__chunks/K4QQOEEY.js";
+import "../__chunks/DNPURXZF.js";
+import "../__chunks/IMP6LK4U.js";
 import "../__chunks/BMLNRUFQ.js";
 import "../__chunks/U2LXZPCY.js";
-import "../__chunks/AV5WE37O.js";
-import "../__chunks/ASYR66PQ.js";
+import "../__chunks/FY2SXATP.js";
+import "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import "../__chunks/4BKCJXBM.js";
 export {

package/esm/collection/collection-item.js

@@ -1,10 +1,10 @@
 import {
   CollectionItem,
   useCollectionItem
-} from "../__chunks/2VSLIXPB.js";
+} from "../__chunks/CWGC7RDD.js";
 import "../__chunks/T3DJZG63.js";
 import "../__chunks/U2LXZPCY.js";
-import "../__chunks/ASYR66PQ.js";
+import "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import "../__chunks/4BKCJXBM.js";
 export {

package/esm/collection/collection-store.js

@@ -2,9 +2,9 @@ import {
   useCollectionStore,
   useCollectionStoreOptions,
   useCollectionStoreProps
-} from "../__chunks/MEYEPL2D.js";
-import "../__chunks/AV5WE37O.js";
-import "../__chunks/ASYR66PQ.js";
+} from "../__chunks/NVLKN7BK.js";
+import "../__chunks/FY2SXATP.js";
+import "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import "../__chunks/4BKCJXBM.js";
 export {

package/esm/collection/collection.js

@@ -8,7 +8,7 @@ import {
 } from "../__chunks/U2LXZPCY.js";
 import {
   useWrapElement
-} from "../__chunks/ASYR66PQ.js";
+} from "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import {
   __objRest

package/esm/combobox/combobox-cancel.js

@@ -1,8 +1,8 @@
 import {
   useButton
-} from "../__chunks/Q4TAYJGL.js";
-import "../__chunks/5KLYDORO.js";
-import "../__chunks/K4QQOEEY.js";
+} from "../__chunks/4UNPWQYT.js";
+import "../__chunks/DNPURXZF.js";
+import "../__chunks/IMP6LK4U.js";
 import "../__chunks/BMLNRUFQ.js";
 import {
   createComponent,
@@ -11,7 +11,7 @@ import {
 } from "../__chunks/U2LXZPCY.js";
 import {
   useEvent
-} from "../__chunks/ASYR66PQ.js";
+} from "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import {
   __objRest,

package/esm/combobox/combobox-disclosure.js

@@ -1,10 +1,10 @@
 import {
   useDialogDisclosure
-} from "../__chunks/PI5KZQST.js";
-import "../__chunks/UR3V2CXC.js";
-import "../__chunks/Q4TAYJGL.js";
-import "../__chunks/5KLYDORO.js";
-import "../__chunks/K4QQOEEY.js";
+} from "../__chunks/B5KVTUMZ.js";
+import "../__chunks/UCNIXL4N.js";
+import "../__chunks/4UNPWQYT.js";
+import "../__chunks/DNPURXZF.js";
+import "../__chunks/IMP6LK4U.js";
 import "../__chunks/BMLNRUFQ.js";
 import {
   createComponent,
@@ -13,7 +13,7 @@ import {
 } from "../__chunks/U2LXZPCY.js";
 import {
   useEvent
-} from "../__chunks/ASYR66PQ.js";
+} from "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import {
   __objRest,

package/esm/combobox/combobox-group-label.js

@@ -1,14 +1,14 @@
 import {
   useCompositeGroupLabel
-} from "../__chunks/7SVOWQTM.js";
-import "../__chunks/RGAE7WHK.js";
+} from "../__chunks/SPQB36IP.js";
+import "../__chunks/XO22PNQJ.js";
 import "../__chunks/F5VAC7MB.js";
 import {
   createComponent,
   createElement,
   createHook
 } from "../__chunks/U2LXZPCY.js";
-import "../__chunks/ASYR66PQ.js";
+import "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import "../__chunks/4BKCJXBM.js";
 

package/esm/combobox/combobox-group.js

@@ -1,14 +1,14 @@
 import {
   useCompositeGroup
-} from "../__chunks/2A7SHVQX.js";
-import "../__chunks/PPIHKGNC.js";
+} from "../__chunks/7GX7Z4RT.js";
+import "../__chunks/34WFGKVL.js";
 import "../__chunks/F5VAC7MB.js";
 import {
   createComponent,
   createElement,
   createHook
 } from "../__chunks/U2LXZPCY.js";
-import "../__chunks/ASYR66PQ.js";
+import "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import "../__chunks/4BKCJXBM.js";
 

package/esm/combobox/combobox-item.js

@@ -4,28 +4,28 @@ import {
 } from "../__chunks/5VGBBGF5.js";
 import {
   useCompositeHover
-} from "../__chunks/Y2V2DFHD.js";
+} from "../__chunks/GFLJYJHR.js";
 import {
   useCompositeItem
-} from "../__chunks/X4UE5ZYC.js";
-import "../__chunks/5KLYDORO.js";
-import "../__chunks/2VSLIXPB.js";
+} from "../__chunks/HYSKO35G.js";
+import "../__chunks/DNPURXZF.js";
+import "../__chunks/CWGC7RDD.js";
 import "../__chunks/T3DJZG63.js";
 import "../__chunks/OXPV2NBK.js";
 import "../__chunks/Z3X3QN6P.js";
-import "../__chunks/K4QQOEEY.js";
+import "../__chunks/IMP6LK4U.js";
 import "../__chunks/BMLNRUFQ.js";
 import {
   createElement,
   createHook,
   createMemoComponent
 } from "../__chunks/U2LXZPCY.js";
-import "../__chunks/AV5WE37O.js";
+import "../__chunks/FY2SXATP.js";
 import {
   useBooleanEvent,
   useEvent,
   useWrapElement
-} from "../__chunks/ASYR66PQ.js";
+} from "../__chunks/JSNCZ2E2.js";
 import "../__chunks/SXC6BPOF.js";
 import {
   __objRest,
@@ -47,7 +47,6 @@ var useComboboxItem = createHook(
       value,
       hideOnClick = value != null,
       setValueOnClick = true,
-      shouldRegisterItem = true,
       focusOnHover = false,
       moveOnKeyPress = true,
       getItem: getItemProp
@@ -56,7 +55,6 @@ var useComboboxItem = createHook(
       "value",
       "hideOnClick",
       "setValueOnClick",
-      "shouldRegisterItem",
       "focusOnHover",
       "moveOnKeyPress",
       "getItem"
@@ -128,14 +126,10 @@ var useComboboxItem = createHook(
       onKeyDown
     });
     const moveOnKeyPressProp = useBooleanEvent(moveOnKeyPress);
-    const shouldRegister = store.useState(
-      (state) => state.mounted && shouldRegisterItem
-    );
     props = useCompositeItem(__spreadProps(__spreadValues({
       store
     }, props), {
       getItem,
-      shouldRegisterItem: shouldRegister,
       // Dispatch a custom event on the combobox input when moving to an item
       // with the keyboard so the Combobox component can enable inline
       // autocompletion.

package/esm/combobox/combobox-list.d.ts

@@ -1,5 +1,6 @@
 import type { DisclosureContentOptions } from "../disclosure/disclosure-content.js";
-import type { As, Options, Props } from "../utils/types.js";
+import type { FocusableOptions } from "../focusable/focusable.js";
+import type { As, Props } from "../utils/types.js";
 import type { ComboboxStore } from "./combobox-store.js";
 /**
  * Returns props to create a `ComboboxList` component.
@@ -34,7 +35,7 @@ export declare const useComboboxList: import("../utils/types.js").Hook<ComboboxL
  * ```
  */
 export declare const ComboboxList: import("../utils/types.js").Component<ComboboxListOptions<"div">>;
-export interface ComboboxListOptions<T extends As = "div"> extends Options<T>, Pick<DisclosureContentOptions, "alwaysVisible"> {
+export interface ComboboxListOptions<T extends As = "div"> extends FocusableOptions<T>, Pick<DisclosureContentOptions, "alwaysVisible"> {
     /**
      * Object returned by the `useComboboxStore` hook.
      */