@base-ui/react 1.1.0 → 1.3.0

package/esm/navigation-menu/trigger/NavigationMenuTrigger.js

@@ -2,14 +2,18 @@
 
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
+import { isHTMLElement } from '@floating-ui/utils/dom';
 import { isTabbable } from 'tabbable';
-import { useStableCallback } from '@base-ui/utils/useStableCallback';
 import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
+import { ownerWindow } from '@base-ui/utils/owner';
+import { useStableCallback } from '@base-ui/utils/useStableCallback';
 import { useTimeout } from '@base-ui/utils/useTimeout';
 import { useAnimationFrame } from '@base-ui/utils/useAnimationFrame';
 import { useValueAsRef } from '@base-ui/utils/useValueAsRef';
-import { safePolygon, useClick, useFloatingRootContext, useFloatingTree, useHover, useInteractions } from "../../floating-ui-react/index.js";
-import { contains, getNextTabbable, getPreviousTabbable, isOutsideEvent, stopEvent } from "../../floating-ui-react/utils.js";
+import { isWebKit } from '@base-ui/utils/detectBrowser';
+import { safePolygon, useClick, useFloatingRootContext, useFloatingTree, useHoverReferenceInteraction, useInteractions } from "../../floating-ui-react/index.js";
+import { applySafePolygonPointerEventsMutation, clearSafePolygonPointerEventsMutation, useHoverInteractionSharedState } from "../../floating-ui-react/hooks/useHoverInteractionSharedState.js";
+import { contains, getTabbableAfterElement, getNextTabbable, getPreviousTabbable, isOutsideEvent, stopEvent } from "../../floating-ui-react/utils.js";
 import { useNavigationMenuItemContext } from "../item/NavigationMenuItemContext.js";
 import { useNavigationMenuRootContext, useNavigationMenuTreeContext } from "../root/NavigationMenuRootContext.js";
 import { createChangeEventDetails } from "../../utils/createBaseUIEventDetails.js";
@@ -17,15 +21,16 @@ import { REASONS } from "../../utils/reasons.js";
 import { EMPTY_ARRAY, ownerVisuallyHidden, PATIENT_CLICK_THRESHOLD } from "../../utils/constants.js";
 import { FocusGuard } from "../../utils/FocusGuard.js";
 import { pressableTriggerOpenStateMapping } from "../../utils/popupStateMapping.js";
+import { TransitionStatusDataAttributes } from "../../utils/stateAttributesMapping.js";
 import { isOutsideMenuEvent } from "../utils/isOutsideMenuEvent.js";
-import { useAnimationsFinished } from "../../utils/useAnimationsFinished.js";
-import { NavigationMenuPopupCssVars } from "../popup/NavigationMenuPopupCssVars.js";
-import { NavigationMenuPositionerCssVars } from "../positioner/NavigationMenuPositionerCssVars.js";
 import { CompositeItem } from "../../composite/item/CompositeItem.js";
 import { useButton } from "../../use-button/index.js";
+import { useAnimationsFinished } from "../../utils/useAnimationsFinished.js";
 import { getCssDimensions } from "../../utils/getCssDimensions.js";
 import { NAVIGATION_MENU_TRIGGER_IDENTIFIER } from "../utils/constants.js";
 import { useNavigationMenuDismissContext } from "../list/NavigationMenuDismissContext.js";
+import { NavigationMenuPopupCssVars } from "../popup/NavigationMenuPopupCssVars.js";
+import { NavigationMenuPositionerCssVars } from "../positioner/NavigationMenuPositionerCssVars.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const DEFAULT_SIZE = {
   width: 0,
@@ -57,12 +62,14 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     setFloatingRootContext,
     popupElement,
     viewportElement,
+    transitionStatus,
     rootRef,
     beforeOutsideRef,
     afterOutsideRef,
     afterInsideRef,
     beforeInsideRef,
     prevTriggerElementRef,
+    currentContentRef,
     delay,
     closeDelay,
     orientation,
@@ -77,18 +84,27 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
   const dismissProps = useNavigationMenuDismissContext();
   const stickIfOpenTimeout = useTimeout();
   const focusFrame = useAnimationFrame();
