@ariakit/react-core 0.3.10 → 0.3.11

package/cjs/tab/tab-provider.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _GF6NWLKXcjs = require('../__chunks/GF6NWLKX.cjs');
+var _WWU35JDJcjs = require('../__chunks/WWU35JDJ.cjs');
 
 
 var _I65V32V2cjs = require('../__chunks/I65V32V2.cjs');
@@ -18,7 +18,7 @@ require('../__chunks/AV6KTKLE.cjs');
 // src/tab/tab-provider.tsx
 var _jsxruntime = require('react/jsx-runtime');
 function TabProvider(props = {}) {
-  const store = _GF6NWLKXcjs.useTabStore.call(void 0, props);
+  const store = _WWU35JDJcjs.useTabStore.call(void 0, props);
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _I65V32V2cjs.TabContextProvider, { value: store, children: props.children });
 }
 

package/cjs/tab/tab-store.cjs

@@ -2,7 +2,7 @@
 
 
 
-var _GF6NWLKXcjs = require('../__chunks/GF6NWLKX.cjs');
+var _WWU35JDJcjs = require('../__chunks/WWU35JDJ.cjs');
 require('../__chunks/N6CR2VNN.cjs');
 require('../__chunks/DKOWT2IJ.cjs');
 require('../__chunks/B233QVZE.cjs');
@@ -12,4 +12,4 @@ require('../__chunks/AV6KTKLE.cjs');
 
 
 
-exports.useTabStore = _GF6NWLKXcjs.useTabStore; exports.useTabStoreProps = _GF6NWLKXcjs.useTabStoreProps;
+exports.useTabStore = _WWU35JDJcjs.useTabStore; exports.useTabStoreProps = _WWU35JDJcjs.useTabStoreProps;

package/cjs/tab/tab.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _TTMCZ7ZNcjs = require('../__chunks/TTMCZ7ZN.cjs');
+var _3RUODFRUcjs = require('../__chunks/3RUODFRU.cjs');
 require('../__chunks/DAJUUBUI.cjs');
 require('../__chunks/R5A2WTWB.cjs');
 
@@ -84,7 +84,7 @@ var useTab = _RNZNGEL4cjs.createHook.call(void 0,
     }, props), {
       onClick
     });
-    props = _TTMCZ7ZNcjs.useCompositeItem.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
+    props = _3RUODFRUcjs.useCompositeItem.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
       store
     }, props), {
       accessibleWhenDisabled,

package/cjs/toolbar/toolbar-container.cjs

@@ -4,8 +4,8 @@
 var _VQJ44BSYcjs = require('../__chunks/VQJ44BSY.cjs');
 
 
-var _SANV4XBFcjs = require('../__chunks/SANV4XBF.cjs');
-require('../__chunks/TTMCZ7ZN.cjs');
+var _7EEAHTIWcjs = require('../__chunks/7EEAHTIW.cjs');
+require('../__chunks/3RUODFRU.cjs');
 require('../__chunks/DAJUUBUI.cjs');
 require('../__chunks/R5A2WTWB.cjs');
 require('../__chunks/RV3PHHWM.cjs');
@@ -36,7 +36,7 @@ var useToolbarContainer = _RNZNGEL4cjs.createHook.call(void 0,
     const context = _LYIGAIJFcjs.useToolbarContext.call(void 0, );
     store = store || context;
     props = _VQJ44BSYcjs.useCompositeContainer.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store }, props));
-    props = _SANV4XBFcjs.useToolbarItem.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store }, props));
+    props = _7EEAHTIWcjs.useToolbarItem.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store }, props));
     return props;
   }
 );

package/cjs/toolbar/toolbar-input.cjs

@@ -4,8 +4,8 @@
 var _FM5S6RADcjs = require('../__chunks/FM5S6RAD.cjs');
 
 
