@ariakit/react-core 0.3.10 → 0.3.12

package/cjs/combobox/combobox-item.cjs

@@ -9,10 +9,10 @@ var _IPYAEPOTcjs = require('../__chunks/IPYAEPOT.cjs');
 var _3WCBE6SUcjs = require('../__chunks/3WCBE6SU.cjs');
 
 
-var _TTMCZ7ZNcjs = require('../__chunks/TTMCZ7ZN.cjs');
+var _IO6J4PANcjs = require('../__chunks/IO6J4PAN.cjs');
 require('../__chunks/DAJUUBUI.cjs');
 require('../__chunks/R5A2WTWB.cjs');
-require('../__chunks/RV3PHHWM.cjs');
+require('../__chunks/6ZZYUFPW.cjs');
 require('../__chunks/UZNYSPKP.cjs');
 require('../__chunks/BZTDJIVT.cjs');
 require('../__chunks/UVBBMANL.cjs');
@@ -25,7 +25,7 @@ require('../__chunks/75KXQZJX.cjs');
 
 
 var _RNZNGEL4cjs = require('../__chunks/RNZNGEL4.cjs');
-require('../__chunks/B233QVZE.cjs');
+require('../__chunks/OLOZ5JT2.cjs');
 
 
 
@@ -169,7 +169,7 @@ var useComboboxItem = _RNZNGEL4cjs.createHook.call(void 0,
       onKeyDown
     });
     const moveOnKeyPressProp = _EO6LS72Hcjs.useBooleanEvent.call(void 0, moveOnKeyPress);
