@base-ui/react 1.2.0 → 1.4.0

package/navigation-menu/trigger/NavigationMenuTrigger.js

@@ -8,11 +8,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.NavigationMenuTrigger = void 0;
 var React = _interopRequireWildcard(require("react"));
 var ReactDOM = _interopRequireWildcard(require("react-dom"));
-var _tabbable = require("tabbable");
+var _dom = require("@floating-ui/utils/dom");
+var _addEventListener = require("@base-ui/utils/addEventListener");
 var _useIsoLayoutEffect = require("@base-ui/utils/useIsoLayoutEffect");
+var _owner = require("@base-ui/utils/owner");
+var _useStableCallback = require("@base-ui/utils/useStableCallback");
 var _useTimeout = require("@base-ui/utils/useTimeout");
 var _useAnimationFrame = require("@base-ui/utils/useAnimationFrame");
+var _useValueAsRef = require("@base-ui/utils/useValueAsRef");
 var _floatingUiReact = require("../../floating-ui-react");
+var _useHoverInteractionSharedState = require("../../floating-ui-react/hooks/useHoverInteractionSharedState");
 var _utils = require("../../floating-ui-react/utils");
 var _NavigationMenuItemContext = require("../item/NavigationMenuItemContext");
 var _NavigationMenuRootContext = require("../root/NavigationMenuRootContext");
@@ -21,12 +26,22 @@ var _reasons = require("../../utils/reasons");
 var _constants = require("../../utils/constants");
 var _FocusGuard = require("../../utils/FocusGuard");
 var _popupStateMapping = require("../../utils/popupStateMapping");
+var _stateAttributesMapping = require("../../utils/stateAttributesMapping");
 var _isOutsideMenuEvent = require("../utils/isOutsideMenuEvent");
 var _CompositeItem = require("../../composite/item/CompositeItem");
 var _useButton = require("../../use-button");
+var _useAnimationsFinished = require("../../utils/useAnimationsFinished");
+var _getCssDimensions = require("../../utils/getCssDimensions");
 var _constants2 = require("../utils/constants");
 var _NavigationMenuDismissContext = require("../list/NavigationMenuDismissContext");
+var _NavigationMenuPopupCssVars = require("../popup/NavigationMenuPopupCssVars");
+var _NavigationMenuPositionerCssVars = require("../positioner/NavigationMenuPositionerCssVars");
 var _jsxRuntime = require("react/jsx-runtime");
