@base-ui/react 1.2.0 → 1.4.0

package/navigation-menu/list/NavigationMenuList.js

@@ -27,19 +27,29 @@ const NavigationMenuList = exports.NavigationMenuList = /*#__PURE__*/React.forwa
   const {
     className,
     render,
+    style,
     ...elementProps
   } = componentProps;
+  const nodeId = (0, _NavigationMenuRootContext.useNavigationMenuTreeContext)();
   const {
     orientation,
     open,
     floatingRootContext,
     positionerElement,
     value,
+    closeDelay,
+    viewportElement,
     nested
   } = (0, _NavigationMenuRootContext.useNavigationMenuRootContext)();
   const fallbackContext = React.useMemo(() => (0, _getEmptyRootContext.getEmptyRootContext)(), []);
   const context = floatingRootContext || fallbackContext;
   const interactionsEnabled = positionerElement ? true : !value;
+  const hoverInteractionsEnabled = positionerElement || viewportElement ? true : !value;
+  (0, _floatingUiReact.useHoverFloatingInteraction)(context, {
+    enabled: Boolean(floatingRootContext) && hoverInteractionsEnabled,
+    closeDelay,
+    nodeId
+  });
   const dismiss = (0, _floatingUiReact.useDismiss)(context, {
     enabled: interactionsEnabled,
     outsidePressEvent: 'intentional',
@@ -57,7 +67,7 @@ const NavigationMenuList = exports.NavigationMenuList = /*#__PURE__*/React.forwa
   // `stopEventPropagation` won't stop the propagation if the end of the list is reached,
   // but we want to block it in this case.
   // When nested, skip this handler so arrow keys can reach the parent CompositeRoot.
-  const defaultProps = nested ? {} : {
+  const defaultProps = nested ? _constants.EMPTY_OBJECT : {
     onKeyDown(event) {
       const shouldStop = orientation === 'horizontal' && (event.key === 'ArrowLeft' || event.key === 'ArrowRight') || orientation === 'vertical' && (event.key === 'ArrowUp' || event.key === 'ArrowDown');
       if (shouldStop) {
@@ -65,7 +75,9 @@ const NavigationMenuList = exports.NavigationMenuList = /*#__PURE__*/React.forwa
       }
     }
   };
-  const props = [dismissProps?.floating || _constants.EMPTY_OBJECT, defaultProps, elementProps];
+  const props = [dismissProps?.floating || _constants.EMPTY_OBJECT, defaultProps, {
+    'aria-orientation': undefined
+  }, elementProps];
 
   // When nested, skip the CompositeRoot wrapper so that triggers can participate
   // in the parent Content's composite navigation context. Also skip the onKeyDown
@@ -87,6 +99,7 @@ const NavigationMenuList = exports.NavigationMenuList = /*#__PURE__*/React.forwa
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CompositeRoot.CompositeRoot, {
       render: render,
       className: className,
+      style: style,
       state: state,
       refs: [forwardedRef],
       props: props,

package/navigation-menu/popup/NavigationMenuPopup.d.ts

@@ -31,7 +31,7 @@ export interface NavigationMenuPopupState {
    */
   anchorHidden: boolean;
 }
-export interface NavigationMenuPopupProps extends BaseUIComponentProps<'nav', NavigationMenuPopup.State> {}
+export interface NavigationMenuPopupProps extends BaseUIComponentProps<'nav', NavigationMenuPopupState> {}
 export declare namespace NavigationMenuPopup {
   type State = NavigationMenuPopupState;
   type Props = NavigationMenuPopupProps;

package/navigation-menu/popup/NavigationMenuPopup.js

@@ -30,6 +30,7 @@ const NavigationMenuPopup = exports.NavigationMenuPopup = /*#__PURE__*/React.for
     className,
     render,
     id: idProp,
+    style,
     ...elementProps
   } = componentProps;
   const {

package/navigation-menu/portal/NavigationMenuPortal.d.ts

@@ -8,10 +8,8 @@ import { FloatingPortal } from "../../floating-ui-react/index.js";
  * Documentation: [Base UI Navigation Menu](https://base-ui.com/react/components/navigation-menu)
  */
 export declare const NavigationMenuPortal: React.ForwardRefExoticComponent<Omit<NavigationMenuPortalProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export declare namespace NavigationMenuPortal {
-  interface State {}
-}
-export interface NavigationMenuPortalProps extends FloatingPortal.Props<NavigationMenuPortal.State> {
+export interface NavigationMenuPortalState {}
+export interface NavigationMenuPortalProps extends FloatingPortal.Props<NavigationMenuPortalState> {
   /**
    * Whether to keep the portal mounted in the DOM while the popup is hidden.
    * @default false
@@ -20,8 +18,9 @@ export interface NavigationMenuPortalProps extends FloatingPortal.Props<Navigati
   /**
    * A parent element to render the portal element into.
    */
-  container?: FloatingPortal.Props<NavigationMenuPortal.State>['container'] | undefined;
+  container?: FloatingPortal.Props<NavigationMenuPortalState>['container'] | undefined;
 }
 export declare namespace NavigationMenuPortal {
+  type State = NavigationMenuPortalState;
   type Props = NavigationMenuPortalProps;
 }

package/navigation-menu/positioner/NavigationMenuPositioner.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { BaseUIComponentProps } from "../../utils/types.js";
-import { useAnchorPositioning, type Align, type Side } from "../../utils/useAnchorPositioning.js";
+import { type Align, type Side, type UseAnchorPositioningSharedParameters } from "../../utils/useAnchorPositioning.js";
 /**
  * Positions the navigation menu against the currently active trigger.
  * Renders a `<div>` element.
@@ -13,15 +13,24 @@ export interface NavigationMenuPositionerState {
    * Whether the navigation menu is currently open.
    */
   open: boolean;
+  /**
+   * The side of the anchor the component is placed on.
+   */
   side: Side;
+  /**
+   * The alignment of the component relative to the anchor.
+   */
   align: Align;
+  /**
+   * Whether the anchor element is hidden.
+   */
   anchorHidden: boolean;
   /**
    * Whether CSS transitions should be disabled.
    */
   instant: boolean;
 }
-export interface NavigationMenuPositionerProps extends useAnchorPositioning.SharedParameters, BaseUIComponentProps<'div', NavigationMenuPositioner.State> {}
+export interface NavigationMenuPositionerProps extends UseAnchorPositioningSharedParameters, BaseUIComponentProps<'div', NavigationMenuPositionerState> {}
 export declare namespace NavigationMenuPositioner {
   type State = NavigationMenuPositionerState;
   type Props = NavigationMenuPositionerProps;

package/navigation-menu/positioner/NavigationMenuPositioner.js

@@ -8,19 +8,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.NavigationMenuPositioner = void 0;
 var React = _interopRequireWildcard(require("react"));
 var ReactDOM = _interopRequireWildcard(require("react-dom"));
+var _addEventListener = require("@base-ui/utils/addEventListener");
+var _mergeCleanups = require("@base-ui/utils/mergeCleanups");
 var _owner = require("@base-ui/utils/owner");
 var _useTimeout = require("@base-ui/utils/useTimeout");
 var _utils = require("../../floating-ui-react/utils");
 var _getEmptyRootContext = require("../../floating-ui-react/utils/getEmptyRootContext");
-var _useRenderElement = require("../../utils/useRenderElement");
 var _NavigationMenuRootContext = require("../root/NavigationMenuRootContext");
 var _NavigationMenuPortalContext = require("../portal/NavigationMenuPortalContext");
 var _useAnchorPositioning = require("../../utils/useAnchorPositioning");
 var _NavigationMenuPositionerContext = require("./NavigationMenuPositionerContext");
-var _popupStateMapping = require("../../utils/popupStateMapping");
 var _constants = require("../../utils/constants");
 var _adaptiveOriginMiddleware = require("../../utils/adaptiveOriginMiddleware");
-var _getDisabledMountTransitionStyles = require("../../utils/getDisabledMountTransitionStyles");
+var _usePositioner = require("../../utils/usePositioner");
 var _jsxRuntime = require("react/jsx-runtime");
 const EMPTY_ROOT_CONTEXT = (0, _getEmptyRootContext.getEmptyRootContext)();
 
@@ -55,6 +55,7 @@ const NavigationMenuPositioner = exports.NavigationMenuPositioner = /*#__PURE__*
     arrowPadding = 5,
     sticky = false,
     disableAnchorTracking = false,
+    style,
     ...elementProps
   } = componentProps;
   const keepMounted = (0, _NavigationMenuPortalContext.useNavigationMenuPortalContext)();
@@ -83,12 +84,7 @@ const NavigationMenuPositioner = exports.NavigationMenuPositioner = /*#__PURE__*
 
     // Listen to the event on the capture phase so they run before the focus
     // trap elements onFocus prop is called.
-    positionerElement.addEventListener('focusin', onFocus, true);
-    positionerElement.addEventListener('focusout', onFocus, true);
-    return () => {
-      positionerElement.removeEventListener('focusin', onFocus, true);
-      positionerElement.removeEventListener('focusout', onFocus, true);
-    };
+    return (0, _mergeCleanups.mergeCleanups)((0, _addEventListener.addEventListener)(positionerElement, 'focusin', onFocus, true), (0, _addEventListener.addEventListener)(positionerElement, 'focusout', onFocus, true));
   }, [positionerElement]);
   const domReference = (floatingRootContext || EMPTY_ROOT_CONTEXT).useState('domReferenceElement');
   const positioning = (0, _useAnchorPositioning.useAnchorPositioning)({
@@ -112,20 +108,6 @@ const NavigationMenuPositioner = exports.NavigationMenuPositioner = /*#__PURE__*
     // and position transition simultaneously when side=top or side=left.
     adaptiveOrigin: _adaptiveOriginMiddleware.adaptiveOrigin
   });
-  const defaultProps = React.useMemo(() => {
-    const hiddenStyles = {};
-    if (!open) {
-      hiddenStyles.pointerEvents = 'none';
-    }
-    return {
-      role: 'presentation',
-      hidden: !mounted,
-      style: {
-        ...positioning.positionerStyles,
-        ...hiddenStyles
-      }
-    };
-  }, [open, mounted, positioning.positionerStyles]);
   const state = {
     open,
     side: positioning.side,
@@ -146,16 +128,15 @@ const NavigationMenuPositioner = exports.NavigationMenuPositioner = /*#__PURE__*
       });
     }
     const win = (0, _owner.ownerWindow)(positionerElement);
-    win.addEventListener('resize', handleResize);
-    return () => {
-      win.removeEventListener('resize', handleResize);
-    };
+    return (0, _addEventListener.addEventListener)(win, 'resize', handleResize);
   }, [open, resizeTimeout, positionerElement]);
-  const element = (0, _useRenderElement.useRenderElement)('div', componentProps, {
-    state,
-    ref: [forwardedRef, setPositionerElement, positionerRef],
-    props: [defaultProps, (0, _getDisabledMountTransitionStyles.getDisabledMountTransitionStyles)(transitionStatus), elementProps],
-    stateAttributesMapping: _popupStateMapping.popupStateMapping
+  const element = (0, _usePositioner.usePositioner)(componentProps, state, {
+    styles: positioning.positionerStyles,
+    transitionStatus,
+    props: elementProps,
+    refs: [forwardedRef, setPositionerElement, positionerRef],
+    hidden: !mounted,
+    inert: !open
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_NavigationMenuPositionerContext.NavigationMenuPositionerContext.Provider, {
     value: positioning,

package/navigation-menu/root/NavigationMenuRoot.d.ts

@@ -8,7 +8,9 @@ import { REASONS } from "../../utils/reasons.js";
  *
  * Documentation: [Base UI Navigation Menu](https://base-ui.com/react/components/navigation-menu)
  */
-export declare const NavigationMenuRoot: React.ForwardRefExoticComponent<Omit<NavigationMenuRootProps, "ref"> & React.RefAttributes<HTMLElement>>;
+export declare const NavigationMenuRoot: {
+  <Value = any>(props: NavigationMenuRoot.Props<Value>): React.JSX.Element;
+};
 export interface NavigationMenuRootState {
   /**
    * If `true`, the popup is open.
@@ -19,7 +21,7 @@ export interface NavigationMenuRootState {
    */
   nested: boolean;
 }
-export interface NavigationMenuRootProps extends BaseUIComponentProps<'nav', NavigationMenuRoot.State> {
+export interface NavigationMenuRootProps<Value = any> extends BaseUIComponentProps<'nav', NavigationMenuRootState> {
   /**
    * A ref to imperative actions.
    */
@@ -35,25 +37,25 @@ export interface NavigationMenuRootProps extends BaseUIComponentProps<'nav', Nav
    * To render an uncontrolled navigation menu, use the `defaultValue` prop instead.
    * @default null
    */
-  value?: any;
+  value?: Value | null | undefined;
   /**
    * The uncontrolled value of the item that should be initially selected.
    *
    * To render a controlled navigation menu, use the `value` prop instead.
    * @default null
    */
-  defaultValue?: any;
+  defaultValue?: Value | null | undefined;
   /**
    * Callback fired when the value changes.
    */
-  onValueChange?: ((value: any, eventDetails: NavigationMenuRoot.ChangeEventDetails) => void) | undefined;
+  onValueChange?: ((value: Value | null, eventDetails: NavigationMenuRoot.ChangeEventDetails) => void) | undefined;
   /**
-   * How long to wait before opening the navigation menu. Specified in milliseconds.
+   * How long to wait before opening the navigation popup. Specified in milliseconds.
    * @default 50
    */
   delay?: number | undefined;
   /**
-   * How long to wait before closing the navigation menu. Specified in milliseconds.
+   * How long to wait before closing the navigation popup. Specified in milliseconds.
    * @default 50
    */
   closeDelay?: number | undefined;
@@ -61,7 +63,7 @@ export interface NavigationMenuRootProps extends BaseUIComponentProps<'nav', Nav
    * The orientation of the navigation menu.
    * @default 'horizontal'
    */
-  orientation?: ('horizontal' | 'vertical') | undefined;
+  orientation?: 'horizontal' | 'vertical' | undefined;
 }
 export interface NavigationMenuRootActions {
   unmount: () => void;
@@ -70,7 +72,8 @@ export type NavigationMenuRootChangeEventReason = typeof REASONS.triggerPress |
 export type NavigationMenuRootChangeEventDetails = BaseUIChangeEventDetails<NavigationMenuRoot.ChangeEventReason>;
 export declare namespace NavigationMenuRoot {
   type State = NavigationMenuRootState;
-  type Props = NavigationMenuRootProps;
+  type Props<TValue = any> = NavigationMenuRootProps<TValue>;
+  type Value<TValue = any> = TValue | null;
   type Actions = NavigationMenuRootActions;
   type ChangeEventReason = NavigationMenuRootChangeEventReason;
   type ChangeEventDetails = NavigationMenuRootChangeEventDetails;

package/navigation-menu/root/NavigationMenuRoot.js

@@ -17,10 +17,25 @@ var _useRenderElement = require("../../utils/useRenderElement");
 var _NavigationMenuRootContext = require("./NavigationMenuRootContext");
 var _useOpenChangeComplete = require("../../utils/useOpenChangeComplete");
 var _useTransitionStatus = require("../../utils/useTransitionStatus");
-var _setFixedSize = require("../utils/setFixedSize");
+var _getCssDimensions = require("../../utils/getCssDimensions");
 var _reasons = require("../../utils/reasons");
+var _NavigationMenuPopupCssVars = require("../popup/NavigationMenuPopupCssVars");
+var _NavigationMenuPositionerCssVars = require("../positioner/NavigationMenuPositionerCssVars");
 var _jsxRuntime = require("react/jsx-runtime");
 const blockedReturnFocusReasons = new Set([_reasons.REASONS.triggerHover, _reasons.REASONS.outsidePress, _reasons.REASONS.focusOut]);
+function setSharedFixedSize(popupElement, positionerElement) {
+  const {
+    width,
+    height
+  } = (0, _getCssDimensions.getCssDimensions)(popupElement);
+  if (width === 0 || height === 0) {
+    return;
+  }
+  popupElement.style.setProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupWidth, `${width}px`);
+  popupElement.style.setProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupHeight, `${height}px`);
+  positionerElement.style.setProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerWidth, `${width}px`);
+  positionerElement.style.setProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerHeight, `${height}px`);
+}
 
 /**
  * Groups all parts of the navigation menu.
@@ -40,6 +55,7 @@ const NavigationMenuRoot = exports.NavigationMenuRoot = /*#__PURE__*/React.forwa
     onOpenChangeComplete
   } = componentProps;
   const nested = (0, _floatingUiReact.useFloatingParentNodeId)() != null;
+  const parentRootContext = (0, _NavigationMenuRootContext.useNavigationMenuRootContext)(true);
   const [value, setValueUnwrapped] = (0, _useControlled.useControlled)({
     controlled: valueParam,
     default: defaultValue,
@@ -64,6 +80,12 @@ const NavigationMenuRoot = exports.NavigationMenuRoot = /*#__PURE__*/React.forwa
   const afterInsideRef = React.useRef(null);
   const beforeOutsideRef = React.useRef(null);
   const afterOutsideRef = React.useRef(null);
+  // Shared across triggers so a newly active trigger can cancel a stale
+  // popup auto-size reset scheduled by the previously active trigger.
+  const popupAutoSizeResetRef = React.useRef({
+    abortController: null,
+    owner: null
+  });
   const {
     mounted,
     setMounted,
@@ -78,8 +100,7 @@ const NavigationMenuRoot = exports.NavigationMenuRoot = /*#__PURE__*/React.forwa
       setActivationDirection(null);
       setFloatingRootContext(undefined);
       if (positionerElement && popupElement) {
-        (0, _setFixedSize.setFixedSize)(popupElement, 'popup');
-        (0, _setFixedSize.setFixedSize)(positionerElement, 'positioner');
+        setSharedFixedSize(popupElement, positionerElement);
       }
     }
     if (nextValue !== value) {
@@ -89,6 +110,9 @@ const NavigationMenuRoot = exports.NavigationMenuRoot = /*#__PURE__*/React.forwa
       return;
     }
     setValueUnwrapped(nextValue);
+    if (nested && !nextValue && eventDetails.reason === _reasons.REASONS.linkPress && parentRootContext) {
+      parentRootContext.setValue(null, eventDetails);
+    }
   });
   const handleUnmount = (0, _useStableCallback.useStableCallback)(() => {
     const doc = (0, _owner.ownerDocument)(rootRef.current);
@@ -157,6 +181,7 @@ const NavigationMenuRoot = exports.NavigationMenuRoot = /*#__PURE__*/React.forwa
     beforeOutsideRef,
     afterOutsideRef,
     prevTriggerElementRef,
+    popupAutoSizeResetRef,
     delay,
     closeDelay,
     orientation,
@@ -192,6 +217,7 @@ function TreeContext(props) {
     closeDelay,
     orientation,
     onOpenChangeComplete,
+    style,
     ...elementProps
   } = props.componentProps;
   const nodeId = (0, _floatingUiReact.useFloatingNodeId)();
@@ -209,12 +235,13 @@ function TreeContext(props) {
   const element = (0, _useRenderElement.useRenderElement)(nested ? 'div' : 'nav', props.componentProps, {
     state,
     ref: [props.forwardedRef, rootRef],
-    props: [{
-      'aria-orientation': orientation
-    }, elementProps]
+    props: elementProps
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_NavigationMenuRootContext.NavigationMenuTreeContext.Provider, {
     value: nodeId,
-    children: element
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_floatingUiReact.FloatingNode, {
+      id: nodeId,
+      children: element
+    })
   });
 }

package/navigation-menu/root/NavigationMenuRootContext.d.ts

@@ -2,10 +2,14 @@ import * as React from 'react';
 import type { FloatingRootContext } from "../../floating-ui-react/index.js";
 import type { TransitionStatus } from "../../utils/useTransitionStatus.js";
 import type { NavigationMenuRoot } from "./NavigationMenuRoot.js";
-export interface NavigationMenuRootContext {
+export type NavigationMenuPopupAutoSizeResetState = {
+  abortController: AbortController | null;
+  owner: any;
+};
+export interface NavigationMenuRootContext<Value = any> {
   open: boolean;
-  value: any;
-  setValue: (value: any, eventDetails: NavigationMenuRoot.ChangeEventDetails) => void;
+  value: NavigationMenuRoot.Value<Value>;
+  setValue: (value: NavigationMenuRoot.Value<Value>, eventDetails: NavigationMenuRoot.ChangeEventDetails) => void;
   transitionStatus: TransitionStatus;
   mounted: boolean;
   popupElement: HTMLElement | null;
@@ -28,15 +32,16 @@ export interface NavigationMenuRootContext {
   beforeOutsideRef: React.RefObject<HTMLSpanElement | null>;
   afterOutsideRef: React.RefObject<HTMLSpanElement | null>;
   prevTriggerElementRef: React.RefObject<Element | null | undefined>;
+  popupAutoSizeResetRef: React.MutableRefObject<NavigationMenuPopupAutoSizeResetState>;
   delay: number;
   closeDelay: number;
   orientation: 'horizontal' | 'vertical';
   viewportInert: boolean;
   setViewportInert: React.Dispatch<React.SetStateAction<boolean>>;
 }
-export declare const NavigationMenuRootContext: React.Context<NavigationMenuRootContext | undefined>;
-declare function useNavigationMenuRootContext(optional?: false): NavigationMenuRootContext;
-declare function useNavigationMenuRootContext(optional: true): NavigationMenuRootContext | undefined;
+export declare const NavigationMenuRootContext: React.Context<NavigationMenuRootContext<any> | undefined>;
+declare function useNavigationMenuRootContext<Value = any>(optional?: false): NavigationMenuRootContext<Value>;
+declare function useNavigationMenuRootContext<Value = any>(optional: true): NavigationMenuRootContext<Value> | undefined;
 export declare const NavigationMenuTreeContext: React.Context<string | undefined>;
 declare function useNavigationMenuTreeContext(): string | undefined;
 export { useNavigationMenuRootContext, useNavigationMenuTreeContext };

package/navigation-menu/trigger/NavigationMenuTrigger.d.ts

@@ -14,7 +14,7 @@ export interface NavigationMenuTriggerState {
    */
   open: boolean;
 }
-export interface NavigationMenuTriggerProps extends NativeButtonProps, BaseUIComponentProps<'button', NavigationMenuTrigger.State> {}
+export interface NavigationMenuTriggerProps extends NativeButtonProps, BaseUIComponentProps<'button', NavigationMenuTriggerState> {}
 export declare namespace NavigationMenuTrigger {
   type State = NavigationMenuTriggerState;
   type Props = NavigationMenuTriggerProps;