@base-ui/react 1.2.0 → 1.3.0

package/toast/positioner/ToastPositioner.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useAnchorPositioning, type Side, type Align } from "../../utils/useAnchorPositioning.js";
+import { type Side, type Align, type UseAnchorPositioningSharedParameters } from "../../utils/useAnchorPositioning.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
 import type { ToastObject } from "../useToastManager.js";
 /**
@@ -10,15 +10,24 @@ import type { ToastObject } from "../useToastManager.js";
  */
 export declare const ToastPositioner: React.ForwardRefExoticComponent<Omit<ToastPositionerProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ToastPositionerState {
+  /**
+   * The side of the anchor the component is placed on.
+   */
   side: Side;
+  /**
+   * The alignment of the component relative to the anchor.
+   */
   align: Align;
+  /**
+   * Whether the anchor element is hidden.
+   */
   anchorHidden: boolean;
 }
-export interface ToastPositionerProps extends BaseUIComponentProps<'div', ToastPositioner.State>, Omit<useAnchorPositioning.SharedParameters, 'side' | 'anchor'> {
+export interface ToastPositionerProps extends BaseUIComponentProps<'div', ToastPositionerState>, Omit<UseAnchorPositioningSharedParameters, 'side' | 'anchor'> {
   /**
    * An element to position the toast against.
    */
-  anchor?: (Element | null) | undefined;
+  anchor?: Element | null | undefined;
   /**
    * Which side of the anchor element to align the toast against.
    * May automatically change to avoid collisions.

package/toast/provider/ToastProvider.d.ts

@@ -6,6 +6,7 @@ import type { ToastManager } from "../createToastManager.js";
  * Documentation: [Base UI Toast](https://base-ui.com/react/components/toast)
  */
 export declare const ToastProvider: React.FC<ToastProvider.Props>;
+export interface ToastProviderState {}
 export interface ToastProviderProps {
   children?: React.ReactNode;
   /**
@@ -26,5 +27,6 @@ export interface ToastProviderProps {
   toastManager?: ToastManager | undefined;
 }
 export declare namespace ToastProvider {
+  type State = ToastProviderState;
   type Props = ToastProviderProps;
 }

package/toast/provider/ToastProvider.js

@@ -48,7 +48,7 @@ const ToastProvider = exports.ToastProvider = function ToastProvider(props) {
         store.promiseToast(options.promise, options);
       } else if (action === 'update' && id) {
         store.updateToast(id, options);
-      } else if (action === 'close' && id) {
+      } else if (action === 'close') {
         store.closeToast(id);
       } else {
         store.addToast(options);

package/toast/root/ToastRoot.d.ts

@@ -11,19 +11,32 @@ import type { TransitionStatus } from "../../utils/useTransitionStatus.js";
 export declare const ToastRoot: React.ForwardRefExoticComponent<Omit<ToastRootProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export type ToastRootToastObject<Data extends object = any> = ToastObjectType<Data>;
 export interface ToastRootState {
+  /**
+   * The transition status of the component.
+   */
   transitionStatus: TransitionStatus;
-  /** Whether the toasts in the viewport are expanded. */
+  /**
+   * Whether the toasts in the viewport are expanded.
+   */
   expanded: boolean;
-  /** Whether the toast was removed due to exceeding the limit. */
+  /**
+   * Whether the toast was removed due to exceeding the limit.
+   */
   limited: boolean;
-  /** The type of the toast. */
+  /**
+   * The type of the toast.
+   */
   type: string | undefined;
-  /** Whether the toast is being swiped. */
+  /**
+   * Whether the toast is being swiped.
+   */
   swiping: boolean;
-  /** The direction the toast is being swiped. */
+  /**
+   * The direction the toast is being swiped.
+   */
   swipeDirection: 'up' | 'down' | 'left' | 'right' | undefined;
 }
-export interface ToastRootProps extends BaseUIComponentProps<'div', ToastRoot.State> {
+export interface ToastRootProps extends BaseUIComponentProps<'div', ToastRootState> {
   /**
    * The toast to render.
    */
@@ -32,7 +45,7 @@ export interface ToastRootProps extends BaseUIComponentProps<'div', ToastRoot.St
    * Direction(s) in which the toast can be swiped to dismiss.
    * @default ['down', 'right']
    */
-  swipeDirection?: ('up' | 'down' | 'left' | 'right' | ('up' | 'down' | 'left' | 'right')[]) | undefined;
+  swipeDirection?: 'up' | 'down' | 'left' | 'right' | ('up' | 'down' | 'left' | 'right')[] | undefined;
 }
 export declare namespace ToastRoot {
   type ToastObject<Data extends object = any> = ToastRootToastObject<Data>;

package/toast/root/ToastRoot.js

@@ -19,6 +19,7 @@ var _ToastProviderContext = require("../provider/ToastProviderContext");
 var _useRenderElement = require("../../utils/useRenderElement");
 var _useOpenChangeComplete = require("../../utils/useOpenChangeComplete");
 var _ToastRootCssVars = require("./ToastRootCssVars");
+var _constants = require("../../utils/constants");
 var _jsxRuntime = require("react/jsx-runtime");
 const stateAttributesMapping = {
   ..._stateAttributesMapping.transitionStatusMapping,
@@ -32,6 +33,7 @@ const SWIPE_THRESHOLD = 40;
 const REVERSE_CANCEL_THRESHOLD = 10;
 const OPPOSITE_DIRECTION_DAMPING_FACTOR = 0.5;
 const MIN_DRAG_THRESHOLD = 1;
+const TOAST_SWIPE_IGNORE_SELECTOR = `${_constants.BASE_UI_SWIPE_IGNORE_SELECTOR},${_constants.LEGACY_SWIPE_IGNORE_SELECTOR}`;
 function getDisplacement(direction, deltaX, deltaY) {
   switch (direction) {
     case 'up':
@@ -210,7 +212,7 @@ const ToastRoot = exports.ToastRoot = /*#__PURE__*/React.forwardRef(function Toa
       store.pauseTimers();
     }
     const target = (0, _utils.getTarget)(event.nativeEvent);
-    const isInteractiveElement = target ? target.closest('button,a,input,textarea,[role="button"],[data-swipe-ignore]') : false;
+    const isInteractiveElement = target ? target.closest(`button,a,input,textarea,[role="button"],${TOAST_SWIPE_IGNORE_SELECTOR}`) : false;
     if (isInteractiveElement) {
       return;
     }

package/toast/store.d.ts

@@ -38,7 +38,7 @@ export declare class ToastStore extends ReactStore<State, {}, typeof selectors>
   addToast: <Data extends object>(toast: ToastManagerAddOptions<Data>) => string;
   updateToast: <Data extends object>(id: string, updates: ToastManagerUpdateOptions<Data>) => void;
   updateToastInternal: <Data extends object>(id: string, updates: ToastInternalUpdateOptions<Data>) => void;
-  closeToast: (toastId: string) => void;
+  closeToast: (toastId?: string) => void;
   promiseToast: <Value, Data extends object>(promiseValue: Promise<Value>, options: ToastManagerPromiseOptions<Value, Data>) => Promise<Value>;
   pauseTimers(): void;
   resumeTimers(): void;

package/toast/store.js

@@ -183,15 +183,33 @@ class ToastStore extends _store.ReactStore {
     }
   };
   closeToast = toastId => {
-    const toast = selectors.toast(this.state, toastId);
-    toast?.onClose?.();
+    const closeAll = toastId === undefined;
     const {
       limit,
       toasts
     } = this.state;
+    let toastsToClose;
+    if (closeAll) {
+      toastsToClose = toasts;
+      this.timers.forEach(timer => {
+        timer.timeout?.clear();
+      });
+      this.timers.clear();
+    } else {
+      const toast = selectors.toast(this.state, toastId);
+      if (!toast) {
+        return;
+      }
+      toastsToClose = [toast];
+      const timer = this.timers.get(toastId);
+      if (timer?.timeout) {
+        timer.timeout.clear();
+        this.timers.delete(toastId);
+      }
+    }
     let activeIndex = 0;
     const newToasts = toasts.map(item => {
-      if (item.id === toastId) {
+      if (closeAll || item.id === toastId) {
         return {
           ...item,
           transitionStatus: 'ending',
@@ -208,13 +226,20 @@ class ToastStore extends _store.ReactStore {
         limited: isLimited
       } : item;
     });
-    const timer = this.timers.get(toastId);
-    if (timer && timer.timeout) {
-      timer.timeout.clear();
-      this.timers.delete(toastId);
+    const updates = {
+      toasts: newToasts
+    };
+    if (closeAll || toasts.length === 1) {
+      updates.hovering = false;
+      updates.focused = false;
     }
+    this.update(updates);
+    toastsToClose.forEach(toast => {
+      if (toast.transitionStatus !== 'ending') {
+        toast.onClose?.();
+      }
+    });
     this.handleFocusManagement(toastId);
-    this.setToasts(newToasts);
   };
   promiseToast = (promiseValue, options) => {
     // Create a loading toast (which does not auto-dismiss).
@@ -327,6 +352,10 @@ class ToastStore extends _store.ReactStore {
     if (!this.state.viewport || !(0, _utils.contains)(this.state.viewport, activeEl) || !(0, _focusVisible.isFocusVisible)(activeEl)) {
       return;
     }
+    if (toastId === undefined) {
+      this.restoreFocusToPrevElement();
+      return;
+    }
     const toasts = selectors.toasts(this.state);
     const currentIndex = selectors.toastIndex(this.state, toastId);
     let nextToast = null;

package/toast/title/ToastTitle.d.ts

@@ -13,7 +13,7 @@ export interface ToastTitleState {
    */
   type: string | undefined;
 }
-export interface ToastTitleProps extends BaseUIComponentProps<'h2', ToastTitle.State> {}
+export interface ToastTitleProps extends BaseUIComponentProps<'h2', ToastTitleState> {}
 export declare namespace ToastTitle {
   type State = ToastTitleState;
   type Props = ToastTitleProps;

package/toast/useToastManager.d.ts

@@ -38,7 +38,7 @@ export interface ToastObject<Data extends object> {
    * - `high` - The toast will be announced urgently.
    * @default 'low'
    */
-  priority?: ('low' | 'high') | undefined;
+  priority?: 'low' | 'high' | undefined;
   /**
    * The transition status of the toast.
    */
@@ -76,12 +76,12 @@ export interface ToastManagerPositionerProps extends Omit<ToastPositionerProps,
   /**
    * An element to position the toast against.
    */
-  anchor?: (Element | null) | undefined;
+  anchor?: Element | null | undefined;
 }
 export interface UseToastManagerReturnValue<Data extends object = any> {
   toasts: ToastObject<Data>[];
   add: <T extends Data = Data>(options: ToastManagerAddOptions<T>) => string;
-  close: (toastId: string) => void;
+  close: (toastId?: string) => void;
   update: <T extends Data = Data>(toastId: string, options: ToastManagerUpdateOptions<T>) => void;
   promise: <Value, T extends Data = Data>(promise: Promise<Value>, options: ToastManagerPromiseOptions<Value, T>) => Promise<Value>;
 }

package/toast/viewport/ToastViewport.d.ts

@@ -13,7 +13,7 @@ export interface ToastViewportState {
    */
   expanded: boolean;
 }
-export interface ToastViewportProps extends BaseUIComponentProps<'div', ToastViewport.State> {}
+export interface ToastViewportProps extends BaseUIComponentProps<'div', ToastViewportState> {}
 export declare namespace ToastViewport {
   type State = ToastViewportState;
   type Props = ToastViewportProps;

package/toggle/Toggle.d.ts

@@ -21,7 +21,7 @@ export interface ToggleState {
    */
   disabled: boolean;
 }
-export interface ToggleProps<Value extends string> extends NativeButtonProps, BaseUIComponentProps<'button', Toggle.State> {
+export interface ToggleProps<Value extends string> extends NativeButtonProps, BaseUIComponentProps<'button', ToggleState> {
   /**
    * Whether the toggle button is currently pressed.
    * This is the controlled counterpart of `defaultPressed`.

package/toggle-group/ToggleGroup.d.ts

@@ -27,7 +27,7 @@ export interface ToggleGroupState {
    */
   orientation: Orientation;
 }
-export interface ToggleGroupProps<Value extends string> extends BaseUIComponentProps<'div', ToggleGroup.State> {
+export interface ToggleGroupProps<Value extends string> extends BaseUIComponentProps<'div', ToggleGroupState> {
   /**
    * The open state of the toggle group represented by an array of
    * the values of all pressed toggle buttons.

package/toolbar/button/ToolbarButton.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { BaseUIComponentProps, NativeButtonProps } from "../../utils/types.js";
-import type { ToolbarRoot } from "../root/ToolbarRoot.js";
+import type { ToolbarRootState } from "../root/ToolbarRoot.js";
 /**
  * A button that can be used as-is or as a trigger for other components.
  * Renders a `<button>` element.
@@ -8,11 +8,17 @@ import type { ToolbarRoot } from "../root/ToolbarRoot.js";
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
 export declare const ToolbarButton: React.ForwardRefExoticComponent<Omit<ToolbarButtonProps, "ref"> & React.RefAttributes<HTMLButtonElement>>;
-export interface ToolbarButtonState extends ToolbarRoot.State {
+export interface ToolbarButtonState extends ToolbarRootState {
+  /**
+   * Whether the component is disabled.
+   */
   disabled: boolean;
+  /**
+   * Whether the component remains focusable when disabled.
+   */
   focusable: boolean;
 }
-export interface ToolbarButtonProps extends NativeButtonProps, BaseUIComponentProps<'button', ToolbarButton.State> {
+export interface ToolbarButtonProps extends NativeButtonProps, BaseUIComponentProps<'button', ToolbarButtonState> {
   /**
    * When `true` the item is disabled.
    * @default false

package/toolbar/group/ToolbarGroup.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { BaseUIComponentProps } from "../../utils/types.js";
-import type { ToolbarRoot } from "../root/ToolbarRoot.js";
+import type { ToolbarRootState } from "../root/ToolbarRoot.js";
 /**
  * Groups several toolbar items or toggles.
  * Renders a `<div>` element.
@@ -8,7 +8,8 @@ import type { ToolbarRoot } from "../root/ToolbarRoot.js";
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
 export declare const ToolbarGroup: React.ForwardRefExoticComponent<Omit<ToolbarGroupProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export interface ToolbarGroupProps extends BaseUIComponentProps<'div', ToolbarRoot.State> {
+export interface ToolbarGroupState extends ToolbarRootState {}
+export interface ToolbarGroupProps extends BaseUIComponentProps<'div', ToolbarGroupState> {
   /**
    * When `true` all toolbar items in the group are disabled.
    * @default false
@@ -16,5 +17,6 @@ export interface ToolbarGroupProps extends BaseUIComponentProps<'div', ToolbarRo
   disabled?: boolean | undefined;
 }
 export declare namespace ToolbarGroup {
+  type State = ToolbarGroupState;
   type Props = ToolbarGroupProps;
 }

package/toolbar/input/ToolbarInput.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { BaseUIComponentProps } from "../../utils/types.js";
-import type { ToolbarRoot } from "../root/ToolbarRoot.js";
+import type { ToolbarRootState } from "../root/ToolbarRoot.js";
 /**
  * A native input element that integrates with Toolbar keyboard navigation.
  * Renders an `<input>` element.
@@ -8,11 +8,17 @@ import type { ToolbarRoot } from "../root/ToolbarRoot.js";
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
 export declare const ToolbarInput: React.ForwardRefExoticComponent<Omit<ToolbarInputProps, "ref"> & React.RefAttributes<HTMLInputElement>>;
-export interface ToolbarInputState extends ToolbarRoot.State {
+export interface ToolbarInputState extends ToolbarRootState {
+  /**
+   * Whether the component is disabled.
+   */
   disabled: boolean;
+  /**
+   * Whether the component remains focusable when disabled.
+   */
   focusable: boolean;
 }
-export interface ToolbarInputProps extends BaseUIComponentProps<'input', ToolbarInput.State> {
+export interface ToolbarInputProps extends BaseUIComponentProps<'input', ToolbarInputState> {
   /**
    * When `true` the item is disabled.
    * @default false

package/toolbar/link/ToolbarLink.d.ts

@@ -9,9 +9,12 @@ import type { ToolbarRoot } from "../root/ToolbarRoot.js";
  */
 export declare const ToolbarLink: React.ForwardRefExoticComponent<Omit<ToolbarLinkProps, "ref"> & React.RefAttributes<HTMLAnchorElement>>;
 export interface ToolbarLinkState {
+  /**
+   * The component orientation.
+   */
   orientation: ToolbarRoot.Orientation;
 }
-export interface ToolbarLinkProps extends BaseUIComponentProps<'a', ToolbarLink.State> {}
+export interface ToolbarLinkProps extends BaseUIComponentProps<'a', ToolbarLinkState> {}
 export declare namespace ToolbarLink {
   type State = ToolbarLinkState;
   type Props = ToolbarLinkProps;

package/toolbar/root/ToolbarRoot.d.ts

@@ -12,10 +12,16 @@ export interface ToolbarRootItemMetadata {
 }
 export type ToolbarRootOrientation = BaseOrientation;
 export interface ToolbarRootState {
+  /**
+   * Whether the component is disabled.
+   */
   disabled: boolean;
+  /**
+   * The component orientation.
+   */
   orientation: ToolbarRoot.Orientation;
 }
-export interface ToolbarRootProps extends BaseUIComponentProps<'div', ToolbarRoot.State> {
+export interface ToolbarRootProps extends BaseUIComponentProps<'div', ToolbarRootState> {
   disabled?: boolean | undefined;
   /**
    * The orientation of the toolbar.

package/toolbar/separator/ToolbarSeparator.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { BaseUIComponentProps } from "../../utils/types.js";
-import { Separator } from "../../separator/index.js";
+import { Separator, type SeparatorState } from "../../separator/index.js";
 /**
  * A separator element accessible to screen readers.
  * Renders a `<div>` element.
@@ -8,7 +8,9 @@ import { Separator } from "../../separator/index.js";
  * Documentation: [Base UI Toolbar](https://base-ui.com/react/components/toolbar)
  */
 export declare const ToolbarSeparator: React.ForwardRefExoticComponent<Omit<ToolbarSeparatorProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export interface ToolbarSeparatorProps extends BaseUIComponentProps<'div', Separator.State>, Separator.Props {}
+export interface ToolbarSeparatorState extends SeparatorState {}
+export interface ToolbarSeparatorProps extends BaseUIComponentProps<'div', ToolbarSeparatorState>, Separator.Props {}
 export declare namespace ToolbarSeparator {
+  type State = ToolbarSeparatorState;
   type Props = ToolbarSeparatorProps;
 }

package/tooltip/arrow/TooltipArrow.d.ts

@@ -13,12 +13,24 @@ export interface TooltipArrowState {
    * Whether the tooltip is currently open.
    */
   open: boolean;
+  /**
+   * The side of the anchor the component is placed on.
+   */
   side: Side;
+  /**
+   * The alignment of the component relative to the anchor.
+   */
   align: Align;
+  /**
+   * Whether the arrow cannot be centered on the anchor.
+   */
   uncentered: boolean;
+  /**
+   * Whether transitions should be skipped.
+   */
   instant: 'delay' | 'dismiss' | 'focus' | undefined;
 }
-export interface TooltipArrowProps extends BaseUIComponentProps<'div', TooltipArrow.State> {}
+export interface TooltipArrowProps extends BaseUIComponentProps<'div', TooltipArrowState> {}
 export declare namespace TooltipArrow {
   type State = TooltipArrowState;
   type Props = TooltipArrowProps;

package/tooltip/popup/TooltipPopup.d.ts

@@ -14,12 +14,24 @@ export interface TooltipPopupState {
    * Whether the tooltip is currently open.
    */
   open: boolean;
+  /**
+   * The side of the anchor the component is placed on.
+   */
   side: Side;
+  /**
+   * The alignment of the component relative to the anchor.
+   */
   align: Align;
+  /**
+   * Whether transitions should be skipped.
+   */
   instant: 'delay' | 'focus' | 'dismiss' | undefined;
+  /**
+   * The transition status of the component.
+   */
   transitionStatus: TransitionStatus;
 }
-export interface TooltipPopupProps extends BaseUIComponentProps<'div', TooltipPopup.State> {}
+export interface TooltipPopupProps extends BaseUIComponentProps<'div', TooltipPopupState> {}
 export declare namespace TooltipPopup {
   type State = TooltipPopupState;
   type Props = TooltipPopupProps;

package/tooltip/portal/TooltipPortal.d.ts

@@ -8,10 +8,8 @@ import { FloatingPortalLite } from "../../utils/FloatingPortalLite.js";
  * Documentation: [Base UI Tooltip](https://base-ui.com/react/components/tooltip)
  */
 export declare const TooltipPortal: React.ForwardRefExoticComponent<Omit<TooltipPortalProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export declare namespace TooltipPortal {
-  interface State {}
-}
-export interface TooltipPortalProps extends FloatingPortalLite.Props<TooltipPortal.State> {
+export interface TooltipPortalState {}
+export interface TooltipPortalProps extends FloatingPortalLite.Props<TooltipPortalState> {
   /**
    * Whether to keep the portal mounted in the DOM while the popup is hidden.
    * @default false
@@ -19,5 +17,6 @@ export interface TooltipPortalProps extends FloatingPortalLite.Props<TooltipPort
   keepMounted?: boolean | undefined;
 }
 export declare namespace TooltipPortal {
+  type State = TooltipPortalState;
   type Props = TooltipPortalProps;
 }

package/tooltip/positioner/TooltipPositioner.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useAnchorPositioning, type Side, type Align } from "../../utils/useAnchorPositioning.js";
+import { type Side, type Align, type UseAnchorPositioningSharedParameters } from "../../utils/useAnchorPositioning.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
 /**
  * Positions the tooltip against the trigger.
@@ -13,15 +13,24 @@ export interface TooltipPositionerState {
    * Whether the tooltip is currently open.
    */
   open: boolean;
+  /**
+   * The side of the anchor the component is placed on.
+   */
   side: Side;
+  /**
+   * The alignment of the component relative to the anchor.
+   */
   align: Align;
+  /**
+   * Whether the anchor element is hidden.
+   */
   anchorHidden: boolean;
   /**
    * Whether CSS transitions should be disabled.
    */
   instant: string | undefined;
 }
-export interface TooltipPositionerProps extends BaseUIComponentProps<'div', TooltipPositioner.State>, Omit<useAnchorPositioning.SharedParameters, 'side'> {
+export interface TooltipPositionerProps extends BaseUIComponentProps<'div', TooltipPositionerState>, Omit<UseAnchorPositioningSharedParameters, 'side'> {
   /**
    * Which side of the anchor element to align the popup against.
    * May automatically change to avoid collisions.

package/tooltip/provider/TooltipProvider.d.ts

@@ -6,6 +6,7 @@ import * as React from 'react';
  * Documentation: [Base UI Tooltip](https://base-ui.com/react/components/tooltip)
  */
 export declare const TooltipProvider: React.FC<TooltipProvider.Props>;
+export interface TooltipProviderState {}
 export interface TooltipProviderProps {
   children?: React.ReactNode;
   /**
@@ -24,5 +25,6 @@ export interface TooltipProviderProps {
   timeout?: number | undefined;
 }
 export declare namespace TooltipProvider {
+  type State = TooltipProviderState;
   type Props = TooltipProviderProps;
 }

package/tooltip/root/TooltipRoot.d.ts

@@ -40,7 +40,7 @@ export interface TooltipRootProps<Payload = unknown> {
    * Determines which axis the tooltip should track the cursor on.
    * @default 'none'
    */
-  trackCursorAxis?: ('none' | 'x' | 'y' | 'both') | undefined;
+  trackCursorAxis?: 'none' | 'x' | 'y' | 'both' | undefined;
   /**
    * A ref to imperative actions.
    * - `unmount`: Unmounts the tooltip popup.
@@ -68,12 +68,12 @@ export interface TooltipRootProps<Payload = unknown> {
    * 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) | undefined;
+  triggerId?: string | null | undefined;
   /**
    * ID of the trigger that the tooltip is associated with.
    * This is useful in conjunction with the `defaultOpen` prop to create an initially open tooltip.
    */
-  defaultTriggerId?: (string | null) | undefined;
+  defaultTriggerId?: string | null | undefined;
 }
 export interface TooltipRootActions {
   unmount: () => void;

package/tooltip/root/TooltipRoot.js

@@ -118,7 +118,7 @@ const TooltipRoot = exports.TooltipRoot = (0, _fastHooks.fastComponent)(function
   const floatingRootContext = store.useState('floatingRootContext');
   const dismiss = (0, _floatingUiReact.useDismiss)(floatingRootContext, {
     enabled: !disabled,
-    referencePress: true
+    referencePress: () => store.select('closeOnClick')
   });
   const clientPoint = (0, _floatingUiReact.useClientPoint)(floatingRootContext, {
     enabled: !disabled && trackCursorAxis !== 'none',

package/tooltip/store/TooltipStore.d.ts

@@ -9,6 +9,7 @@ export type State<Payload> = PopupStoreState<Payload> & {
   trackCursorAxis: 'none' | 'x' | 'y' | 'both';
   disableHoverablePopup: boolean;
   openChangeReason: TooltipRoot.ChangeEventReason | null;
+  closeOnClick: boolean;
   closeDelay: number;
   hasViewport: boolean;
 };
@@ -22,6 +23,7 @@ declare const selectors: {
   trackCursorAxis: (state: State<unknown>) => "none" | "both" | "x" | "y";
   disableHoverablePopup: (state: State<unknown>) => boolean;
   lastOpenChangeReason: (state: State<unknown>) => import("../index.js").TooltipRootChangeEventReason | null;
+  closeOnClick: (state: State<unknown>) => boolean;
   closeDelay: (state: State<unknown>) => number;
   hasViewport: (state: State<unknown>) => boolean;
   open: (state: {

package/tooltip/store/TooltipStore.js

@@ -20,6 +20,7 @@ const selectors = {
   trackCursorAxis: (0, _store.createSelector)(state => state.trackCursorAxis),
   disableHoverablePopup: (0, _store.createSelector)(state => state.disableHoverablePopup),
   lastOpenChangeReason: (0, _store.createSelector)(state => state.openChangeReason),
+  closeOnClick: (0, _store.createSelector)(state => state.closeOnClick),
   closeDelay: (0, _store.createSelector)(state => state.closeDelay),
   hasViewport: (0, _store.createSelector)(state => state.hasViewport)
 };
@@ -108,6 +109,7 @@ function createInitialState() {
     trackCursorAxis: 'none',
     disableHoverablePopup: false,
     openChangeReason: null,
+    closeOnClick: true,
     closeDelay: 0,
     hasViewport: false
   };

package/tooltip/trigger/TooltipTrigger.d.ts

@@ -17,7 +17,7 @@ export interface TooltipTriggerState {
    */
   open: boolean;
 }
-export interface TooltipTriggerProps<Payload = unknown> extends BaseUIComponentProps<'button', TooltipTrigger.State> {
+export interface TooltipTriggerProps<Payload = unknown> extends BaseUIComponentProps<'button', TooltipTriggerState> {
   /**
    * A handle to associate the trigger with a tooltip.
    */
@@ -31,6 +31,11 @@ export interface TooltipTriggerProps<Payload = unknown> extends BaseUIComponentP
    * @default 600
    */
   delay?: number | undefined;
+  /**
+   * Whether the tooltip should close when this trigger is clicked.
+   * @default true
+   */
+  closeOnClick?: boolean | undefined;
   /**
    * How long to wait before closing the tooltip. Specified in milliseconds.
    * @default 0