-var _SANV4XBFcjs = require('../__chunks/SANV4XBF.cjs');
-require('../__chunks/TTMCZ7ZN.cjs');
+var _7EEAHTIWcjs = require('../__chunks/7EEAHTIW.cjs');
+require('../__chunks/3RUODFRU.cjs');
 require('../__chunks/DAJUUBUI.cjs');
 require('../__chunks/R5A2WTWB.cjs');
 require('../__chunks/RV3PHHWM.cjs');
@@ -36,7 +36,7 @@ var useToolbarInput = _RNZNGEL4cjs.createHook.call(void 0,
     const context = _LYIGAIJFcjs.useToolbarContext.call(void 0, );
     store = store || context;
     props = _FM5S6RADcjs.useCompositeInput.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store }, props));
-    props = _SANV4XBFcjs.useToolbarItem.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store }, props));
+    props = _7EEAHTIWcjs.useToolbarItem.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store }, props));
     return props;
   }
 );

package/cjs/toolbar/toolbar-item.cjs

@@ -2,8 +2,8 @@
 
 
 
-var _SANV4XBFcjs = require('../__chunks/SANV4XBF.cjs');
-require('../__chunks/TTMCZ7ZN.cjs');
+var _7EEAHTIWcjs = require('../__chunks/7EEAHTIW.cjs');
+require('../__chunks/3RUODFRU.cjs');
 require('../__chunks/DAJUUBUI.cjs');
 require('../__chunks/R5A2WTWB.cjs');
 require('../__chunks/RV3PHHWM.cjs');
@@ -20,4 +20,4 @@ require('../__chunks/AV6KTKLE.cjs');
 
 
 
-exports.ToolbarItem = _SANV4XBFcjs.ToolbarItem; exports.useToolbarItem = _SANV4XBFcjs.useToolbarItem;
+exports.ToolbarItem = _7EEAHTIWcjs.ToolbarItem; exports.useToolbarItem = _7EEAHTIWcjs.useToolbarItem;

package/cjs/toolbar/toolbar.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _CZOBQEIOcjs = require('../__chunks/CZOBQEIO.cjs');
+var _RM2WCNSUcjs = require('../__chunks/RM2WCNSU.cjs');
 require('../__chunks/RV3PHHWM.cjs');
 
 
@@ -69,7 +69,7 @@ var useToolbar = _RNZNGEL4cjs.createHook.call(void 0,
       role: "toolbar",
       "aria-orientation": orientation
     }, props);
-    props = _CZOBQEIOcjs.useComposite.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store }, props));
+    props = _RM2WCNSUcjs.useComposite.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store }, props));
     return props;
   }
 );

package/esm/__chunks/{FHDXHZLB.js → 57KNUQTI.js}

@@ -48,43 +48,32 @@ function isGrid(items) {
   return items.some((item) => !!item.rowId);
 }
 function isPrintableKey(event) {
+  const target = event.target;
+  if (target && !isTextField(target))
+    return false;
   return event.key.length === 1 && !event.ctrlKey && !event.metaKey;
 }
 function isModifierKey(event) {
   return event.key === "Shift" || event.key === "Control" || event.key === "Alt" || event.key === "Meta";
 }