-    props = _TTMCZ7ZNcjs.useCompositeItem.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
+    props = _IO6J4PANcjs.useCompositeItem.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
       store
     }, props), {
       getItem,

package/cjs/combobox/combobox-item.d.cts

@@ -56,6 +56,11 @@ export interface ComboboxItemOptions<T extends As = "div"> extends CompositeItem
      *   [`setValueOnClick`](https://ariakit.org/reference/combobox-item#setvalueonclick)
      *   is set to `true`, this will be the value of the combobox input when the
      *   user clicks on this item.
+     * - If
+     *   [`selectValueOnClick`](https://ariakit.org/reference/combobox-item#selectvalueonclick)
+     *   is set to `true`, this will be the value of the
+     *   [`selectedValue`](https://ariakit.org/reference/combobox-provider#selectedvalue)
+     *   state.
      * - If the
      *   [`autoComplete`](https://ariakit.org/reference/combobox#autocomplete)
      *   prop on the [`Combobox`](https://ariakit.org/reference/combobox)
@@ -88,7 +93,12 @@ export interface ComboboxItemOptions<T extends As = "div"> extends CompositeItem
      * [`selectedValue`](https://ariakit.org/reference/combobox-provider#selectedvalue)
      * state using this item's
      * [`value`](https://ariakit.org/reference/combobox-item#value) when the item
-     * is clicked.
+     * is clicked. If a callback is provided, it will only be invoked if the item
+     * has a value.
+     *
+     * Live examples:
+     * - [Submenu with
+     *   Combobox](https://ariakit.org/examples/menu-nested-combobox)
      * @default true
      */
     selectValueOnClick?: BooleanOrCallback<MouseEvent<HTMLElement>>;
@@ -102,6 +112,8 @@ export interface ComboboxItemOptions<T extends As = "div"> extends CompositeItem
      *
      * Live examples:
      * - [Menu with Combobox](https://ariakit.org/examples/menu-combobox)
+     * - [Submenu with
+     *   Combobox](https://ariakit.org/examples/menu-nested-combobox)
      */
     setValueOnClick?: BooleanOrCallback<MouseEvent<HTMLElement>>;
     /**

package/cjs/combobox/combobox-item.d.ts

@@ -56,6 +56,11 @@ export interface ComboboxItemOptions<T extends As = "div"> extends CompositeItem
      *   [`setValueOnClick`](https://ariakit.org/reference/combobox-item#setvalueonclick)
      *   is set to `true`, this will be the value of the combobox input when the
      *   user clicks on this item.
+     * - If
+     *   [`selectValueOnClick`](https://ariakit.org/reference/combobox-item#selectvalueonclick)
+     *   is set to `true`, this will be the value of the
+     *   [`selectedValue`](https://ariakit.org/reference/combobox-provider#selectedvalue)
+     *   state.
      * - If the
      *   [`autoComplete`](https://ariakit.org/reference/combobox#autocomplete)
      *   prop on the [`Combobox`](https://ariakit.org/reference/combobox)
@@ -88,7 +93,12 @@ export interface ComboboxItemOptions<T extends As = "div"> extends CompositeItem
      * [`selectedValue`](https://ariakit.org/reference/combobox-provider#selectedvalue)
      * state using this item's
      * [`value`](https://ariakit.org/reference/combobox-item#value) when the item
-     * is clicked.
+     * is clicked. If a callback is provided, it will only be invoked if the item
+     * has a value.
+     *
+     * Live examples:
+     * - [Submenu with
+     *   Combobox](https://ariakit.org/examples/menu-nested-combobox)
      * @default true
      */
     selectValueOnClick?: BooleanOrCallback<MouseEvent<HTMLElement>>;
@@ -102,6 +112,8 @@ export interface ComboboxItemOptions<T extends As = "div"> extends CompositeItem
      *
      * Live examples:
      * - [Menu with Combobox](https://ariakit.org/examples/menu-combobox)
+     * - [Submenu with
+     *   Combobox](https://ariakit.org/examples/menu-nested-combobox)
      */
     setValueOnClick?: BooleanOrCallback<MouseEvent<HTMLElement>>;
     /**

package/cjs/combobox/combobox-list.cjs

@@ -2,22 +2,22 @@
 
 
 
-var _LO3RECODcjs = require('../__chunks/LO3RECOD.cjs');
+var _D4TG5DM4cjs = require('../__chunks/D4TG5DM4.cjs');
 require('../__chunks/3WCBE6SU.cjs');
 require('../__chunks/UZNYSPKP.cjs');
 require('../__chunks/BZTDJIVT.cjs');
-require('../__chunks/TD5MOASJ.cjs');
+require('../__chunks/YPVQYY4J.cjs');
 require('../__chunks/UVBBMANL.cjs');
 require('../__chunks/F2A2ZQDB.cjs');
 require('../__chunks/S6UU7NA4.cjs');
 require('../__chunks/Z3GCTNW4.cjs');
 require('../__chunks/75KXQZJX.cjs');
 require('../__chunks/RNZNGEL4.cjs');
-require('../__chunks/B233QVZE.cjs');
+require('../__chunks/OLOZ5JT2.cjs');
 require('../__chunks/EO6LS72H.cjs');
 require('../__chunks/CJDHQUBR.cjs');
 require('../__chunks/AV6KTKLE.cjs');
 
 
 
-exports.ComboboxList = _LO3RECODcjs.ComboboxList; exports.useComboboxList = _LO3RECODcjs.useComboboxList;
+exports.ComboboxList = _D4TG5DM4cjs.ComboboxList; exports.useComboboxList = _D4TG5DM4cjs.useComboboxList;

package/cjs/combobox/combobox-popover.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _LO3RECODcjs = require('../__chunks/LO3RECOD.cjs');
+var _D4TG5DM4cjs = require('../__chunks/D4TG5DM4.cjs');
 
 
 var _3WCBE6SUcjs = require('../__chunks/3WCBE6SU.cjs');
@@ -9,11 +9,11 @@ require('../__chunks/UZNYSPKP.cjs');
 require('../__chunks/BZTDJIVT.cjs');
 
 
-var _NVHGMKAEcjs = require('../__chunks/NVHGMKAE.cjs');
+var _KDG57VZVcjs = require('../__chunks/KDG57VZV.cjs');
 
 
-var _36QK2QLEcjs = require('../__chunks/36QK2QLE.cjs');
-require('../__chunks/RTT4XR27.cjs');
+var _EKB76T2Ucjs = require('../__chunks/EKB76T2U.cjs');
+require('../__chunks/WZ3DRKGP.cjs');
 require('../__chunks/NKR65BKC.cjs');
 require('../__chunks/PZL34OVO.cjs');
 require('../__chunks/344F3DYO.cjs');
@@ -34,7 +34,7 @@ require('../__chunks/XB3G2EO2.cjs');
 require('../__chunks/CVD2AZE2.cjs');
 require('../__chunks/2BIO7R5N.cjs');
 require('../__chunks/LAUATD5O.cjs');
-require('../__chunks/TD5MOASJ.cjs');
+require('../__chunks/YPVQYY4J.cjs');
 require('../__chunks/UVBBMANL.cjs');
 require('../__chunks/F2A2ZQDB.cjs');
 require('../__chunks/S6UU7NA4.cjs');
@@ -46,9 +46,9 @@ require('../__chunks/R66IWXK6.cjs');
 
 
 var _RNZNGEL4cjs = require('../__chunks/RNZNGEL4.cjs');
-require('../__chunks/HRKRTCJC.cjs');
-require('../__chunks/EGAIDKB5.cjs');
-require('../__chunks/B233QVZE.cjs');
+require('../__chunks/W5LJEMLB.cjs');
+require('../__chunks/JAQJG42R.cjs');
+require('../__chunks/OLOZ5JT2.cjs');
 require('../__chunks/EO6LS72H.cjs');
 require('../__chunks/CJDHQUBR.cjs');
 
@@ -64,7 +64,7 @@ function isController(target, ...ids) {
   if (!target)
     return false;
   if ("id" in target) {
-    const selector = ids.filter(Boolean).map((id) => `[aria-controls="${id}"]`).join(", ");
+    const selector = ids.filter(Boolean).map((id) => `[aria-controls~="${id}"]`).join(", ");
     if (!selector)
       return false;
     return _dom.matches.call(void 0, target, selector);
@@ -75,11 +75,13 @@ var useComboboxPopover = _RNZNGEL4cjs.createHook.call(void 0,
   (_a) => {
     var _b = _a, {
       store,
+      modal,
       tabIndex,
       alwaysVisible,
       hideOnInteractOutside = true
     } = _b, props = _AV6KTKLEcjs.__objRest.call(void 0, _b, [
       "store",
+      "modal",
       "tabIndex",
       "alwaysVisible",
       "hideOnInteractOutside"
@@ -91,23 +93,50 @@ var useComboboxPopover = _RNZNGEL4cjs.createHook.call(void 0,
       process.env.NODE_ENV !== "production" && "ComboboxPopover must receive a `store` prop or be wrapped in a ComboboxProvider component."
     );
     const baseElement = store.useState("baseElement");
-    props = _LO3RECODcjs.useComboboxList.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store, alwaysVisible }, props));
-    props = _NVHGMKAEcjs.usePopover.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
+    props = _D4TG5DM4cjs.useComboboxList.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store, alwaysVisible }, props));
+    props = _KDG57VZVcjs.usePopover.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
       store,
+      modal,
       alwaysVisible,
+      backdrop: false,
       autoFocusOnShow: false,
       autoFocusOnHide: false,
       finalFocus: baseElement,
       preserveTabOrderAnchor: null
     }, props), {
-      // Combobox popovers can't be modal because the focus may be (and is by
-      // default) outside of it on the combobox input element.
-      modal: false,
+      // When the combobox popover is modal, we make sure to include the
+      // combobox input and all the combobox controls (cancel, disclosure) in
+      // the list of persistent elements so they make part of the modal context,
+      // allowing users to tab through them.
+      getPersistentElements() {
+        var _a2;
+        const elements = ((_a2 = props.getPersistentElements) == null ? void 0 : _a2.call(props)) || [];
+        if (!modal)
+          return elements;
+        if (!store)
+          return elements;
+        const { contentElement, baseElement: baseElement2 } = store.getState();
+        if (!baseElement2)
+          return elements;
+        const doc = _dom.getDocument.call(void 0, baseElement2);
+        const selectors = [];
+        if (contentElement == null ? void 0 : contentElement.id) {
+          selectors.push(`[aria-controls~="${contentElement.id}"]`);
+        }
+        if (baseElement2 == null ? void 0 : baseElement2.id) {
+          selectors.push(`[aria-controls~="${baseElement2.id}"]`);
+        }
+        if (!selectors.length)
+          return [...elements, baseElement2];
+        const selector = selectors.join(",");
+        const controlElements = doc.querySelectorAll(selector);
+        return [...elements, ...controlElements];
+      },
       // Make sure we don't hide the popover when the user interacts with the
       // combobox cancel or the combobox disclosure buttons. They will have the
       // aria-controls attribute pointing to either the combobox input or the
       // combobox popover elements.
-      hideOnInteractOutside: (event) => {
+      hideOnInteractOutside(event) {
         var _a2, _b2;
         const state = store == null ? void 0 : store.getState();
         const contentId = (_a2 = state == null ? void 0 : state.contentElement) == null ? void 0 : _a2.id;
@@ -121,7 +150,7 @@ var useComboboxPopover = _RNZNGEL4cjs.createHook.call(void 0,
     return props;
   }
 );
-var ComboboxPopover = _36QK2QLEcjs.createDialogComponent.call(void 0, 
+var ComboboxPopover = _EKB76T2Ucjs.createDialogComponent.call(void 0, 
   _RNZNGEL4cjs.createComponent.call(void 0, (props) => {
     const htmlProps = useComboboxPopover(props);
     return _RNZNGEL4cjs.createElement.call(void 0, "div", htmlProps);

package/cjs/combobox/combobox-popover.d.cts

@@ -35,6 +35,6 @@ export declare const useComboboxPopover: import("../utils/types.js").Hook<Combob
  * ```
  */
 export declare const ComboboxPopover: import("../utils/types.js").Component<ComboboxPopoverOptions<"div">>;
-export interface ComboboxPopoverOptions<T extends As = "div"> extends ComboboxListOptions<T>, Omit<PopoverOptions<T>, "store" | "modal"> {
+export interface ComboboxPopoverOptions<T extends As = "div"> extends ComboboxListOptions<T>, Omit<PopoverOptions<T>, "store"> {
 }
 export type ComboboxPopoverProps<T extends As = "div"> = Props<ComboboxPopoverOptions<T>>;

package/cjs/combobox/combobox-popover.d.ts

@@ -35,6 +35,6 @@ export declare const useComboboxPopover: import("../utils/types.js").Hook<Combob
  * ```
  */
 export declare const ComboboxPopover: import("../utils/types.js").Component<ComboboxPopoverOptions<"div">>;
-export interface ComboboxPopoverOptions<T extends As = "div"> extends ComboboxListOptions<T>, Omit<PopoverOptions<T>, "store" | "modal"> {
+export interface ComboboxPopoverOptions<T extends As = "div"> extends ComboboxListOptions<T>, Omit<PopoverOptions<T>, "store"> {
 }
 export type ComboboxPopoverProps<T extends As = "div"> = Props<ComboboxPopoverOptions<T>>;

package/cjs/combobox/combobox-provider.cjs

@@ -1,22 +1,22 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _47RLIVETcjs = require('../__chunks/47RLIVET.cjs');
+var _CFKRWKZRcjs = require('../__chunks/CFKRWKZR.cjs');
 
 
 var _3WCBE6SUcjs = require('../__chunks/3WCBE6SU.cjs');
-require('../__chunks/N6CR2VNN.cjs');
-require('../__chunks/DKOWT2IJ.cjs');
+require('../__chunks/LUL2YWZ3.cjs');
+require('../__chunks/CDNJPIEG.cjs');
 require('../__chunks/UZNYSPKP.cjs');
 require('../__chunks/BZTDJIVT.cjs');
 require('../__chunks/UVBBMANL.cjs');
 require('../__chunks/F2A2ZQDB.cjs');
 require('../__chunks/S6UU7NA4.cjs');
 require('../__chunks/RNZNGEL4.cjs');
-require('../__chunks/7BPAESN3.cjs');
-require('../__chunks/HRKRTCJC.cjs');
-require('../__chunks/EGAIDKB5.cjs');
-require('../__chunks/B233QVZE.cjs');
+require('../__chunks/NRGWVSB5.cjs');
+require('../__chunks/W5LJEMLB.cjs');
+require('../__chunks/JAQJG42R.cjs');
+require('../__chunks/OLOZ5JT2.cjs');
 require('../__chunks/EO6LS72H.cjs');
 require('../__chunks/CJDHQUBR.cjs');
 require('../__chunks/AV6KTKLE.cjs');
@@ -24,7 +24,7 @@ require('../__chunks/AV6KTKLE.cjs');
 // src/combobox/combobox-provider.tsx
 var _jsxruntime = require('react/jsx-runtime');
 function ComboboxProvider(props = {}) {
-  const store = _47RLIVETcjs.useComboboxStore.call(void 0, props);
+  const store = _CFKRWKZRcjs.useComboboxStore.call(void 0, props);
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _3WCBE6SUcjs.ComboboxContextProvider, { value: store, children: props.children });
 }
 

package/cjs/combobox/combobox-store.cjs

@@ -2,17 +2,17 @@
 
 
 
-var _47RLIVETcjs = require('../__chunks/47RLIVET.cjs');
-require('../__chunks/N6CR2VNN.cjs');
-require('../__chunks/DKOWT2IJ.cjs');
-require('../__chunks/7BPAESN3.cjs');
-require('../__chunks/HRKRTCJC.cjs');
-require('../__chunks/EGAIDKB5.cjs');
-require('../__chunks/B233QVZE.cjs');
+var _CFKRWKZRcjs = require('../__chunks/CFKRWKZR.cjs');
+require('../__chunks/LUL2YWZ3.cjs');
+require('../__chunks/CDNJPIEG.cjs');
+require('../__chunks/NRGWVSB5.cjs');
+require('../__chunks/W5LJEMLB.cjs');
+require('../__chunks/JAQJG42R.cjs');
+require('../__chunks/OLOZ5JT2.cjs');
 require('../__chunks/EO6LS72H.cjs');
 require('../__chunks/CJDHQUBR.cjs');
 require('../__chunks/AV6KTKLE.cjs');
 
 
 
-exports.useComboboxStore = _47RLIVETcjs.useComboboxStore; exports.useComboboxStoreProps = _47RLIVETcjs.useComboboxStoreProps;
+exports.useComboboxStore = _CFKRWKZRcjs.useComboboxStore; exports.useComboboxStoreProps = _CFKRWKZRcjs.useComboboxStoreProps;

package/cjs/combobox/combobox.cjs

@@ -7,8 +7,8 @@ var _3QW6ELTGcjs = require('../__chunks/3QW6ELTG.cjs');
 var _3WCBE6SUcjs = require('../__chunks/3WCBE6SU.cjs');
 
 
-var _CZOBQEIOcjs = require('../__chunks/CZOBQEIO.cjs');
-require('../__chunks/RV3PHHWM.cjs');
+var _H6OLBVHAcjs = require('../__chunks/H6OLBVHA.cjs');
+require('../__chunks/6ZZYUFPW.cjs');
 require('../__chunks/UZNYSPKP.cjs');
 require('../__chunks/BZTDJIVT.cjs');
 require('../__chunks/UVBBMANL.cjs');
@@ -82,6 +82,7 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
       store,
       focusable = true,
       autoSelect: autoSelectProp = false,
+      getAutoSelectId,
       showOnChange = true,
       setValueOnChange = true,
       showOnMouseDown = true,
@@ -93,6 +94,7 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
       "store",
       "focusable",
       "autoSelect",
+      "getAutoSelectId",
       "showOnChange",
       "setValueOnChange",
       "showOnMouseDown",
@@ -189,6 +191,8 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
       storeValue
     ]);
     const scrollingElementRef = _react.useRef.call(void 0, null);
+    const getAutoSelectIdProp = _EO6LS72Hcjs.useEvent.call(void 0, getAutoSelectId);
+    const autoSelectIdRef = _react.useRef.call(void 0, null);
     _react.useEffect.call(void 0, () => {
       if (!open)
         return;
@@ -204,10 +208,12 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
       const onScroll = () => {
         if (!store)
           return;
+        if (!canAutoSelectRef.current)
+          return;
         const { activeId } = store.getState();
         if (activeId === null)
           return;
-        if (activeId === store.first())
+        if (activeId === autoSelectIdRef.current)
           return;
         canAutoSelectRef.current = false;
       };
@@ -233,12 +239,11 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
     }, [open]);
     const resetValueOnSelect = store.useState("resetValueOnSelect");
     _EO6LS72Hcjs.useUpdateEffect.call(void 0, () => {
-      var _a2, _b2;
+      var _a2;
+      const canAutoSelect = canAutoSelectRef.current;
       if (!store)
         return;
-      if (!autoSelect && !resetValueOnSelect)
-        return;
-      if (!canAutoSelectRef.current)
+      if ((!autoSelect || !canAutoSelect) && !resetValueOnSelect)
         return;
       const { baseElement, contentElement: contentElement2, activeId } = store.getState();
       if (baseElement && !_focus.hasFocus.call(void 0, baseElement))
@@ -248,10 +253,13 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
         observer.observe(contentElement2, { attributeFilter: ["data-placing"] });
         return () => observer.disconnect();
       }
-      if (autoSelect) {
-        store.move((_a2 = store.first()) != null ? _a2 : null);
+      if (autoSelect && canAutoSelect) {
+        const userAutoSelectId = getAutoSelectIdProp(items);
+        const autoSelectId = userAutoSelectId !== void 0 ? userAutoSelectId : store.first();
+        autoSelectIdRef.current = autoSelectId;
+        store.move(autoSelectId != null ? autoSelectId : null);
       } else {
-        const element = (_b2 = store.item(activeId)) == null ? void 0 : _b2.element;
+        const element = (_a2 = store.item(activeId)) == null ? void 0 : _a2.element;
         if (element && "scrollIntoView" in element) {
           element.scrollIntoView({ block: "nearest", inline: "nearest" });
         }
@@ -263,6 +271,7 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
       storeValue,
       autoSelect,
       resetValueOnSelect,
+      getAutoSelectIdProp,
       items
     ]);
     _react.useEffect.call(void 0, () => {
@@ -361,6 +370,9 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
     const onKeyDown = _EO6LS72Hcjs.useEvent.call(void 0, 
       (event) => {
         onKeyDownProp == null ? void 0 : onKeyDownProp(event);
+        if (!event.repeat) {
+          canAutoSelectRef.current = false;
+        }
         if (event.defaultPrevented)
           return;
         if (event.ctrlKey)
@@ -395,6 +407,7 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
     });
     const id = _EO6LS72Hcjs.useId.call(void 0, props.id);
     const ariaAutoComplete = isAriaAutoCompleteValue(autoComplete) ? autoComplete : void 0;
+    const isActiveItem = store.useState((state) => state.activeId === null);
     props = _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
       id,
       role: "combobox",
@@ -402,6 +415,7 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
       "aria-haspopup": _dom.getPopupRole.call(void 0, contentElement, "listbox"),
       "aria-expanded": open,
       "aria-controls": contentElement == null ? void 0 : contentElement.id,
+      "data-active-item": isActiveItem || void 0,
       value
     }, props), {
       ref: _EO6LS72Hcjs.useMergeRefs.call(void 0, ref, props.ref),
@@ -411,7 +425,7 @@ var useCombobox = _RNZNGEL4cjs.createHook.call(void 0,
       onKeyDown,
       onBlur
     });
-    props = _CZOBQEIOcjs.useComposite.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
+    props = _H6OLBVHAcjs.useComposite.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
       store,
       focusable
     }, props), {

package/cjs/combobox/combobox.d.cts

@@ -3,7 +3,7 @@ import type { BooleanOrCallback, StringWithValue } from "@ariakit/core/utils/typ
 import type { CompositeOptions } from "../composite/composite.js";
 import type { PopoverAnchorOptions } from "../popover/popover-anchor.js";
 import type { As, Props } from "../utils/types.js";
-import type { ComboboxStore } from "./combobox-store.js";
+import type { ComboboxStore, ComboboxStoreState } from "./combobox-store.js";
 /**
  * Returns props to create a `Combobox` component.
  * @see https://ariakit.org/components/combobox
@@ -70,6 +70,34 @@ export interface ComboboxOptions<T extends As = "input"> extends CompositeOption
      * @default false
      */
     autoSelect?: boolean;
+    /**
+     * Function that takes the currently rendered items and returns the id of the
+     * item to be auto selected when the
+     * [`autoSelect`](https://ariakit.org/reference/combobox#autoselect) prop is
+     * `true`.
+     *
+     * By default, the first enabled item is auto selected. This function is handy
+     * if you prefer a different item to be auto selected.
+     *
+     * Live examples:
+     * - [Combobox with tabs](https://ariakit.org/examples/combobox-tabs)
+     * @example
+     * ```jsx
+     * <Combobox
+     *   autoSelect
+     *   getAutoSelectId={(items) => {
+     *     // Auto select the first enabled item with a value
+     *     const item = items.find((item) => {
+     *       if (item.disabled) return false;
+     *       if (!item.value) return false;
+     *       return true;
+     *     });
+     *     return item?.id;
+     *   }}
+     * />
+     * ```
+     */
+    getAutoSelectId?: (renderedItems: ComboboxStoreState["renderedItems"]) => string | null | undefined;
     /**
      * Whether the items will be filtered based on
      * [`value`](https://ariakit.org/reference/combobox-provider#value) and

package/cjs/combobox/combobox.d.ts

@@ -3,7 +3,7 @@ import type { BooleanOrCallback, StringWithValue } from "@ariakit/core/utils/typ
 import type { CompositeOptions } from "../composite/composite.js";
 import type { PopoverAnchorOptions } from "../popover/popover-anchor.js";
 import type { As, Props } from "../utils/types.js";
-import type { ComboboxStore } from "./combobox-store.js";
+import type { ComboboxStore, ComboboxStoreState } from "./combobox-store.js";
 /**
  * Returns props to create a `Combobox` component.
  * @see https://ariakit.org/components/combobox
@@ -70,6 +70,34 @@ export interface ComboboxOptions<T extends As = "input"> extends CompositeOption
      * @default false
      */
     autoSelect?: boolean;
+    /**
+     * Function that takes the currently rendered items and returns the id of the
+     * item to be auto selected when the
+     * [`autoSelect`](https://ariakit.org/reference/combobox#autoselect) prop is
+     * `true`.
+     *
+     * By default, the first enabled item is auto selected. This function is handy
+     * if you prefer a different item to be auto selected.
+     *
+     * Live examples:
+     * - [Combobox with tabs](https://ariakit.org/examples/combobox-tabs)
+     * @example
+     * ```jsx
+     * <Combobox
+     *   autoSelect
+     *   getAutoSelectId={(items) => {
+     *     // Auto select the first enabled item with a value
+     *     const item = items.find((item) => {
+     *       if (item.disabled) return false;
+     *       if (!item.value) return false;
+     *       return true;
+     *     });
+     *     return item?.id;
+     *   }}
+     * />
+     * ```
+     */
+    getAutoSelectId?: (renderedItems: ComboboxStoreState["renderedItems"]) => string | null | undefined;
     /**
      * Whether the items will be filtered based on
      * [`value`](https://ariakit.org/reference/combobox-provider#value) and

package/cjs/composite/composite-container.cjs

@@ -2,16 +2,16 @@
 
 
 
-var _VQJ44BSYcjs = require('../__chunks/VQJ44BSY.cjs');
-require('../__chunks/RV3PHHWM.cjs');
+var _JQS6X2I5cjs = require('../__chunks/JQS6X2I5.cjs');
+require('../__chunks/6ZZYUFPW.cjs');
 require('../__chunks/UZNYSPKP.cjs');
 require('../__chunks/BZTDJIVT.cjs');
 require('../__chunks/RNZNGEL4.cjs');
-require('../__chunks/B233QVZE.cjs');
+require('../__chunks/OLOZ5JT2.cjs');
 require('../__chunks/EO6LS72H.cjs');
 require('../__chunks/CJDHQUBR.cjs');
 require('../__chunks/AV6KTKLE.cjs');
 
 
 
-exports.CompositeContainer = _VQJ44BSYcjs.CompositeContainer; exports.useCompositeContainer = _VQJ44BSYcjs.useCompositeContainer;
+exports.CompositeContainer = _JQS6X2I5cjs.CompositeContainer; exports.useCompositeContainer = _JQS6X2I5cjs.useCompositeContainer;

package/cjs/composite/composite-hover.d.cts

@@ -43,7 +43,12 @@ export interface CompositeHoverOptions<T extends As = "div"> extends Options<T>
      */
     store?: CompositeStore;
     /**
-     * Determines if the composite item should be focused on hover.
+     * Determines if the composite item should be _focused_ when hovered over.
+     *
+     * Note that the actual DOM focus will stay on the composite element. This
+     * item will get the
+     * [`data-active-item`](https://ariakit.org/guide/styling#data-active-item)
+     * attribute so it can be styled as if it's focused.
      *
      * Live examples:
      * - [Multi-selectable
@@ -53,6 +58,9 @@ export interface CompositeHoverOptions<T extends As = "div"> extends Options<T>
      * - [Textarea with inline
      *   Combobox](https://ariakit.org/examples/combobox-textarea)
      * - [Navigation Menubar](https://ariakit.org/examples/menubar-navigation)
+     * - [Submenu with
+     *   Combobox](https://ariakit.org/examples/menu-nested-combobox)
+     * - [Combobox with tabs](https://ariakit.org/examples/combobox-tabs)
      * @default true
      */
     focusOnHover?: BooleanOrCallback<ReactMouseEvent<HTMLElement>>;
@@ -66,6 +74,9 @@ export interface CompositeHoverOptions<T extends As = "div"> extends Options<T>
      * - [Navigation Menubar](https://ariakit.org/examples/menubar-navigation)
      * - [Combobox with integrated
      *   filter](https://ariakit.org/examples/combobox-filtering-integrated)
+     * - [Submenu with
+     *   Combobox](https://ariakit.org/examples/menu-nested-combobox)
+     * - [Combobox with tabs](https://ariakit.org/examples/combobox-tabs)
      */
     blurOnHoverEnd?: BooleanOrCallback<ReactMouseEvent<HTMLElement>>;
 }

package/cjs/composite/composite-hover.d.ts

@@ -43,7 +43,12 @@ export interface CompositeHoverOptions<T extends As = "div"> extends Options<T>
      */
     store?: CompositeStore;
     /**
-     * Determines if the composite item should be focused on hover.
+     * Determines if the composite item should be _focused_ when hovered over.
+     *
+     * Note that the actual DOM focus will stay on the composite element. This
+     * item will get the
+     * [`data-active-item`](https://ariakit.org/guide/styling#data-active-item)
+     * attribute so it can be styled as if it's focused.
      *
      * Live examples:
      * - [Multi-selectable
@@ -53,6 +58,9 @@ export interface CompositeHoverOptions<T extends As = "div"> extends Options<T>
      * - [Textarea with inline
      *   Combobox](https://ariakit.org/examples/combobox-textarea)
      * - [Navigation Menubar](https://ariakit.org/examples/menubar-navigation)
+     * - [Submenu with
+     *   Combobox](https://ariakit.org/examples/menu-nested-combobox)
+     * - [Combobox with tabs](https://ariakit.org/examples/combobox-tabs)
      * @default true
      */
     focusOnHover?: BooleanOrCallback<ReactMouseEvent<HTMLElement>>;
@@ -66,6 +74,9 @@ export interface CompositeHoverOptions<T extends As = "div"> extends Options<T>
      * - [Navigation Menubar](https://ariakit.org/examples/menubar-navigation)
      * - [Combobox with integrated
      *   filter](https://ariakit.org/examples/combobox-filtering-integrated)
+     * - [Submenu with
+     *   Combobox](https://ariakit.org/examples/menu-nested-combobox)
+     * - [Combobox with tabs](https://ariakit.org/examples/combobox-tabs)
      */
     blurOnHoverEnd?: BooleanOrCallback<ReactMouseEvent<HTMLElement>>;
 }