@ariakit/react-core 0.3.5 → 0.3.7

package/cjs/menu/menu-bar-store.d.cts

@@ -1,10 +1,11 @@
-import * as Core from "@ariakit/core/menu/menu-bar-store";
-import type { CompositeStoreFunctions, CompositeStoreOptions, CompositeStoreState } from "../composite/composite-store.js";
-import type { Store } from "../utils/store.js";
+import type * as Core from "@ariakit/core/menu/menu-bar-store";
+import type { MenubarStore, MenubarStoreFunctions, MenubarStoreOptions, MenubarStoreProps, MenubarStoreState } from "../menubar/menubar-store.js";
 export declare function useMenuBarStoreProps<T extends Core.MenuBarStore>(store: T, update: () => void, props: MenuBarStoreProps): T;
 /**
  * Creates a menu bar store.
- * @see https://ariakit.org/components/menu
+ * @deprecated
+ * Use [`useMenubarStore`](https://ariakit.org/reference/use-menubar-store)
+ * instead.
  * @example
  * ```jsx
  * const menu = useMenuBarStore();
@@ -12,11 +13,13 @@ export declare function useMenuBarStoreProps<T extends Core.MenuBarStore>(store:
  * ```
  */
 export declare function useMenuBarStore(props?: MenuBarStoreProps): MenuBarStore;