+const DEFAULT_SIZE = {
+  width: 0,
+  height: 0
+};
+
 /**
  * Opens the navigation menu popup when hovered or clicked, revealing the
  * associated content.
@@ -40,6 +55,7 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
     render,
     nativeButton = true,
     disabled,
+    style,
     ...elementProps
   } = componentProps;
   const {
@@ -52,12 +68,15 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
     setFloatingRootContext,
     popupElement,
     viewportElement,
+    transitionStatus,
     rootRef,
     beforeOutsideRef,
     afterOutsideRef,
     afterInsideRef,
     beforeInsideRef,
     prevTriggerElementRef,
+    popupAutoSizeResetRef,
+    currentContentRef,
     delay,
     closeDelay,
     orientation,
@@ -72,17 +91,256 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
   const dismissProps = (0, _NavigationMenuDismissContext.useNavigationMenuDismissContext)();
   const stickIfOpenTimeout = (0, _useTimeout.useTimeout)();
   const focusFrame = (0, _useAnimationFrame.useAnimationFrame)();
+  const mutationFrame = (0, _useAnimationFrame.useAnimationFrame)();
+  const resizeFrame = (0, _useAnimationFrame.useAnimationFrame)();
+  const sizeFrame = (0, _useAnimationFrame.useAnimationFrame)();
   const [triggerElement, setTriggerElement] = React.useState(null);
   const [stickIfOpen, setStickIfOpen] = React.useState(true);
   const [pointerType, setPointerType] = React.useState('');
+  const triggerElementRef = React.useRef(null);
   const allowFocusRef = React.useRef(false);
+  const prevSizeRef = React.useRef(DEFAULT_SIZE);
+  const skipAutoSizeSyncRef = React.useRef(false);
   const isActiveItem = open && value === itemValue;
+  const isActiveItemRef = (0, _useValueAsRef.useValueAsRef)(isActiveItem);
   const interactionsEnabled = positionerElement ? true : !value;
+  const hoverFloatingElement = positionerElement || viewportElement;
+  const hoverInteractionsEnabled = hoverFloatingElement ? true : !value;
+  const runOnceAnimationsFinish = (0, _useAnimationsFinished.useAnimationsFinished)(popupElement, false, false);
+  const handleTriggerElement = React.useCallback(element => {
+    triggerElementRef.current = element;
+    setTriggerElement(element);
+  }, []);
+  const cancelAutoSizeReset = (0, _useStableCallback.useStableCallback)((force = false) => {
+    if (!force && popupAutoSizeResetRef.current.owner !== itemValue) {
+      return;
+    }
+    popupAutoSizeResetRef.current.abortController?.abort();
+    popupAutoSizeResetRef.current.abortController = null;
+    popupAutoSizeResetRef.current.owner = null;
+  });
+  React.useEffect(cancelAutoSizeReset, [isActiveItem, cancelAutoSizeReset]);
+  function setAutoSizes() {
+    if (!popupElement) {
+      return;
+    }
+    popupElement.style.setProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupWidth, 'auto');
+    popupElement.style.setProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupHeight, 'auto');
+  }
+  function clearFixedSizes() {
+    if (!popupElement || !positionerElement) {
+      return;
+    }
+    popupElement.style.removeProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupWidth);
+    popupElement.style.removeProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupHeight);
+    positionerElement.style.removeProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerWidth);
+    positionerElement.style.removeProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerHeight);
+  }
+  function setSharedFixedSizes(width, height) {
+    if (!popupElement || !positionerElement) {
+      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`);
+  }
+  function scheduleAutoSizeReset() {
+    cancelAutoSizeReset(true);
+    const abortController = new AbortController();
+    popupAutoSizeResetRef.current.abortController = abortController;
+    popupAutoSizeResetRef.current.owner = itemValue;
+    runOnceAnimationsFinish(() => {
+      if (popupAutoSizeResetRef.current.abortController !== abortController || popupAutoSizeResetRef.current.owner !== itemValue) {
+        return;
+      }
+      popupAutoSizeResetRef.current.abortController = null;
+      popupAutoSizeResetRef.current.owner = null;
+      setAutoSizes();
+    }, abortController.signal);
+  }
+  const handleValueChange = (0, _useStableCallback.useStableCallback)((currentWidth, currentHeight, options = {}) => {
+    if (!popupElement || !positionerElement) {
+      return;
+    }
+    cancelAutoSizeReset(true);
+    const {
+      syncPositioner = false
+    } = options;
+    clearFixedSizes();
+    const {
+      width,
+      height
+    } = (0, _getCssDimensions.getCssDimensions)(popupElement);
+    const measuredWidth = width || prevSizeRef.current.width;
+    const measuredHeight = height || prevSizeRef.current.height;
+    if (currentHeight === 0 || currentWidth === 0) {
+      currentWidth = measuredWidth;
+      currentHeight = measuredHeight;
+    }
+    popupElement.style.setProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupWidth, `${currentWidth}px`);
+    popupElement.style.setProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupHeight, `${currentHeight}px`);
+    positionerElement.style.setProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerWidth, `${syncPositioner ? currentWidth : measuredWidth}px`);
+    positionerElement.style.setProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerHeight, `${syncPositioner ? currentHeight : measuredHeight}px`);
+    sizeFrame.request(() => {
+      popupElement.style.setProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupWidth, `${measuredWidth}px`);
+      popupElement.style.setProperty(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupHeight, `${measuredHeight}px`);
+      if (syncPositioner) {
+        positionerElement.style.setProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerWidth, `${measuredWidth}px`);
+        positionerElement.style.setProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerHeight, `${measuredHeight}px`);
+      }
+      scheduleAutoSizeReset();
+    });
+  });
+  const handleInterruptedMutationResize = (0, _useStableCallback.useStableCallback)((currentWidth, currentHeight) => {
+    if (!popupElement || !positionerElement) {
+      return;
+    }
+    sizeFrame.cancel();
+    mutationFrame.cancel();
+    cancelAutoSizeReset(true);
+    if (currentWidth === 0 || currentHeight === 0) {
+      return;
+    }
+    setSharedFixedSizes(currentWidth, currentHeight);
+    mutationFrame.request(() => {
+      mutationFrame.request(() => {
+        clearFixedSizes();
+        const {
+          width,
+          height
+        } = (0, _getCssDimensions.getCssDimensions)(popupElement);
+        const measuredWidth = width || currentWidth || prevSizeRef.current.width;
+        const measuredHeight = height || currentHeight || prevSizeRef.current.height;
+        setSharedFixedSizes(currentWidth, currentHeight);
+        sizeFrame.request(() => {
+          setSharedFixedSizes(measuredWidth, measuredHeight);
+          scheduleAutoSizeReset();
+        });
+      });
+    });
+  });
+  const syncCurrentSize = (0, _useStableCallback.useStableCallback)(() => {
+    if (!popupElement || !positionerElement) {
+      return;
+    }
+    sizeFrame.cancel();
+    cancelAutoSizeReset(true);
+    clearFixedSizes();
+    const {
+      width,
+      height
+    } = (0, _getCssDimensions.getCssDimensions)(popupElement);
+    if (width === 0 || height === 0) {
+      return;
+    }
+    prevSizeRef.current = {
+      width,
+      height
+    };
+    setAutoSizes();
+    positionerElement.style.setProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerWidth, `${width}px`);
+    positionerElement.style.setProperty(_NavigationMenuPositionerCssVars.NavigationMenuPositionerCssVars.positionerHeight, `${height}px`);
+  });
+  const getMutationBaseline = (0, _useStableCallback.useStableCallback)(() => {
+    if (!popupElement) {
+      return {
+        size: prevSizeRef.current,
+        syncPositioner: false
+      };
+    }
+    const popupWidth = popupElement.style.getPropertyValue(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupWidth);
+    const popupHeight = popupElement.style.getPropertyValue(_NavigationMenuPopupCssVars.NavigationMenuPopupCssVars.popupHeight);
+    const isResizing = popupWidth !== '' && popupWidth !== 'auto' && popupHeight !== '' && popupHeight !== 'auto';
+    if (!isResizing) {
+      return {
+        size: prevSizeRef.current,
+        syncPositioner: false
+      };
+    }
+    return {
+      size: {
+        width: popupElement.offsetWidth || prevSizeRef.current.width,
+        height: popupElement.offsetHeight || prevSizeRef.current.height
+      },
+      syncPositioner: true
+    };
+  });
   React.useEffect(() => {
     if (!open) {
       stickIfOpenTimeout.clear();
+      mutationFrame.cancel();
+      resizeFrame.cancel();
+      sizeFrame.cancel();
+      cancelAutoSizeReset(true);
+      skipAutoSizeSyncRef.current = false;
+      setPointerType('');
+    }
+  }, [stickIfOpenTimeout, open, mutationFrame, resizeFrame, sizeFrame, cancelAutoSizeReset]);
+  React.useEffect(() => {
+    if (!mounted) {
+      prevSizeRef.current = DEFAULT_SIZE;
+    }
+  }, [mounted]);
+  React.useEffect(() => {
+    if (!popupElement || typeof ResizeObserver !== 'function') {
+      return undefined;
+    }
+    const resizeObserver = new ResizeObserver(() => {
+      prevSizeRef.current = {
+        width: popupElement.offsetWidth,
+        height: popupElement.offsetHeight
+      };
+    });
+    resizeObserver.observe(popupElement);
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, [popupElement]);
+  React.useEffect(() => {
+    if (!open || !isActiveItem || !popupElement || !positionerElement) {
+      return undefined;
+    }
+    const win = (0, _owner.ownerWindow)(positionerElement);
+    function handleResize() {
+      resizeFrame.cancel();
+      resizeFrame.request(syncCurrentSize);
+    }
+    const unsubscribe = (0, _addEventListener.addEventListener)(win, 'resize', handleResize);
+    return () => {
+      resizeFrame.cancel();
+      unsubscribe();
+    };
+  }, [open, isActiveItem, popupElement, positionerElement, resizeFrame, syncCurrentSize]);
+  React.useEffect(() => {
+    const observedElement = currentContentRef.current;
+    if (!observedElement || !popupElement || !isActiveItem || typeof MutationObserver !== 'function') {
+      return undefined;
     }
-  }, [stickIfOpenTimeout, open]);
+    const mutationObserver = new MutationObserver(() => {
+      if (transitionStatus === 'starting' || popupElement.hasAttribute(_stateAttributesMapping.TransitionStatusDataAttributes.startingStyle)) {
+        syncCurrentSize();
+        return;
+      }
+      const {
+        size,
+        syncPositioner
+      } = getMutationBaseline();
+      if (syncPositioner) {
+        handleInterruptedMutationResize(size.width, size.height);
+        return;
+      }
+      handleValueChange(size.width, size.height);
+    });
+    mutationObserver.observe(observedElement, {
+      childList: true,
+      subtree: true,
+      characterData: true
+    });
+    return () => {
+      mutationObserver.disconnect();
+    };
+  }, [currentContentRef, popupElement, isActiveItem, transitionStatus, getMutationBaseline, handleInterruptedMutationResize, handleValueChange, syncCurrentSize]);
   React.useEffect(() => {
     if (isActiveItem && open && popupElement && allowFocusRef.current) {
       allowFocusRef.current = false;
@@ -94,6 +352,29 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
       focusFrame.cancel();
     };
   }, [beforeOutsideRef, focusFrame, isActiveItem, open, popupElement]);
+  (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
+    if (isActiveItemRef.current && open && popupElement) {
+      if (transitionStatus === 'starting') {
+        const hasNestedMenu = currentContentRef.current?.querySelector('[data-nested]') != null;
+        if (hasNestedMenu) {
+          sizeFrame.request(syncCurrentSize);
+          return () => {
+            sizeFrame.cancel();
+          };
+        }
+      }
+      if (skipAutoSizeSyncRef.current) {
+        skipAutoSizeSyncRef.current = false;
+        return undefined;
+      }
+      const {
+        width,
+        height
+      } = (0, _getCssDimensions.getCssDimensions)(popupElement);
+      handleValueChange(width, height);
+    }
+    return undefined;
+  }, [currentContentRef, handleValueChange, isActiveItemRef, open, popupElement, sizeFrame, syncCurrentSize, transitionStatus]);
   function handleOpenChange(nextOpen, eventDetails) {
     const isHover = eventDetails.reason === _reasons.REASONS.triggerHover;
     if (!interactionsEnabled) {
@@ -133,35 +414,68 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
     onOpenChange: handleOpenChange,
     elements: {
       reference: triggerElement,
-      floating: positionerElement || viewportElement
+      floating: hoverFloatingElement
     }
   });
-  const hover = (0, _floatingUiReact.useHover)(context, {
+  const hoverInteractionState = (0, _useHoverInteractionSharedState.useHoverInteractionSharedState)(context);
+  const shouldBlockSafePolygonPointerEvents = pointerType !== 'touch';
+  React.useEffect(() => {
+    if (!open) {
+      context.context.dataRef.current.openEvent = undefined;
+      hoverInteractionState.pointerType = undefined;
+      hoverInteractionState.interactedInside = false;
+      hoverInteractionState.restTimeoutPending = false;
+      hoverInteractionState.openChangeTimeout.clear();
+      hoverInteractionState.restTimeout.clear();
+      (0, _useHoverInteractionSharedState.clearSafePolygonPointerEventsMutation)(hoverInteractionState);
+    }
+  }, [context, hoverInteractionState, open]);
+  const getInlineHandleCloseContext = (0, _useStableCallback.useStableCallback)(() => {
+    if (!nested || positionerElement || !triggerElementRef.current || !hoverFloatingElement) {
+      return null;
+    }
+    return getHandleCloseContext(triggerElementRef.current, hoverFloatingElement, nodeId);
+  });
+  function getScope() {
+    if (!nested || !positionerElement) {
+      return triggerElementRef.current?.closest('ul') ?? null;
+    }
+    return null;
+  }
+  const hoverProps = (0, _floatingUiReact.useHoverReferenceInteraction)(context, {
+    enabled: hoverInteractionsEnabled,
     move: false,
     handleClose: (0, _floatingUiReact.safePolygon)({
-      blockPointerEvents: pointerType !== 'touch'
+      blockPointerEvents: shouldBlockSafePolygonPointerEvents,
+      getScope
     }),
     restMs: mounted && positionerElement ? 0 : delay,
     delay: {
       close: closeDelay
-    }
+    },
+    triggerElementRef,
+    getHandleCloseContext: getInlineHandleCloseContext
   });
+  const hover = React.useMemo(() => hoverProps ? {
+    reference: hoverProps
+  } : undefined, [hoverProps]);
   const click = (0, _floatingUiReact.useClick)(context, {
     enabled: interactionsEnabled,
     stickIfOpen,
     toggle: isActiveItem
   });
+  const {
+    getReferenceProps
+  } = (0, _floatingUiReact.useInteractions)([hover, click]);
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
     if (isActiveItem) {
       setFloatingRootContext(context);
       prevTriggerElementRef.current = triggerElement;
     }
   }, [isActiveItem, context, setFloatingRootContext, prevTriggerElementRef, triggerElement]);
-  const {
-    getReferenceProps
-  } = (0, _floatingUiReact.useInteractions)([hover, click]);
   function handleActivation(event) {
     ReactDOM.flushSync(() => {
+      const currentTarget = (0, _dom.isHTMLElement)(event.currentTarget) ? event.currentTarget : null;
       const prevTriggerRect = prevTriggerElementRef.current?.getBoundingClientRect();
       if (mounted && prevTriggerRect && triggerElement) {
         const nextTriggerRect = triggerElement.getBoundingClientRect();
@@ -177,7 +491,7 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
       // Reset the `openEvent` to `undefined` when the active item changes so that a
       // `click` -> `hover` on new trigger -> `hover` back to old trigger doesn't unexpectedly
       // cause the popup to remain stuck open when leaving the old trigger.
-      if (event.type !== 'click') {
+      if (event.type !== 'click' && value != null) {
         context.context.dataRef.current.openEvent = undefined;
       }
       if (pointerType === 'touch' && event.type !== 'click') {
@@ -186,20 +500,55 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
       if (value != null) {
         setValue(itemValue, (0, _createBaseUIEventDetails.createChangeEventDetails)(event.type === 'mouseenter' ? _reasons.REASONS.triggerHover : _reasons.REASONS.triggerPress, event.nativeEvent));
       }
+      if (event.type === 'mouseenter' && shouldBlockSafePolygonPointerEvents && (!nested || !positionerElement) && hoverFloatingElement && currentTarget) {
+        const applyPointerEventsMutation = () => {
+          const scopeElement = getScope() ?? currentTarget.ownerDocument.body;
+          (0, _useHoverInteractionSharedState.applySafePolygonPointerEventsMutation)(hoverInteractionState, {
+            scopeElement,
+            referenceElement: currentTarget,
+            floatingElement: hoverFloatingElement
+          });
+        };
+        if (value != null && value !== itemValue) {
+          queueMicrotask(applyPointerEventsMutation);
+        } else {
+          applyPointerEventsMutation();
+        }
+      }
     });
   }
+  const handleOpenEvent = (0, _useStableCallback.useStableCallback)(event => {
+    if (!popupElement || !positionerElement) {
+      handleActivation(event);
+      return;
+    }
+    const {
+      width,
+      height
+    } = (0, _getCssDimensions.getCssDimensions)(popupElement);
+    const shouldSkipAutoSizeSync = value != null && value !== itemValue && (event.type === 'click' || pointerType !== 'touch');
+    handleActivation(event);
+    if (shouldSkipAutoSizeSync) {
+      skipAutoSizeSyncRef.current = true;
+    }
+    handleValueChange(width, height);
+  });
   const state = {
     open: isActiveItem
   };
   function handleSetPointerType(event) {
     setPointerType(event.pointerType);
   }
+  function handleTriggerPointerDown(event) {
+    handleSetPointerType(event);
+    (0, _useHoverInteractionSharedState.clearSafePolygonPointerEventsMutation)(hoverInteractionState);
+  }
   const defaultProps = {
     tabIndex: 0,
-    onMouseEnter: handleActivation,
-    onClick: handleActivation,
+    onMouseEnter: handleOpenEvent,
+    onClick: handleOpenEvent,
     onPointerEnter: handleSetPointerType,
-    onPointerDown: handleSetPointerType,
+    onPointerDown: handleTriggerPointerDown,
     'aria-expanded': isActiveItem,
     'aria-controls': isActiveItem ? popupElement?.id : undefined,
     [_constants2.NAVIGATION_MENU_TRIGGER_IDENTIFIER]: '',
@@ -225,7 +574,7 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
       const openVertical = orientation === 'vertical' && event.key === 'ArrowRight';
       if (openHorizontal || openVertical) {
         setValue(itemValue, (0, _createBaseUIEventDetails.createChangeEventDetails)(_reasons.REASONS.listNavigation, event.nativeEvent));
-        handleActivation(event);
+        handleOpenEvent(event);
         (0, _utils.stopEvent)(event);
       }
     },
@@ -251,15 +600,16 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
     focusableWhenDisabled: true,
     native: nativeButton
   });
-  const referenceElement = positionerElement || viewportElement;
+  const referenceElement = hoverFloatingElement;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CompositeItem.CompositeItem, {
       tag: "button",
       render: render,
       className: className,
+      style: style,
       state: state,
       stateAttributesMapping: _popupStateMapping.pressableTriggerOpenStateMapping,
-      refs: [forwardedRef, setTriggerElement, buttonRef],
+      refs: [forwardedRef, handleTriggerElement, buttonRef],
       props: [getReferenceProps, dismissProps?.reference || _constants.EMPTY_ARRAY, defaultProps, elementProps, getButtonProps]
     }), isActiveItem && /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_FocusGuard.FocusGuard, {
@@ -279,12 +629,18 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
         ref: afterOutsideRef,
         onFocus: event => {
           if (referenceElement && (0, _utils.isOutsideEvent)(event, referenceElement)) {
-            const elementToFocus = afterInsideRef.current && (0, _tabbable.isTabbable)(afterInsideRef.current) ? afterInsideRef.current : triggerElement;
+            ReactDOM.flushSync(() => {
+              setViewportInert(false);
+            });
+            const elementToFocus = afterInsideRef.current || triggerElement;
             elementToFocus?.focus();
           } else {
-            const nextTabbable = (0, _utils.getNextTabbable)(triggerElement);
+            let nextTabbable = (0, _utils.getNextTabbable)(triggerElement);
+            if (nested && !positionerElement && referenceElement && nextTabbable && (0, _utils.contains)(referenceElement, nextTabbable)) {
+              nextTabbable = (0, _utils.getTabbableAfterElement)(afterInsideRef.current);
+            }
             nextTabbable?.focus();
-            if (!(0, _utils.contains)(rootRef.current, nextTabbable)) {
+            if ((!nested || positionerElement) && !(0, _utils.contains)(rootRef.current, nextTabbable)) {
               setValue(null, (0, _createBaseUIEventDetails.createChangeEventDetails)(_reasons.REASONS.focusOut, event.nativeEvent));
             }
           }
@@ -293,4 +649,28 @@ const NavigationMenuTrigger = exports.NavigationMenuTrigger = /*#__PURE__*/React
     })]
   });
 });
