@base-ui/react 1.0.0-rc.2 → 1.1.0

package/esm/tabs/indicator/TabsIndicator.js

@@ -10,6 +10,7 @@ import { tabsStateAttributesMapping } from "../root/stateAttributesMapping.js";
 import { useTabsListContext } from "../list/TabsListContext.js";
 import { script as prehydrationScript } from "./prehydrationScript.min.js";
 import { TabsIndicatorCssVars } from "./TabsIndicatorCssVars.js";
+import { useCSPContext } from "../../csp-provider/CSPContext.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const stateAttributesMapping = {
   ...tabsStateAttributesMapping,
@@ -30,6 +31,9 @@ export const TabsIndicator = /*#__PURE__*/React.forwardRef(function TabIndicator
     renderBeforeHydration = false,
     ...elementProps
   } = componentProps;
+  const {
+    nonce
+  } = useCSPContext();
   const {
     getTabElementBySelectedValue,
     orientation,
@@ -141,7 +145,9 @@ export const TabsIndicator = /*#__PURE__*/React.forwardRef(function TabIndicator
   }
   return /*#__PURE__*/_jsxs(React.Fragment, {
     children: [element, !isMounted && renderBeforeHydration && /*#__PURE__*/_jsx("script", {
+      nonce: nonce
       // eslint-disable-next-line react/no-danger
+      ,
       dangerouslySetInnerHTML: {
         __html: prehydrationScript
       },

package/esm/tabs/list/TabsList.d.ts

@@ -7,7 +7,7 @@ import type { TabsRoot } from "../root/TabsRoot.js";
  *
  * Documentation: [Base UI Tabs](https://base-ui.com/react/components/tabs)
  */
-export declare const TabsList: React.ForwardRefExoticComponent<TabsListProps & React.RefAttributes<HTMLDivElement>>;
+export declare const TabsList: React.ForwardRefExoticComponent<Omit<TabsListProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface TabsListState extends TabsRoot.State {}
 export interface TabsListProps extends BaseUIComponentProps<'div', TabsList.State> {
   /**

package/esm/tabs/panel/TabsPanel.d.ts

@@ -8,7 +8,7 @@ import type { TabsTab } from "../tab/TabsTab.js";
  *
  * Documentation: [Base UI Tabs](https://base-ui.com/react/components/tabs)
  */
-export declare const TabsPanel: React.ForwardRefExoticComponent<TabsPanelProps & React.RefAttributes<HTMLDivElement>>;
+export declare const TabsPanel: React.ForwardRefExoticComponent<Omit<TabsPanelProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface TabsPanelMetadata {
   id?: string;
   value: TabsTab.Value;

package/esm/tabs/root/TabsRoot.d.ts

@@ -9,7 +9,7 @@ import { REASONS } from "../../utils/reasons.js";
  *
  * Documentation: [Base UI Tabs](https://base-ui.com/react/components/tabs)
  */
-export declare const TabsRoot: React.ForwardRefExoticComponent<TabsRootProps & React.RefAttributes<HTMLDivElement>>;
+export declare const TabsRoot: React.ForwardRefExoticComponent<Omit<TabsRootProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export type TabsRootOrientation = BaseOrientation;
 export interface TabsRootState {
   orientation: TabsRoot.Orientation;

package/esm/tabs/tab/TabsTab.d.ts

@@ -7,7 +7,7 @@ import type { TabsRoot } from "../root/TabsRoot.js";
  *
  * Documentation: [Base UI Tabs](https://base-ui.com/react/components/tabs)
  */
-export declare const TabsTab: React.ForwardRefExoticComponent<TabsTabProps & React.RefAttributes<Element>>;
+export declare const TabsTab: React.ForwardRefExoticComponent<Omit<TabsTabProps, "ref"> & React.RefAttributes<HTMLElement>>;
 export type TabsTabValue = any | null;
 export type TabsTabActivationDirection = 'left' | 'right' | 'up' | 'down' | 'none';
 export interface TabsTabPosition {

package/esm/toast/action/ToastAction.d.ts

@@ -6,7 +6,7 @@ import type { BaseUIComponentProps, NativeButtonProps } from "../../utils/types.
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastAction: React.ForwardRefExoticComponent<ToastActionProps & React.RefAttributes<HTMLButtonElement>>;
+export declare const ToastAction: React.ForwardRefExoticComponent<Omit<ToastActionProps, "ref"> & React.RefAttributes<HTMLButtonElement>>;
 export interface ToastActionState {
   /**
    * The type of the toast.

package/esm/toast/arrow/ToastArrow.d.ts

@@ -7,7 +7,7 @@ import type { Side, Align } from "../../utils/useAnchorPositioning.js";
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastArrow: React.ForwardRefExoticComponent<ToastArrowProps & React.RefAttributes<HTMLDivElement>>;
+export declare const ToastArrow: React.ForwardRefExoticComponent<Omit<ToastArrowProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ToastArrowState {
   side: Side;
   align: Align;

package/esm/toast/close/ToastClose.d.ts

@@ -6,7 +6,7 @@ import type { BaseUIComponentProps, NativeButtonProps } from "../../utils/types.
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastClose: React.ForwardRefExoticComponent<ToastCloseProps & React.RefAttributes<HTMLButtonElement>>;
+export declare const ToastClose: React.ForwardRefExoticComponent<Omit<ToastCloseProps, "ref"> & React.RefAttributes<HTMLButtonElement>>;
 export interface ToastCloseState {
   /**
    * The type of the toast.

package/esm/toast/content/ToastContent.d.ts

@@ -6,7 +6,7 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastContent: React.ForwardRefExoticComponent<ToastContentProps & React.RefAttributes<HTMLDivElement>>;
+export declare const ToastContent: React.ForwardRefExoticComponent<Omit<ToastContentProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ToastContentState {
   /**
    * Whether the toast viewport is expanded.

package/esm/toast/description/ToastDescription.d.ts

@@ -7,7 +7,7 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastDescription: React.ForwardRefExoticComponent<ToastDescriptionProps & React.RefAttributes<HTMLParagraphElement>>;
+export declare const ToastDescription: React.ForwardRefExoticComponent<Omit<ToastDescriptionProps, "ref"> & React.RefAttributes<HTMLParagraphElement>>;
 export interface ToastDescriptionState {
   /**
    * The type of the toast.

package/esm/toast/portal/ToastPortal.d.ts

@@ -6,7 +6,7 @@ import { FloatingPortalLite } from "../../utils/FloatingPortalLite.js";
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastPortal: import("react").ForwardRefExoticComponent<FloatingPortalLite.Props<any> & import("react").RefAttributes<HTMLDivElement>>;
+export declare const ToastPortal: import("react").ForwardRefExoticComponent<Omit<FloatingPortalLite.Props<any>, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
 export declare namespace ToastPortal {
   interface State {}
 }

package/esm/toast/positioner/ToastPositioner.d.ts

@@ -8,7 +8,7 @@ import type { ToastObject } from "../useToastManager.js";
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastPositioner: React.ForwardRefExoticComponent<ToastPositionerProps & React.RefAttributes<HTMLDivElement>>;
+export declare const ToastPositioner: React.ForwardRefExoticComponent<Omit<ToastPositionerProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ToastPositionerState {
   side: Side;
   align: Align;

package/esm/toast/provider/ToastProvider.js

@@ -1,6 +1,7 @@
 'use client';
 
 import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 import { ownerDocument } from '@base-ui/utils/owner';
 import { useStableCallback } from '@base-ui/utils/useStableCallback';
 import { generateId } from '@base-ui/utils/generateId';
@@ -196,10 +197,48 @@ export const ToastProvider = function ToastProvider(props) {
     return id;
   });
   const update = useStableCallback((id, updates) => {
-    setToasts(prev => prev.map(toast => toast.id === id ? {
-      ...toast,
+    const prevToast = toasts.find(toast => toast.id === id) ?? null;
+    const nextToast = prevToast ? {
+      ...prevToast,
       ...updates
-    } : toast));
+    } : null;
+
+    // Avoid race conditions if `update()` is called multiple times in a row
+    ReactDOM.flushSync(() => {
+      setToasts(prev => prev.map(toast => toast.id === id ? {
+        ...toast,
+        ...updates
+      } : toast));
+    });
+    if (!nextToast) {
+      return;
+    }
+    const nextTimeout = nextToast.timeout ?? timeout;
+    const prevTimeout = prevToast?.timeout ?? timeout;
+    const timeoutUpdated = Object.hasOwn(updates, 'timeout');
+    const shouldHaveTimer = nextToast.transitionStatus !== 'ending' && nextToast.type !== 'loading' && nextTimeout > 0;
+    const hasTimer = timersRef.current.has(id);
+    const timeoutChanged = prevTimeout !== nextTimeout;
+    const wasLoading = prevToast?.type === 'loading';
+    if (!shouldHaveTimer && hasTimer) {
+      const timer = timersRef.current.get(id);
+      timer?.timeout?.clear();
+      timersRef.current.delete(id);
+      return;
+    }
+
+    // Schedule or reschedule timer if needed
+    if (shouldHaveTimer && (!hasTimer || timeoutChanged || timeoutUpdated || wasLoading)) {
+      const timer = timersRef.current.get(id);
+      if (timer) {
+        timer.timeout?.clear();
+        timersRef.current.delete(id);
+      }
+      scheduleTimer(id, nextTimeout, () => close(id));
+      if (hovering || focused || !windowFocusedRef.current) {
+        pauseTimers();
+      }
+    }
   });
   const promise = useStableCallback((promiseValue, options) => {
     // Create a loading toast (which does not auto-dismiss).
@@ -212,29 +251,17 @@ export const ToastProvider = function ToastProvider(props) {
       const successOptions = resolvePromiseOptions(options.success, result);
       update(id, {
         ...successOptions,
-        type: 'success'
+        type: 'success',
+        timeout: successOptions.timeout
       });
-      const successTimeout = successOptions.timeout ?? timeout;
-      if (successTimeout > 0) {
-        scheduleTimer(id, successTimeout, () => close(id));
-      }
-      if (hovering || focused || !windowFocusedRef.current) {
-        pauseTimers();
-      }
       return result;
     }).catch(error => {
       const errorOptions = resolvePromiseOptions(options.error, error);
       update(id, {
         ...errorOptions,
-        type: 'error'
+        type: 'error',
+        timeout: errorOptions.timeout
       });
-      const errorTimeout = errorOptions.timeout ?? timeout;
-      if (errorTimeout > 0) {
-        scheduleTimer(id, errorTimeout, () => close(id));
-      }
-      if (hovering || focused || !windowFocusedRef.current) {
-        pauseTimers();
-      }
       return Promise.reject(error);
     });
 

package/esm/toast/root/ToastRoot.d.ts

@@ -8,7 +8,7 @@ import type { TransitionStatus } from "../../utils/useTransitionStatus.js";
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastRoot: React.ForwardRefExoticComponent<ToastRootProps & React.RefAttributes<HTMLDivElement>>;
+export declare const ToastRoot: React.ForwardRefExoticComponent<Omit<ToastRootProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export type ToastRootToastObject<Data extends object = any> = ToastObjectType<Data>;
 export interface ToastRootState {
   transitionStatus: TransitionStatus;

package/esm/toast/title/ToastTitle.d.ts

@@ -6,7 +6,7 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastTitle: React.ForwardRefExoticComponent<ToastTitleProps & React.RefAttributes<HTMLHeadingElement>>;
+export declare const ToastTitle: React.ForwardRefExoticComponent<Omit<ToastTitleProps, "ref"> & React.RefAttributes<HTMLHeadingElement>>;
 export interface ToastTitleState {
   /**
    * The type of the toast.

package/esm/toast/viewport/ToastViewport.d.ts

@@ -6,7 +6,7 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  *
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
-export declare const ToastViewport: React.ForwardRefExoticComponent<ToastViewportProps & React.RefAttributes<HTMLDivElement>>;
+export declare const ToastViewport: React.ForwardRefExoticComponent<Omit<ToastViewportProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ToastViewportState {
   /**
    * Whether toasts are expanded in the viewport.

package/esm/toggle/Toggle.d.ts

@@ -8,7 +8,7 @@ import { REASONS } from "../utils/reasons.js";
  *
  * Documentation: [Base UI Toggle](https://base-ui.com/react/components/toggle)
  */
-export declare const Toggle: React.ForwardRefExoticComponent<ToggleProps & React.RefAttributes<HTMLButtonElement>>;
+export declare const Toggle: React.ForwardRefExoticComponent<Omit<ToggleProps, "ref"> & React.RefAttributes<HTMLButtonElement>>;
 export interface ToggleState {
   /**
    * Whether the toggle is currently pressed.

package/esm/toggle-group/ToggleGroup.d.ts

@@ -7,7 +7,7 @@ import { REASONS } from "../utils/reasons.js";
  *
  * Documentation: [Base UI Toggle Group](https://base-ui.com/react/components/toggle-group)
  */
-export declare const ToggleGroup: React.ForwardRefExoticComponent<ToggleGroupProps & React.RefAttributes<HTMLDivElement>>;
+export declare const ToggleGroup: React.ForwardRefExoticComponent<Omit<ToggleGroupProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ToggleGroupState {
   /**
    * Whether the component should ignore user interaction.

package/esm/toolbar/button/ToolbarButton.d.ts

@@ -7,7 +7,7 @@ import type { ToolbarRoot } from "../root/ToolbarRoot.js";
  *
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
-export declare const ToolbarButton: React.ForwardRefExoticComponent<ToolbarButtonProps & React.RefAttributes<HTMLButtonElement>>;
+export declare const ToolbarButton: React.ForwardRefExoticComponent<Omit<ToolbarButtonProps, "ref"> & React.RefAttributes<HTMLButtonElement>>;
 export interface ToolbarButtonState extends ToolbarRoot.State {
   disabled: boolean;
   focusable: boolean;

package/esm/toolbar/group/ToolbarGroup.d.ts

@@ -7,7 +7,7 @@ import type { ToolbarRoot } from "../root/ToolbarRoot.js";
  *
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
-export declare const ToolbarGroup: React.ForwardRefExoticComponent<ToolbarGroupProps & React.RefAttributes<HTMLElement>>;
+export declare const ToolbarGroup: React.ForwardRefExoticComponent<Omit<ToolbarGroupProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ToolbarGroupProps extends BaseUIComponentProps<'div', ToolbarRoot.State> {
   /**
    * When `true` all toolbar items in the group are disabled.

package/esm/toolbar/input/ToolbarInput.d.ts

@@ -7,7 +7,7 @@ import type { ToolbarRoot } from "../root/ToolbarRoot.js";
  *
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
-export declare const ToolbarInput: React.ForwardRefExoticComponent<ToolbarInputProps & React.RefAttributes<HTMLInputElement>>;
+export declare const ToolbarInput: React.ForwardRefExoticComponent<Omit<ToolbarInputProps, "ref"> & React.RefAttributes<HTMLInputElement>>;
 export interface ToolbarInputState extends ToolbarRoot.State {
   disabled: boolean;
   focusable: boolean;

package/esm/toolbar/link/ToolbarLink.d.ts

@@ -7,7 +7,7 @@ import type { ToolbarRoot } from "../root/ToolbarRoot.js";
  *
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
-export declare const ToolbarLink: React.ForwardRefExoticComponent<ToolbarLinkProps & React.RefAttributes<HTMLAnchorElement>>;
+export declare const ToolbarLink: React.ForwardRefExoticComponent<Omit<ToolbarLinkProps, "ref"> & React.RefAttributes<HTMLAnchorElement>>;
 export interface ToolbarLinkState {
   orientation: ToolbarRoot.Orientation;
 }

package/esm/toolbar/root/ToolbarRoot.d.ts

@@ -6,7 +6,7 @@ import { BaseUIComponentProps, Orientation as BaseOrientation } from "../../util
  *
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
-export declare const ToolbarRoot: React.ForwardRefExoticComponent<ToolbarRootProps & React.RefAttributes<HTMLDivElement>>;
+export declare const ToolbarRoot: React.ForwardRefExoticComponent<Omit<ToolbarRootProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ToolbarRootItemMetadata {
   focusableWhenDisabled: boolean;
 }

package/esm/toolbar/separator/ToolbarSeparator.d.ts

@@ -7,7 +7,7 @@ import { Separator } from "../../separator/index.js";
  *
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
-export declare const ToolbarSeparator: React.ForwardRefExoticComponent<ToolbarSeparatorProps & React.RefAttributes<HTMLDivElement>>;
+export declare const ToolbarSeparator: React.ForwardRefExoticComponent<Omit<ToolbarSeparatorProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ToolbarSeparatorProps extends BaseUIComponentProps<'div', Separator.State>, Separator.Props {}
 export declare namespace ToolbarSeparator {
   type Props = ToolbarSeparatorProps;

package/esm/tooltip/arrow/TooltipArrow.d.ts

@@ -7,7 +7,7 @@ import type { Side, Align } from "../../utils/useAnchorPositioning.js";
  *
  * Documentation: [Base UI Tooltip](https://base-ui.com/react/components/tooltip)
  */
-export declare const TooltipArrow: React.ForwardRefExoticComponent<TooltipArrowProps & React.RefAttributes<HTMLDivElement>>;
+export declare const TooltipArrow: React.ForwardRefExoticComponent<Omit<TooltipArrowProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface TooltipArrowState {
   /**
    * Whether the tooltip is currently open.

package/esm/tooltip/popup/TooltipPopup.d.ts

@@ -8,7 +8,7 @@ import type { TransitionStatus } from "../../utils/useTransitionStatus.js";
  *
  * Documentation: [Base UI Tooltip](https://base-ui.com/react/components/tooltip)
  */
-export declare const TooltipPopup: React.ForwardRefExoticComponent<TooltipPopupProps & React.RefAttributes<HTMLDivElement>>;
+export declare const TooltipPopup: React.ForwardRefExoticComponent<Omit<TooltipPopupProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface TooltipPopupState {
   /**
    * Whether the tooltip is currently open.

package/esm/tooltip/popup/TooltipPopup.js

@@ -7,10 +7,8 @@ import { popupStateMapping as baseMapping } from "../../utils/popupStateMapping.
 import { transitionStatusMapping } from "../../utils/stateAttributesMapping.js";
 import { useOpenChangeComplete } from "../../utils/useOpenChangeComplete.js";
 import { useRenderElement } from "../../utils/useRenderElement.js";
-import { usePopupAutoResize } from "../../utils/usePopupAutoResize.js";
 import { getDisabledMountTransitionStyles } from "../../utils/getDisabledMountTransitionStyles.js";
 import { useHoverFloatingInteraction } from "../../floating-ui-react/index.js";
-import { useDirection } from "../../direction-provider/index.js";
 const stateAttributesMapping = {
   ...baseMapping,
   ...transitionStatusMapping
@@ -34,15 +32,10 @@ export const TooltipPopup = /*#__PURE__*/React.forwardRef(function TooltipPopup(
     align
   } = useTooltipPositionerContext();
   const open = store.useState('open');
-  const mounted = store.useState('mounted');
   const instantType = store.useState('instantType');
   const transitionStatus = store.useState('transitionStatus');
   const popupProps = store.useState('popupProps');
-  const payload = store.useState('payload');
-  const popupElement = store.useState('popupElement');
-  const positionerElement = store.useState('positionerElement');
   const floatingContext = store.useState('floatingRootContext');
-  const direction = useDirection();
   useOpenChangeComplete({
     open,
     ref: store.context.popupRef,
@@ -52,30 +45,6 @@ export const TooltipPopup = /*#__PURE__*/React.forwardRef(function TooltipPopup(
       }
     }
   });
-  function handleMeasureLayout() {
-    floatingContext.context.events.emit('measure-layout');
-  }
-  function handleMeasureLayoutComplete(previousDimensions, nextDimensions) {
-    floatingContext.context.events.emit('measure-layout-complete', {
-      previousDimensions,
-      nextDimensions
-    });
-  }
-
-  // If there's just one trigger, we can skip the auto-resize logic as
-  // the tooltip will always be anchored to the same position.
-  const autoresizeEnabled = React.useCallback(() => store.context.triggerElements.size > 1, [store]);
-  usePopupAutoResize({
-    popupElement,
-    positionerElement,
-    mounted,
-    content: payload,
-    enabled: autoresizeEnabled,
-    onMeasureLayout: handleMeasureLayout,
-    onMeasureLayoutComplete: handleMeasureLayoutComplete,
-    side,
-    direction
-  });
   const disabled = store.useState('disabled');
   const closeDelay = store.useState('closeDelay');
   useHoverFloatingInteraction(floatingContext, {

package/esm/tooltip/portal/TooltipPortal.d.ts

@@ -7,7 +7,7 @@ import { FloatingPortalLite } from "../../utils/FloatingPortalLite.js";
  *
  * Documentation: [Base UI Tooltip](https://base-ui.com/react/components/tooltip)
  */
-export declare const TooltipPortal: React.ForwardRefExoticComponent<TooltipPortalProps & React.RefAttributes<HTMLDivElement>>;
+export declare const TooltipPortal: React.ForwardRefExoticComponent<Omit<TooltipPortalProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export declare namespace TooltipPortal {
   interface State {}
 }

package/esm/tooltip/positioner/TooltipPositioner.d.ts

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

package/esm/tooltip/positioner/TooltipPositioner.js

@@ -45,6 +45,7 @@ export const TooltipPositioner = /*#__PURE__*/React.forwardRef(function TooltipP
   const floatingRootContext = store.useState('floatingRootContext');
   const instantType = store.useState('instantType');
   const transitionStatus = store.useState('transitionStatus');
+  const hasViewport = store.useState('hasViewport');
   const positioning = useAnchorPositioning({
     anchor,
     positionMethod,
@@ -61,7 +62,7 @@ export const TooltipPositioner = /*#__PURE__*/React.forwardRef(function TooltipP
     disableAnchorTracking,
     keepMounted,
     collisionAvoidance,
-    adaptiveOrigin
+    adaptiveOrigin: hasViewport ? adaptiveOrigin : undefined
   });
   const defaultProps = React.useMemo(() => {
     const hiddenStyles = {};

package/esm/tooltip/root/TooltipRoot.d.ts

@@ -43,12 +43,10 @@ export interface TooltipRootProps<Payload = unknown> {
   trackCursorAxis?: 'none' | 'x' | 'y' | 'both';
   /**
    * A ref to imperative actions.
-   * - `unmount`: When specified, the tooltip will not be unmounted when closed.
-   * Instead, the `unmount` function must be called to unmount the tooltip manually.
-   * Useful when the tooltip's animation is controlled by an external library.
-   * - `close`: Closes the dialog imperatively when called.
+   * - `unmount`: Unmounts the tooltip popup.
+   * - `close`: Closes the tooltip imperatively when called.
    */
-  actionsRef?: React.RefObject<TooltipRoot.Actions>;
+  actionsRef?: React.RefObject<TooltipRoot.Actions | null>;
   /**
    * Whether the tooltip is disabled.
    * @default false
@@ -67,7 +65,7 @@ export interface TooltipRootProps<Payload = unknown> {
   children?: React.ReactNode | PayloadChildRenderFunction<Payload>;
   /**
    * ID of the trigger that the tooltip is associated with.
-   * This is useful in conjuntion with the `open` prop to create a controlled tooltip.
+   * This is useful in conjunction with the `open` prop to create a controlled tooltip.
    * There's no need to specify this prop when the tooltip is uncontrolled (i.e. when the `open` prop is not set).
    */
   triggerId?: string | null;

package/esm/tooltip/root/TooltipRoot.js

@@ -40,13 +40,13 @@ export function TooltipRoot(props) {
   store.useContextCallback('onOpenChange', onOpenChange);
   store.useContextCallback('onOpenChangeComplete', onOpenChangeComplete);
   const openState = store.useState('open');
+  const open = !disabled && openState;
   const activeTriggerId = store.useState('activeTriggerId');
   const payload = store.useState('payload');
   store.useSyncedValues({
     trackCursorAxis,
     disableHoverablePopup
   });
-  const open = !disabled && openState;
   useIsoLayoutEffect(() => {
     if (openState && disabled) {
       store.setOpen(false, createChangeEventDetails(REASONS.disabled));
@@ -117,7 +117,6 @@ export function TooltipRoot(props) {
   const inactiveTriggerProps = React.useMemo(() => getTriggerProps(), [getTriggerProps]);
   const popupProps = React.useMemo(() => getFloatingProps(), [getFloatingProps]);
   store.useSyncedValues({
-    floatingRootContext,
     activeTriggerProps,
     inactiveTriggerProps,
     popupProps

package/esm/tooltip/store/TooltipStore.d.ts

@@ -10,6 +10,7 @@ export type State<Payload> = PopupStoreState<Payload> & {
   disableHoverablePopup: boolean;
   openChangeReason: TooltipRoot.ChangeEventReason | null;
   closeDelay: number;
+  hasViewport: boolean;
 };
 export type Context = PopupStoreContext<TooltipRoot.ChangeEventDetails> & {
   readonly popupRef: React.RefObject<HTMLElement | null>;
@@ -22,6 +23,7 @@ declare const selectors: {
   disableHoverablePopup: (state: State<unknown>) => boolean;
   lastOpenChangeReason: (state: State<unknown>) => import("../index.js").TooltipRootChangeEventReason | null;
   closeDelay: (state: State<unknown>) => number;
+  hasViewport: (state: State<unknown>) => boolean;
   open: (state: PopupStoreState<unknown>) => boolean;
   mounted: (state: PopupStoreState<unknown>) => boolean;
   transitionStatus: (state: PopupStoreState<unknown>) => import("../../utils/useTransitionStatus.js").TransitionStatus;
@@ -33,8 +35,8 @@ declare const selectors: {
   isTriggerActive: (state: PopupStoreState<unknown>, triggerId: string | undefined) => boolean;
   isOpenedByTrigger: (state: PopupStoreState<unknown>, triggerId: string | undefined) => boolean;
   isMountedByTrigger: (state: PopupStoreState<unknown>, triggerId: string | undefined) => boolean;
-  triggerProps: (state: PopupStoreState<unknown>, isActive: boolean) => import("../../utils/types.js").HTMLProps;
-  popupProps: (state: PopupStoreState<unknown>) => import("../../utils/types.js").HTMLProps;
+  triggerProps: (state: PopupStoreState<unknown>, isActive: boolean) => import("../../index.js").HTMLProps;
+  popupProps: (state: PopupStoreState<unknown>) => import("../../index.js").HTMLProps;
   popupElement: (state: PopupStoreState<unknown>) => HTMLElement | null;
   positionerElement: (state: PopupStoreState<unknown>) => HTMLElement | null;
 };

package/esm/tooltip/store/TooltipStore.js

@@ -13,7 +13,8 @@ const selectors = {
   trackCursorAxis: createSelector(state => state.trackCursorAxis),
   disableHoverablePopup: createSelector(state => state.disableHoverablePopup),
   lastOpenChangeReason: createSelector(state => state.openChangeReason),
-  closeDelay: createSelector(state => state.closeDelay)
+  closeDelay: createSelector(state => state.closeDelay),
+  hasViewport: createSelector(state => state.hasViewport)
 };
 export class TooltipStore extends ReactStore {
   constructor(initialState) {
@@ -71,9 +72,10 @@ export class TooltipStore extends ReactStore {
   };
   static useStore(externalStore, initialState) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    const store = useRefWithInit(() => {
-      return externalStore ?? new TooltipStore(initialState);
+    const internalStore = useRefWithInit(() => {
+      return new TooltipStore(initialState);
     }).current;
+    const store = externalStore ?? internalStore;
 
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const floatingRootContext = useSyncedFloatingRootContext({
@@ -98,6 +100,7 @@ function createInitialState() {
     trackCursorAxis: 'none',
     disableHoverablePopup: false,
     openChangeReason: null,
-    closeDelay: 0
+    closeDelay: 0,
+    hasViewport: false
   };
 }

package/esm/tooltip/trigger/TooltipTrigger.js

@@ -36,8 +36,8 @@ export const TooltipTrigger = /*#__PURE__*/React.forwardRef(function TooltipTrig
   }
   const thisTriggerId = useBaseUiId(idProp);
   const isTriggerActive = store.useState('isTriggerActive', thisTriggerId);
-  const floatingRootContext = store.useState('floatingRootContext');
   const isOpenedByThisTrigger = store.useState('isOpenedByTrigger', thisTriggerId);
+  const floatingRootContext = store.useState('floatingRootContext');
   const triggerElementRef = React.useRef(null);
   const delayWithDefault = delay ?? OPEN_DELAY;
   const closeDelayWithDefault = closeDelay ?? 0;

package/esm/tooltip/viewport/TooltipViewport.d.ts

@@ -8,7 +8,7 @@ import { BaseUIComponentProps } from "../../utils/types.js";
  *
  * Documentation: [Base UI Tooltip](https://base-ui.com/react/components/tooltip)
  */
-export declare const TooltipViewport: React.ForwardRefExoticComponent<TooltipViewport.Props & React.RefAttributes<HTMLDivElement>>;
+export declare const TooltipViewport: React.ForwardRefExoticComponent<Omit<TooltipViewport.Props, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export declare namespace TooltipViewport {
   interface Props extends BaseUIComponentProps<'div', State> {
     /**