-  const sizeFrame1 = useAnimationFrame();
-  const sizeFrame2 = useAnimationFrame();
+  const mutationFrame = useAnimationFrame();
+  const resizeFrame = useAnimationFrame();
+  const sizeFrame = 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 animationAbortControllerRef = React.useRef(null);
+  const skipAutoSizeSyncRef = React.useRef(false);
   const isActiveItem = open && value === itemValue;
   const isActiveItemRef = useValueAsRef(isActiveItem);
   const interactionsEnabled = positionerElement ? true : !value;
-  const runOnceAnimationsFinish = useAnimationsFinished(popupElement);
+  const hoverFloatingElement = positionerElement || viewportElement;
+  const hoverInteractionsEnabled = hoverFloatingElement ? true : !value;
+  const runOnceAnimationsFinish = useAnimationsFinished(popupElement, false, false);
+  const handleTriggerElement = React.useCallback(element => {
+    triggerElementRef.current = element;
+    setTriggerElement(element);
+  }, []);
   React.useEffect(() => {
     animationAbortControllerRef.current?.abort();
   }, [isActiveItem]);
@@ -99,7 +115,7 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     popupElement.style.setProperty(NavigationMenuPopupCssVars.popupWidth, 'auto');
     popupElement.style.setProperty(NavigationMenuPopupCssVars.popupHeight, 'auto');
   }