-if (process.env.NODE_ENV !== "production") NavigationMenuTrigger.displayName = "NavigationMenuTrigger";
+if (process.env.NODE_ENV !== "production") NavigationMenuTrigger.displayName = "NavigationMenuTrigger";
+function getPlacementFromElements(domReferenceElement, floatingElement) {
+  const referenceRect = domReferenceElement.getBoundingClientRect();
+  const floatingRect = floatingElement.getBoundingClientRect();
+  const referenceCenterX = referenceRect.left + referenceRect.width / 2;
+  const referenceCenterY = referenceRect.top + referenceRect.height / 2;
+  const floatingCenterX = floatingRect.left + floatingRect.width / 2;
+  const floatingCenterY = floatingRect.top + floatingRect.height / 2;
+  const deltaX = floatingCenterX - referenceCenterX;
+  const deltaY = floatingCenterY - referenceCenterY;
+  if (Math.abs(deltaX) >= Math.abs(deltaY)) {
+    return deltaX >= 0 ? 'right' : 'left';
+  }
+  return deltaY >= 0 ? 'bottom' : 'top';
+}
+function getHandleCloseContext(domReferenceElement, floatingElement, nodeId) {
+  return {
+    placement: getPlacementFromElements(domReferenceElement, floatingElement),
+    elements: {
+      domReference: domReferenceElement,
+      floating: floatingElement
+    },
+    nodeId
+  };
+}

