@base-ui/react 1.2.0 → 1.3.0

package/esm/preview-card/root/PreviewCardRoot.d.ts

@@ -50,15 +50,15 @@ export interface PreviewCardRootProps<Payload = unknown> {
   children?: React.ReactNode | PayloadChildRenderFunction<Payload>;
   /**
    * ID of the trigger that the preview card is associated with.
-   * This is useful in conjuntion with the `open` prop to create a controlled preview card.
+   * This is useful in conjunction with the `open` prop to create a controlled preview card.
    * There's no need to specify this prop when the preview card 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 preview card is associated with.
    * This is useful in conjunction with the `defaultOpen` prop to create an initially open preview card.
    */
-  defaultTriggerId?: (string | null) | undefined;
+  defaultTriggerId?: string | null | undefined;
 }
 export interface PreviewCardRootActions {
   unmount: () => void;

package/esm/preview-card/root/PreviewCardRoot.js

@@ -3,20 +3,14 @@
 import * as React from 'react';
 import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
 import { useOnFirstRender } from '@base-ui/utils/useOnFirstRender';
-import { useDismiss, useInteractions } from "../../floating-ui-react/index.js";
-import { PreviewCardRootContext } from "./PreviewCardContext.js";
+import { useDismiss, useInteractions, FloatingTree } from "../../floating-ui-react/index.js";
+import { PreviewCardRootContext, usePreviewCardRootContext } from "./PreviewCardContext.js";
 import { createChangeEventDetails } from "../../utils/createBaseUIEventDetails.js";
 import { REASONS } from "../../utils/reasons.js";
 import { PreviewCardStore } from "../store/PreviewCardStore.js";
 import { useImplicitActiveTrigger, useOpenStateTransitions } from "../../utils/popups/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * Groups all parts of the preview card.
- * Doesn’t render its own HTML element.
- *
- * Documentation: [Base UI Preview Card](https://base-ui.com/react/components/preview-card)
- */
-export function PreviewCardRoot(props) {
+function PreviewCardRootComponent(props) {
   const {
     open: openProp,
     defaultOpen = false,
@@ -91,6 +85,25 @@ export function PreviewCardRoot(props) {
     }) : children
   });
 }
+
+/**
+ * Groups all parts of the preview card.
+ * Doesn’t render its own HTML element.
+ *
+ * Documentation: [Base UI Preview Card](https://base-ui.com/react/components/preview-card)
+ */
+export function PreviewCardRoot(props) {
+  if (usePreviewCardRootContext(true)) {
+    return /*#__PURE__*/_jsx(PreviewCardRootComponent, {
+      ...props
+    });
+  }
+  return /*#__PURE__*/_jsx(FloatingTree, {
+    children: /*#__PURE__*/_jsx(PreviewCardRootComponent, {
+      ...props
+    })
+  });
+}
 function createPreviewCardEventDetails(store, reason) {
   const details = createChangeEventDetails(reason);
   details.preventUnmountOnClose = () => {

package/esm/preview-card/trigger/PreviewCardTrigger.d.ts

@@ -17,7 +17,7 @@ export interface PreviewCardTriggerState {
    */
   open: boolean;
 }
-export interface PreviewCardTriggerProps<Payload = unknown> extends BaseUIComponentProps<'a', PreviewCardTrigger.State> {
+export interface PreviewCardTriggerProps<Payload = unknown> extends BaseUIComponentProps<'a', PreviewCardTriggerState> {
   /**
    * A handle to associate the trigger with a preview card.
    */

package/esm/preview-card/viewport/PreviewCardViewport.d.ts

@@ -9,19 +9,26 @@ import { BaseUIComponentProps } from "../../utils/types.js";
  * Documentation: [Base UI Preview Card](https://base-ui.com/react/components/preview-card)
  */
 export declare const PreviewCardViewport: React.ForwardRefExoticComponent<Omit<PreviewCardViewport.Props, "ref"> & React.RefAttributes<HTMLDivElement>>;
+export interface PreviewCardViewportState {
+  /**
+   * The activation direction of the transitioned content.
+   */
+  activationDirection: string | undefined;
+  /**
+   * Whether the viewport is currently transitioning between contents.
+   */
+  transitioning: boolean;
+  /**
+   * Present if animations should be instant.
+   */
+  instant: 'dismiss' | 'focus' | undefined;
+}
 export declare namespace PreviewCardViewport {
-  interface Props extends BaseUIComponentProps<'div', State> {
+  interface Props extends BaseUIComponentProps<'div', PreviewCardViewportState> {
     /**
      * The content to render inside the transition container.
      */
     children?: React.ReactNode;
   }
-  interface State {
-    activationDirection: string | undefined;
-    /**
-     * Whether the viewport is currently transitioning between contents.
-     */
-    transitioning: boolean;
-    instant: 'dismiss' | 'focus' | undefined;
-  }
+  type State = PreviewCardViewportState;
 }

package/esm/progress/indicator/ProgressIndicator.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { ProgressRoot } from "../root/ProgressRoot.js";
+import type { ProgressRootState } from "../root/ProgressRoot.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
 /**
  * Visualizes the completion status of the task.
@@ -8,7 +8,9 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  * Documentation: [Base UI Progress](https://base-ui.com/react/components/progress)
  */
 export declare const ProgressIndicator: React.ForwardRefExoticComponent<Omit<ProgressIndicatorProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export interface ProgressIndicatorProps extends BaseUIComponentProps<'div', ProgressRoot.State> {}
+export interface ProgressIndicatorState extends ProgressRootState {}
+export interface ProgressIndicatorProps extends BaseUIComponentProps<'div', ProgressIndicatorState> {}
 export declare namespace ProgressIndicator {
+  type State = ProgressIndicatorState;
   type Props = ProgressIndicatorProps;
 }

package/esm/progress/label/ProgressLabel.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { ProgressRoot } from "../root/ProgressRoot.js";
+import type { ProgressRootState } from "../root/ProgressRoot.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
 /**
  * An accessible label for the progress bar.
@@ -8,7 +8,9 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  * Documentation: [Base UI Progress](https://base-ui.com/react/components/progress)
  */
 export declare const ProgressLabel: React.ForwardRefExoticComponent<Omit<ProgressLabelProps, "ref"> & React.RefAttributes<HTMLSpanElement>>;
-export interface ProgressLabelProps extends BaseUIComponentProps<'span', ProgressRoot.State> {}
+export interface ProgressLabelState extends ProgressRootState {}
+export interface ProgressLabelProps extends BaseUIComponentProps<'span', ProgressLabelState> {}
 export declare namespace ProgressLabel {
+  type State = ProgressLabelState;
   type Props = ProgressLabelProps;
 }

package/esm/progress/label/ProgressLabel.js

@@ -1,9 +1,8 @@
 'use client';
 
 import * as React from 'react';
-import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
-import { useBaseUiId } from "../../utils/useBaseUiId.js";
 import { useRenderElement } from "../../utils/useRenderElement.js";
+import { useRegisteredLabelId } from "../../utils/useRegisteredLabelId.js";
 import { useProgressRootContext } from "../root/ProgressRootContext.js";
 import { progressStateAttributesMapping } from "../root/stateAttributesMapping.js";
 /**
@@ -19,20 +18,17 @@ export const ProgressLabel = /*#__PURE__*/React.forwardRef(function ProgressLabe
     id: idProp,
     ...elementProps
   } = componentProps;
-  const id = useBaseUiId(idProp);
   const {
     setLabelId,
     state
   } = useProgressRootContext();
-  useIsoLayoutEffect(() => {
-    setLabelId(id);
-    return () => setLabelId(undefined);
-  }, [id, setLabelId]);
+  const id = useRegisteredLabelId(idProp, setLabelId);
   const element = useRenderElement('span', componentProps, {
     state,
     ref: forwardedRef,
     props: [{
-      id
+      id,
+      role: 'presentation'
     }, elementProps],
     stateAttributesMapping: progressStateAttributesMapping
   });

package/esm/progress/root/ProgressRoot.d.ts

@@ -9,9 +9,12 @@ import { BaseUIComponentProps } from "../../utils/types.js";
 export declare const ProgressRoot: React.ForwardRefExoticComponent<Omit<ProgressRootProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export type ProgressStatus = 'indeterminate' | 'progressing' | 'complete';
 export interface ProgressRootState {
+  /**
+   * The current status.
+   */
   status: ProgressStatus;
 }
-export interface ProgressRootProps extends BaseUIComponentProps<'div', ProgressRoot.State> {
+export interface ProgressRootProps extends BaseUIComponentProps<'div', ProgressRootState> {
   /**
    * A string value that provides a user-friendly name for `aria-valuenow`, the current value of the meter.
    */

package/esm/progress/root/ProgressRoot.js

@@ -2,11 +2,12 @@
 
 import * as React from 'react';
 import { useValueAsRef } from '@base-ui/utils/useValueAsRef';
+import { visuallyHidden } from '@base-ui/utils/visuallyHidden';
 import { formatNumberValue } from "../../utils/formatNumber.js";
 import { useRenderElement } from "../../utils/useRenderElement.js";
 import { ProgressRootContext } from "./ProgressRootContext.js";
 import { progressStateAttributesMapping } from "./stateAttributesMapping.js";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function getDefaultAriaValueText(formattedValue, value) {
   if (value == null) {
     return 'indeterminate progress';
@@ -30,6 +31,7 @@ export const ProgressRoot = /*#__PURE__*/React.forwardRef(function ProgressRoot(
     value,
     render,
     className,
+    children,
     ...elementProps
   } = componentProps;
   const [labelId, setLabelId] = React.useState();
@@ -48,7 +50,14 @@ export const ProgressRoot = /*#__PURE__*/React.forwardRef(function ProgressRoot(
     'aria-valuemin': min,
     'aria-valuenow': value ?? undefined,
     'aria-valuetext': getAriaValueText(formattedValue, value),
-    role: 'progressbar'
+    role: 'progressbar',
+    children: /*#__PURE__*/_jsxs(React.Fragment, {
+      children: [children, /*#__PURE__*/_jsx("span", {
+        role: "presentation",
+        style: visuallyHidden,
+        children: "x"
+      })]
+    })
   };
   const contextValue = React.useMemo(() => ({
     formattedValue,

package/esm/progress/root/ProgressRootContext.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { ProgressRoot, ProgressStatus } from "./ProgressRoot.js";
+import type { ProgressStatus, ProgressRootState } from "./ProgressRoot.js";
 export type ProgressRootContext = {
   /**
    * Formatted value of the component.
@@ -18,7 +18,7 @@ export type ProgressRootContext = {
    */
   value: number | null;
   setLabelId: React.Dispatch<React.SetStateAction<string | undefined>>;
-  state: ProgressRoot.State;
+  state: ProgressRootState;
   status: ProgressStatus;
 };
 /**

package/esm/progress/root/stateAttributesMapping.d.ts

@@ -1,3 +1,3 @@
 import type { StateAttributesMapping } from "../../utils/getStateAttributesProps.js";
-import type { ProgressRoot } from "./ProgressRoot.js";
-export declare const progressStateAttributesMapping: StateAttributesMapping<ProgressRoot.State>;
+import type { ProgressRootState } from "./ProgressRoot.js";
+export declare const progressStateAttributesMapping: StateAttributesMapping<ProgressRootState>;

package/esm/progress/track/ProgressTrack.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { ProgressRoot } from "../root/ProgressRoot.js";
+import type { ProgressRootState } from "../root/ProgressRoot.js";
 import type { BaseUIComponentProps } from "../../utils/types.js";
 /**
  * Contains the progress bar indicator.
@@ -8,7 +8,9 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  * Documentation: [Base UI Progress](https://base-ui.com/react/components/progress)
  */
 export declare const ProgressTrack: React.ForwardRefExoticComponent<Omit<ProgressTrackProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export interface ProgressTrackProps extends BaseUIComponentProps<'div', ProgressRoot.State> {}
+export interface ProgressTrackState extends ProgressRootState {}
+export interface ProgressTrackProps extends BaseUIComponentProps<'div', ProgressTrackState> {}
 export declare namespace ProgressTrack {
+  type State = ProgressTrackState;
   type Props = ProgressTrackProps;
 }

package/esm/progress/value/ProgressValue.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { BaseUIComponentProps } from "../../utils/types.js";
-import type { ProgressRoot } from "../root/ProgressRoot.js";
+import type { ProgressRootState } from "../root/ProgressRoot.js";
 /**
  * A text label displaying the current value.
  * Renders a `<span>` element.
@@ -8,9 +8,11 @@ import type { ProgressRoot } from "../root/ProgressRoot.js";
  * Documentation: [Base UI Progress](https://base-ui.com/react/components/progress)
  */
 export declare const ProgressValue: React.ForwardRefExoticComponent<Omit<ProgressValueProps, "ref"> & React.RefAttributes<HTMLSpanElement>>;
-export interface ProgressValueProps extends Omit<BaseUIComponentProps<'span', ProgressRoot.State>, 'children'> {
-  children?: (null | ((formattedValue: string | null, value: number | null) => React.ReactNode)) | undefined;
+export interface ProgressValueState extends ProgressRootState {}
+export interface ProgressValueProps extends Omit<BaseUIComponentProps<'span', ProgressValueState>, 'children'> {
+  children?: null | ((formattedValue: string | null, value: number | null) => React.ReactNode) | undefined;
 }
 export declare namespace ProgressValue {
+  type State = ProgressValueState;
   type Props = ProgressValueProps;
 }

package/esm/radio/indicator/RadioIndicator.d.ts

@@ -8,7 +8,7 @@ import { type TransitionStatus } from "../../utils/useTransitionStatus.js";
  * Documentation: [Base UI Radio](https://base-ui.com/react/components/radio)
  */
 export declare const RadioIndicator: React.ForwardRefExoticComponent<Omit<RadioIndicatorProps, "ref"> & React.RefAttributes<HTMLSpanElement>>;
-export interface RadioIndicatorProps extends BaseUIComponentProps<'span', RadioIndicator.State> {
+export interface RadioIndicatorProps extends BaseUIComponentProps<'span', RadioIndicatorState> {
   /**
    * Whether to keep the HTML element in the DOM when the radio button is inactive.
    * @default false
@@ -20,6 +20,9 @@ export interface RadioIndicatorState {
    * Whether the radio button is currently selected.
    */
   checked: boolean;
+  /**
+   * The transition status of the component.
+   */
   transitionStatus: TransitionStatus;
 }
 export declare namespace RadioIndicator {

package/esm/radio/indicator/RadioIndicatorDataAttributes.d.ts

@@ -19,6 +19,14 @@ export declare enum RadioIndicatorDataAttributes {
    * Present when the radio is required.
    */
   required = "data-required",
+  /**
+   * Present when the radio indicator is animating in.
+   */
+  startingStyle = "data-starting-style",
+  /**
+   * Present when the radio indicator is animating out.
+   */
+  endingStyle = "data-ending-style",
   /**
    * Present when the radio is in valid state (when wrapped in Field.Root).
    */

package/esm/radio/indicator/RadioIndicatorDataAttributes.js

@@ -1,4 +1,5 @@
-export let RadioIndicatorDataAttributes = /*#__PURE__*/function (RadioIndicatorDataAttributes) {
+import { TransitionStatusDataAttributes } from "../../utils/stateAttributesMapping.js";
+export let RadioIndicatorDataAttributes = function (RadioIndicatorDataAttributes) {
   /**
    * Present when the radio is checked.
    */
@@ -19,6 +20,14 @@ export let RadioIndicatorDataAttributes = /*#__PURE__*/function (RadioIndicatorD
    * Present when the radio is required.
    */
   RadioIndicatorDataAttributes["required"] = "data-required";
+  /**
+   * Present when the radio indicator is animating in.
+   */
+  RadioIndicatorDataAttributes[RadioIndicatorDataAttributes["startingStyle"] = TransitionStatusDataAttributes.startingStyle] = "startingStyle";
+  /**
+   * Present when the radio indicator is animating out.
+   */
+  RadioIndicatorDataAttributes[RadioIndicatorDataAttributes["endingStyle"] = TransitionStatusDataAttributes.endingStyle] = "endingStyle";
   /**
    * Present when the radio is in valid state (when wrapped in Field.Root).
    */

package/esm/radio/root/RadioRoot.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { BaseUIComponentProps, NonNativeButtonProps } from "../../utils/types.js";
-import type { FieldRoot } from "../../field/root/FieldRoot.js";
+import type { FieldRootState } from "../../field/root/FieldRoot.js";
 /**
  * Represents the radio button itself.
  * Renders a `<span>` element and a hidden `<input>` beside.
@@ -10,7 +10,7 @@ import type { FieldRoot } from "../../field/root/FieldRoot.js";
 export declare const RadioRoot: {
   <Value>(props: RadioRoot.Props<Value>): React.JSX.Element;
 };
-export interface RadioRootState extends FieldRoot.State {
+export interface RadioRootState extends FieldRootState {
   /**
    * Whether the radio button is currently selected.
    */
@@ -28,7 +28,7 @@ export interface RadioRootState extends FieldRoot.State {
    */
   required: boolean;
 }
-export interface RadioRootProps<Value = any> extends NonNativeButtonProps, Omit<BaseUIComponentProps<'span', RadioRoot.State>, 'value'> {
+export interface RadioRootProps<Value = any> extends NonNativeButtonProps, Omit<BaseUIComponentProps<'span', RadioRootState>, 'value'> {
   /**
    * The unique identifying value of the radio in a group.
    */

package/esm/radio/root/RadioRoot.js

@@ -18,6 +18,7 @@ import { CompositeItem } from "../../composite/item/CompositeItem.js";
 import { useFieldRootContext } from "../../field/root/FieldRootContext.js";
 import { useFieldItemContext } from "../../field/item/FieldItemContext.js";
 import { useLabelableContext } from "../../labelable-provider/LabelableContext.js";
+import { useAriaLabelledBy } from "../../labelable-provider/useAriaLabelledBy.js";
 import { useLabelableId } from "../../labelable-provider/useLabelableId.js";
 import { useRadioGroupContext } from "../../radio-group/RadioGroupContext.js";
 import { serializeValue } from "../../utils/serializeValue.js";
@@ -37,6 +38,7 @@ export const RadioRoot = /*#__PURE__*/React.forwardRef(function RadioRoot(compon
     disabled: disabledProp = false,
     readOnly: readOnlyProp = false,
     required: requiredProp = false,
+    'aria-labelledby': ariaLabelledByProp,
     value,
     inputRef: inputRefProp,
     nativeButton = false,
@@ -109,12 +111,13 @@ export const RadioRoot = /*#__PURE__*/React.forwardRef(function RadioRoot(compon
     controlRef: radioRef
   });
   const hiddenInputId = nativeButton ? undefined : inputId;
+  const ariaLabelledBy = useAriaLabelledBy(ariaLabelledByProp, labelId, inputRef, !nativeButton, hiddenInputId);
   const rootProps = {
     role: 'radio',
     'aria-checked': checked,
     'aria-required': required || undefined,
     'aria-readonly': readOnly || undefined,
-    'aria-labelledby': labelId,
+    'aria-labelledby': ariaLabelledBy,
     [ACTIVE_COMPOSITE_ITEM]: checked ? '' : undefined,
     id: nativeButton ? inputId : id,
     onKeyDown(event) {

package/esm/radio-group/RadioGroup.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { BaseUIComponentProps } from "../utils/types.js";
-import type { FieldRoot } from "../field/root/FieldRoot.js";
+import type { FieldRootState } from "../field/root/FieldRoot.js";
 import type { BaseUIChangeEventDetails } from "../utils/createBaseUIEventDetails.js";
 import { REASONS } from "../utils/reasons.js";
 /**
@@ -12,7 +12,7 @@ import { REASONS } from "../utils/reasons.js";
 export declare const RadioGroup: {
   <Value>(props: RadioGroup.Props<Value>): React.JSX.Element;
 };
-export interface RadioGroupState extends FieldRoot.State {
+export interface RadioGroupState extends FieldRootState {
   /**
    * Whether the user should be unable to select a different radio button in the group.
    */
@@ -22,7 +22,7 @@ export interface RadioGroupState extends FieldRoot.State {
    */
   required: boolean;
 }
-export interface RadioGroupProps<Value = any> extends Omit<BaseUIComponentProps<'div', RadioGroup.State>, 'value'> {
+export interface RadioGroupProps<Value = any> extends Omit<BaseUIComponentProps<'div', RadioGroupState>, 'value'> {
   /**
    * Whether the component should ignore user interaction.
    * @default false

package/esm/scroll-area/content/ScrollAreaContent.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { BaseUIComponentProps } from "../../utils/types.js";
-import type { ScrollAreaRoot } from "../root/ScrollAreaRoot.js";
+import type { ScrollAreaRootState } from "../root/ScrollAreaRoot.js";
 /**
  * A container for the content of the scroll area.
  * Renders a `<div>` element.
@@ -8,8 +8,8 @@ import type { ScrollAreaRoot } from "../root/ScrollAreaRoot.js";
  * Documentation: [Base UI Scroll Area](https://base-ui.com/react/components/scroll-area)
  */
 export declare const ScrollAreaContent: React.ForwardRefExoticComponent<Omit<ScrollAreaContentProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
-export interface ScrollAreaContentState extends ScrollAreaRoot.State {}
-export interface ScrollAreaContentProps extends BaseUIComponentProps<'div', ScrollAreaContent.State> {}
+export interface ScrollAreaContentState extends ScrollAreaRootState {}
+export interface ScrollAreaContentProps extends BaseUIComponentProps<'div', ScrollAreaContentState> {}
 export declare namespace ScrollAreaContent {
   type State = ScrollAreaContentState;
   type Props = ScrollAreaContentProps;

package/esm/scroll-area/corner/ScrollAreaCorner.d.ts

@@ -8,7 +8,7 @@ import type { BaseUIComponentProps } from "../../utils/types.js";
  */
 export declare const ScrollAreaCorner: React.ForwardRefExoticComponent<Omit<ScrollAreaCornerProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ScrollAreaCornerState {}
-export interface ScrollAreaCornerProps extends BaseUIComponentProps<'div', ScrollAreaCorner.State> {}
+export interface ScrollAreaCornerProps extends BaseUIComponentProps<'div', ScrollAreaCornerState> {}
 export declare namespace ScrollAreaCorner {
   type State = ScrollAreaCornerState;
   type Props = ScrollAreaCornerProps;

package/esm/scroll-area/root/ScrollAreaRoot.d.ts

@@ -31,35 +31,51 @@ export type Coords = typeof DEFAULT_COORDS;
  */
 export declare const ScrollAreaRoot: React.ForwardRefExoticComponent<Omit<ScrollAreaRootProps, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export interface ScrollAreaRootState {
-  /** Whether the scroll area is being scrolled. */
+  /**
+   * Whether the scroll area is being scrolled.
+   */
   scrolling: boolean;
-  /** Whether horizontal overflow is present. */
+  /**
+   * Whether horizontal overflow is present.
+   */
   hasOverflowX: boolean;
-  /** Whether vertical overflow is present. */
+  /**
+   * Whether vertical overflow is present.
+   */
   hasOverflowY: boolean;
-  /** Whether there is overflow on the inline start side for the horizontal axis. */
+  /**
+   * Whether there is overflow on the inline start side for the horizontal axis.
+   */
   overflowXStart: boolean;
-  /** Whether there is overflow on the inline end side for the horizontal axis. */
+  /**
+   * Whether there is overflow on the inline end side for the horizontal axis.
+   */
   overflowXEnd: boolean;
-  /** Whether there is overflow on the block start side. */
+  /**
+   * Whether there is overflow on the block start side.
+   */
   overflowYStart: boolean;
-  /** Whether there is overflow on the block end side. */
+  /**
+   * Whether there is overflow on the block end side.
+   */
   overflowYEnd: boolean;
-  /** Whether the scrollbar corner is hidden. */
+  /**
+   * Whether the scrollbar corner is hidden.
+   */
   cornerHidden: boolean;
 }
-export interface ScrollAreaRootProps extends BaseUIComponentProps<'div', ScrollAreaRoot.State> {
+export interface ScrollAreaRootProps extends BaseUIComponentProps<'div', ScrollAreaRootState> {
   /**
    * The threshold in pixels that must be passed before the overflow edge attributes are applied.
    * Accepts a single number for all edges or an object to configure them individually.
    * @default 0
    */
-  overflowEdgeThreshold?: (number | Partial<{
+  overflowEdgeThreshold?: number | Partial<{
     xStart: number;
     xEnd: number;
     yStart: number;
     yEnd: number;
-  }>) | undefined;
+  }> | undefined;
 }
 export declare namespace ScrollAreaRoot {
   type State = ScrollAreaRootState;

package/esm/scroll-area/root/ScrollAreaRoot.js

@@ -30,9 +30,9 @@ const DEFAULT_OVERFLOW_EDGES = {
   yEnd: false
 };
 const DEFAULT_HIDDEN_STATE = {
-  x: false,
-  y: false,
-  corner: false
+  x: true,
+  y: true,
+  corner: true
 };
 /**
  * Groups all parts of the scroll area.
@@ -59,6 +59,7 @@ export const ScrollAreaRoot = /*#__PURE__*/React.forwardRef(function ScrollAreaR
   const [scrollingX, setScrollingX] = React.useState(false);
   const [scrollingY, setScrollingY] = React.useState(false);
   const [touchModality, setTouchModality] = React.useState(false);
+  const [hasMeasuredScrollbar, setHasMeasuredScrollbar] = React.useState(false);
   const [cornerSize, setCornerSize] = React.useState(DEFAULT_SIZE);
   const [thumbSize, setThumbSize] = React.useState(DEFAULT_SIZE);
   const [overflowEdges, setOverflowEdges] = React.useState(DEFAULT_OVERFLOW_EDGES);
@@ -210,6 +211,8 @@ export const ScrollAreaRoot = /*#__PURE__*/React.forwardRef(function ScrollAreaR
     setCornerSize,
     thumbSize,
     setThumbSize,
+    hasMeasuredScrollbar,
+    setHasMeasuredScrollbar,
     touchModality,
     cornerRef,
     scrollingX,
@@ -231,7 +234,7 @@ export const ScrollAreaRoot = /*#__PURE__*/React.forwardRef(function ScrollAreaR
     setOverflowEdges,
     viewportState: state,
     overflowEdgeThreshold
-  }), [handlePointerDown, handlePointerMove, handlePointerUp, handleScroll, cornerSize, thumbSize, touchModality, scrollingX, setScrollingX, scrollingY, setScrollingY, hovering, setHovering, rootId, hiddenState, overflowEdges, state, overflowEdgeThreshold]);
+  }), [handlePointerDown, handlePointerMove, handlePointerUp, handleScroll, cornerSize, thumbSize, hasMeasuredScrollbar, touchModality, scrollingX, setScrollingX, scrollingY, setScrollingY, hovering, setHovering, rootId, hiddenState, overflowEdges, state, overflowEdgeThreshold]);
   return /*#__PURE__*/_jsxs(ScrollAreaRootContext.Provider, {
     value: contextValue,
     children: [!disableStyleElements && styleDisableScrollbar.getElement(nonce), element]

package/esm/scroll-area/root/ScrollAreaRootContext.d.ts

@@ -1,10 +1,12 @@
 import * as React from 'react';
-import type { Coords, HiddenState, OverflowEdges, ScrollAreaRoot, Size } from "./ScrollAreaRoot.js";
+import type { Coords, HiddenState, OverflowEdges, Size, ScrollAreaRootState } from "./ScrollAreaRoot.js";
 export interface ScrollAreaRootContext {
   cornerSize: Size;
   setCornerSize: React.Dispatch<React.SetStateAction<Size>>;
   thumbSize: Size;
   setThumbSize: React.Dispatch<React.SetStateAction<Size>>;
+  hasMeasuredScrollbar: boolean;
+  setHasMeasuredScrollbar: React.Dispatch<React.SetStateAction<boolean>>;
   touchModality: boolean;
   hovering: boolean;
   setHovering: React.Dispatch<React.SetStateAction<boolean>>;
@@ -28,7 +30,7 @@ export interface ScrollAreaRootContext {
   setHiddenState: React.Dispatch<React.SetStateAction<HiddenState>>;
   overflowEdges: OverflowEdges;
   setOverflowEdges: React.Dispatch<React.SetStateAction<OverflowEdges>>;
-  viewportState: ScrollAreaRoot.State;
+  viewportState: ScrollAreaRootState;
   overflowEdgeThreshold: {
     xStart: number;
     xEnd: number;

package/esm/scroll-area/root/stateAttributes.d.ts

@@ -1,3 +1,3 @@
 import type { StateAttributesMapping } from "../../utils/getStateAttributesProps.js";
-import type { ScrollAreaRoot } from "./ScrollAreaRoot.js";
-export declare const scrollAreaStateAttributesMapping: StateAttributesMapping<ScrollAreaRoot.State>;
+import type { ScrollAreaRootState } from "./ScrollAreaRoot.js";
+export declare const scrollAreaStateAttributesMapping: StateAttributesMapping<ScrollAreaRootState>;