@base-ui/react 1.0.0 → 1.2.0

package/fieldset/root/FieldsetRoot.js

@@ -11,7 +11,7 @@ var _FieldsetRootContext = require("./FieldsetRootContext");
 var _useRenderElement = require("../../utils/useRenderElement");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
- * Groups the fieldset legend and the associated fields.
+ * Groups a shared legend with related controls.
  * Renders a `<fieldset>` element.
  *
  * Documentation: [Base UI Fieldset](https://base-ui.com/react/components/fieldset)
@@ -24,9 +24,9 @@ const FieldsetRoot = exports.FieldsetRoot = /*#__PURE__*/React.forwardRef(functi
     ...elementProps
   } = componentProps;
   const [legendId, setLegendId] = React.useState(undefined);
-  const state = React.useMemo(() => ({
+  const state = {
     disabled
-  }), [disabled]);
+  };
   const element = (0, _useRenderElement.useRenderElement)('fieldset', componentProps, {
     ref: forwardedRef,
     state,

package/floating-ui-react/components/FloatingDelayGroup.d.ts

@@ -12,7 +12,7 @@ export interface FloatingDelayGroupProps {
    * This is useful if you want grouping to “last” longer than the close delay,
    * for example if there is no close delay at all.
    */
-  timeoutMs?: number;
+  timeoutMs?: number | undefined;
 }
 /**
  * Experimental next version of `FloatingDelayGroup` to become the default
@@ -26,11 +26,6 @@ export interface FloatingDelayGroupProps {
  */
 export declare function FloatingDelayGroup(props: FloatingDelayGroupProps): React.JSX.Element;
 interface UseDelayGroupOptions {
-  /**
-   * Whether delay grouping should be enabled.
-   * @default true
-   */
-  enabled?: boolean;
   /**
    * Whether the trigger this hook is used in has opened the tooltip.
    */
@@ -40,7 +35,7 @@ interface UseDelayGroupReturn {
   /**
    * The delay reference object.
    */
-  delayRef: React.MutableRefObject<Delay>;
+  delayRef: React.RefObject<Delay>;
   /**
    * Whether animations should be removed.
    */

package/floating-ui-react/components/FloatingDelayGroup.js

@@ -78,7 +78,6 @@ function useDelayGroup(context, options = {
   const store = 'rootStore' in context ? context.rootStore : context;
   const floatingId = store.useState('floatingId');
   const {
-    enabled = true,
     open
   } = options;
   const groupContext = React.useContext(FloatingDelayGroupContext);
@@ -100,9 +99,6 @@ function useDelayGroup(context, options = {
       currentContextRef.current = null;
       delayRef.current = initialDelayRef.current;
     }
-    if (!enabled) {
-      return undefined;
-    }
     if (!currentIdRef.current) {
       return undefined;
     }
@@ -124,11 +120,8 @@ function useDelayGroup(context, options = {
       unset();
     }
     return undefined;
-  }, [enabled, open, floatingId, currentIdRef, delayRef, timeoutMs, initialDelayRef, currentContextRef, timeout, store]);
+  }, [open, floatingId, currentIdRef, delayRef, timeoutMs, initialDelayRef, currentContextRef, timeout, store]);
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
-    if (!enabled) {
-      return;
-    }
     if (!open) {
       return;
     }
@@ -155,7 +148,7 @@ function useDelayGroup(context, options = {
       setIsInstantPhase(false);
       prevContext?.setIsInstantPhase(false);
     }
-  }, [enabled, open, floatingId, store, currentIdRef, delayRef, timeoutMs, initialDelayRef, currentContextRef, timeout]);
+  }, [open, floatingId, store, currentIdRef, delayRef, timeoutMs, initialDelayRef, currentContextRef, timeout]);
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
     return () => {
       currentContextRef.current = null;

package/floating-ui-react/components/FloatingFocusManager.d.ts

@@ -11,19 +11,14 @@ export interface FloatingFocusManagerProps {
   /**
    * The interaction type used to open the floating element.
    */
-  openInteractionType?: InteractionType | null;
+  openInteractionType?: (InteractionType | null) | undefined;
   /**
    * Whether or not the focus manager should be disabled. Useful to delay focus
    * management until after a transition completes or some other conditional
    * state.
    * @default false
    */
-  disabled?: boolean;
-  /**
-   * The order in which focus cycles.
-   * @default ['content']
-   */
-  order?: Array<'reference' | 'floating' | 'content'>;
+  disabled?: boolean | undefined;
   /**
    * Determines the element to focus when the floating element is opened.
    *
@@ -35,7 +30,7 @@ export interface FloatingFocusManagerProps {
    *   or `false`/`undefined` to do nothing.
    * @default true
    */
-  initialFocus?: boolean | React.RefObject<HTMLElement | null> | ((openType: InteractionType) => boolean | HTMLElement | null | void);
+  initialFocus?: (boolean | React.RefObject<HTMLElement | null> | ((openType: InteractionType) => boolean | HTMLElement | null | void)) | undefined;
   /**
    * Determines the element to focus when the floating element is closed.
    *
@@ -47,7 +42,7 @@ export interface FloatingFocusManagerProps {
    *   or `false`/`undefined` to do nothing.
    * @default true
    */
-  returnFocus?: boolean | React.RefObject<HTMLElement | null> | ((closeType: InteractionType) => boolean | HTMLElement | null | void);
+  returnFocus?: (boolean | React.RefObject<HTMLElement | null> | ((closeType: InteractionType) => boolean | HTMLElement | null | void)) | undefined;
   /**
    * Determines where focus should be restored if focus inside the floating element is lost
    * (such as due to the removal of the currently focused element from the DOM).
@@ -58,14 +53,14 @@ export interface FloatingFocusManagerProps {
    * - `false`: do not restore focus
    * @default false
    */
-  restoreFocus?: boolean | 'popup';
+  restoreFocus?: (boolean | 'popup') | undefined;
   /**
    * Determines if focus is “modal”, meaning focus is fully trapped inside the
    * floating element and outside content cannot be accessed. This includes
    * screen reader virtual cursors.
    * @default true
    */
-  modal?: boolean;
+  modal?: boolean | undefined;
   /**
    * Determines whether `focusout` event listeners that control whether the
    * floating element should be closed if the focus moves outside of it are
@@ -73,29 +68,24 @@ export interface FloatingFocusManagerProps {
    * focus management.
    * @default true
    */
-  closeOnFocusOut?: boolean;
-  /**
-   * Returns a list of elements that should be considered part of the
-   * floating element.
-   */
-  getInsideElements?: () => Element[];
+  closeOnFocusOut?: boolean | undefined;
   /**
    * Overrides the element to focus when tabbing forward out of the floating element.
    */
-  nextFocusableElement?: HTMLElement | React.RefObject<HTMLElement | null> | null;
+  nextFocusableElement?: (HTMLElement | React.RefObject<HTMLElement | null> | null) | undefined;
   /**
    * Overrides the element to focus when tabbing backward out of the floating element.
    */
-  previousFocusableElement?: HTMLElement | React.RefObject<HTMLElement | null> | null;
+  previousFocusableElement?: (HTMLElement | React.RefObject<HTMLElement | null> | null) | undefined;
   /**
    * Ref to the focus guard preceding the floating element content.
    * Can be useful to focus the popup progammatically.
    */
-  beforeContentFocusGuardRef?: React.RefObject<HTMLSpanElement | null>;
+  beforeContentFocusGuardRef?: React.RefObject<HTMLSpanElement | null> | undefined;
   /**
    * External FlatingTree to use when the one provided by context can't be used.
    */
-  externalTree?: FloatingTreeStore;
+  externalTree?: FloatingTreeStore | undefined;
 }
 /**
  * Provides focus management for the floating element.

package/floating-ui-react/components/FloatingFocusManager.js

@@ -15,6 +15,7 @@ var _useStableCallback = require("@base-ui/utils/useStableCallback");
 var _useIsoLayoutEffect = require("@base-ui/utils/useIsoLayoutEffect");
 var _visuallyHidden = require("@base-ui/utils/visuallyHidden");
 var _useTimeout = require("@base-ui/utils/useTimeout");
+var _detectBrowser = require("@base-ui/utils/detectBrowser");
 var _useAnimationFrame = require("@base-ui/utils/useAnimationFrame");
 var _owner = require("@base-ui/utils/owner");
 var _FocusGuard = require("../../utils/FocusGuard");
@@ -54,12 +55,14 @@ function getEventType(event, lastInteractionType) {
 const LIST_LIMIT = 20;
 let previouslyFocusedElements = [];
 function clearDisconnectedPreviouslyFocusedElements() {
-  previouslyFocusedElements = previouslyFocusedElements.filter(el => el.isConnected);
+  previouslyFocusedElements = previouslyFocusedElements.filter(entry => {
+    return entry.deref()?.isConnected;
+  });
 }
 function addPreviouslyFocusedElement(element) {
   clearDisconnectedPreviouslyFocusedElements();
   if (element && (0, _dom.getNodeName)(element) !== 'body') {
-    previouslyFocusedElements.push(element);
+    previouslyFocusedElements.push(new WeakRef(element));
     if (previouslyFocusedElements.length > LIST_LIMIT) {
       previouslyFocusedElements = previouslyFocusedElements.slice(-LIST_LIMIT);
     }
@@ -67,7 +70,7 @@ function addPreviouslyFocusedElement(element) {
 }
 function getPreviouslyFocusedElement() {
   clearDisconnectedPreviouslyFocusedElements();
-  return previouslyFocusedElements[previouslyFocusedElements.length - 1];
+  return previouslyFocusedElements[previouslyFocusedElements.length - 1]?.deref();
 }
 function getFirstTabbableElement(container) {
   if (!container) {
@@ -118,14 +121,12 @@ function FloatingFocusManager(props) {
     context,
     children,
     disabled = false,
-    order = ['content'],
     initialFocus = true,
     returnFocus = true,
     restoreFocus = false,
     modal = true,
     closeOnFocusOut = true,
     openInteractionType = '',
-    getInsideElements: getInsideElementsProp = () => [],
     nextFocusableElement,
     previousFocusableElement,
     beforeContentFocusGuardRef,
@@ -140,7 +141,6 @@ function FloatingFocusManager(props) {
     dataRef
   } = store.context;
   const getNodeId = (0, _useStableCallback.useStableCallback)(() => dataRef.current.floatingContext?.nodeId);
-  const getInsideElements = (0, _useStableCallback.useStableCallback)(getInsideElementsProp);
   const ignoreInitialFocus = initialFocus === false;
   // If the reference is a combobox and is typeable (e.g. input/textarea),
   // there are different focus semantics. The guards should not be rendered, but
@@ -148,7 +148,7 @@ function FloatingFocusManager(props) {
   // hidden dismiss button should only appear at the end of the list, not the
   // start.
   const isUntrappedTypeableCombobox = (0, _utils.isTypeableCombobox)(domReference) && ignoreInitialFocus;
-  const orderRef = (0, _useValueAsRef.useValueAsRef)(order);
+  const orderRef = React.useRef(['content']);
   const initialFocusRef = (0, _useValueAsRef.useValueAsRef)(initialFocus);
   const returnFocusRef = (0, _useValueAsRef.useValueAsRef)(returnFocus);
   const openInteractionTypeRef = (0, _useValueAsRef.useValueAsRef)(openInteractionType);
@@ -162,6 +162,10 @@ function FloatingFocusManager(props) {
   const tabbableIndexRef = React.useRef(-1);
   const closeTypeRef = React.useRef('');
   const lastInteractionTypeRef = React.useRef('');
+  const beforeGuardRef = React.useRef(null);
+  const afterGuardRef = React.useRef(null);
+  const mergedBeforeGuardRef = (0, _useMergedRefs.useMergedRefs)(beforeGuardRef, beforeContentFocusGuardRef, portalContext?.beforeInsideRef);
+  const mergedAfterGuardRef = (0, _useMergedRefs.useMergedRefs)(afterGuardRef, portalContext?.afterInsideRef);
   const blurTimeout = (0, _useTimeout.useTimeout)();
   const pointerDownTimeout = (0, _useTimeout.useTimeout)();
   const restoreFocusFrame = (0, _useAnimationFrame.useAnimationFrame)();
@@ -174,54 +178,33 @@ function FloatingFocusManager(props) {
     const content = getTabbableContent(container);
     return orderRef.current.map(() => content).filter(Boolean).flat();
   });
+
+  // Prevent Tab from escaping the modal when there are no tabbable elements.
   React.useEffect(() => {
-    if (disabled) {
-      return undefined;
-    }
-    if (!modal) {
+    if (disabled || !modal) {
       return undefined;
     }
     function onKeyDown(event) {
       if (event.key === 'Tab') {
         // The focus guards have nothing to focus, so we need to stop the event.
-        if ((0, _utils.contains)(floatingFocusElement, (0, _utils.activeElement)((0, _utils.getDocument)(floatingFocusElement))) && getTabbableContent().length === 0 && !isUntrappedTypeableCombobox) {
+        if ((0, _utils.contains)(floatingFocusElement, (0, _utils.activeElement)((0, _owner.ownerDocument)(floatingFocusElement))) && getTabbableContent().length === 0 && !isUntrappedTypeableCombobox) {
           (0, _utils.stopEvent)(event);
         }
       }
     }
-    const doc = (0, _utils.getDocument)(floatingFocusElement);
+    const doc = (0, _owner.ownerDocument)(floatingFocusElement);
     doc.addEventListener('keydown', onKeyDown);
     return () => {
       doc.removeEventListener('keydown', onKeyDown);
     };
   }, [disabled, domReference, floatingFocusElement, modal, orderRef, isUntrappedTypeableCombobox, getTabbableContent, getTabbableElements]);
-  React.useEffect(() => {
-    if (disabled) {
-      return undefined;
-    }
-    if (!floating) {
-      return undefined;
-    }
-    function handleFocusIn(event) {
-      const target = (0, _utils.getTarget)(event);
-      const tabbableContent = getTabbableContent();
-      const tabbableIndex = tabbableContent.indexOf(target);
-      if (tabbableIndex !== -1) {
-        tabbableIndexRef.current = tabbableIndex;
-      }
-    }
-    floating.addEventListener('focusin', handleFocusIn);
-    return () => {
-      floating.removeEventListener('focusin', handleFocusIn);
-    };
-  }, [disabled, floating, getTabbableContent]);
 
-  // Track the last interaction type at the document level to disambiguate focus events
+  // Track pointer/keyboard interactions to disambiguate focus and outside presses.
   React.useEffect(() => {
     if (disabled || !open) {
       return undefined;
     }
-    const doc = (0, _utils.getDocument)(floatingFocusElement);
+    const doc = (0, _owner.ownerDocument)(floatingFocusElement);
     function clearPointerDownOutside() {
       pointerDownOutsideRef.current = false;
     }
@@ -230,6 +213,9 @@ function FloatingFocusManager(props) {
       const pointerTargetInside = (0, _utils.contains)(floating, target) || (0, _utils.contains)(domReference, target) || (0, _utils.contains)(portalContext?.portalNode, target);
       pointerDownOutsideRef.current = !pointerTargetInside;
       lastInteractionTypeRef.current = event.pointerType || 'keyboard';
+      if (target?.closest(`[${_constants.CLICK_TRIGGER_IDENTIFIER}]`)) {
+        isPointerDownRef.current = true;
+      }
     }
     function onKeyDown() {
       lastInteractionTypeRef.current = 'keyboard';
@@ -245,13 +231,13 @@ function FloatingFocusManager(props) {
       doc.removeEventListener('keydown', onKeyDown, true);
     };
   }, [disabled, floating, domReference, floatingFocusElement, open, portalContext]);
+
+  // Close on focus out and restore focus within the floating tree when needed.
   React.useEffect(() => {
-    if (disabled) {
-      return undefined;
-    }
-    if (!closeOnFocusOut) {
+    if (disabled || !closeOnFocusOut) {
       return undefined;
     }
+    const doc = (0, _owner.ownerDocument)(floatingFocusElement);
 
     // In Safari, buttons lose focus when pressing them.
     function handlePointerDown() {
@@ -260,6 +246,14 @@ function FloatingFocusManager(props) {
         isPointerDownRef.current = false;
       });
     }
+    function handleFocusIn(event) {
+      const target = (0, _utils.getTarget)(event);
+      const tabbableContent = getTabbableContent();
+      const tabbableIndex = tabbableContent.indexOf(target);
+      if (tabbableIndex !== -1) {
+        tabbableIndexRef.current = tabbableIndex;
+      }
+    }
     function handleFocusOutside(event) {
       const relatedTarget = event.relatedTarget;
       const currentTarget = event.currentTarget;
@@ -267,14 +261,15 @@ function FloatingFocusManager(props) {
       queueMicrotask(() => {
         const nodeId = getNodeId();
         const triggers = store.context.triggerElements;
-        const movedToUnrelatedNode = !((0, _utils.contains)(domReference, relatedTarget) || (0, _utils.contains)(floating, relatedTarget) || (0, _utils.contains)(relatedTarget, floating) || (0, _utils.contains)(portalContext?.portalNode, relatedTarget) || relatedTarget != null && triggers.hasElement(relatedTarget) || triggers.hasMatchingElement(trigger => (0, _utils.contains)(trigger, relatedTarget)) || relatedTarget?.hasAttribute((0, _createAttribute.createAttribute)('focus-guard')) || tree && ((0, _utils.getNodeChildren)(tree.nodesRef.current, nodeId).find(node => (0, _utils.contains)(node.context?.elements.floating, relatedTarget) || (0, _utils.contains)(node.context?.elements.domReference, relatedTarget)) || (0, _utils.getNodeAncestors)(tree.nodesRef.current, nodeId).find(node => [node.context?.elements.floating, (0, _utils.getFloatingFocusElement)(node.context?.elements.floating)].includes(relatedTarget) || node.context?.elements.domReference === relatedTarget)));
+        const isRelatedFocusGuard = relatedTarget?.hasAttribute((0, _createAttribute.createAttribute)('focus-guard')) && [beforeGuardRef.current, afterGuardRef.current, portalContext?.beforeInsideRef.current, portalContext?.afterInsideRef.current, portalContext?.beforeOutsideRef.current, portalContext?.afterOutsideRef.current, (0, _resolveRef.resolveRef)(previousFocusableElement), (0, _resolveRef.resolveRef)(nextFocusableElement)].includes(relatedTarget);
+        const movedToUnrelatedNode = !((0, _utils.contains)(domReference, relatedTarget) || (0, _utils.contains)(floating, relatedTarget) || (0, _utils.contains)(relatedTarget, floating) || (0, _utils.contains)(portalContext?.portalNode, relatedTarget) || relatedTarget != null && triggers.hasElement(relatedTarget) || triggers.hasMatchingElement(trigger => (0, _utils.contains)(trigger, relatedTarget)) || isRelatedFocusGuard || tree && ((0, _utils.getNodeChildren)(tree.nodesRef.current, nodeId).find(node => (0, _utils.contains)(node.context?.elements.floating, relatedTarget) || (0, _utils.contains)(node.context?.elements.domReference, relatedTarget)) || (0, _utils.getNodeAncestors)(tree.nodesRef.current, nodeId).find(node => [node.context?.elements.floating, (0, _utils.getFloatingFocusElement)(node.context?.elements.floating)].includes(relatedTarget) || node.context?.elements.domReference === relatedTarget)));
         if (currentTarget === domReference && floatingFocusElement) {
           handleTabIndex(floatingFocusElement, orderRef);
         }
 
         // Restore focus to the previous tabbable element index to prevent
         // focus from being lost outside the floating tree.
-        if (restoreFocus && currentTarget !== domReference && !isFocusable(target) && (0, _utils.activeElement)((0, _utils.getDocument)(floatingFocusElement)) === (0, _utils.getDocument)(floatingFocusElement).body) {
+        if (restoreFocus && currentTarget !== domReference && !isFocusable(target) && (0, _utils.activeElement)(doc) === doc.body) {
           // Let `FloatingPortal` effect knows that focus is still inside the
           // floating tree.
           if ((0, _dom.isHTMLElement)(floatingFocusElement)) {
@@ -345,6 +340,7 @@ function FloatingFocusManager(props) {
       });
     }
     if (floating) {
+      floating.addEventListener('focusin', handleFocusIn);
       floating.addEventListener('focusout', handleFocusOutside);
       if (portalContext) {
         floating.addEventListener('focusout', markInsideReactTree, true);
@@ -353,6 +349,7 @@ function FloatingFocusManager(props) {
         });
       }
       cleanups.push(() => {
+        floating.removeEventListener('focusin', handleFocusIn);
         floating.removeEventListener('focusout', handleFocusOutside);
       });
     }
@@ -361,11 +358,9 @@ function FloatingFocusManager(props) {
         cleanup();
       });
     };
-  }, [disabled, domReference, floating, floatingFocusElement, modal, tree, portalContext, store, closeOnFocusOut, restoreFocus, getTabbableContent, isUntrappedTypeableCombobox, getNodeId, orderRef, dataRef, blurTimeout, pointerDownTimeout, restoreFocusFrame]);
-  const beforeGuardRef = React.useRef(null);
-  const afterGuardRef = React.useRef(null);
-  const mergedBeforeGuardRef = (0, _useMergedRefs.useMergedRefs)(beforeGuardRef, beforeContentFocusGuardRef, portalContext?.beforeInsideRef);
-  const mergedAfterGuardRef = (0, _useMergedRefs.useMergedRefs)(afterGuardRef, portalContext?.afterInsideRef);
+  }, [disabled, domReference, floating, floatingFocusElement, modal, tree, portalContext, store, closeOnFocusOut, restoreFocus, getTabbableContent, isUntrappedTypeableCombobox, getNodeId, orderRef, dataRef, blurTimeout, pointerDownTimeout, restoreFocusFrame, nextFocusableElement, previousFocusableElement]);
+
+  // Hide everything outside the floating tree from assistive tech while open.
   React.useEffect(() => {
     if (disabled || !floating || !open) {
       return undefined;
@@ -375,17 +370,16 @@ function FloatingFocusManager(props) {
     const portalNodes = Array.from(portalContext?.portalNode?.querySelectorAll(`[${(0, _createAttribute.createAttribute)('portal')}]`) || []);
     const ancestors = tree ? (0, _utils.getNodeAncestors)(tree.nodesRef.current, getNodeId()) : [];
     const rootAncestorComboboxDomReference = ancestors.find(node => (0, _utils.isTypeableCombobox)(node.context?.elements.domReference || null))?.context?.elements.domReference;
-    const insideElements = [floating, rootAncestorComboboxDomReference, ...portalNodes, ...getInsideElements(), startDismissButtonRef.current, endDismissButtonRef.current, beforeGuardRef.current, afterGuardRef.current, portalContext?.beforeOutsideRef.current, portalContext?.afterOutsideRef.current, (0, _resolveRef.resolveRef)(previousFocusableElement), (0, _resolveRef.resolveRef)(nextFocusableElement), isUntrappedTypeableCombobox ? domReference : null].filter(x => x != null);
-    const cleanup = (0, _markOthers.markOthers)(insideElements, modal || isUntrappedTypeableCombobox);
-    return () => {
-      cleanup();
-    };
-  }, [open, disabled, domReference, floating, modal, orderRef, portalContext, isUntrappedTypeableCombobox, tree, getNodeId, getInsideElements, nextFocusableElement, previousFocusableElement]);
+    const insideElements = [floating, rootAncestorComboboxDomReference, ...portalNodes, startDismissButtonRef.current, endDismissButtonRef.current, beforeGuardRef.current, afterGuardRef.current, portalContext?.beforeOutsideRef.current, portalContext?.afterOutsideRef.current, (0, _resolveRef.resolveRef)(previousFocusableElement), (0, _resolveRef.resolveRef)(nextFocusableElement), isUntrappedTypeableCombobox ? domReference : null].filter(x => x != null);
+    return (0, _markOthers.markOthers)(insideElements, modal || isUntrappedTypeableCombobox);
+  }, [open, disabled, domReference, floating, modal, orderRef, portalContext, isUntrappedTypeableCombobox, tree, getNodeId, nextFocusableElement, previousFocusableElement]);
+
+  // Focus the initial element when the floating element opens.
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
     if (!open || disabled || !(0, _dom.isHTMLElement)(floatingFocusElement)) {
       return;
     }
-    const doc = (0, _utils.getDocument)(floatingFocusElement);
+    const doc = (0, _owner.ownerDocument)(floatingFocusElement);
     const previouslyFocusedElement = (0, _utils.activeElement)(doc);
 
     // Wait for any layout effect state setters to execute to set `tabIndex`.
@@ -414,11 +408,13 @@ function FloatingFocusManager(props) {
       });
     });
   }, [disabled, open, floatingFocusElement, ignoreInitialFocus, getTabbableElements, initialFocusRef, openInteractionTypeRef]);
+
+  // Track return focus targets and restore focus on unmount/close.
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
     if (disabled || !floatingFocusElement) {
       return undefined;
     }
-    const doc = (0, _utils.getDocument)(floatingFocusElement);
+    const doc = (0, _owner.ownerDocument)(floatingFocusElement);
     const previouslyFocusedElement = (0, _utils.activeElement)(doc);
     addPreviouslyFocusedElement(previouslyFocusedElement);
 
@@ -500,40 +496,30 @@ function FloatingFocusManager(props) {
           });
         }
         fallbackEl.remove();
+        preventReturnFocusRef.current = false;
       });
     };
   }, [disabled, floating, floatingFocusElement, returnFocusRef, dataRef, events, tree, isInsidePortal, domReference, getNodeId]);
-  React.useEffect(() => {
-    // The `returnFocus` cleanup behavior is inside a microtask; ensure we
-    // wait for it to complete before resetting the flag.
-    queueMicrotask(() => {
-      preventReturnFocusRef.current = false;
-    });
-  }, [disabled]);
-  React.useEffect(() => {
-    if (disabled || !open) {
-      return undefined;
+
+  // Safari may randomly scroll to the bottom of the page if an input inside a popup has focus
+  // when the popup unmounts from the DOM.
+  // By blurring it before the popup unmounts, we can prevent this behavior.
+  (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
+    if (!_detectBrowser.isWebKit || open || !floating) {
+      return;
     }
-    function handlePointerDown(event) {
-      const target = (0, _utils.getTarget)(event);
-      if (target?.closest(`[${_constants.CLICK_TRIGGER_IDENTIFIER}]`)) {
-        isPointerDownRef.current = true;
-      }
+    const activeEl = (0, _utils.activeElement)((0, _owner.ownerDocument)(floating));
+    if (!(0, _dom.isHTMLElement)(activeEl) || !(0, _utils.isTypeableElement)(activeEl)) {
+      return;
     }
-    const doc = (0, _utils.getDocument)(floatingFocusElement);
-    doc.addEventListener('pointerdown', handlePointerDown, true);
-    return () => {
-      doc.removeEventListener('pointerdown', handlePointerDown, true);
-    };
-  }, [disabled, open, floatingFocusElement]);
-
+    if ((0, _utils.contains)(floating, activeEl)) {
+      activeEl.blur();
+    }
+  }, [open, floating]);
   // Synchronize the `context` & `modal` value to the FloatingPortal context.
   // It will decide whether or not it needs to render its own guards.
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
-    if (disabled) {
-      return undefined;
-    }
-    if (!portalContext) {
+    if (disabled || !portalContext) {
       return undefined;
     }
     portalContext.setFocusManagerState({
@@ -547,6 +533,8 @@ function FloatingFocusManager(props) {
       portalContext.setFocusManagerState(null);
     };
   }, [disabled, portalContext, modal, open, store, closeOnFocusOut, domReference]);
+
+  // Keep the floating element tabIndex in sync and clear stale focus records.
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
     if (disabled || !floatingFocusElement) {
       return undefined;

package/floating-ui-react/components/FloatingPortal.d.ts

@@ -5,8 +5,8 @@ type FocusManagerState = null | {
   modal: boolean;
   open: boolean;
   onOpenChange(open: boolean, data?: {
-    reason?: string;
-    event?: Event;
+    reason?: string | undefined;
+    event?: Event | undefined;
   }): void;
   domReference: Element | null;
   closeOnFocusOut: boolean;
@@ -20,11 +20,10 @@ export declare const usePortalContext: () => {
   afterOutsideRef: React.RefObject<HTMLSpanElement | null>;
 } | null;
 export interface UseFloatingPortalNodeProps {
-  ref?: React.Ref<HTMLDivElement>;
-  container?: HTMLElement | ShadowRoot | null | React.RefObject<HTMLElement | ShadowRoot | null>;
-  componentProps?: useRenderElement.ComponentProps<any>;
-  elementProps?: React.HTMLAttributes<HTMLDivElement>;
-  elementState?: Record<string, unknown>;
+  ref?: React.Ref<HTMLDivElement> | undefined;
+  container?: (HTMLElement | ShadowRoot | null | React.RefObject<HTMLElement | ShadowRoot | null>) | undefined;
+  componentProps?: useRenderElement.ComponentProps<any> | undefined;
+  elementProps?: React.HTMLAttributes<HTMLDivElement> | undefined;
 }
 export interface UseFloatingPortalNodeResult {
   portalNode: HTMLElement | null;
@@ -40,15 +39,15 @@ export declare function useFloatingPortalNode(props?: UseFloatingPortalNodeProps
  * @see https://floating-ui.com/docs/FloatingPortal
  * @internal
  */
-export declare const FloatingPortal: React.ForwardRefExoticComponent<FloatingPortal.Props<any> & {
-  renderGuards?: boolean;
-} & React.RefAttributes<HTMLDivElement>>;
+export declare const FloatingPortal: React.ForwardRefExoticComponent<Omit<FloatingPortal.Props<any> & {
+  renderGuards?: boolean | undefined;
+}, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export declare namespace FloatingPortal {
   interface Props<State> extends BaseUIComponentProps<'div', State> {
     /**
      * A parent element to render the portal element into.
      */
-    container?: UseFloatingPortalNodeProps['container'];
+    container?: UseFloatingPortalNodeProps['container'] | undefined;
   }
 }
 export {};

package/floating-ui-react/components/FloatingPortal.js

@@ -13,6 +13,7 @@ var ReactDOM = _interopRequireWildcard(require("react-dom"));
 var _dom = require("@floating-ui/utils/dom");
 var _useId = require("@base-ui/utils/useId");
 var _useIsoLayoutEffect = require("@base-ui/utils/useIsoLayoutEffect");
+var _useStableCallback = require("@base-ui/utils/useStableCallback");
 var _FocusGuard = require("../../utils/FocusGuard");
 var _utils = require("../utils");
 var _createBaseUIEventDetails = require("../../utils/createBaseUIEventDetails");
@@ -31,14 +32,21 @@ function useFloatingPortalNode(props = {}) {
     ref,
     container: containerProp,
     componentProps = _constants.EMPTY_OBJECT,
-    elementProps,
-    elementState
+    elementProps
   } = props;
   const uniqueId = (0, _useId.useId)();
   const portalContext = usePortalContext();
   const parentPortalNode = portalContext?.portalNode;
   const [containerElement, setContainerElement] = React.useState(null);
   const [portalNode, setPortalNode] = React.useState(null);
+  const setPortalNodeRef = (0, _useStableCallback.useStableCallback)(node => {
+    if (node !== null) {
+      // the useIsoLayoutEffect below watching containerProp / parentPortalNode
+      // sets setPortalNode(null) when the container becomes null or changes.
+      // So even though the ref callback now ignores null, the portal node still gets cleared.
+      setPortalNode(node);
+    }
+  });
   const containerRef = React.useRef(null);
   (0, _useIsoLayoutEffect.useIsoLayoutEffect)(() => {
     // Wait for the container to be resolved if explicitly `null`.
@@ -71,8 +79,7 @@ function useFloatingPortalNode(props = {}) {
     }
   }, [containerProp, parentPortalNode, uniqueId]);
   const portalElement = (0, _useRenderElement.useRenderElement)('div', componentProps, {
-    ref: [ref, setPortalNode],
-    state: elementState,
+    ref: [ref, setPortalNodeRef],
     props: [{
       id: uniqueId,
       [attr]: ''
@@ -134,7 +141,7 @@ const FloatingPortal = exports.FloatingPortal = /*#__PURE__*/React.forwardRef(fu
     // portal has already been focused, either by tabbing into a focus trap
     // element outside or using the mouse.
     function onFocus(event) {
-      if (portalNode && (0, _utils.isOutsideEvent)(event)) {
+      if (portalNode && event.relatedTarget && (0, _utils.isOutsideEvent)(event)) {
         const focusing = event.type === 'focusin';
         const manageFocus = focusing ? _utils.enableFocusInside : _utils.disableFocusInside;
         manageFocus(portalNode);

package/floating-ui-react/components/FloatingTree.d.ts

@@ -27,7 +27,7 @@ export interface FloatingNodeProps {
 export declare function FloatingNode(props: FloatingNodeProps): React.JSX.Element;
 export interface FloatingTreeProps {
   children?: React.ReactNode;
-  externalTree?: FloatingTreeStore;
+  externalTree?: FloatingTreeStore | undefined;
 }
 /**
  * Provides context for nested floating elements when they are not children of