-function canProxyKeyboardEvent(event, state) {
-  if (!isSelfTarget(event))
-    return false;
-  if (isModifierKey(event))
-    return false;
-  const target = event.target;
-  if (!target)
-    return true;
-  if (isTextField(target)) {
-    if (isPrintableKey(event))
-      return false;
-    const grid = isGrid(state.renderedItems);
-    const focusingInputOnly = state.activeId === null;
-    const allowHorizontalNavigationOnItems = grid && !focusingInputOnly;
-    const isHomeOrEnd = event.key === "Home" || event.key === "End";
-    if (!allowHorizontalNavigationOnItems && isHomeOrEnd)
-      return false;
-  }
-  return !event.isPropagationStopped();
-}
 function useKeyboardEventProxy(store, onKeyboardEvent, previousElementRef) {
   return useEvent((event) => {
     var _a;
     onKeyboardEvent == null ? void 0 : onKeyboardEvent(event);
     if (event.defaultPrevented)
       return;
+    if (event.isPropagationStopped())
+      return;
+    if (!isSelfTarget(event))
+      return;
+    if (isModifierKey(event))
+      return;
+    if (isPrintableKey(event))
+      return;
     const state = store.getState();
     const activeElement = (_a = getEnabledItem(store, state.activeId)) == null ? void 0 : _a.element;
     if (!activeElement)
       return;
-    if (!canProxyKeyboardEvent(event, state))
-      return;
     const _b = event, { view } = _b, eventInit = __objRest(_b, ["view"]);
     const previousElement = previousElementRef == null ? void 0 : previousElementRef.current;
     if (activeElement !== previousElement) {
@@ -269,6 +258,8 @@ var useComposite = createHook(
           }
         } else if (activeElement) {
           fireBlurEvent(activeElement, event);
+        } else if (previousElement) {
+          fireBlurEvent(previousElement, event);
         }
         event.stopPropagation();
       } else {
@@ -296,6 +287,9 @@ var useComposite = createHook(
       const isVertical = orientation !== "horizontal";
       const isHorizontal = orientation !== "vertical";
       const grid = isGrid(renderedItems);
+      const isHorizontalKey = event.key === "ArrowLeft" || event.key === "ArrowRight" || event.key === "Home" || event.key === "End";
+      if (isHorizontalKey && isTextField(event.currentTarget))
+        return;
       const up = () => {
         if (grid) {
           const item = items && findFirstEnabledItemInTheLastRow(items);

package/esm/__chunks/{UV2O3GRQ.js → 7D63S66W.js}

@@ -8,7 +8,7 @@ import {
 } from "./5HVNGX6D.js";
 import {
   useComposite
-} from "./FHDXHZLB.js";
+} from "./57KNUQTI.js";
 import {
   isHidden
 } from "./KOKHD3Z3.js";

package/esm/__chunks/{TZJDOU75.js → 7R5VX7DV.js}

@@ -8,7 +8,7 @@ import {
 } from "./FWQLUQ4T.js";
 import {
   useComposite
-} from "./FHDXHZLB.js";
+} from "./57KNUQTI.js";
 import {
   createComponent,
   createElement,

package/esm/__chunks/{GJYUMUMT.js → 7SHHFY4P.js}

@@ -4,7 +4,7 @@ import {
 } from "./XEV62JUQ.js";
 import {
   useCompositeItem
-} from "./P6VCQ6Q3.js";
+} from "./R2WNOXYG.js";
 import {
   createElement,
   createHook,

package/esm/__chunks/{QEPSYGAQ.js → CVFC2LN3.js}

@@ -10,7 +10,7 @@ import {
 } from "./G6ONQ5EH.js";
 import {
   useCompositeItem
-} from "./P6VCQ6Q3.js";
+} from "./R2WNOXYG.js";
 import {
   createElement,
   createHook,

package/esm/__chunks/{DHHIMTTV.js → DENCHBDS.js}

@@ -8,7 +8,7 @@ import {
 } from "./HBGJOTTX.js";
 import {
   useComposite
-} from "./FHDXHZLB.js";
+} from "./57KNUQTI.js";
 import {
   isHidden
 } from "./KOKHD3Z3.js";

package/esm/__chunks/{K5VQ2XTM.js → LZUSNDXA.js}

@@ -6,6 +6,9 @@ import {
   useStore,
   useStoreProps
 } from "./4OZYHFMH.js";
+import {
+  useUpdateEffect
+} from "./6O5OEQGF.js";
 import {
   __spreadProps,
   __spreadValues
@@ -18,8 +21,9 @@ function useTabStoreProps(store, update, props) {
   store = useCompositeStoreProps(store, update, props);
   useStoreProps(store, props, "selectedId", "setSelectedId");
   useStoreProps(store, props, "selectOnMove");
-  const [panels] = useStore(() => store.panels, {});
-  return useMemo(() => __spreadProps(__spreadValues({}, store), { panels }), []);
+  const [panels, updatePanels] = useStore(() => store.panels, {});
+  useUpdateEffect(updatePanels, [store, updatePanels]);
+  return useMemo(() => __spreadProps(__spreadValues({}, store), { panels }), [store, panels]);
 }
 function useTabStore(props = {}) {
   const [store, update] = useStore(Core.createTabStore, props);

package/esm/__chunks/{P6VCQ6Q3.js → R2WNOXYG.js}

@@ -259,18 +259,33 @@ var useCompositeItem = createHook(
       const isGrid = !!(item == null ? void 0 : item.rowId);
       const isVertical = state.orientation !== "horizontal";
       const isHorizontal = state.orientation !== "vertical";
+      const canHomeEnd = () => {
+        if (isGrid)
+          return true;
+        if (isHorizontal)
+          return true;
+        if (!state.baseElement)
+          return true;
+        if (!isTextField(state.baseElement))
+          return true;
+        return false;
+      };
       const keyMap = {
         ArrowUp: (isGrid || isVertical) && store.up,
         ArrowRight: (isGrid || isHorizontal) && store.next,
         ArrowDown: (isGrid || isVertical) && store.down,
         ArrowLeft: (isGrid || isHorizontal) && store.previous,
         Home: () => {
+          if (!canHomeEnd())
+            return;
           if (!isGrid || event.ctrlKey) {
             return store == null ? void 0 : store.first();
           }
           return store == null ? void 0 : store.previous(-1);
         },
         End: () => {
+          if (!canHomeEnd())
+            return;
           if (!isGrid || event.ctrlKey) {
             return store == null ? void 0 : store.last();
           }

package/esm/__chunks/{UJUY6GAA.js → W2TTCKOE.js}

@@ -1,7 +1,7 @@
 "use client";
 import {
   useCompositeItem
-} from "./P6VCQ6Q3.js";
+} from "./R2WNOXYG.js";
 import {
   useToolbarContext
 } from "./SOK7T35T.js";

package/esm/checkbox/checkbox-check.d.ts

@@ -28,9 +28,12 @@ export interface CheckboxCheckOptions<T extends As = "span"> extends Options<T>
      */
     store?: CheckboxStore;
     /**
-     * Whether the check mark should be shown. This value is automatically
-     * inferred from the `store` prop or the parent `Checkbox` component. Manually
-     * setting this prop will override the inferred value.
+     * Determines if the check mark should be displayed. This value is
+     * automatically derived from the
+     * [`store`](https://ariakit.org/reference/checkbox-check#store) prop or the
+     * parent [`Checkbox`](https://ariakit.org/reference/checkbox) component.
+     *
+     * Manually setting this prop will supersede the derived value.
      */
     checked?: boolean;
 }

package/esm/combobox/combobox-disclosure.js

@@ -75,13 +75,12 @@ var useComboboxDisclosure = createHook(
       const { baseElement } = store.getState();
       store.setDisclosureElement(baseElement);
     });
-    const label = store.useState(
-      (state) => state.open ? "Hide popup" : "Show popup"
-    );
+    const open = store.useState("open");
     props = __spreadProps(__spreadValues({
       children,
       tabIndex: -1,
-      "aria-label": label
+      "aria-label": open ? "Hide popup" : "Show popup",
+      "aria-expanded": open
     }, props), {
       onMouseDown,
       onClick

package/esm/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/esm/combobox/combobox-item.js

@@ -9,7 +9,7 @@ import {
 } from "../__chunks/W76OTZCC.js";
 import {
   useCompositeItem
-} from "../__chunks/P6VCQ6Q3.js";
+} from "../__chunks/R2WNOXYG.js";
 import "../__chunks/NWCBQ4CV.js";
 import "../__chunks/UH3I23HL.js";
 import "../__chunks/6QXBPV75.js";

package/esm/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/esm/combobox/combobox-popover.js

@@ -58,13 +58,13 @@ import {
 } from "../__chunks/4R3V3JGP.js";
 
 // src/combobox/combobox-popover.tsx
-import { matches } from "@ariakit/core/utils/dom";
+import { getDocument, matches } from "@ariakit/core/utils/dom";
 import { invariant } from "@ariakit/core/utils/misc";
 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 matches(target, selector);
@@ -75,11 +75,13 @@ var useComboboxPopover = createHook(
   (_a) => {
     var _b = _a, {
       store,
+      modal,
       tabIndex,
       alwaysVisible,
       hideOnInteractOutside = true
     } = _b, props = __objRest(_b, [
       "store",
+      "modal",
       "tabIndex",
       "alwaysVisible",
       "hideOnInteractOutside"
@@ -94,20 +96,47 @@ var useComboboxPopover = createHook(
     props = useComboboxList(__spreadValues({ store, alwaysVisible }, props));
     props = usePopover(__spreadProps(__spreadValues({
       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 = getDocument(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;

package/esm/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,31 @@ 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.
+     * @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/esm/combobox/combobox.js

@@ -7,7 +7,7 @@ import {
 } from "../__chunks/W76OTZCC.js";
 import {
   useComposite
-} from "../__chunks/FHDXHZLB.js";
+} from "../__chunks/57KNUQTI.js";
 import "../__chunks/6QXBPV75.js";
 import "../__chunks/IB7YUKH5.js";
 import "../__chunks/4UUKJZ4V.js";
@@ -82,6 +82,7 @@ var useCombobox = createHook(
       store,
       focusable = true,
       autoSelect: autoSelectProp = false,
+      getAutoSelectId,
       showOnChange = true,
       setValueOnChange = true,
       showOnMouseDown = true,
@@ -93,6 +94,7 @@ var useCombobox = createHook(
       "store",
       "focusable",
       "autoSelect",
+      "getAutoSelectId",
       "showOnChange",
       "setValueOnChange",
       "showOnMouseDown",
@@ -189,6 +191,8 @@ var useCombobox = createHook(
       storeValue
     ]);
     const scrollingElementRef = useRef(null);
+    const getAutoSelectIdProp = useEvent(getAutoSelectId);
+    const autoSelectIdRef = useRef(null);
     useEffect(() => {
       if (!open)
         return;
@@ -204,10 +208,12 @@ var useCombobox = createHook(
       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,7 +239,7 @@ var useCombobox = createHook(
     }, [open]);
     const resetValueOnSelect = store.useState("resetValueOnSelect");
     useUpdateEffect(() => {
-      var _a2, _b2;
+      var _a2;
       if (!store)
         return;
       if (!autoSelect && !resetValueOnSelect)
@@ -249,9 +255,12 @@ var useCombobox = createHook(
         return () => observer.disconnect();
       }
       if (autoSelect) {
-        store.move((_a2 = store.first()) != null ? _a2 : null);
+        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 +272,7 @@ var useCombobox = createHook(
       storeValue,
       autoSelect,
       resetValueOnSelect,
+      getAutoSelectIdProp,
       items
     ]);
     useEffect(() => {
@@ -395,6 +405,7 @@ var useCombobox = createHook(
     });
     const id = useId(props.id);
     const ariaAutoComplete = isAriaAutoCompleteValue(autoComplete) ? autoComplete : void 0;
+    const isActiveItem = store.useState((state) => state.activeId === null);
     props = __spreadProps(__spreadValues({
       id,
       role: "combobox",
@@ -402,6 +413,7 @@ var useCombobox = createHook(
       "aria-haspopup": getPopupRole(contentElement, "listbox"),
       "aria-expanded": open,
       "aria-controls": contentElement == null ? void 0 : contentElement.id,
+      "data-active-item": isActiveItem || void 0,
       value
     }, props), {
       ref: useMergeRefs(ref, props.ref),

package/esm/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,8 @@ 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)
      * @default true
      */
     focusOnHover?: BooleanOrCallback<ReactMouseEvent<HTMLElement>>;
@@ -66,6 +73,8 @@ 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)
      */
     blurOnHoverEnd?: BooleanOrCallback<ReactMouseEvent<HTMLElement>>;
 }