package/navigation-menu/utils/isOutsideMenuEvent.d.ts

@@ -5,7 +5,7 @@ interface Targets {
 }
 interface Params {
   popupElement: HTMLElement | null;
-  viewportElement?: (HTMLElement | null) | undefined;
+  viewportElement?: HTMLElement | null | undefined;
   rootRef: React.RefObject<HTMLDivElement | null>;
   tree: FloatingTreeType | null;
   nodeId: string | undefined;

package/navigation-menu/viewport/NavigationMenuViewport.d.ts

@@ -8,7 +8,7 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  */
 export declare const NavigationMenuViewport: React.ForwardRefExoticComponent<Omit<NavigationMenuViewportProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface NavigationMenuViewportState {}
-export interface NavigationMenuViewportProps extends BaseUIComponentProps<'div', NavigationMenuViewport.State> {}
+export interface NavigationMenuViewportProps extends BaseUIComponentProps<'div', NavigationMenuViewportState> {}
 export declare namespace NavigationMenuViewport {
   type State = NavigationMenuViewportState;
   type Props = NavigationMenuViewportProps;

package/navigation-menu/viewport/NavigationMenuViewport.js

@@ -10,15 +10,12 @@ var React = _interopRequireWildcard(require("react"));
 var _useIsoLayoutEffect = require("@base-ui/utils/useIsoLayoutEffect");
 var _useId = require("@base-ui/utils/useId");
 var _inertValue = require("@base-ui/utils/inertValue");
-var _useStableCallback = require("@base-ui/utils/useStableCallback");
 var _useRenderElement = require("../../utils/useRenderElement");
 var _NavigationMenuRootContext = require("../root/NavigationMenuRootContext");
 var _FocusGuard = require("../../utils/FocusGuard");
-var _usePopupAutoResize = require("../../utils/usePopupAutoResize");
 var _utils = require("../../floating-ui-react/utils");
 var _getEmptyRootContext = require("../../floating-ui-react/utils/getEmptyRootContext");
 var _NavigationMenuPositionerContext = require("../positioner/NavigationMenuPositionerContext");
-var _DirectionContext = require("../../direction-provider/DirectionContext");
 var _jsxRuntime = require("react/jsx-runtime");
 const EMPTY_ROOT_CONTEXT = (0, _getEmptyRootContext.getEmptyRootContext)();
 function Guards({
@@ -74,15 +71,11 @@ const NavigationMenuViewport = exports.NavigationMenuViewport = /*#__PURE__*/Rea
     render,
     children,
     id: idProp,
+    style,
     ...elementProps
   } = componentProps;
   const id = (0, _useId.useId)(idProp);
   const {
-    open,
-    mounted,
-    value,
-    popupElement,
-    positionerElement,
     setViewportElement,
     setViewportTargetElement,
     floatingRootContext,
@@ -92,17 +85,6 @@ const NavigationMenuViewport = exports.NavigationMenuViewport = /*#__PURE__*/Rea
   } = (0, _NavigationMenuRootContext.useNavigationMenuRootContext)();
   const positioning = (0, _NavigationMenuPositionerContext.useNavigationMenuPositionerContext)(true);
   const hasPositioner = Boolean(positioning);
-  const direction = (0, _DirectionContext.useDirection)();
-  const enableAutoResize = (0, _useStableCallback.useStableCallback)(() => open);
-  (0, _usePopupAutoResize.usePopupAutoResize)({
-    popupElement,
-    positionerElement,
-    mounted,
-    content: value,
-    enabled: enableAutoResize,
-    side: positioning?.side ?? 'bottom',
-    direction
-  });
   const domReference = (floatingRootContext || EMPTY_ROOT_CONTEXT).useState('domReferenceElement');
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
     if (domReference) {

package/number-field/decrement/NumberFieldDecrement.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { BaseUIComponentProps, NativeButtonProps } from "../../utils/types.js";
-import type { NumberFieldRoot } from "../root/NumberFieldRoot.js";
+import type { NumberFieldRootState } from "../root/NumberFieldRoot.js";
 /**
  * A stepper button that decreases the field value when clicked.
  * Renders an `<button>` element.
@@ -8,8 +8,8 @@ import type { NumberFieldRoot } from "../root/NumberFieldRoot.js";
  * Documentation: [Base UI Number Field](https://base-ui.com/react/components/number-field)
  */
 export declare const NumberFieldDecrement: React.ForwardRefExoticComponent<Omit<NumberFieldDecrementProps, "ref"> & React.RefAttributes<HTMLButtonElement>>;
-export interface NumberFieldDecrementState extends NumberFieldRoot.State {}
-export interface NumberFieldDecrementProps extends NativeButtonProps, BaseUIComponentProps<'button', NumberFieldDecrement.State> {}
+export interface NumberFieldDecrementState extends NumberFieldRootState {}
+export interface NumberFieldDecrementProps extends NativeButtonProps, BaseUIComponentProps<'button', NumberFieldDecrementState> {}
 export declare namespace NumberFieldDecrement {
   type State = NumberFieldDecrementState;
   type Props = NumberFieldDecrementProps;