@base-ui/react 1.0.0 → 1.2.0

package/esm/menu/link-item/MenuLinkItemDataAttributes.d.ts

@@ -0,0 +1,6 @@
+export declare enum MenuLinkItemDataAttributes {
+  /**
+   * Present when the link is highlighted.
+   */
+  highlighted = "data-highlighted",
+}

package/esm/menu/link-item/MenuLinkItemDataAttributes.js

@@ -0,0 +1,7 @@
+export let MenuLinkItemDataAttributes = /*#__PURE__*/function (MenuLinkItemDataAttributes) {
+  /**
+   * Present when the link is highlighted.
+   */
+  MenuLinkItemDataAttributes["highlighted"] = "data-highlighted";
+  return MenuLinkItemDataAttributes;
+}({});

package/esm/menu/popup/MenuPopup.d.ts

@@ -9,13 +9,13 @@ import type { TransitionStatus } from "../../utils/useTransitionStatus.js";
  *
  * Documentation: [Base UI Menu](https://base-ui.com/react/components/menu)
  */
-export declare const MenuPopup: React.ForwardRefExoticComponent<MenuPopupProps & React.RefAttributes<Element>>;
+export declare const MenuPopup: React.ForwardRefExoticComponent<Omit<MenuPopupProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface MenuPopupProps extends BaseUIComponentProps<'div', MenuPopup.State> {
   children?: React.ReactNode;
   /**
    * @ignore
    */
-  id?: string;
+  id?: string | undefined;
   /**
    * Determines the element to focus when the menu is closed.
    *
@@ -25,7 +25,7 @@ export interface MenuPopupProps extends BaseUIComponentProps<'div', MenuPopup.St
    * - `function`: Called with the interaction type (`mouse`, `touch`, `pen`, or `keyboard`).
    *   Return an element to focus, `true` to use the default behavior, or `false`/`undefined` to do nothing.
    */
-  finalFocus?: boolean | React.RefObject<HTMLElement | null> | ((closeType: InteractionType) => boolean | HTMLElement | null | void);
+  finalFocus?: (boolean | React.RefObject<HTMLElement | null> | ((closeType: InteractionType) => boolean | HTMLElement | null | void)) | undefined;
 }
 export type MenuPopupState = {
   transitionStatus: TransitionStatus;
@@ -36,6 +36,7 @@ export type MenuPopupState = {
    */
   open: boolean;
   nested: boolean;
+  instant: 'dismiss' | 'click' | 'group' | undefined;
 };
 export declare namespace MenuPopup {
   type Props = MenuPopupProps;

package/esm/menu/popup/MenuPopup.js

@@ -53,6 +53,7 @@ export const MenuPopup = /*#__PURE__*/React.forwardRef(function MenuPopup(compon
   const floatingTreeRoot = store.useState('floatingTreeRoot');
   const closeDelay = store.useState('closeDelay');
   const activeTriggerElement = store.useState('activeTriggerElement');
+  const isContextMenu = parent.type === 'context-menu';
   useOpenChangeComplete({
     open,
     ref: store.context.popupRef,
@@ -74,17 +75,17 @@ export const MenuPopup = /*#__PURE__*/React.forwardRef(function MenuPopup(compon
   const hoverEnabled = store.useState('hoverEnabled');
   const disabled = store.useState('disabled');
   useHoverFloatingInteraction(floatingContext, {
-    enabled: hoverEnabled && !disabled && parent.type !== 'context-menu' && parent.type !== 'menubar',
+    enabled: hoverEnabled && !disabled && !isContextMenu && parent.type !== 'menubar',
     closeDelay
   });
-  const state = React.useMemo(() => ({
+  const state = {
     transitionStatus,
     side,
     align,
     open,
     nested: parent.type === 'menu',
     instant: instantType
-  }), [transitionStatus, side, align, open, parent.type, instantType]);
+  };
   const element = useRenderElement('div', componentProps, {
     state,
     ref: [forwardedRef, store.context.popupRef],
@@ -99,13 +100,13 @@ export const MenuPopup = /*#__PURE__*/React.forwardRef(function MenuPopup(compon
       'data-rootownerid': rootId
     }]
   });
-  let returnFocus = parent.type === undefined || parent.type === 'context-menu';
+  let returnFocus = parent.type === undefined || isContextMenu;
   if (triggerElement || parent.type === 'menubar' && lastOpenChangeReason !== REASONS.outsidePress) {
     returnFocus = true;
   }
   return /*#__PURE__*/_jsx(FloatingFocusManager, {
     context: floatingContext,
-    modal: false,
+    modal: isContextMenu,
     disabled: !mounted,
     returnFocus: finalFocus === undefined ? returnFocus : finalFocus,
     initialFocus: parent.type !== 'menu',

package/esm/menu/popup/MenuPopupDataAttributes.js

@@ -20,12 +20,12 @@ export let MenuPopupDataAttributes = function (MenuPopupDataAttributes) {
    * Indicates which side the popup is positioned relative to the trigger.
    * @type {'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'}
    */
-  MenuPopupDataAttributes["side"] = "data-side";
+  MenuPopupDataAttributes[MenuPopupDataAttributes["side"] = CommonPopupDataAttributes.side] = "side";
   /**
    * Indicates how the popup is aligned relative to specified side.
    * @type {'start' | 'center' | 'end'}
    */
-  MenuPopupDataAttributes["align"] = "data-align";
+  MenuPopupDataAttributes[MenuPopupDataAttributes["align"] = CommonPopupDataAttributes.align] = "align";
   /**
    * Present if animations should be instant.
    * @type {'click' | 'dismiss' | 'group'}

package/esm/menu/portal/MenuPortal.d.ts

@@ -7,7 +7,7 @@ import { FloatingPortal } from "../../floating-ui-react/index.js";
  *
  * Documentation: [Base UI Menu](https://base-ui.com/react/components/menu)
  */
-export declare const MenuPortal: React.ForwardRefExoticComponent<MenuPortalProps & React.RefAttributes<HTMLDivElement>>;
+export declare const MenuPortal: React.ForwardRefExoticComponent<Omit<MenuPortalProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export declare namespace MenuPortal {
   interface State {}
 }
@@ -16,7 +16,7 @@ export interface MenuPortalProps extends FloatingPortal.Props<MenuPortal.State>
    * Whether to keep the portal mounted in the DOM while the popup is hidden.
    * @default false
    */
-  keepMounted?: boolean;
+  keepMounted?: boolean | undefined;
 }
 export declare namespace MenuPortal {
   type Props = MenuPortalProps;

package/esm/menu/portal/MenuPortalContext.js

@@ -1,3 +1,5 @@
+'use client';
+
 import _formatErrorMessage from "@base-ui/utils/formatErrorMessage";
 import * as React from 'react';
 export const MenuPortalContext = /*#__PURE__*/React.createContext(undefined);

package/esm/menu/positioner/MenuPositioner.d.ts

@@ -7,7 +7,7 @@ import { BaseUIComponentProps } from "../../utils/types.js";
  *
  * Documentation: [Base UI Menu](https://base-ui.com/react/components/menu)
  */
-export declare const MenuPositioner: React.ForwardRefExoticComponent<MenuPositionerProps & React.RefAttributes<HTMLDivElement>>;
+export declare const MenuPositioner: React.ForwardRefExoticComponent<Omit<MenuPositionerProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface MenuPositionerState {
   /**
    * Whether the menu is currently open.

package/esm/menu/positioner/MenuPositioner.js

@@ -12,6 +12,7 @@ import { CompositeList } from "../../composite/list/CompositeList.js";
 import { InternalBackdrop } from "../../utils/InternalBackdrop.js";
 import { useMenuPortalContext } from "../portal/MenuPortalContext.js";
 import { DROPDOWN_COLLISION_AVOIDANCE, POPUP_COLLISION_AVOIDANCE } from "../../utils/constants.js";
+import { getDisabledMountTransitionStyles } from "../../utils/getDisabledMountTransitionStyles.js";
 import { useContextMenuRootContext } from "../../context-menu/root/ContextMenuRootContext.js";
 import { createChangeEventDetails } from "../../utils/createBaseUIEventDetails.js";
 import { REASONS } from "../../utils/reasons.js";
@@ -52,6 +53,7 @@ export const MenuPositioner = /*#__PURE__*/React.forwardRef(function MenuPositio
   const open = store.useState('open');
   const modal = store.useState('modal');
   const triggerElement = store.useState('activeTriggerElement');
+  const transitionStatus = store.useState('transitionStatus');
   const lastOpenChangeReason = store.useState('lastOpenChangeReason');
   const floatingNodeId = store.useState('floatingNodeId');
   const floatingParentNodeId = store.useState('floatingParentNodeId');
@@ -96,7 +98,7 @@ export const MenuPositioner = /*#__PURE__*/React.forwardRef(function MenuPositio
     keepMounted,
     disableAnchorTracking,
     collisionAvoidance,
-    shiftCrossAxis: contextMenu,
+    shiftCrossAxis: contextMenu && !('side' in collisionAvoidance && collisionAvoidance.side === 'flip'),
     externalTree: floatingTreeRoot
   });
   const positionerProps = React.useMemo(() => {
@@ -122,14 +124,6 @@ export const MenuPositioner = /*#__PURE__*/React.forwardRef(function MenuPositio
         if (details.nodeId !== floatingNodeId && details.parentNodeId === store.select('floatingParentNodeId')) {
           store.setOpen(false, createChangeEventDetails(REASONS.siblingOpen));
         }
-      } else if (details.parentNodeId === floatingNodeId) {
-        // Re-enable hover on the parent when a child closes, except when the child
-        // closed due to hovering a different sibling item in this parent (sibling-open).
-        // Keeping hover disabled in that scenario prevents the parent from closing
-        // immediately when the pointer then leaves it.
-        if (details.reason !== REASONS.siblingOpen) {
-          store.set('hoverEnabled', true);
-        }
       }
     }
     floatingTreeRoot.events.on('menuopenchange', onMenuOpenChange);
@@ -180,13 +174,13 @@ export const MenuPositioner = /*#__PURE__*/React.forwardRef(function MenuPositio
     };
     floatingTreeRoot.events.emit('menuopenchange', eventDetails);
   }, [floatingTreeRoot.events, open, store, floatingNodeId, floatingParentNodeId]);
-  const state = React.useMemo(() => ({
+  const state = {
     open,
     side: positioner.side,
     align: positioner.align,
     anchorHidden: positioner.anchorHidden,
     nested: parent.type === 'menu'
-  }), [open, positioner.side, positioner.align, positioner.anchorHidden, parent.type]);
+  };
   const contextValue = React.useMemo(() => ({
     side: positioner.side,
     align: positioner.align,
@@ -199,7 +193,7 @@ export const MenuPositioner = /*#__PURE__*/React.forwardRef(function MenuPositio
     state,
     stateAttributesMapping: popupStateMapping,
     ref: [forwardedRef, store.useStateSetter('positionerElement')],
-    props: [positionerProps, elementProps]
+    props: [positionerProps, getDisabledMountTransitionStyles(transitionStatus), elementProps]
   });
   const shouldRenderBackdrop = mounted && parent.type !== 'menu' && (parent.type !== 'menubar' && modal && lastOpenChangeReason !== REASONS.triggerHover || parent.type === 'menubar' && parent.context.modal);
 

package/esm/menu/positioner/MenuPositionerDataAttributes.js

@@ -16,11 +16,11 @@ export let MenuPositionerDataAttributes = function (MenuPositionerDataAttributes
    * Indicates which side the popup is positioned relative to the trigger.
    * @type {'top' | 'bottom' | 'left' | 'right' | 'inline-end' | 'inline-start'}
    */
-  MenuPositionerDataAttributes["side"] = "data-side";
+  MenuPositionerDataAttributes[MenuPositionerDataAttributes["side"] = CommonPopupDataAttributes.side] = "side";
   /**
    * Indicates how the popup is aligned relative to specified side.
    * @type {'start' | 'center' | 'end'}
    */
-  MenuPositionerDataAttributes["align"] = "data-align";
+  MenuPositionerDataAttributes[MenuPositionerDataAttributes["align"] = CommonPopupDataAttributes.align] = "align";
   return MenuPositionerDataAttributes;
 }({});

package/esm/menu/radio-group/MenuRadioGroup.d.ts

@@ -7,7 +7,7 @@ import type { MenuRoot } from "../root/MenuRoot.js";
  *
  * Documentation: [Base UI Menu](https://base-ui.com/react/components/menu)
  */
-export declare const MenuRadioGroup: React.NamedExoticComponent<MenuRadioGroupProps & React.RefAttributes<Element>>;
+export declare const MenuRadioGroup: React.NamedExoticComponent<Omit<MenuRadioGroupProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface MenuRadioGroupProps extends BaseUIComponentProps<'div', MenuRadioGroup.State> {
   /**
    * The content of the component.
@@ -28,13 +28,13 @@ export interface MenuRadioGroupProps extends BaseUIComponentProps<'div', MenuRad
   /**
    * Function called when the selected value changes.
    */
-  onValueChange?: (value: any, eventDetails: MenuRadioGroup.ChangeEventDetails) => void;
+  onValueChange?: ((value: any, eventDetails: MenuRadioGroup.ChangeEventDetails) => void) | undefined;
   /**
    * Whether the component should ignore user interaction.
    *
    * @default false
    */
-  disabled?: boolean;
+  disabled?: boolean | undefined;
 }
 export type MenuRadioGroupState = {
   disabled: boolean;

package/esm/menu/radio-group/MenuRadioGroup.js

@@ -35,9 +35,9 @@ export const MenuRadioGroup = /*#__PURE__*/React.memo(/*#__PURE__*/React.forward
     }
     setValueUnwrapped(newValue);
   });
-  const state = React.useMemo(() => ({
+  const state = {
     disabled
-  }), [disabled]);
+  };
   const element = useRenderElement('div', componentProps, {
     state,
     ref: forwardedRef,

package/esm/menu/radio-group/MenuRadioGroupContext.js

@@ -1,3 +1,5 @@
+'use client';
+
 import _formatErrorMessage from "@base-ui/utils/formatErrorMessage";
 import * as React from 'react';
 export const MenuRadioGroupContext = /*#__PURE__*/React.createContext(undefined);

package/esm/menu/radio-item/MenuRadioItem.d.ts

@@ -6,7 +6,7 @@ import type { BaseUIComponentProps, NonNativeButtonProps } from "../../utils/typ
  *
  * Documentation: [Base UI Menu](https://base-ui.com/react/components/menu)
  */
-export declare const MenuRadioItem: React.ForwardRefExoticComponent<MenuRadioItemProps & React.RefAttributes<Element>>;
+export declare const MenuRadioItem: React.ForwardRefExoticComponent<Omit<MenuRadioItemProps, "ref"> & React.RefAttributes<HTMLElement>>;
 export type MenuRadioItemState = {
   /**
    * Whether the radio item should ignore user interaction.
@@ -30,25 +30,25 @@ export interface MenuRadioItemProps extends NonNativeButtonProps, BaseUIComponen
   /**
    * The click handler for the menu item.
    */
-  onClick?: React.MouseEventHandler<HTMLElement>;
+  onClick?: BaseUIComponentProps<'div', MenuRadioItemState>['onClick'] | undefined;
   /**
    * Whether the component should ignore user interaction.
    * @default false
    */
-  disabled?: boolean;
+  disabled?: boolean | undefined;
   /**
    * Overrides the text label to use when the item is matched during keyboard text navigation.
    */
-  label?: string;
+  label?: string | undefined;
   /**
    * @ignore
    */
-  id?: string;
+  id?: string | undefined;
   /**
    * Whether to close the menu when the item is clicked.
    * @default false
    */
-  closeOnClick?: boolean;
+  closeOnClick?: boolean | undefined;
 }
 export declare namespace MenuRadioItem {
   type State = MenuRadioItemState;

package/esm/menu/radio-item/MenuRadioItemContext.js

@@ -1,3 +1,5 @@
+'use client';
+
 import _formatErrorMessage from "@base-ui/utils/formatErrorMessage";
 import * as React from 'react';
 export const MenuRadioItemContext = /*#__PURE__*/React.createContext(undefined);

package/esm/menu/radio-item-indicator/MenuRadioItemIndicator.d.ts

@@ -3,17 +3,17 @@ import { BaseUIComponentProps } from "../../utils/types.js";
 import { TransitionStatus } from "../../utils/useTransitionStatus.js";
 /**
  * Indicates whether the radio item is selected.
- * Renders a `<div>` element.
+ * Renders a `<span>` element.
  *
  * Documentation: [Base UI Menu](https://base-ui.com/react/components/menu)
  */
-export declare const MenuRadioItemIndicator: React.ForwardRefExoticComponent<MenuRadioItemIndicatorProps & React.RefAttributes<HTMLSpanElement>>;
+export declare const MenuRadioItemIndicator: React.ForwardRefExoticComponent<Omit<MenuRadioItemIndicatorProps, "ref"> & React.RefAttributes<HTMLSpanElement>>;
 export interface MenuRadioItemIndicatorProps extends BaseUIComponentProps<'span', MenuRadioItemIndicator.State> {
   /**
    * Whether to keep the HTML element in the DOM when the radio item is inactive.
    * @default false
    */
-  keepMounted?: boolean;
+  keepMounted?: boolean | undefined;
 }
 export interface MenuRadioItemIndicatorState {
   /**

package/esm/menu/radio-item-indicator/MenuRadioItemIndicator.js

@@ -9,7 +9,7 @@ import { useOpenChangeComplete } from "../../utils/useOpenChangeComplete.js";
 
 /**
  * Indicates whether the radio item is selected.
- * Renders a `<div>` element.
+ * Renders a `<span>` element.
  *
  * Documentation: [Base UI Menu](https://base-ui.com/react/components/menu)
  */
@@ -35,12 +35,12 @@ export const MenuRadioItemIndicator = /*#__PURE__*/React.forwardRef(function Men
       }
     }
   });
-  const state = React.useMemo(() => ({
+  const state = {
     checked: item.checked,
     disabled: item.disabled,
     highlighted: item.highlighted,
     transitionStatus
-  }), [item.checked, item.disabled, item.highlighted, transitionStatus]);
+  };
   const element = useRenderElement('span', componentProps, {
     state,
     stateAttributesMapping: itemMapping,

package/esm/menu/root/MenuRoot.d.ts

@@ -13,7 +13,7 @@ import { PayloadChildRenderFunction } from "../../utils/popups/index.js";
  *
  * Documentation: [Base UI Menu](https://base-ui.com/react/components/menu)
  */
-export declare function MenuRoot<Payload>(props: MenuRoot.Props<Payload>): import("react/jsx-runtime").JSX.Element;
+export declare const MenuRoot: <Payload>(props: MenuRoot.Props<Payload>) => import("react/jsx-runtime").JSX.Element;
 export interface MenuRootProps<Payload = unknown> {
   /**
    * Whether the menu is initially open.
@@ -21,55 +21,55 @@ export interface MenuRootProps<Payload = unknown> {
    * To render a controlled menu, use the `open` prop instead.
    * @default false
    */
-  defaultOpen?: boolean;
+  defaultOpen?: boolean | undefined;
   /**
    * Whether to loop keyboard focus back to the first item
    * when the end of the list is reached while using the arrow keys.
    * @default true
    */
-  loopFocus?: boolean;
+  loopFocus?: boolean | undefined;
   /**
    * Whether moving the pointer over items should highlight them.
    * Disabling this prop allows CSS `:hover` to be differentiated from the `:focus` (`data-highlighted`) state.
    * @default true
    */
-  highlightItemOnHover?: boolean;
+  highlightItemOnHover?: boolean | undefined;
   /**
    * Determines if the menu enters a modal state when open.
-   * - `true`: user interaction is limited to the menu: document page scroll is locked and and pointer interactions on outside elements are disabled.
+   * - `true`: user interaction is limited to the menu: document page scroll is locked and pointer interactions on outside elements are disabled.
    * - `false`: user interaction with the rest of the document is allowed.
    * @default true
    */
-  modal?: boolean;
+  modal?: boolean | undefined;
   /**
    * Event handler called when the menu is opened or closed.
    */
-  onOpenChange?: (open: boolean, eventDetails: MenuRoot.ChangeEventDetails) => void;
+  onOpenChange?: ((open: boolean, eventDetails: MenuRoot.ChangeEventDetails) => void) | undefined;
   /**
    * Event handler called after any animations complete when the menu is closed.
    */
-  onOpenChangeComplete?: (open: boolean) => void;
+  onOpenChangeComplete?: ((open: boolean) => void) | undefined;
   /**
    * Whether the menu is currently open.
    */
-  open?: boolean;
+  open?: boolean | undefined;
   /**
    * The visual orientation of the menu.
    * Controls whether roving focus uses up/down or left/right arrow keys.
    * @default 'vertical'
    */
-  orientation?: MenuRoot.Orientation;
+  orientation?: MenuRoot.Orientation | undefined;
   /**
    * Whether the component should ignore user interaction.
    * @default false
    */
-  disabled?: boolean;
+  disabled?: boolean | undefined;
   /**
    * When in a submenu, determines whether pressing the Escape key
    * closes the entire menu, or only the current child menu.
    * @default false
    */
-  closeParentOnEsc?: boolean;
+  closeParentOnEsc?: boolean | undefined;
   /**
    * A ref to imperative actions.
    * - `unmount`: When specified, the menu will not be unmounted when closed.
@@ -77,23 +77,23 @@ export interface MenuRootProps<Payload = unknown> {
    *   Useful when the menu's animation is controlled by an external library.
    * - `close`: When specified, the menu can be closed imperatively.
    */
-  actionsRef?: React.RefObject<MenuRoot.Actions>;
+  actionsRef?: React.RefObject<MenuRoot.Actions | null> | undefined;
   /**
    * ID of the trigger that the popover is associated with.
-   * This is useful in conjuntion with the `open` prop to create a controlled popover.
+   * This is useful in conjunction with the `open` prop to create a controlled popover.
    * There's no need to specify this prop when the popover is uncontrolled (i.e. when the `open` prop is not set).
    */
-  triggerId?: string | null;
+  triggerId?: (string | null) | undefined;
   /**
    * ID of the trigger that the popover is associated with.
-   * This is useful in conjuntion with the `defaultOpen` prop to create an initially open popover.
+   * This is useful in conjunction with the `defaultOpen` prop to create an initially open popover.
    */
-  defaultTriggerId?: string | null;
+  defaultTriggerId?: (string | null) | undefined;
   /**
-   * A handle to associate the popover with a trigger.
-   * If specified, allows external triggers to control the popover's open state.
+   * A handle to associate the menu with a trigger.
+   * If specified, allows external triggers to control the menu's open state.
    */
-  handle?: MenuHandle<Payload>;
+  handle?: MenuHandle<Payload> | undefined;
   /**
    * The content of the popover.
    * This can be a regular React node or a render function that receives the `payload` of the active trigger.
@@ -102,6 +102,7 @@ export interface MenuRootProps<Payload = unknown> {
 }
 export interface MenuRootActions {
   unmount: () => void;
+  close: () => void;
 }
 export type MenuRootChangeEventReason = typeof REASONS.triggerHover | typeof REASONS.triggerFocus | typeof REASONS.triggerPress | typeof REASONS.outsidePress | typeof REASONS.focusOut | typeof REASONS.listNavigation | typeof REASONS.escapeKey | typeof REASONS.itemPress | typeof REASONS.closePress | typeof REASONS.siblingOpen | typeof REASONS.cancelOpen | typeof REASONS.imperativeAction | typeof REASONS.none;
 export type MenuRootChangeEventDetails = BaseUIChangeEventDetails<MenuRoot.ChangeEventReason> & {

package/esm/menu/root/MenuRoot.js

@@ -1,14 +1,14 @@
 'use client';
 
 import * as React from 'react';
-import * as ReactDOM from 'react-dom';
 import { useTimeout } from '@base-ui/utils/useTimeout';
 import { useStableCallback } from '@base-ui/utils/useStableCallback';
 import { useId } from '@base-ui/utils/useId';
 import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
-import { useAnimationFrame } from '@base-ui/utils/useAnimationFrame';
+import { useOnFirstRender } from '@base-ui/utils/useOnFirstRender';
 import { useScrollLock } from '@base-ui/utils/useScrollLock';
 import { EMPTY_ARRAY } from '@base-ui/utils/empty';
+import { fastComponent } from '@base-ui/utils/fastHooks';
 import { FloatingTree, useDismiss, useFloatingNodeId, useFloatingParentNodeId, useInteractions, useListNavigation, useRole, useTypeahead, useSyncedFloatingRootContext } from "../../floating-ui-react/index.js";
 import { MenuRootContext, useMenuRootContext } from "./MenuRootContext.js";
 import { useMenubarContext } from "../../menubar/MenubarContext.js";
@@ -30,7 +30,7 @@ import { useMenuSubmenuRootContext } from "../submenu-root/MenuSubmenuRootContex
  * Documentation: [Base UI Menu](https://base-ui.com/react/components/menu)
  */
 import { jsx as _jsx } from "react/jsx-runtime";
-export function MenuRoot(props) {
+export const MenuRoot = fastComponent(function MenuRoot(props) {
   const {
     children,
     open: openProp,
@@ -80,8 +80,25 @@ export function MenuRoot(props) {
     };
   }, [contextMenuContext, parentMenuRootContext, menubarContext, isSubmenu]);
   const store = MenuStore.useStore(handle?.store, {
+    open: defaultOpen,
+    openProp,
+    activeTriggerId: defaultTriggerIdProp,
+    triggerIdProp,
     parent: parentFromContext
   });
+
+  // Support initially open state when uncontrolled
+  useOnFirstRender(() => {
+    if (openProp === undefined && store.state.open === false && defaultOpen === true) {
+      store.update({
+        open: true,
+        activeTriggerId: defaultTriggerIdProp
+      });
+    }
+  });
+  store.useControlledProp('openProp', openProp);
+  store.useControlledProp('triggerIdProp', triggerIdProp);
+  store.useContextCallback('onOpenChangeComplete', onOpenChangeComplete);
   const floatingTreeRoot = store.useState('floatingTreeRoot');
   const floatingNodeIdFromContext = useFloatingNodeId(floatingTreeRoot);
   const floatingParentNodeIdFromContext = useFloatingParentNodeId();
@@ -104,9 +121,6 @@ export function MenuRoot(props) {
       });
     }
   }, [contextMenuContext, parentMenuRootContext, floatingNodeIdFromContext, floatingParentNodeIdFromContext, store]);
-  store.useControlledProp('open', openProp, defaultOpen);
-  store.useControlledProp('activeTriggerId', triggerIdProp, defaultTriggerIdProp);
-  store.useContextCallback('onOpenChangeComplete', onOpenChangeComplete);
   const open = store.useState('open');
   const activeTriggerElement = store.useState('activeTriggerElement');
   const positionerElement = store.useState('positionerElement');
@@ -178,7 +192,7 @@ export function MenuRoot(props) {
   const allowTouchToCloseTimeout = useTimeout();
   const setOpen = useStableCallback((nextOpen, eventDetails) => {
     const reason = eventDetails.reason;
-    if (open === nextOpen && eventDetails.trigger === activeTriggerElement) {
+    if (open === nextOpen && eventDetails.trigger === activeTriggerElement && lastOpenChangeReason === reason) {
       return;
     }
     eventDetails.preventUnmountOnClose = () => {
@@ -233,27 +247,20 @@ export function MenuRoot(props) {
     }
     const isKeyboardClick = (reason === REASONS.triggerPress || reason === REASONS.itemPress) && nativeEvent.detail === 0 && nativeEvent?.isTrusted;
     const isDismissClose = !nextOpen && (reason === REASONS.escapeKey || reason == null);
-    function changeState() {
-      const updatedState = {
-        open: nextOpen,
-        openChangeReason: reason
-      };
-      openEventRef.current = eventDetails.event ?? null;
+    const updatedState = {
+      open: nextOpen,
+      openChangeReason: reason
+    };
+    openEventRef.current = eventDetails.event ?? null;
 
-      // If a popup is closing, the `trigger` may be null.
-      // We want to keep the previous value so that exit animations are played and focus is returned correctly.
-      const newTriggerId = eventDetails.trigger?.id ?? null;
-      if (newTriggerId || nextOpen) {
-        updatedState.activeTriggerId = newTriggerId;
-        updatedState.activeTriggerElement = eventDetails.trigger ?? null;
-      }
-      store.update(updatedState);
-    }
-    if (reason === REASONS.triggerHover) {
-      ReactDOM.flushSync(changeState);
-    } else {
-      changeState();
+    // If a popup is closing, the `trigger` may be null.
+    // We want to keep the previous value so that exit animations are played and focus is returned correctly.
+    const newTriggerId = eventDetails.trigger?.id ?? null;
+    if (newTriggerId || nextOpen) {
+      updatedState.activeTriggerId = newTriggerId;
+      updatedState.activeTriggerElement = eventDetails.trigger ?? null;
     }
+    store.update(updatedState);
     if (parent.type === 'menubar' && (reason === REASONS.triggerFocus || reason === REASONS.focusOut || reason === REASONS.triggerHover || reason === REASONS.listNavigation || reason === REASONS.siblingOpen)) {
       store.set('instantType', 'group');
     } else if (isKeyboardClick || isDismissClose) {
@@ -301,7 +308,9 @@ export function MenuRoot(props) {
   }, [floatingEvents, setOpen]);
   const dismiss = useDismiss(floatingRootContext, {
     enabled: !disabled,
-    bubbles: closeParentOnEsc && parent.type === 'menu',
+    bubbles: {
+      escapeKey: closeParentOnEsc && parent.type === 'menu'
+    },
     outsidePress() {
       if (parent.type !== 'context-menu' || openEventRef.current?.type === 'contextmenu') {
         return true;
@@ -357,9 +366,6 @@ export function MenuRoot(props) {
   } = useInteractions([dismiss, role, listNavigation, typeahead]);
   const activeTriggerProps = React.useMemo(() => {
     const mergedProps = mergeProps(getReferenceProps(), {
-      onMouseEnter() {
-        store.set('hoverEnabled', true);
-      },
       onMouseMove() {
         store.set('allowMouseEnter', true);
       }
@@ -377,15 +383,12 @@ export function MenuRoot(props) {
     delete mergedProps['aria-controls'];
     return mergedProps;
   }, [getTriggerProps, interactionTypeProps]);
-  const disableHoverTimeout = useAnimationFrame();
   const popupProps = React.useMemo(() => getFloatingProps({
-    onMouseEnter() {
-      if (parent.type === 'menu') {
-        disableHoverTimeout.request(() => store.set('hoverEnabled', false));
-      }
-    },
     onMouseMove() {
       store.set('allowMouseEnter', true);
+      if (parent.type === 'menu') {
+        store.set('hoverEnabled', false);
+      }
     },
     onClick() {
       if (store.select('hoverEnabled')) {
@@ -401,7 +404,7 @@ export function MenuRoot(props) {
         relay(event);
       }
     }
-  }), [getFloatingProps, parent.type, disableHoverTimeout, store]);
+  }), [getFloatingProps, parent.type, store]);
   const itemProps = React.useMemo(() => getItemProps(), [getItemProps]);
   store.useSyncedValues({
     floatingRootContext,
@@ -428,4 +431,5 @@ export function MenuRoot(props) {
     });
   }
   return content;
-}
+});
+if (process.env.NODE_ENV !== "production") MenuRoot.displayName = "MenuRoot";