-export interface MenuBarStoreState extends Core.MenuBarStoreState, CompositeStoreState {
+export interface MenuBarStoreState extends MenubarStoreState {
 }
-export interface MenuBarStoreFunctions extends Core.MenuBarStoreFunctions, CompositeStoreFunctions {
+export interface MenuBarStoreFunctions extends MenubarStoreFunctions {
 }
-export interface MenuBarStoreOptions extends Core.MenuBarStoreOptions, CompositeStoreOptions {
+export interface MenuBarStoreOptions extends MenubarStoreOptions {
+}
+export interface MenuBarStoreProps extends MenubarStoreProps {
+}
+export interface MenuBarStore extends MenubarStore {
 }
-export type MenuBarStoreProps = MenuBarStoreOptions & Core.MenuBarStoreProps;
-export type MenuBarStore = MenuBarStoreFunctions & Store<Core.MenuBarStore>;

package/cjs/menu/menu-bar-store.d.ts

@@ -1,10 +1,11 @@
-import * as Core from "@ariakit/core/menu/menu-bar-store";
-import type { CompositeStoreFunctions, CompositeStoreOptions, CompositeStoreState } from "../composite/composite-store.js";
-import type { Store } from "../utils/store.js";
+import type * as Core from "@ariakit/core/menu/menu-bar-store";
+import type { MenubarStore, MenubarStoreFunctions, MenubarStoreOptions, MenubarStoreProps, MenubarStoreState } from "../menubar/menubar-store.js";
 export declare function useMenuBarStoreProps<T extends Core.MenuBarStore>(store: T, update: () => void, props: MenuBarStoreProps): T;
 /**
  * Creates a menu bar store.
- * @see https://ariakit.org/components/menu
+ * @deprecated
+ * Use [`useMenubarStore`](https://ariakit.org/reference/use-menubar-store)
+ * instead.
  * @example
  * ```jsx
  * const menu = useMenuBarStore();
@@ -12,11 +13,13 @@ export declare function useMenuBarStoreProps<T extends Core.MenuBarStore>(store:
  * ```
  */
 export declare function useMenuBarStore(props?: MenuBarStoreProps): MenuBarStore;
-export interface MenuBarStoreState extends Core.MenuBarStoreState, CompositeStoreState {
+export interface MenuBarStoreState extends MenubarStoreState {
 }
-export interface MenuBarStoreFunctions extends Core.MenuBarStoreFunctions, CompositeStoreFunctions {
+export interface MenuBarStoreFunctions extends MenubarStoreFunctions {
 }
-export interface MenuBarStoreOptions extends Core.MenuBarStoreOptions, CompositeStoreOptions {
+export interface MenuBarStoreOptions extends MenubarStoreOptions {
+}
+export interface MenuBarStoreProps extends MenubarStoreProps {
+}
+export interface MenuBarStore extends MenubarStore {
 }
-export type MenuBarStoreProps = MenuBarStoreOptions & Core.MenuBarStoreProps;
-export type MenuBarStore = MenuBarStoreFunctions & Store<Core.MenuBarStore>;

package/cjs/menu/menu-bar.cjs

@@ -1,67 +1,34 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-
-var _YRDDHZT7cjs = require('../__chunks/YRDDHZT7.cjs');
-
-
-var _6MOJZWMLcjs = require('../__chunks/6MOJZWML.cjs');
+var _KAQBQZEGcjs = require('../__chunks/KAQBQZEG.cjs');
+require('../__chunks/7LBZXSLY.cjs');
+require('../__chunks/SSJIHRU6.cjs');
+require('../__chunks/CZOBQEIO.cjs');
 require('../__chunks/RV3PHHWM.cjs');
-require('../__chunks/FQGSRSYD.cjs');
-require('../__chunks/JVORNAMD.cjs');
-require('../__chunks/ORT5QOHH.cjs');
-require('../__chunks/KZA6P235.cjs');
-require('../__chunks/QKKT6RXX.cjs');
-require('../__chunks/SMKW5GKS.cjs');
-require('../__chunks/7ARL6QHN.cjs');
+require('../__chunks/A5RWZSX7.cjs');
+require('../__chunks/TUVU5ERH.cjs');
+require('../__chunks/UZNYSPKP.cjs');
+require('../__chunks/BZTDJIVT.cjs');
+require('../__chunks/Z3GCTNW4.cjs');
 require('../__chunks/75KXQZJX.cjs');
 
 
 
 
-var _VKYTJKYNcjs = require('../__chunks/VKYTJKYN.cjs');
-
-
-var _JTVNRMACcjs = require('../__chunks/JTVNRMAC.cjs');
-require('../__chunks/LNE2FWJO.cjs');
-
-
-
-var _WYXAWBLEcjs = require('../__chunks/WYXAWBLE.cjs');
+var _RNZNGEL4cjs = require('../__chunks/RNZNGEL4.cjs');
+require('../__chunks/OALXXRFM.cjs');
+require('../__chunks/EO6LS72H.cjs');
+require('../__chunks/CJDHQUBR.cjs');
+require('../__chunks/AV6KTKLE.cjs');
 
 // src/menu/menu-bar.tsx
-var _misc = require('@ariakit/core/utils/misc');
-var _jsxruntime = require('react/jsx-runtime');
-var useMenuBar = _VKYTJKYNcjs.createHook.call(void 0, 
-  (_a) => {
-    var _b = _a, { store, composite = true } = _b, props = _WYXAWBLEcjs.__objRest.call(void 0, _b, ["store", "composite"]);
-    const context = _YRDDHZT7cjs.useMenuBarProviderContext.call(void 0, );
-    store = store || context;
-    _misc.invariant.call(void 0, 
-      store,
-      process.env.NODE_ENV !== "production" && "MenuBar must receive a `store` prop or be wrapped in a MenuBarProvider component."
-    );
-    const orientation = store.useState(
-      (state) => !composite || state.orientation === "both" ? void 0 : state.orientation
-    );
-    props = _JTVNRMACcjs.useWrapElement.call(void 0, 
-      props,
-      (element) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _YRDDHZT7cjs.MenuBarScopedContextProvider, { value: store, children: element }),
-      [store]
-    );
-    if (composite) {
-      props = _WYXAWBLEcjs.__spreadValues.call(void 0, {
-        role: "menubar",
-        "aria-orientation": orientation
-      }, props);
-    }
-    props = _6MOJZWMLcjs.useComposite.call(void 0, _WYXAWBLEcjs.__spreadValues.call(void 0, { store, composite }, props));
-    return props;
-  }
-);
-var MenuBar = _VKYTJKYNcjs.createComponent.call(void 0, (props) => {
+var useMenuBar = _RNZNGEL4cjs.createHook.call(void 0, (props) => {
+  return _KAQBQZEGcjs.useMenubar.call(void 0, props);
+});
+var MenuBar = _RNZNGEL4cjs.createComponent.call(void 0, (props) => {
   const htmlProps = useMenuBar(props);
-  return _VKYTJKYNcjs.createElement.call(void 0, "div", htmlProps);
+  return _RNZNGEL4cjs.createElement.call(void 0, "div", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   MenuBar.displayName = "MenuBar";

package/cjs/menu/menu-bar.d.cts

@@ -1,9 +1,9 @@
-import type { CompositeOptions } from "../composite/composite.js";
+import type { MenubarOptions } from "../menubar/menubar.js";
 import type { As, Props } from "../utils/types.js";
-import type { MenuBarStore } from "./menu-bar-store.js";
 /**
  * Returns props to create a `MenuBar` component.
- * @see https://ariakit.org/components/menu
+ * @deprecated
+ * Use [`useMenubar`](https://ariakit.org/reference/use-menubar) instead.
  * @example
  * ```jsx
  * const store = useMenuBarStore();
@@ -25,7 +25,8 @@ export declare const useMenuBar: import("../utils/types.js").Hook<MenuBarOptions
 /**
  * Renders a menu bar that may contain a group of menu items that control other
  * submenus.
- * @see https://ariakit.org/components/menu
+ * @deprecated
+ * Use [`Menubar`](https://ariakit.org/reference/menubar) instead.
  * @example
  * ```jsx
  * <MenuBarProvider>
@@ -49,14 +50,6 @@ export declare const useMenuBar: import("../utils/types.js").Hook<MenuBarOptions
  * ```
  */
 export declare const MenuBar: import("../utils/types.js").Component<MenuBarOptions<"div">>;
-export interface MenuBarOptions<T extends As = "div"> extends CompositeOptions<T> {
-    /**
-     * Object returned by the
-     * [`useMenuBarStore`](https://ariakit.org/reference/use-menu-bar-store) hook.
-     * If not provided, the closest
-     * [`MenuBarProvider`](https://ariakit.org/reference/menu-bar-provider)
-     * component's context will be used.
-     */
-    store?: MenuBarStore;
+export interface MenuBarOptions<T extends As = "div"> extends MenubarOptions<T> {
 }
 export type MenuBarProps<T extends As = "div"> = Props<MenuBarOptions<T>>;

package/cjs/menu/menu-bar.d.ts

@@ -1,9 +1,9 @@
-import type { CompositeOptions } from "../composite/composite.js";
+import type { MenubarOptions } from "../menubar/menubar.js";
 import type { As, Props } from "../utils/types.js";
-import type { MenuBarStore } from "./menu-bar-store.js";
 /**
  * Returns props to create a `MenuBar` component.
- * @see https://ariakit.org/components/menu
+ * @deprecated
+ * Use [`useMenubar`](https://ariakit.org/reference/use-menubar) instead.
  * @example
  * ```jsx
  * const store = useMenuBarStore();
@@ -25,7 +25,8 @@ export declare const useMenuBar: import("../utils/types.js").Hook<MenuBarOptions
 /**
  * Renders a menu bar that may contain a group of menu items that control other
  * submenus.
- * @see https://ariakit.org/components/menu
+ * @deprecated
+ * Use [`Menubar`](https://ariakit.org/reference/menubar) instead.
  * @example
  * ```jsx
  * <MenuBarProvider>
@@ -49,14 +50,6 @@ export declare const useMenuBar: import("../utils/types.js").Hook<MenuBarOptions
  * ```
  */
 export declare const MenuBar: import("../utils/types.js").Component<MenuBarOptions<"div">>;
-export interface MenuBarOptions<T extends As = "div"> extends CompositeOptions<T> {
-    /**
-     * Object returned by the
-     * [`useMenuBarStore`](https://ariakit.org/reference/use-menu-bar-store) hook.
-     * If not provided, the closest
-     * [`MenuBarProvider`](https://ariakit.org/reference/menu-bar-provider)
-     * component's context will be used.
-     */
-    store?: MenuBarStore;
+export interface MenuBarOptions<T extends As = "div"> extends MenubarOptions<T> {
 }
 export type MenuBarProps<T extends As = "div"> = Props<MenuBarOptions<T>>;

package/cjs/menu/menu-button-arrow.cjs

@@ -1,42 +1,43 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _YRDDHZT7cjs = require('../__chunks/YRDDHZT7.cjs');
+var _NGEKJJDHcjs = require('../__chunks/NGEKJJDH.cjs');
+require('../__chunks/7LBZXSLY.cjs');
 
 
-var _AIPLRMQMcjs = require('../__chunks/AIPLRMQM.cjs');
-require('../__chunks/FQGSRSYD.cjs');
-require('../__chunks/JVORNAMD.cjs');
-require('../__chunks/ORT5QOHH.cjs');
-require('../__chunks/KZA6P235.cjs');
-require('../__chunks/QKKT6RXX.cjs');
-require('../__chunks/SMKW5GKS.cjs');
+var _YU7XEYUJcjs = require('../__chunks/YU7XEYUJ.cjs');
+require('../__chunks/UZNYSPKP.cjs');
+require('../__chunks/BZTDJIVT.cjs');
+require('../__chunks/3W6FH6JK.cjs');
+require('../__chunks/UVBBMANL.cjs');
+require('../__chunks/F2A2ZQDB.cjs');
+require('../__chunks/S6UU7NA4.cjs');
 
 
 
 
-var _VKYTJKYNcjs = require('../__chunks/VKYTJKYN.cjs');
-require('../__chunks/JTVNRMAC.cjs');
-require('../__chunks/LNE2FWJO.cjs');
+var _RNZNGEL4cjs = require('../__chunks/RNZNGEL4.cjs');
+require('../__chunks/EO6LS72H.cjs');
+require('../__chunks/CJDHQUBR.cjs');
 
 
 
-var _WYXAWBLEcjs = require('../__chunks/WYXAWBLE.cjs');
+var _AV6KTKLEcjs = require('../__chunks/AV6KTKLE.cjs');
 
 // src/menu/menu-button-arrow.ts
-var useMenuButtonArrow = _VKYTJKYNcjs.createHook.call(void 0, 
+var useMenuButtonArrow = _RNZNGEL4cjs.createHook.call(void 0, 
   (_a) => {
-    var _b = _a, { store } = _b, props = _WYXAWBLEcjs.__objRest.call(void 0, _b, ["store"]);
-    const context = _YRDDHZT7cjs.useMenuContext.call(void 0, );
+    var _b = _a, { store } = _b, props = _AV6KTKLEcjs.__objRest.call(void 0, _b, ["store"]);
+    const context = _NGEKJJDHcjs.useMenuContext.call(void 0, );
     store = store || context;
-    props = _AIPLRMQMcjs.usePopoverDisclosureArrow.call(void 0, _WYXAWBLEcjs.__spreadValues.call(void 0, { store }, props));
+    props = _YU7XEYUJcjs.usePopoverDisclosureArrow.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, { store }, props));
     return props;
   }
 );
-var MenuButtonArrow = _VKYTJKYNcjs.createComponent.call(void 0, 
+var MenuButtonArrow = _RNZNGEL4cjs.createComponent.call(void 0, 
   (props) => {
     const htmlProps = useMenuButtonArrow(props);
-    return _VKYTJKYNcjs.createElement.call(void 0, "span", htmlProps);
+    return _RNZNGEL4cjs.createElement.call(void 0, "span", htmlProps);
   }
 );
 if (process.env.NODE_ENV !== "production") {

package/cjs/menu/menu-button.cjs

@@ -1,63 +1,60 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});"use client";
 
 
-var _6HAYK3MKcjs = require('../__chunks/6HAYK3MK.cjs');
 
+var _NGEKJJDHcjs = require('../__chunks/NGEKJJDH.cjs');
+require('../__chunks/7LBZXSLY.cjs');
 
 
-var _YRDDHZT7cjs = require('../__chunks/YRDDHZT7.cjs');
+var _LICANQTIcjs = require('../__chunks/LICANQTI.cjs');
+require('../__chunks/QCG6J6X5.cjs');
+require('../__chunks/LFHNPG2L.cjs');
+require('../__chunks/3QW6ELTG.cjs');
+require('../__chunks/5UTRYT6E.cjs');
 
 
-var _AET6NN6Scjs = require('../__chunks/AET6NN6S.cjs');
-require('../__chunks/LXIYFIHE.cjs');
-require('../__chunks/IBMLAICP.cjs');
-require('../__chunks/PH2Q5GQR.cjs');
-require('../__chunks/XCM6Y3AX.cjs');
+var _FQZOOWMHcjs = require('../__chunks/FQZOOWMH.cjs');
+require('../__chunks/DAJUUBUI.cjs');
 
 
-var _TUYB72LLcjs = require('../__chunks/TUYB72LL.cjs');
-require('../__chunks/F7HB6RYG.cjs');
-
-
-var _AX6LOJFXcjs = require('../__chunks/AX6LOJFX.cjs');
+var _35LC5W3Mcjs = require('../__chunks/35LC5W3M.cjs');
 require('../__chunks/RV3PHHWM.cjs');
-require('../__chunks/FQGSRSYD.cjs');
-require('../__chunks/JVORNAMD.cjs');
+require('../__chunks/UZNYSPKP.cjs');
+require('../__chunks/BZTDJIVT.cjs');
 
 
-var _2TEJFTKYcjs = require('../__chunks/2TEJFTKY.cjs');
-require('../__chunks/ORT5QOHH.cjs');
-require('../__chunks/KZA6P235.cjs');
-require('../__chunks/QKKT6RXX.cjs');
-require('../__chunks/SMKW5GKS.cjs');
-require('../__chunks/7ARL6QHN.cjs');
+var _LAUATD5Ocjs = require('../__chunks/LAUATD5O.cjs');
+require('../__chunks/3W6FH6JK.cjs');
+require('../__chunks/UVBBMANL.cjs');
+require('../__chunks/F2A2ZQDB.cjs');
+require('../__chunks/S6UU7NA4.cjs');
+require('../__chunks/Z3GCTNW4.cjs');
 require('../__chunks/75KXQZJX.cjs');
 
 
 
 
-var _VKYTJKYNcjs = require('../__chunks/VKYTJKYN.cjs');
+var _RNZNGEL4cjs = require('../__chunks/RNZNGEL4.cjs');
 
 
-var _WLJVTO7Acjs = require('../__chunks/WLJVTO7A.cjs');
+var _OALXXRFMcjs = require('../__chunks/OALXXRFM.cjs');
 
 
 
 
 
-var _JTVNRMACcjs = require('../__chunks/JTVNRMAC.cjs');
-require('../__chunks/LNE2FWJO.cjs');
+var _EO6LS72Hcjs = require('../__chunks/EO6LS72H.cjs');
+require('../__chunks/CJDHQUBR.cjs');
 
 
 
 
-var _WYXAWBLEcjs = require('../__chunks/WYXAWBLE.cjs');
+var _AV6KTKLEcjs = require('../__chunks/AV6KTKLE.cjs');
 
 // src/menu/menu-button.tsx
 var _react = require('react');
 var _dom = require('@ariakit/core/utils/dom');
 var _misc = require('@ariakit/core/utils/misc');
-var _store = require('@ariakit/core/utils/store');
 var _jsxruntime = require('react/jsx-runtime');
 function getInitialFocus(event, dir) {
   const keyMap = {
@@ -68,10 +65,19 @@ function getInitialFocus(event, dir) {
   };
   return keyMap[event.key];
 }
-var useMenuButton = _VKYTJKYNcjs.createHook.call(void 0, 
+function hasActiveItem(items, excludeElement) {
+  return !!(items == null ? void 0 : items.some((item) => {
+    if (!item.element)
+      return false;
+    if (item.element === excludeElement)
+      return false;
+    return item.element.getAttribute("aria-expanded") === "true";
+  }));
+}
+var useMenuButton = _RNZNGEL4cjs.createHook.call(void 0, 
   (_a) => {
-    var _b = _a, { store, focusable, accessibleWhenDisabled, showOnHover } = _b, props = _WYXAWBLEcjs.__objRest.call(void 0, _b, ["store", "focusable", "accessibleWhenDisabled", "showOnHover"]);
-    const context = _YRDDHZT7cjs.useMenuProviderContext.call(void 0, );
+    var _b = _a, { store, focusable, accessibleWhenDisabled, showOnHover } = _b, props = _AV6KTKLEcjs.__objRest.call(void 0, _b, ["store", "focusable", "accessibleWhenDisabled", "showOnHover"]);
+    const context = _NGEKJJDHcjs.useMenuProviderContext.call(void 0, );
     store = store || context;
     _misc.invariant.call(void 0, 
       store,
@@ -79,19 +85,20 @@ var useMenuButton = _VKYTJKYNcjs.createHook.call(void 0,
     );
     const ref = _react.useRef.call(void 0, null);
     const parentMenu = store.parent;
-    const parentMenuBar = store.menubar;
+    const parentMenubar = store.menubar;
     const hasParentMenu = !!parentMenu;
-    const parentIsMenuBar = !!parentMenuBar && !hasParentMenu;
+    const parentIsMenubar = !!parentMenubar && !hasParentMenu;
     const disabled = _misc.disabledFromProps.call(void 0, props);
-    _react.useEffect.call(void 0, () => {
-      return _store.sync.call(void 0, store, ["disclosureElement"], (state) => {
-        if (!state.disclosureElement)
-          return;
-        store == null ? void 0 : store.setState("disclosureElement", ref.current);
-      });
-    }, [store]);
+    const showMenu = () => {
+      const trigger = ref.current;
+      if (!trigger)
+        return;
+      store == null ? void 0 : store.setDisclosureElement(trigger);
+      store == null ? void 0 : store.setAnchorElement(trigger);
+      store == null ? void 0 : store.show();
+    };
     const onFocusProp = props.onFocus;
-    const onFocus = _JTVNRMACcjs.useEvent.call(void 0, (event) => {
+    const onFocus = _EO6LS72Hcjs.useEvent.call(void 0, (event) => {
       onFocusProp == null ? void 0 : onFocusProp(event);
       if (disabled)
         return;
@@ -99,20 +106,20 @@ var useMenuButton = _VKYTJKYNcjs.createHook.call(void 0,
         return;
       store == null ? void 0 : store.setAutoFocusOnShow(false);
       store == null ? void 0 : store.setActiveId(null);
-      if (!parentMenuBar)
+      if (!parentMenubar)
         return;
-      if (!parentIsMenuBar)
+      if (!parentIsMenubar)
         return;
-      const { items } = parentMenuBar.getState();
-      if (_6HAYK3MKcjs.hasExpandedMenuButton.call(void 0, items, event.currentTarget)) {
-        store == null ? void 0 : store.show();
+      const { items } = parentMenubar.getState();
+      if (hasActiveItem(items, event.currentTarget)) {
+        showMenu();
       }
     });
     const dir = store.useState(
       (state) => state.placement.split("-")[0]
     );
     const onKeyDownProp = props.onKeyDown;
-    const onKeyDown = _JTVNRMACcjs.useEvent.call(void 0, (event) => {
+    const onKeyDown = _EO6LS72Hcjs.useEvent.call(void 0, (event) => {
       onKeyDownProp == null ? void 0 : onKeyDownProp(event);
       if (disabled)
         return;
@@ -121,13 +128,13 @@ var useMenuButton = _VKYTJKYNcjs.createHook.call(void 0,
       const initialFocus = getInitialFocus(event, dir);
       if (initialFocus) {
         event.preventDefault();
-        store == null ? void 0 : store.show();
+        showMenu();
         store == null ? void 0 : store.setAutoFocusOnShow(true);
         store == null ? void 0 : store.setInitialFocus(initialFocus);
       }
     });
     const onClickProp = props.onClick;
-    const onClick = _JTVNRMACcjs.useEvent.call(void 0, (event) => {
+    const onClick = _EO6LS72Hcjs.useEvent.call(void 0, (event) => {
       onClickProp == null ? void 0 : onClickProp(event);
       if (event.defaultPrevented)
         return;
@@ -142,67 +149,77 @@ var useMenuButton = _VKYTJKYNcjs.createHook.call(void 0,
         store.setInitialFocus(isKeyboardClick ? "first" : "container");
       }
       if (hasParentMenu) {
-        store.show();
+        showMenu();
       }
     });
-    props = _JTVNRMACcjs.useWrapElement.call(void 0, 
+    props = _EO6LS72Hcjs.useWrapElement.call(void 0, 
       props,
-      (element) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _YRDDHZT7cjs.MenuContextProvider, { value: store, children: element }),
+      (element) => /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _NGEKJJDHcjs.MenuContextProvider, { value: store, children: element }),
       [store]
     );
     if (hasParentMenu) {
-      props = _WYXAWBLEcjs.__spreadProps.call(void 0, _WYXAWBLEcjs.__spreadValues.call(void 0, {}, props), {
-        render: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _2TEJFTKYcjs.Role.div, { render: props.render })
+      props = _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {}, props), {
+        render: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _LAUATD5Ocjs.Role.div, { render: props.render })
       });
     }
-    const id = _JTVNRMACcjs.useId.call(void 0, props.id);
-    const parentContentElement = _WLJVTO7Acjs.useStoreState.call(void 0, parentMenu, "contentElement");
-    const role = hasParentMenu || parentIsMenuBar ? _dom.getPopupItemRole.call(void 0, parentContentElement, "menuitem") : void 0;
+    const id = _EO6LS72Hcjs.useId.call(void 0, props.id);
+    const parentContentElement = _OALXXRFMcjs.useStoreState.call(void 0, parentMenu, "contentElement");
+    const role = hasParentMenu || parentIsMenubar ? _dom.getPopupItemRole.call(void 0, parentContentElement, "menuitem") : void 0;
     const contentElement = store.useState("contentElement");
-    props = _WYXAWBLEcjs.__spreadProps.call(void 0, _WYXAWBLEcjs.__spreadValues.call(void 0, {
+    props = _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
       id,
       role,
       "aria-haspopup": _dom.getPopupRole.call(void 0, contentElement, "menu")
     }, props), {
-      ref: _JTVNRMACcjs.useMergeRefs.call(void 0, ref, props.ref),
+      ref: _EO6LS72Hcjs.useMergeRefs.call(void 0, ref, props.ref),
       onFocus,
       onKeyDown,
       onClick
     });
-    props = _AX6LOJFXcjs.useHovercardAnchor.call(void 0, _WYXAWBLEcjs.__spreadProps.call(void 0, _WYXAWBLEcjs.__spreadValues.call(void 0, {
+    props = _35LC5W3Mcjs.useHovercardAnchor.call(void 0, _AV6KTKLEcjs.__spreadProps.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
       store,
       focusable,
       accessibleWhenDisabled
     }, props), {
       showOnHover: (event) => {
-        if (typeof showOnHover === "function")
-          return showOnHover(event);
-        if (showOnHover != null)
-          return showOnHover;
-        if (hasParentMenu)
-          return true;
-        if (!parentMenuBar)
+        const getShowOnHover = () => {
+          if (typeof showOnHover === "function")
+            return showOnHover(event);
+          if (showOnHover != null)
+            return showOnHover;
+          if (hasParentMenu)
+            return true;
+          if (!parentMenubar)
+            return false;
+          const { items } = parentMenubar.getState();
+          return parentIsMenubar && hasActiveItem(items);
+        };
+        const canShowOnHover = getShowOnHover();
+        if (!canShowOnHover)
           return false;
-        const { items } = parentMenuBar.getState();
-        return parentIsMenuBar && _6HAYK3MKcjs.hasExpandedMenuButton.call(void 0, items);
+        const parent = parentIsMenubar ? parentMenubar : parentMenu;
+        if (!parent)
+          return true;
+        parent.setActiveId(event.currentTarget.id);
+        return true;
       }
     }));
-    props = _AET6NN6Scjs.usePopoverDisclosure.call(void 0, _WYXAWBLEcjs.__spreadValues.call(void 0, {
+    props = _LICANQTIcjs.usePopoverDisclosure.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
       store,
       toggleOnClick: !hasParentMenu,
       focusable,
       accessibleWhenDisabled
     }, props));
-    props = _TUYB72LLcjs.useCompositeTypeahead.call(void 0, _WYXAWBLEcjs.__spreadValues.call(void 0, {
+    props = _FQZOOWMHcjs.useCompositeTypeahead.call(void 0, _AV6KTKLEcjs.__spreadValues.call(void 0, {
       store,
-      typeahead: parentIsMenuBar
+      typeahead: parentIsMenubar
     }, props));
     return props;
   }
 );
-var MenuButton = _VKYTJKYNcjs.createComponent.call(void 0, (props) => {
+var MenuButton = _RNZNGEL4cjs.createComponent.call(void 0, (props) => {
   const htmlProps = useMenuButton(props);
-  return _VKYTJKYNcjs.createElement.call(void 0, "button", htmlProps);
+  return _RNZNGEL4cjs.createElement.call(void 0, "button", htmlProps);
 });
 if (process.env.NODE_ENV !== "production") {
   MenuButton.displayName = "MenuButton";

package/cjs/menu/menu-button.d.cts

@@ -50,7 +50,7 @@ export interface MenuButtonOptions<T extends As = "button" | "div"> extends Hove
      * [`MenuButton`](https://ariakit.org/reference/menu-button) should move focus
      * to the [`MenuItem`](https://ariakit.org/reference/menu-item) starting with
      * that character. By default, it's `true` for menu buttons in a
-     * [`MenuBar`](https://ariakit.org/reference/menu-bar), but `false` for other
+     * [Menubar](https://ariakit.org/components/menubar), but `false` for other
      * menu buttons.
      */
     typeahead?: boolean;

package/cjs/menu/menu-button.d.ts

@@ -50,7 +50,7 @@ export interface MenuButtonOptions<T extends As = "button" | "div"> extends Hove
      * [`MenuButton`](https://ariakit.org/reference/menu-button) should move focus
      * to the [`MenuItem`](https://ariakit.org/reference/menu-item) starting with
      * that character. By default, it's `true` for menu buttons in a
-     * [`MenuBar`](https://ariakit.org/reference/menu-bar), but `false` for other
+     * [Menubar](https://ariakit.org/components/menubar), but `false` for other
      * menu buttons.
      */
     typeahead?: boolean;

package/cjs/menu/menu-context.cjs

@@ -11,17 +11,18 @@
 
 
 
-var _YRDDHZT7cjs = require('../__chunks/YRDDHZT7.cjs');
-require('../__chunks/FQGSRSYD.cjs');
-require('../__chunks/JVORNAMD.cjs');
-require('../__chunks/ORT5QOHH.cjs');
-require('../__chunks/KZA6P235.cjs');
-require('../__chunks/QKKT6RXX.cjs');
-require('../__chunks/SMKW5GKS.cjs');
-require('../__chunks/VKYTJKYN.cjs');
-require('../__chunks/JTVNRMAC.cjs');
-require('../__chunks/LNE2FWJO.cjs');
-require('../__chunks/WYXAWBLE.cjs');
+var _NGEKJJDHcjs = require('../__chunks/NGEKJJDH.cjs');
+require('../__chunks/7LBZXSLY.cjs');
+require('../__chunks/UZNYSPKP.cjs');
+require('../__chunks/BZTDJIVT.cjs');
+require('../__chunks/3W6FH6JK.cjs');
+require('../__chunks/UVBBMANL.cjs');
+require('../__chunks/F2A2ZQDB.cjs');
+require('../__chunks/S6UU7NA4.cjs');
+require('../__chunks/RNZNGEL4.cjs');
+require('../__chunks/EO6LS72H.cjs');
+require('../__chunks/CJDHQUBR.cjs');
+require('../__chunks/AV6KTKLE.cjs');
 
 
 
@@ -34,4 +35,4 @@ require('../__chunks/WYXAWBLE.cjs');
 
 
 
-exports.MenuBarContextProvider = _YRDDHZT7cjs.MenuBarContextProvider; exports.MenuBarScopedContextProvider = _YRDDHZT7cjs.MenuBarScopedContextProvider; exports.MenuContextProvider = _YRDDHZT7cjs.MenuContextProvider; exports.MenuItemCheckedContext = _YRDDHZT7cjs.MenuItemCheckedContext; exports.MenuScopedContextProvider = _YRDDHZT7cjs.MenuScopedContextProvider; exports.useMenuBarContext = _YRDDHZT7cjs.useMenuBarContext; exports.useMenuBarProviderContext = _YRDDHZT7cjs.useMenuBarProviderContext; exports.useMenuBarScopedContext = _YRDDHZT7cjs.useMenuBarScopedContext; exports.useMenuContext = _YRDDHZT7cjs.useMenuContext; exports.useMenuProviderContext = _YRDDHZT7cjs.useMenuProviderContext; exports.useMenuScopedContext = _YRDDHZT7cjs.useMenuScopedContext;
+exports.MenuBarContextProvider = _NGEKJJDHcjs.MenuBarContextProvider; exports.MenuBarScopedContextProvider = _NGEKJJDHcjs.MenuBarScopedContextProvider; exports.MenuContextProvider = _NGEKJJDHcjs.MenuContextProvider; exports.MenuItemCheckedContext = _NGEKJJDHcjs.MenuItemCheckedContext; exports.MenuScopedContextProvider = _NGEKJJDHcjs.MenuScopedContextProvider; exports.useMenuBarContext = _NGEKJJDHcjs.useMenuBarContext; exports.useMenuBarProviderContext = _NGEKJJDHcjs.useMenuBarProviderContext; exports.useMenuBarScopedContext = _NGEKJJDHcjs.useMenuBarScopedContext; exports.useMenuContext = _NGEKJJDHcjs.useMenuContext; exports.useMenuProviderContext = _NGEKJJDHcjs.useMenuProviderContext; exports.useMenuScopedContext = _NGEKJJDHcjs.useMenuScopedContext;