-  const handleValueChange = useStableCallback((currentWidth, currentHeight) => {
+  function clearFixedSizes() {
     if (!popupElement || !positionerElement) {
       return;
     }
@@ -107,6 +123,28 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     popupElement.style.removeProperty(NavigationMenuPopupCssVars.popupHeight);
     positionerElement.style.removeProperty(NavigationMenuPositionerCssVars.positionerWidth);
     positionerElement.style.removeProperty(NavigationMenuPositionerCssVars.positionerHeight);
+  }
+  function setSharedFixedSizes(width, height) {
+    if (!popupElement || !positionerElement) {
+      return;
+    }
+    popupElement.style.setProperty(NavigationMenuPopupCssVars.popupWidth, `${width}px`);
+    popupElement.style.setProperty(NavigationMenuPopupCssVars.popupHeight, `${height}px`);
+    positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerWidth, `${width}px`);
+    positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerHeight, `${height}px`);
+  }
+  function scheduleAutoSizeReset() {
+    animationAbortControllerRef.current = new AbortController();
+    runOnceAnimationsFinish(setAutoSizes, animationAbortControllerRef.current.signal);
+  }
+  const handleValueChange = useStableCallback((currentWidth, currentHeight, options = {}) => {
+    if (!popupElement || !positionerElement) {
+      return;
+    }
+    const {
+      syncPositioner = false
+    } = options;
+    clearFixedSizes();
     const {
       width,
       height
@@ -119,24 +157,106 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     }
     popupElement.style.setProperty(NavigationMenuPopupCssVars.popupWidth, `${currentWidth}px`);
     popupElement.style.setProperty(NavigationMenuPopupCssVars.popupHeight, `${currentHeight}px`);
-    positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerWidth, `${measuredWidth}px`);
-    positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerHeight, `${measuredHeight}px`);
-    sizeFrame1.request(() => {
+    positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerWidth, `${syncPositioner ? currentWidth : measuredWidth}px`);
+    positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerHeight, `${syncPositioner ? currentHeight : measuredHeight}px`);
+    sizeFrame.request(() => {
       popupElement.style.setProperty(NavigationMenuPopupCssVars.popupWidth, `${measuredWidth}px`);
       popupElement.style.setProperty(NavigationMenuPopupCssVars.popupHeight, `${measuredHeight}px`);
-      sizeFrame2.request(() => {
-        animationAbortControllerRef.current = new AbortController();
-        runOnceAnimationsFinish(setAutoSizes, animationAbortControllerRef.current.signal);
+      if (syncPositioner) {
+        positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerWidth, `${measuredWidth}px`);
+        positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerHeight, `${measuredHeight}px`);
+      }
+      scheduleAutoSizeReset();
+    });
+  });
+  const handleInterruptedMutationResize = useStableCallback((currentWidth, currentHeight) => {
+    if (!popupElement || !positionerElement) {
+      return;
+    }
+    sizeFrame.cancel();
+    mutationFrame.cancel();
+    animationAbortControllerRef.current?.abort();
+    animationAbortControllerRef.current = null;
+    if (currentWidth === 0 || currentHeight === 0) {
+      return;
+    }
+    setSharedFixedSizes(currentWidth, currentHeight);
+    mutationFrame.request(() => {
+      mutationFrame.request(() => {
+        clearFixedSizes();
+        const {
+          width,
+          height
+        } = 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 = useStableCallback(() => {
+    if (!popupElement || !positionerElement) {
+      return;
+    }
+    sizeFrame.cancel();
+    animationAbortControllerRef.current?.abort();
+    animationAbortControllerRef.current = null;
+    clearFixedSizes();
+    const {
+      width,
+      height
+    } = getCssDimensions(popupElement);
+    if (width === 0 || height === 0) {
+      return;
+    }
+    prevSizeRef.current = {
+      width,
+      height
+    };
+    setAutoSizes();
+    positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerWidth, `${width}px`);
+    positionerElement.style.setProperty(NavigationMenuPositionerCssVars.positionerHeight, `${height}px`);
+  });
+  const getMutationBaseline = useStableCallback(() => {
+    if (!popupElement) {
+      return {
+        size: prevSizeRef.current,
+        syncPositioner: false
+      };
+    }
+    const popupWidth = popupElement.style.getPropertyValue(NavigationMenuPopupCssVars.popupWidth);
+    const popupHeight = popupElement.style.getPropertyValue(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();
-      sizeFrame1.cancel();
-      sizeFrame2.cancel();
+      mutationFrame.cancel();
+      resizeFrame.cancel();
+      sizeFrame.cancel();
+      animationAbortControllerRef.current?.abort();
+      animationAbortControllerRef.current = null;
+      skipAutoSizeSyncRef.current = false;
+      setPointerType('');
     }
-  }, [stickIfOpenTimeout, open, sizeFrame1, sizeFrame2]);
+  }, [stickIfOpenTimeout, open, mutationFrame, resizeFrame, sizeFrame]);
   React.useEffect(() => {
     if (!mounted) {
       prevSizeRef.current = DEFAULT_SIZE;
@@ -147,7 +267,6 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
       return undefined;
     }
     const resizeObserver = new ResizeObserver(() => {
-      // Using `getCssDimensions` here causes issues due to fractional values.
       prevSizeRef.current = {
         width: popupElement.offsetWidth,
         height: popupElement.offsetHeight
@@ -159,14 +278,41 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     };
   }, [popupElement]);
   React.useEffect(() => {
-    if (!popupElement || !isActiveItem || typeof MutationObserver !== 'function') {
+    if (!open || !isActiveItem || !popupElement || !positionerElement) {
+      return undefined;
+    }
+    const win = ownerWindow(positionerElement);
+    function handleResize() {
+      resizeFrame.cancel();
+      resizeFrame.request(syncCurrentSize);
+    }
+    win.addEventListener('resize', handleResize);
+    return () => {
+      resizeFrame.cancel();
+      win.removeEventListener('resize', handleResize);
+    };
+  }, [open, isActiveItem, popupElement, positionerElement, resizeFrame, syncCurrentSize]);
+  React.useEffect(() => {
+    const observedElement = currentContentRef.current;
+    if (!observedElement || !popupElement || !isActiveItem || typeof MutationObserver !== 'function') {
       return undefined;
     }
     const mutationObserver = new MutationObserver(() => {
-      animationAbortControllerRef.current?.abort();
-      handleValueChange(prevSizeRef.current.width, prevSizeRef.current.height);
+      if (transitionStatus === 'starting' || popupElement.hasAttribute(TransitionStatusDataAttributes.startingStyle)) {
+        syncCurrentSize();
+        return;
+      }
+      const {
+        size,
+        syncPositioner
+      } = getMutationBaseline();
+      if (syncPositioner) {
+        handleInterruptedMutationResize(size.width, size.height);
+        return;
+      }
+      handleValueChange(size.width, size.height);
     });
-    mutationObserver.observe(popupElement, {
+    mutationObserver.observe(observedElement, {
       childList: true,
       subtree: true,
       characterData: true
@@ -174,7 +320,7 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     return () => {
       mutationObserver.disconnect();
     };
-  }, [popupElement, positionerElement, isActiveItem, handleValueChange]);
+  }, [currentContentRef, popupElement, isActiveItem, transitionStatus, getMutationBaseline, handleInterruptedMutationResize, handleValueChange, syncCurrentSize]);
   React.useEffect(() => {
     if (isActiveItem && open && popupElement && allowFocusRef.current) {
       allowFocusRef.current = false;
@@ -185,12 +331,26 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     return () => {
       focusFrame.cancel();
     };
-  }, [beforeOutsideRef, focusFrame, handleValueChange, isActiveItem, open, popupElement]);
+  }, [beforeOutsideRef, focusFrame, isActiveItem, open, popupElement]);
   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;
+      }
       handleValueChange(0, 0);
     }
-  }, [isActiveItemRef, open, popupElement, handleValueChange]);
+    return undefined;
+  }, [currentContentRef, handleValueChange, isActiveItemRef, open, popupElement, sizeFrame, syncCurrentSize, transitionStatus]);
   function handleOpenChange(nextOpen, eventDetails) {
     const isHover = eventDetails.reason === REASONS.triggerHover;
     if (!interactionsEnabled) {
@@ -230,33 +390,61 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     onOpenChange: handleOpenChange,
     elements: {
       reference: triggerElement,
-      floating: positionerElement || viewportElement
+      floating: hoverFloatingElement
+    }
+  });
+  const hoverInteractionState = useHoverInteractionSharedState(context);
+  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();
+      clearSafePolygonPointerEventsMutation(hoverInteractionState);
+    }
+  }, [context, hoverInteractionState, open]);
+  const getInlineHandleCloseContext = useStableCallback(() => {
+    if (!nested || positionerElement || !triggerElementRef.current || !hoverFloatingElement) {
+      return null;
     }
+    return getHandleCloseContext(triggerElementRef.current, hoverFloatingElement, nodeId);
   });
