@base-ui/react 1.6.0 → 1.7.0

package/context-menu/trigger/ContextMenuTrigger.mjs

@@ -47,6 +47,7 @@ export const ContextMenuTrigger = /*#__PURE__*/React.forwardRef(function Context
   const longPressTimeout = useTimeout();
   const allowMouseUpTimeout = useTimeout();
   const allowMouseUpRef = React.useRef(false);
+  const mouseUpAbortControllerRef = React.useRef(null);
   function handleLongPress(x, y, event) {
     const isTouchEvent = event.type.startsWith('touch');
     initialCursorPointRef.current = {
@@ -77,7 +78,13 @@ export const ContextMenuTrigger = /*#__PURE__*/React.forwardRef(function Context
     stopEvent(event);
     handleLongPress(event.clientX, event.clientY, event.nativeEvent);
     const doc = ownerDocument(triggerRef.current);
-    addEventListener(doc, 'mouseup', mouseEvent => {
+
+    // Abort a listener from a previous trigger that never saw its mouseup, and scope this
+    // one to a fresh controller so it's removed on unmount if the mouseup never arrives.
+    mouseUpAbortControllerRef.current?.abort();
+    const mouseUpAbortController = new AbortController();
+    mouseUpAbortControllerRef.current = mouseUpAbortController;
+    doc.addEventListener('mouseup', mouseEvent => {
       allowMouseUpTriggerRef.current = false;
       if (!allowMouseUpRef.current) {
         return;
@@ -93,43 +100,54 @@ export const ContextMenuTrigger = /*#__PURE__*/React.forwardRef(function Context
       }
       actionsRef.current?.setOpen(false, createChangeEventDetails(REASONS.cancelOpen, mouseEvent));
     }, {
-      once: true
+      once: true,
+      signal: mouseUpAbortController.signal
     });
   }
+  function cancelLongPress() {
+    longPressTimeout.clear();
+    touchPositionRef.current = null;
+  }
   function handleTouchStart(event) {
     if (disabled) {
+      cancelLongPress();
       return;
     }
     allowMouseUpTriggerRef.current = false;
-    if (event.touches.length === 1) {
-      event.stopPropagation();
-      const touch = event.touches[0];
-      touchPositionRef.current = {
-        x: touch.clientX,
-        y: touch.clientY
-      };
-      longPressTimeout.start(LONG_PRESS_DELAY, () => {
-        if (touchPositionRef.current) {
-          handleLongPress(touchPositionRef.current.x, touchPositionRef.current.y, event.nativeEvent);
-        }
-      });
+    if (event.touches.length !== 1) {
+      cancelLongPress();
+      return;
     }
+    event.stopPropagation();
+    const touch = event.touches[0];
+    const touchPosition = {
+      x: touch.clientX,
+      y: touch.clientY
+    };
+    touchPositionRef.current = touchPosition;
+    longPressTimeout.start(LONG_PRESS_DELAY, () => {
+      handleLongPress(touchPosition.x, touchPosition.y, event.nativeEvent);
+    });
   }
   function handleTouchMove(event) {
-    if (longPressTimeout.isStarted() && touchPositionRef.current && event.touches.length === 1) {
+    if (event.touches.length !== 1) {
+      cancelLongPress();
+      return;
+    }
+    if (longPressTimeout.isStarted() && touchPositionRef.current) {
       const touch = event.touches[0];
       const moveThreshold = 10;
       const deltaX = Math.abs(touch.clientX - touchPositionRef.current.x);
       const deltaY = Math.abs(touch.clientY - touchPositionRef.current.y);
       if (deltaX > moveThreshold || deltaY > moveThreshold) {
-        longPressTimeout.clear();
+        cancelLongPress();
       }
     }
   }
-  function handleTouchEnd() {
-    longPressTimeout.clear();
-    touchPositionRef.current = null;
-  }
+  React.useEffect(() => () => {
+    // Abort a pending mouseup listener if the trigger unmounts before it fires.
+    mouseUpAbortControllerRef.current?.abort();
+  }, []);
   React.useEffect(() => {
     function handleDocumentContextMenu(event) {
       if (disabled) {
@@ -154,8 +172,8 @@ export const ContextMenuTrigger = /*#__PURE__*/React.forwardRef(function Context
       onContextMenu: handleContextMenu,
       onTouchStart: handleTouchStart,
       onTouchMove: handleTouchMove,
-      onTouchEnd: handleTouchEnd,
-      onTouchCancel: handleTouchEnd,
+      onTouchEnd: cancelLongPress,
+      onTouchCancel: cancelLongPress,
       style: {
         WebkitTouchCallout: 'none'
       }

package/dialog/backdrop/DialogBackdrop.js

@@ -10,12 +10,6 @@ var React = _interopRequireWildcard(require("react"));
 var _DialogRootContext = require("../root/DialogRootContext");
 var _useRenderElement = require("../../internals/useRenderElement");
 var _popupStateMapping = require("../../utils/popupStateMapping");
-var _stateAttributesMapping = require("../../internals/stateAttributesMapping");
-const stateAttributesMapping = {
-  ..._popupStateMapping.popupStateMapping,
-  ..._stateAttributesMapping.transitionStatusMapping
-};
-
 /**
  * An overlay displayed beneath the popup.
  * Renders a `<div>` element.
@@ -30,9 +24,7 @@ const DialogBackdrop = exports.DialogBackdrop = /*#__PURE__*/React.forwardRef(fu
     forceRender = false,
     ...elementProps
   } = componentProps;
-  const {
-    store
-  } = (0, _DialogRootContext.useDialogRootContext)();
+  const store = (0, _DialogRootContext.useDialogRootContext)();
   const open = store.useState('open');
   const nested = store.useState('nested');
   const mounted = store.useState('mounted');
@@ -44,7 +36,7 @@ const DialogBackdrop = exports.DialogBackdrop = /*#__PURE__*/React.forwardRef(fu
   return (0, _useRenderElement.useRenderElement)('div', componentProps, {
     state,
     ref: [store.context.backdropRef, forwardedRef],
-    stateAttributesMapping,
+    stateAttributesMapping: _popupStateMapping.popupTransitionStateMapping,
     props: [{
       role: 'presentation',
       hidden: !mounted,

package/dialog/backdrop/DialogBackdrop.mjs

@@ -3,12 +3,7 @@
 import * as React from 'react';
 import { useDialogRootContext } from "../root/DialogRootContext.mjs";
 import { useRenderElement } from "../../internals/useRenderElement.mjs";
-import { popupStateMapping as baseMapping } from "../../utils/popupStateMapping.mjs";
-import { transitionStatusMapping } from "../../internals/stateAttributesMapping.mjs";
-const stateAttributesMapping = {
-  ...baseMapping,
-  ...transitionStatusMapping
-};
+import { popupTransitionStateMapping } from "../../utils/popupStateMapping.mjs";
 
 /**
  * An overlay displayed beneath the popup.
@@ -24,9 +19,7 @@ export const DialogBackdrop = /*#__PURE__*/React.forwardRef(function DialogBackd
     forceRender = false,
     ...elementProps
   } = componentProps;
-  const {
-    store
-  } = useDialogRootContext();
+  const store = useDialogRootContext();
   const open = store.useState('open');
   const nested = store.useState('nested');
   const mounted = store.useState('mounted');
@@ -38,7 +31,7 @@ export const DialogBackdrop = /*#__PURE__*/React.forwardRef(function DialogBackd
   return useRenderElement('div', componentProps, {
     state,
     ref: [store.context.backdropRef, forwardedRef],
-    stateAttributesMapping,
+    stateAttributesMapping: popupTransitionStateMapping,
     props: [{
       role: 'presentation',
       hidden: !mounted,

package/dialog/backdrop/DialogBackdropDataAttributes.d.mts

@@ -8,7 +8,7 @@ export declare enum DialogBackdropDataAttributes {
    */
   closed = "data-closed",
   /**
-   * Present when the dialog is animating in.
+   * Present when the dialog begins animating in.
    */
   startingStyle = "data-starting-style",
   /**

package/dialog/backdrop/DialogBackdropDataAttributes.d.ts

@@ -8,7 +8,7 @@ export declare enum DialogBackdropDataAttributes {
    */
   closed = "data-closed",
   /**
-   * Present when the dialog is animating in.
+   * Present when the dialog begins animating in.
    */
   startingStyle = "data-starting-style",
   /**

package/dialog/backdrop/DialogBackdropDataAttributes.js

@@ -15,7 +15,7 @@ let DialogBackdropDataAttributes = exports.DialogBackdropDataAttributes = functi
    */
   DialogBackdropDataAttributes[DialogBackdropDataAttributes["closed"] = _popupStateMapping.CommonPopupDataAttributes.closed] = "closed";
   /**
-   * Present when the dialog is animating in.
+   * Present when the dialog begins animating in.
    */
   DialogBackdropDataAttributes[DialogBackdropDataAttributes["startingStyle"] = _popupStateMapping.CommonPopupDataAttributes.startingStyle] = "startingStyle";
   /**

package/dialog/backdrop/DialogBackdropDataAttributes.mjs

@@ -9,7 +9,7 @@ export let DialogBackdropDataAttributes = function (DialogBackdropDataAttributes
    */
   DialogBackdropDataAttributes[DialogBackdropDataAttributes["closed"] = CommonPopupDataAttributes.closed] = "closed";
   /**
-   * Present when the dialog is animating in.
+   * Present when the dialog begins animating in.
    */
   DialogBackdropDataAttributes[DialogBackdropDataAttributes["startingStyle"] = CommonPopupDataAttributes.startingStyle] = "startingStyle";
   /**

package/dialog/close/DialogClose.js

@@ -27,9 +27,7 @@ const DialogClose = exports.DialogClose = /*#__PURE__*/React.forwardRef(function
     nativeButton = true,
     ...elementProps
   } = componentProps;
-  const {
-    store
-  } = (0, _DialogRootContext.useDialogRootContext)();
+  const store = (0, _DialogRootContext.useDialogRootContext)();
   const open = store.useState('open');
   const {
     getButtonProps,

package/dialog/close/DialogClose.mjs

@@ -22,9 +22,7 @@ export const DialogClose = /*#__PURE__*/React.forwardRef(function DialogClose(co
     nativeButton = true,
     ...elementProps
   } = componentProps;
-  const {
-    store
-  } = useDialogRootContext();
+  const store = useDialogRootContext();
   const open = store.useState('open');
   const {
     getButtonProps,

package/dialog/description/DialogDescription.js

@@ -24,9 +24,7 @@ const DialogDescription = exports.DialogDescription = /*#__PURE__*/React.forward
     id: idProp,
     ...elementProps
   } = componentProps;
-  const {
-    store
-  } = (0, _DialogRootContext.useDialogRootContext)();
+  const store = (0, _DialogRootContext.useDialogRootContext)();
   const id = (0, _useBaseUiId.useBaseUiId)(idProp);
   store.useSyncedValueWithCleanup('descriptionElementId', id);
   return (0, _useRenderElement.useRenderElement)('p', componentProps, {

package/dialog/description/DialogDescription.mjs

@@ -18,9 +18,7 @@ export const DialogDescription = /*#__PURE__*/React.forwardRef(function DialogDe
     id: idProp,
     ...elementProps
   } = componentProps;
-  const {
-    store
-  } = useDialogRootContext();
+  const store = useDialogRootContext();
   const id = useBaseUiId(idProp);
   store.useSyncedValueWithCleanup('descriptionElementId', id);
   return useRenderElement('p', componentProps, {

package/dialog/popup/DialogPopup.js

@@ -10,25 +10,12 @@ var React = _interopRequireWildcard(require("react"));
 var _floatingUiReact = require("../../floating-ui-react");
 var _DialogRootContext = require("../root/DialogRootContext");
 var _useRenderElement = require("../../internals/useRenderElement");
-var _popupStateMapping = require("../../utils/popupStateMapping");
-var _stateAttributesMapping = require("../../internals/stateAttributesMapping");
-var _DialogPopupCssVars = require("./DialogPopupCssVars");
-var _DialogPopupDataAttributes = require("./DialogPopupDataAttributes");
 var _DialogPortalContext = require("../portal/DialogPortalContext");
 var _useOpenChangeComplete = require("../../internals/useOpenChangeComplete");
 var _composite = require("../../internals/composite/composite");
 var _popups = require("../../utils/popups");
+var _stateAttributesMapping = require("../utils/stateAttributesMapping");
 var _jsxRuntime = require("react/jsx-runtime");
-const stateAttributesMapping = {
-  ..._popupStateMapping.popupStateMapping,
-  ..._stateAttributesMapping.transitionStatusMapping,
-  nestedDialogOpen(value) {
-    return value ? {
-      [_DialogPopupDataAttributes.DialogPopupDataAttributes.nestedDialogOpen]: ''
-    } : null;
-  }
-};
-
 /**
  * A container for the dialog contents.
  * Renders a `<div>` element.
@@ -44,9 +31,7 @@ const DialogPopup = exports.DialogPopup = /*#__PURE__*/React.forwardRef(function
     initialFocus,
     ...elementProps
   } = componentProps;
-  const {
-    store
-  } = (0, _DialogRootContext.useDialogRootContext)();
+  const store = (0, _DialogRootContext.useDialogRootContext)();
   const descriptionElementId = store.useState('descriptionElementId');
   const disablePointerDismissal = store.useState('disablePointerDismissal');
   const floatingRootContext = store.useState('floatingRootContext');
@@ -61,7 +46,6 @@ const DialogPopup = exports.DialogPopup = /*#__PURE__*/React.forwardRef(function
   const transitionStatus = store.useState('transitionStatus');
   const role = store.useState('role');
   const floatingId = floatingRootContext.useState('floatingId');
-  const popupId = elementProps.id ?? floatingId;
   (0, _DialogPortalContext.useDialogPortalContext)();
   (0, _useOpenChangeComplete.useOpenChangeComplete)({
     open,
@@ -84,9 +68,9 @@ const DialogPopup = exports.DialogPopup = /*#__PURE__*/React.forwardRef(function
   const element = (0, _useRenderElement.useRenderElement)('div', componentProps, {
     state,
     props: [rootPopupProps, {
-      id: popupId,
-      'aria-labelledby': titleElementId ?? undefined,
-      'aria-describedby': descriptionElementId ?? undefined,
+      id: floatingId,
+      'aria-labelledby': titleElementId,
+      'aria-describedby': descriptionElementId,
       role,
       ..._popups.FOCUSABLE_POPUP_PROPS,
       hidden: !mounted,
@@ -96,11 +80,11 @@ const DialogPopup = exports.DialogPopup = /*#__PURE__*/React.forwardRef(function
         }
       },
       style: {
-        [_DialogPopupCssVars.DialogPopupCssVars.nestedDialogs]: nestedOpenDialogCount
+        '--nested-dialogs': nestedOpenDialogCount
       }
     }, elementProps],
     ref: [forwardedRef, store.context.popupRef, setPopupElement],
-    stateAttributesMapping
+    stateAttributesMapping: _stateAttributesMapping.dialogStateAttributesMapping
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_floatingUiReact.FloatingFocusManager, {
     context: floatingRootContext,

package/dialog/popup/DialogPopup.mjs

@@ -4,24 +4,11 @@ import * as React from 'react';
 import { FloatingFocusManager } from "../../floating-ui-react/index.mjs";
 import { useDialogRootContext } from "../root/DialogRootContext.mjs";
 import { useRenderElement } from "../../internals/useRenderElement.mjs";
-import { popupStateMapping as baseMapping } from "../../utils/popupStateMapping.mjs";
-import { transitionStatusMapping } from "../../internals/stateAttributesMapping.mjs";
-import { DialogPopupCssVars } from "./DialogPopupCssVars.mjs";
-import { DialogPopupDataAttributes } from "./DialogPopupDataAttributes.mjs";
 import { useDialogPortalContext } from "../portal/DialogPortalContext.mjs";
 import { useOpenChangeComplete } from "../../internals/useOpenChangeComplete.mjs";
 import { COMPOSITE_KEYS } from "../../internals/composite/composite.mjs";
 import { FOCUSABLE_POPUP_PROPS, createDefaultInitialFocus } from "../../utils/popups/index.mjs";
-import { jsx as _jsx } from "react/jsx-runtime";
-const stateAttributesMapping = {
-  ...baseMapping,
-  ...transitionStatusMapping,
-  nestedDialogOpen(value) {
-    return value ? {
-      [DialogPopupDataAttributes.nestedDialogOpen]: ''
-    } : null;
-  }
-};
+import { dialogStateAttributesMapping } from "../utils/stateAttributesMapping.mjs";
 
 /**
  * A container for the dialog contents.
@@ -29,6 +16,7 @@ const stateAttributesMapping = {
  *
  * Documentation: [Base UI Dialog](https://base-ui.com/react/components/dialog)
  */
+import { jsx as _jsx } from "react/jsx-runtime";
 export const DialogPopup = /*#__PURE__*/React.forwardRef(function DialogPopup(componentProps, forwardedRef) {
   const {
     render,
@@ -38,9 +26,7 @@ export const DialogPopup = /*#__PURE__*/React.forwardRef(function DialogPopup(co
     initialFocus,
     ...elementProps
   } = componentProps;
-  const {
-    store
-  } = useDialogRootContext();
+  const store = useDialogRootContext();
   const descriptionElementId = store.useState('descriptionElementId');
   const disablePointerDismissal = store.useState('disablePointerDismissal');
   const floatingRootContext = store.useState('floatingRootContext');
@@ -55,7 +41,6 @@ export const DialogPopup = /*#__PURE__*/React.forwardRef(function DialogPopup(co
   const transitionStatus = store.useState('transitionStatus');
   const role = store.useState('role');
   const floatingId = floatingRootContext.useState('floatingId');
-  const popupId = elementProps.id ?? floatingId;
   useDialogPortalContext();
   useOpenChangeComplete({
     open,
@@ -78,9 +63,9 @@ export const DialogPopup = /*#__PURE__*/React.forwardRef(function DialogPopup(co
   const element = useRenderElement('div', componentProps, {
     state,
     props: [rootPopupProps, {
-      id: popupId,
-      'aria-labelledby': titleElementId ?? undefined,
-      'aria-describedby': descriptionElementId ?? undefined,
+      id: floatingId,
+      'aria-labelledby': titleElementId,
+      'aria-describedby': descriptionElementId,
       role,
       ...FOCUSABLE_POPUP_PROPS,
       hidden: !mounted,
@@ -90,11 +75,11 @@ export const DialogPopup = /*#__PURE__*/React.forwardRef(function DialogPopup(co
         }
       },
       style: {
-        [DialogPopupCssVars.nestedDialogs]: nestedOpenDialogCount
+        '--nested-dialogs': nestedOpenDialogCount
       }
     }, elementProps],
     ref: [forwardedRef, store.context.popupRef, setPopupElement],
-    stateAttributesMapping
+    stateAttributesMapping: dialogStateAttributesMapping
   });
   return /*#__PURE__*/_jsx(FloatingFocusManager, {
     context: floatingRootContext,

package/dialog/popup/DialogPopupDataAttributes.d.mts

@@ -8,7 +8,7 @@ export declare enum DialogPopupDataAttributes {
    */
   closed = "data-closed",
   /**
-   * Present when the dialog is animating in.
+   * Present when the dialog begins animating in.
    */
   startingStyle = "data-starting-style",
   /**

package/dialog/popup/DialogPopupDataAttributes.d.ts

@@ -8,7 +8,7 @@ export declare enum DialogPopupDataAttributes {
    */
   closed = "data-closed",
   /**
-   * Present when the dialog is animating in.
+   * Present when the dialog begins animating in.
    */
   startingStyle = "data-starting-style",
   /**

package/dialog/popup/DialogPopupDataAttributes.js

@@ -15,7 +15,7 @@ let DialogPopupDataAttributes = exports.DialogPopupDataAttributes = function (Di
    */
   DialogPopupDataAttributes[DialogPopupDataAttributes["closed"] = _popupStateMapping.CommonPopupDataAttributes.closed] = "closed";
   /**
-   * Present when the dialog is animating in.
+   * Present when the dialog begins animating in.
    */
   DialogPopupDataAttributes[DialogPopupDataAttributes["startingStyle"] = _popupStateMapping.CommonPopupDataAttributes.startingStyle] = "startingStyle";
   /**

package/dialog/popup/DialogPopupDataAttributes.mjs

@@ -9,7 +9,7 @@ export let DialogPopupDataAttributes = function (DialogPopupDataAttributes) {
    */
   DialogPopupDataAttributes[DialogPopupDataAttributes["closed"] = CommonPopupDataAttributes.closed] = "closed";
   /**
-   * Present when the dialog is animating in.
+   * Present when the dialog begins animating in.
    */
   DialogPopupDataAttributes[DialogPopupDataAttributes["startingStyle"] = CommonPopupDataAttributes.startingStyle] = "startingStyle";
   /**

package/dialog/portal/DialogPortal.d.mts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FloatingPortal } from "../../floating-ui-react/index.mjs";
+import { type BaseUIComponentProps } from "../../internals/types.mjs";
 /**
  * A portal element that moves the popup to a different part of the DOM.
  * By default, the portal element is appended to `<body>`.
@@ -9,7 +9,7 @@ import { FloatingPortal } from "../../floating-ui-react/index.mjs";
  */
 export declare const DialogPortal: React.ForwardRefExoticComponent<Omit<DialogPortalProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface DialogPortalState {}
-export interface DialogPortalProps extends FloatingPortal.Props<DialogPortalState> {
+export interface DialogPortalProps extends BaseUIComponentProps<'div', DialogPortalState> {
   /**
    * Whether to keep the portal mounted in the DOM while the popup is hidden.
    * @default false
@@ -18,7 +18,7 @@ export interface DialogPortalProps extends FloatingPortal.Props<DialogPortalStat
   /**
    * A parent element to render the portal element into.
    */
-  container?: FloatingPortal.Props<DialogPortalState>['container'] | undefined;
+  container?: HTMLElement | ShadowRoot | React.RefObject<HTMLElement | ShadowRoot | null> | null | undefined;
 }
 export declare namespace DialogPortal {
   type State = DialogPortalState;

package/dialog/portal/DialogPortal.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { FloatingPortal } from "../../floating-ui-react/index.js";
+import { type BaseUIComponentProps } from "../../internals/types.js";
 /**
  * A portal element that moves the popup to a different part of the DOM.
  * By default, the portal element is appended to `<body>`.
@@ -9,7 +9,7 @@ import { FloatingPortal } from "../../floating-ui-react/index.js";
  */
 export declare const DialogPortal: React.ForwardRefExoticComponent<Omit<DialogPortalProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface DialogPortalState {}
-export interface DialogPortalProps extends FloatingPortal.Props<DialogPortalState> {
+export interface DialogPortalProps extends BaseUIComponentProps<'div', DialogPortalState> {
   /**
    * Whether to keep the portal mounted in the DOM while the popup is hidden.
    * @default false
@@ -18,7 +18,7 @@ export interface DialogPortalProps extends FloatingPortal.Props<DialogPortalStat
   /**
    * A parent element to render the portal element into.
    */
-  container?: FloatingPortal.Props<DialogPortalState>['container'] | undefined;
+  container?: HTMLElement | ShadowRoot | React.RefObject<HTMLElement | ShadowRoot | null> | null | undefined;
 }
 export declare namespace DialogPortal {
   type State = DialogPortalState;

package/dialog/portal/DialogPortal.js

@@ -25,9 +25,7 @@ const DialogPortal = exports.DialogPortal = /*#__PURE__*/React.forwardRef(functi
     keepMounted = false,
     ...portalProps
   } = props;
-  const {
-    store
-  } = (0, _DialogRootContext.useDialogRootContext)();
+  const store = (0, _DialogRootContext.useDialogRootContext)();
   const mounted = store.useState('mounted');
   const modal = store.useState('modal');
   const open = store.useState('open');

package/dialog/portal/DialogPortal.mjs

@@ -20,9 +20,7 @@ export const DialogPortal = /*#__PURE__*/React.forwardRef(function DialogPortal(
     keepMounted = false,
     ...portalProps
   } = props;
-  const {
-    store
-  } = useDialogRootContext();
+  const store = useDialogRootContext();
   const mounted = store.useState('mounted');
   const modal = store.useState('modal');
   const open = store.useState('open');

package/dialog/root/DialogRoot.js

@@ -1,13 +1,10 @@
 "use strict";
 'use client';
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DialogRoot = DialogRoot;
-var React = _interopRequireWildcard(require("react"));
-var _DialogRootContext = require("./DialogRootContext");
 var _useRenderDialogRoot = require("./useRenderDialogRoot");
 /**
  * Groups all parts of the dialog.
@@ -16,6 +13,5 @@ var _useRenderDialogRoot = require("./useRenderDialogRoot");
  * Documentation: [Base UI Dialog](https://base-ui.com/react/components/dialog)
  */
 function DialogRoot(props) {
-  const mode = React.useContext(_DialogRootContext.IsDrawerContext) ? 'drawer' : 'dialog';
-  return (0, _useRenderDialogRoot.useRenderDialogRoot)(props, mode);
+  return (0, _useRenderDialogRoot.useRenderDialogRoot)('dialog', props);
 }

package/dialog/root/DialogRoot.mjs

@@ -1,7 +1,5 @@
 'use client';
 
-import * as React from 'react';
-import { IsDrawerContext } from "./DialogRootContext.mjs";
 import { useRenderDialogRoot } from "./useRenderDialogRoot.mjs";
 
 /**
@@ -11,6 +9,5 @@ import { useRenderDialogRoot } from "./useRenderDialogRoot.mjs";
  * Documentation: [Base UI Dialog](https://base-ui.com/react/components/dialog)
  */
 export function DialogRoot(props) {
-  const mode = React.useContext(IsDrawerContext) ? 'drawer' : 'dialog';
-  return useRenderDialogRoot(props, mode);
+  return useRenderDialogRoot('dialog', props);
 }

package/dialog/root/DialogRootContext.d.mts

@@ -1,9 +1,5 @@
 import * as React from 'react';
 import { DialogStore } from "../store/DialogStore.mjs";
-export interface DialogRootContext<Payload = unknown> {
-  store: DialogStore<Payload>;
-}
-export declare const IsDrawerContext: React.Context<boolean>;
-export declare const DialogRootContext: React.Context<DialogRootContext<unknown> | undefined>;
-export declare function useDialogRootContext(optional?: false): DialogRootContext;
-export declare function useDialogRootContext(optional: true): DialogRootContext | undefined;
+export declare const DialogRootContext: React.Context<DialogStore<unknown> | undefined>;
+export declare function useDialogRootContext(optional?: false): DialogStore<unknown>;
+export declare function useDialogRootContext(optional: true): DialogStore<unknown> | undefined;

package/dialog/root/DialogRootContext.d.ts

@@ -1,9 +1,5 @@
 import * as React from 'react';
 import { DialogStore } from "../store/DialogStore.js";
-export interface DialogRootContext<Payload = unknown> {
-  store: DialogStore<Payload>;
-}
-export declare const IsDrawerContext: React.Context<boolean>;
-export declare const DialogRootContext: React.Context<DialogRootContext<unknown> | undefined>;
-export declare function useDialogRootContext(optional?: false): DialogRootContext;
-export declare function useDialogRootContext(optional: true): DialogRootContext | undefined;
+export declare const DialogRootContext: React.Context<DialogStore<unknown> | undefined>;
+export declare function useDialogRootContext(optional?: false): DialogStore<unknown>;
+export declare function useDialogRootContext(optional: true): DialogStore<unknown> | undefined;

package/dialog/root/DialogRootContext.js

@@ -6,18 +6,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.IsDrawerContext = exports.DialogRootContext = void 0;
+exports.DialogRootContext = void 0;
 exports.useDialogRootContext = useDialogRootContext;
 var _formatErrorMessage2 = _interopRequireDefault(require("@base-ui/utils/formatErrorMessage"));
 var React = _interopRequireWildcard(require("react"));
-const IsDrawerContext = exports.IsDrawerContext = /*#__PURE__*/React.createContext(false);
-if (process.env.NODE_ENV !== "production") IsDrawerContext.displayName = "IsDrawerContext";
 const DialogRootContext = exports.DialogRootContext = /*#__PURE__*/React.createContext(undefined);
 if (process.env.NODE_ENV !== "production") DialogRootContext.displayName = "DialogRootContext";
 function useDialogRootContext(optional) {
-  const dialogRootContext = React.useContext(DialogRootContext);
-  if (optional === false && dialogRootContext === undefined) {
+  const store = React.useContext(DialogRootContext);
+  if (!optional && store === undefined) {
     throw new Error(process.env.NODE_ENV !== "production" ? 'Base UI: DialogRootContext is missing. Dialog parts must be placed within <Dialog.Root>.' : (0, _formatErrorMessage2.default)(27));
   }
-  return dialogRootContext;
+  return store;
 }

package/dialog/root/DialogRootContext.mjs

@@ -2,14 +2,12 @@
 
 import _formatErrorMessage from "@base-ui/utils/formatErrorMessage";
 import * as React from 'react';
-export const IsDrawerContext = /*#__PURE__*/React.createContext(false);
-if (process.env.NODE_ENV !== "production") IsDrawerContext.displayName = "IsDrawerContext";
 export const DialogRootContext = /*#__PURE__*/React.createContext(undefined);
 if (process.env.NODE_ENV !== "production") DialogRootContext.displayName = "DialogRootContext";
 export function useDialogRootContext(optional) {
-  const dialogRootContext = React.useContext(DialogRootContext);
-  if (optional === false && dialogRootContext === undefined) {
+  const store = React.useContext(DialogRootContext);
+  if (!optional && store === undefined) {
     throw new Error(process.env.NODE_ENV !== "production" ? 'Base UI: DialogRootContext is missing. Dialog parts must be placed within <Dialog.Root>.' : _formatErrorMessage(27));
   }
-  return dialogRootContext;
+  return store;
 }