-  const hover = useHover(context, {
+  function getScope() {
+    return triggerElementRef.current?.closest('ul') ?? null;
+  }
+  const hoverProps = useHoverReferenceInteraction(context, {
+    enabled: hoverInteractionsEnabled,
     move: false,
     handleClose: safePolygon({
-      blockPointerEvents: pointerType !== 'touch'
+      blockPointerEvents: pointerType !== 'touch' && (!isWebKit || nested),
+      getScope
     }),
     restMs: mounted && positionerElement ? 0 : delay,
     delay: {
       close: closeDelay
-    }
+    },
+    triggerElementRef,
+    getHandleCloseContext: getInlineHandleCloseContext
   });
+  const hover = React.useMemo(() => hoverProps ? {
+    reference: hoverProps
+  } : undefined, [hoverProps]);
   const click = useClick(context, {
     enabled: interactionsEnabled,
     stickIfOpen,
     toggle: isActiveItem
   });
+  const {
+    getReferenceProps
+  } = useInteractions([hover, click]);
   useIsoLayoutEffect(() => {
     if (isActiveItem) {
       setFloatingRootContext(context);
       prevTriggerElementRef.current = triggerElement;
     }
   }, [isActiveItem, context, setFloatingRootContext, prevTriggerElementRef, triggerElement]);
-  const {
-    getReferenceProps
-  } = useInteractions([hover, click]);
   function handleActivation(event) {
     ReactDOM.flushSync(() => {
       const prevTriggerRect = prevTriggerElementRef.current?.getBoundingClientRect();
@@ -274,7 +462,7 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
       // 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') {
@@ -283,11 +471,20 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
       if (value != null) {
         setValue(itemValue, createChangeEventDetails(event.type === 'mouseenter' ? REASONS.triggerHover : REASONS.triggerPress, event.nativeEvent));
       }
+      if (event.type === 'mouseenter' && nested && !positionerElement && pointerType !== 'touch' && hoverFloatingElement && isHTMLElement(event.currentTarget)) {
+        const scopeElement = getScope();
+        if (!scopeElement) {
+          return;
+        }
+        applySafePolygonPointerEventsMutation(hoverInteractionState, {
+          scopeElement,
+          referenceElement: event.currentTarget,
+          floatingElement: hoverFloatingElement
+        });
+      }
     });
   }
   const handleOpenEvent = useStableCallback(event => {
-    // For nested scenarios without positioner/popup, we can still open the menu
-    // but we can't do size calculations
     if (!popupElement || !positionerElement) {
       handleActivation(event);
       return;
@@ -296,12 +493,16 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
       width,
       height
     } = 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 = React.useMemo(() => ({
+  const state = {
     open: isActiveItem
-  }), [isActiveItem]);
+  };
   function handleSetPointerType(event) {
     setPointerType(event.pointerType);
   }
@@ -362,7 +563,7 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     focusableWhenDisabled: true,
     native: nativeButton
   });
-  const referenceElement = positionerElement || viewportElement;
+  const referenceElement = hoverFloatingElement;
   return /*#__PURE__*/_jsxs(React.Fragment, {
     children: [/*#__PURE__*/_jsx(CompositeItem, {
       tag: "button",
@@ -370,7 +571,7 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
       className: className,
       state: state,
       stateAttributesMapping: pressableTriggerOpenStateMapping,
-      refs: [forwardedRef, setTriggerElement, buttonRef],
+      refs: [forwardedRef, handleTriggerElement, buttonRef],
       props: [getReferenceProps, dismissProps?.reference || EMPTY_ARRAY, defaultProps, elementProps, getButtonProps]
     }), isActiveItem && /*#__PURE__*/_jsxs(React.Fragment, {
       children: [/*#__PURE__*/_jsx(FocusGuard, {
@@ -393,9 +594,12 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
             const elementToFocus = afterInsideRef.current && isTabbable(afterInsideRef.current) ? afterInsideRef.current : triggerElement;
             elementToFocus?.focus();
           } else {
-            const nextTabbable = getNextTabbable(triggerElement);
+            let nextTabbable = getNextTabbable(triggerElement);
+            if (nested && !positionerElement && referenceElement && nextTabbable && contains(referenceElement, nextTabbable)) {
+              nextTabbable = getTabbableAfterElement(afterInsideRef.current);
+            }
             nextTabbable?.focus();
-            if (!contains(rootRef.current, nextTabbable)) {
+            if ((!nested || positionerElement) && !contains(rootRef.current, nextTabbable)) {
               setValue(null, createChangeEventDetails(REASONS.focusOut, event.nativeEvent));
             }
           }
@@ -404,4 +608,28 @@ export const NavigationMenuTrigger = /*#__PURE__*/React.forwardRef(function Navi
     })]
   });
 });
-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/esm/navigation-menu/utils/isOutsideMenuEvent.d.ts

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

package/esm/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/esm/navigation-menu/viewport/NavigationMenuViewport.js

@@ -76,7 +76,8 @@ export const NavigationMenuViewport = /*#__PURE__*/React.forwardRef(function Nav
     viewportInert,
     setViewportInert
   } = useNavigationMenuRootContext();
-  const hasPositioner = Boolean(useNavigationMenuPositionerContext(true));
+  const positioning = useNavigationMenuPositionerContext(true);
+  const hasPositioner = Boolean(positioning);
   const domReference = (floatingRootContext || EMPTY_ROOT_CONTEXT).useState('domReferenceElement');
   useIsoLayoutEffect(() => {
     if (domReference) {

package/esm/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;

package/esm/number-field/group/NumberFieldGroup.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { NumberFieldRoot } from "../root/NumberFieldRoot.js";
+import type { NumberFieldRootState } from "../root/NumberFieldRoot.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
 /**
  * Groups the input with the increment and decrement buttons.
@@ -8,8 +8,8 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  * Documentation: [Base UI Number Field](https://base-ui.com/react/components/number-field)
  */
 export declare const NumberFieldGroup: React.ForwardRefExoticComponent<Omit<NumberFieldGroupProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export interface NumberFieldGroupState extends NumberFieldRoot.State {}
-export interface NumberFieldGroupProps extends BaseUIComponentProps<'div', NumberFieldGroup.State> {}
+export interface NumberFieldGroupState extends NumberFieldRootState {}
+export interface NumberFieldGroupProps extends BaseUIComponentProps<'div', NumberFieldGroupState> {}
 export declare namespace NumberFieldGroup {
   type State = NumberFieldGroupState;
   type Props = NumberFieldGroupProps;

package/esm/number-field/increment/NumberFieldIncrement.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { BaseUIComponentProps, NativeButtonProps } from "../../utils/types.js";
-import type { NumberFieldRoot } from "../root/NumberFieldRoot.js";
+import type { NumberFieldRootState } from "../root/NumberFieldRoot.js";
 /**
  * A stepper button that increases 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 NumberFieldIncrement: React.ForwardRefExoticComponent<Omit<NumberFieldIncrementProps, "ref"> & React.RefAttributes<HTMLButtonElement>>;
-export interface NumberFieldIncrementState extends NumberFieldRoot.State {}
-export interface NumberFieldIncrementProps extends NativeButtonProps, BaseUIComponentProps<'button', NumberFieldIncrement.State> {}
+export interface NumberFieldIncrementState extends NumberFieldRootState {}
+export interface NumberFieldIncrementProps extends NativeButtonProps, BaseUIComponentProps<'button', NumberFieldIncrementState> {}
 export declare namespace NumberFieldIncrement {
   type State = NumberFieldIncrementState;
   type Props = NumberFieldIncrementProps;

package/esm/number-field/input/NumberFieldInput.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { BaseUIComponentProps } from "../../utils/types.js";
-import type { NumberFieldRoot } from "../root/NumberFieldRoot.js";
+import type { NumberFieldRootState } from "../root/NumberFieldRoot.js";
 /**
  * The native input control in the number field.
  * Renders an `<input>` 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 NumberFieldInput: React.ForwardRefExoticComponent<Omit<NumberFieldInputProps, "ref"> & React.RefAttributes<HTMLInputElement>>;
-export interface NumberFieldInputState extends NumberFieldRoot.State {}
-export interface NumberFieldInputProps extends BaseUIComponentProps<'input', NumberFieldInput.State> {
+export interface NumberFieldInputState extends NumberFieldRootState {}
+export interface NumberFieldInputProps extends BaseUIComponentProps<'input', NumberFieldInputState> {
   /**
    * A string value that provides a user-friendly name for the role of the input.
    * @default 'Number field'

package/esm/number-field/input/NumberFieldInput.js

@@ -194,8 +194,8 @@ export const NumberFieldInput = /*#__PURE__*/React.forwardRef(function NumberFie
         return;
       }
 
-      // For trusted user typing, update the input text immediately and only fire onValueChange
-      // if the typed value is currently parseable into a number. This preserves good UX for IME
+      // Update the input text immediately and only fire onValueChange if the typed value is
+      // currently parseable into a number. This preserves good UX for IME
       // composition/partial input while still providing live numeric updates when possible.
       const allowedNonNumericKeys = getAllowedNonNumericKeys();
       const isValidCharacterString = Array.from(targetValue).every(ch => {
@@ -210,17 +210,9 @@ export const NumberFieldInput = /*#__PURE__*/React.forwardRef(function NumberFie
       if (!isValidCharacterString) {
         return;
       }
-      if (event.isTrusted) {
-        setInputValue(targetValue);
-        const parsedValue = parseNumber(targetValue, locale, formatOptionsRef.current);
-        if (parsedValue !== null) {
-          setValue(parsedValue, createChangeEventDetails(REASONS.inputChange, event.nativeEvent));
-        }
-        return;
-      }
       const parsedValue = parseNumber(targetValue, locale, formatOptionsRef.current);
+      setInputValue(targetValue);
       if (parsedValue !== null) {
-        setInputValue(targetValue);
         setValue(parsedValue, createChangeEventDetails(REASONS.inputChange, event.nativeEvent));
       }
     },