@base-ui/react 1.3.0 → 1.4.0

package/esm/progress/value/ProgressValue.js

@@ -15,6 +15,7 @@ export const ProgressValue = /*#__PURE__*/React.forwardRef(function ProgressValu
     className,
     render,
     children,
+    style,
     ...elementProps
   } = componentProps;
   const {

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

@@ -4,7 +4,7 @@ export declare enum ProgressValueDataAttributes {
    */
   complete = "data-complete",
   /**
-   * Present when the progress is in interminate state.
+   * Present when the progress is in indeterminate state.
    */
   indeterminate = "data-indeterminate",
   /**

package/esm/progress/value/ProgressValueDataAttributes.js

@@ -4,7 +4,7 @@ export let ProgressValueDataAttributes = /*#__PURE__*/function (ProgressValueDat
    */
   ProgressValueDataAttributes["complete"] = "data-complete";
   /**
-   * Present when the progress is in interminate state.
+   * Present when the progress is in indeterminate state.
    */
   ProgressValueDataAttributes["indeterminate"] = "data-indeterminate";
   /**

package/esm/radio/indicator/RadioIndicator.js

@@ -17,6 +17,7 @@ export const RadioIndicator = /*#__PURE__*/React.forwardRef(function RadioIndica
   const {
     render,
     className,
+    style,
     keepMounted = false,
     ...elementProps
   } = componentProps;

package/esm/radio/root/RadioRoot.js

@@ -43,6 +43,7 @@ export const RadioRoot = /*#__PURE__*/React.forwardRef(function RadioRoot(compon
     inputRef: inputRefProp,
     nativeButton = false,
     id: idProp,
+    style,
     ...elementProps
   } = componentProps;
   const groupContext = useRadioGroupContext();
@@ -50,6 +51,7 @@ export const RadioRoot = /*#__PURE__*/React.forwardRef(function RadioRoot(compon
     disabled: disabledGroup,
     readOnly: readOnlyGroup,
     required: requiredGroup,
+    form: formGroup,
     checkedValue,
     touched = false,
     validation,
@@ -75,6 +77,7 @@ export const RadioRoot = /*#__PURE__*/React.forwardRef(function RadioRoot(compon
   const disabled = fieldDisabled || fieldItemContext.disabled || disabledGroup || disabledProp;
   const readOnly = readOnlyGroup || readOnlyProp;
   const required = requiredGroup || requiredProp;
+  const form = formGroup;
   const checked = groupContext ? checkedValue === value : value === '';
   const serializedValue = React.useMemo(() => serializeValue(value), [value]);
   const radioRef = React.useRef(null);
@@ -156,6 +159,7 @@ export const RadioRoot = /*#__PURE__*/React.forwardRef(function RadioRoot(compon
   const inputProps = {
     type: 'radio',
     ref: mergedInputRef,
+    form,
     id: hiddenInputId,
     name,
     tabIndex: -1,
@@ -213,12 +217,14 @@ export const RadioRoot = /*#__PURE__*/React.forwardRef(function RadioRoot(compon
       tag: "span",
       render: render,
       className: className,
+      style: style,
       state: state,
       refs: refs,
       props: props,
       stateAttributesMapping: stateAttributesMapping
     }) : element, /*#__PURE__*/_jsx("input", {
-      ...inputProps
+      ...inputProps,
+      suppressHydrationWarning: true
     })]
   });
 });

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

@@ -42,6 +42,11 @@ export interface RadioGroupProps<Value = any> extends Omit<BaseUIComponentProps<
    * Identifies the field when a form is submitted.
    */
   name?: string | undefined;
+  /**
+   * Identifies the form that owns the radio inputs.
+   * Useful when the radio group is rendered outside the form.
+   */
+  form?: string | undefined;
   /**
    * The controlled value of the radio item that should be currently selected.
    *

package/esm/radio-group/RadioGroup.js

@@ -7,8 +7,8 @@ import { useBaseUiId } from "../utils/useBaseUiId.js";
 import { contains } from "../floating-ui-react/utils.js";
 import { SHIFT } from "../composite/composite.js";
 import { CompositeRoot } from "../composite/root/CompositeRoot.js";
-import { useField } from "../field/useField.js";
 import { useFieldRootContext } from "../field/root/FieldRootContext.js";
+import { useRegisterFieldControl } from "../field/root/useRegisterFieldControl.js";
 import { fieldValidityMapping } from "../field/utils/constants.js";
 import { useFieldsetRootContext } from "../fieldset/root/FieldsetRootContext.js";
 import { useFormContext } from "../form/FormContext.js";
@@ -34,9 +34,11 @@ export const RadioGroup = /*#__PURE__*/React.forwardRef(function RadioGroup(comp
     onValueChange: onValueChangeProp,
     value: externalValue,
     defaultValue,
+    form,
     name: nameProp,
     inputRef: inputRefProp,
     id: idProp,
+    style,
     ...elementProps
   } = componentProps;
   const {
@@ -119,13 +121,11 @@ export const RadioGroup = /*#__PURE__*/React.forwardRef(function RadioGroup(comp
     }
     return undefined;
   });
-  useField({
+  const getFieldValue = useStableCallback(() => checkedValue ?? null);
+  useRegisterFieldControl(controlRef, {
     id,
-    commit: validation.commit,
     value: checkedValue,
-    controlRef,
-    name,
-    getValue: () => checkedValue ?? null
+    getValue: getFieldValue
   });
   useValueChanged(checkedValue, () => {
     clearErrors(name);
@@ -153,6 +153,7 @@ export const RadioGroup = /*#__PURE__*/React.forwardRef(function RadioGroup(comp
     ...fieldState,
     checkedValue,
     disabled,
+    form,
     validation,
     name,
     onValueChange,
@@ -163,7 +164,7 @@ export const RadioGroup = /*#__PURE__*/React.forwardRef(function RadioGroup(comp
     setCheckedValue,
     setTouched,
     touched
-  }), [checkedValue, disabled, validation, fieldState, name, onValueChange, readOnly, registerControlRef, registerInputRef, required, setCheckedValue, setTouched, touched]);
+  }), [checkedValue, disabled, form, validation, fieldState, name, onValueChange, readOnly, registerControlRef, registerInputRef, required, setCheckedValue, setTouched, touched]);
   const defaultProps = {
     role: 'radiogroup',
     'aria-required': required || undefined,
@@ -195,6 +196,7 @@ export const RadioGroup = /*#__PURE__*/React.forwardRef(function RadioGroup(comp
     children: /*#__PURE__*/_jsx(CompositeRoot, {
       render: render,
       className: className,
+      style: style,
       state: state,
       props: [defaultProps, validation.getValidationProps, elementProps],
       refs: [forwardedRef],

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

@@ -6,6 +6,7 @@ export interface RadioGroupContext<Value> {
   disabled: boolean | undefined;
   readOnly: boolean | undefined;
   required: boolean | undefined;
+  form: string | undefined;
   name: string | undefined;
   checkedValue: Value | undefined;
   setCheckedValue: (value: Value, eventDetails: BaseUIChangeEventDetails<BaseUIEventReasons['none']>) => void;

package/esm/scroll-area/content/ScrollAreaContent.js

@@ -16,6 +16,7 @@ export const ScrollAreaContent = /*#__PURE__*/React.forwardRef(function ScrollAr
   const {
     render,
     className,
+    style,
     ...elementProps
   } = componentProps;
   const contentWrapperRef = React.useRef(null);

package/esm/scroll-area/corner/ScrollAreaCorner.js

@@ -14,6 +14,7 @@ export const ScrollAreaCorner = /*#__PURE__*/React.forwardRef(function ScrollAre
   const {
     render,
     className,
+    style,
     ...elementProps
   } = componentProps;
   const {

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

@@ -45,6 +45,7 @@ export const ScrollAreaRoot = /*#__PURE__*/React.forwardRef(function ScrollAreaR
     render,
     className,
     overflowEdgeThreshold: overflowEdgeThresholdProp,
+    style,
     ...elementProps
   } = componentProps;
   const overflowEdgeThreshold = normalizeOverflowEdgeThreshold(overflowEdgeThresholdProp);

package/esm/scroll-area/scrollbar/ScrollAreaScrollbar.d.ts

@@ -29,7 +29,7 @@ export interface ScrollAreaScrollbarProps extends BaseUIComponentProps<'div', Sc
    */
   orientation?: 'vertical' | 'horizontal' | undefined;
   /**
-   * Whether to keep the HTML element in the DOM when the viewport isn’t scrollable.
+   * Whether to keep the HTML element in the DOM when the viewport isn't scrollable.
    * @default false
    */
   keepMounted?: boolean | undefined;

package/esm/scroll-area/scrollbar/ScrollAreaScrollbar.js

@@ -1,6 +1,8 @@
 'use client';
 
 import * as React from 'react';
+import { addEventListener } from '@base-ui/utils/addEventListener';
+import { contains, getTarget } from "../../floating-ui-react/utils.js";
 import { useScrollAreaRootContext } from "../root/ScrollAreaRootContext.js";
 import { ScrollAreaScrollbarContext } from "./ScrollAreaScrollbarContext.js";
 import { useRenderElement } from "../../utils/useRenderElement.js";
@@ -22,6 +24,7 @@ export const ScrollAreaScrollbar = /*#__PURE__*/React.forwardRef(function Scroll
     className,
     orientation = 'vertical',
     keepMounted = false,
+    style,
     ...elementProps
   } = componentProps;
   const {
@@ -89,12 +92,9 @@ export const ScrollAreaScrollbar = /*#__PURE__*/React.forwardRef(function Scroll
         viewportEl.scrollLeft += event.deltaX;
       }
     }
-    scrollbarEl.addEventListener('wheel', handleWheel, {
+    return addEventListener(scrollbarEl, 'wheel', handleWheel, {
       passive: false
     });
-    return () => {
-      scrollbarEl.removeEventListener('wheel', handleWheel);
-    };
   }, [orientation, scrollbarXRef, scrollbarYRef, viewportRef]);
   const props = {
     ...(rootId && {
@@ -104,9 +104,12 @@ export const ScrollAreaScrollbar = /*#__PURE__*/React.forwardRef(function Scroll
       if (event.button !== 0) {
         return;
       }
+      const target = getTarget(event.nativeEvent);
+      const thumb = orientation === 'vertical' ? thumbYRef.current : thumbXRef.current;
 
-      // Ignore clicks on thumb
-      if (event.currentTarget !== event.target) {
+      // Ignore clicks on thumb, including cases where React retargets the
+      // synthetic event to the track host across a shadow boundary.
+      if (thumb && contains(thumb, target)) {
         return;
       }
       if (!viewportRef.current) {

package/esm/scroll-area/thumb/ScrollAreaThumb.js

@@ -16,6 +16,7 @@ export const ScrollAreaThumb = /*#__PURE__*/React.forwardRef(function ScrollArea
   const {
     render,
     className,
+    style,
     ...elementProps
   } = componentProps;
   const {

package/esm/scroll-area/viewport/ScrollAreaViewport.js

@@ -13,17 +13,14 @@ import { getOffset } from "../utils/getOffset.js";
 import { MIN_THUMB_SIZE } from "../constants.js";
 import { clamp } from "../../utils/clamp.js";
 import { styleDisableScrollbar } from "../../utils/styles.js";
-import { onVisible } from "../utils/onVisible.js";
 import { scrollAreaStateAttributesMapping } from "../root/stateAttributes.js";
 import { ScrollAreaViewportCssVars } from "./ScrollAreaViewportCssVars.js";
-import { normalizeScrollOffset } from "../utils/scrollEdges.js";
+import { normalizeScrollOffset } from "../../utils/scrollEdges.js";
 
 // Module-level flag to ensure we only register the CSS properties once,
 // regardless of how many Scroll Area components are mounted.
 import { jsx as _jsx } from "react/jsx-runtime";
 let scrollAreaOverflowVarsRegistered = false;
-const HAS_RESIZE_OBSERVER = typeof ResizeObserver !== 'undefined';
-
 /**
  * Removes inheritance of the scroll area overflow CSS variables, which
  * improves rendering performance in complex scroll areas with deep subtrees.
@@ -66,6 +63,7 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
   const {
     render,
     className,
+    style,
     ...elementProps
   } = componentProps;
   const {
@@ -235,16 +233,10 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
   });
   useIsoLayoutEffect(() => {
     if (!viewportRef.current) {
-      return undefined;
+      return;
     }
     removeCSSVariableInheritance();
-    if (HAS_RESIZE_OBSERVER) {
-      return undefined;
-    }
-    return onVisible(viewportRef.current, () => {
-      computeThumbPosition();
-    });
-  }, [computeThumbPosition, viewportRef]);
+  }, [viewportRef]);
   useIsoLayoutEffect(() => {
     // Wait for scrollbar and thumb refs after hidden-state toggles, and refresh math on direction flips.
     queueMicrotask(computeThumbPosition);
@@ -258,7 +250,7 @@ export const ScrollAreaViewport = /*#__PURE__*/React.forwardRef(function ScrollA
   }, [viewportRef, setHovering]);
   React.useEffect(() => {
     const viewport = viewportRef.current;
-    if (!HAS_RESIZE_OBSERVER || !viewport) {
+    if (typeof ResizeObserver === 'undefined' || !viewport) {
       return undefined;
     }
     let hasInitialized = false;

package/esm/select/arrow/SelectArrow.js

@@ -23,6 +23,7 @@ export const SelectArrow = /*#__PURE__*/React.forwardRef(function SelectArrow(co
   const {
     className,
     render,
+    style,
     ...elementProps
   } = componentProps;
   const {

package/esm/select/backdrop/SelectBackdrop.js

@@ -22,6 +22,7 @@ export const SelectBackdrop = /*#__PURE__*/React.forwardRef(function SelectBackd
   const {
     className,
     render,
+    style,
     ...elementProps
   } = componentProps;
   const {

package/esm/select/group/SelectGroup.js

@@ -15,6 +15,7 @@ export const SelectGroup = /*#__PURE__*/React.forwardRef(function SelectGroup(co
   const {
     className,
     render,
+    style,
     ...elementProps
   } = componentProps;
   const [labelId, setLabelId] = React.useState();

package/esm/select/group-label/SelectGroupLabel.js

@@ -17,6 +17,7 @@ export const SelectGroupLabel = /*#__PURE__*/React.forwardRef(function SelectGro
     className,
     render,
     id: idProp,
+    style,
     ...elementProps
   } = componentProps;
   const {

package/esm/select/icon/SelectIcon.js

@@ -17,6 +17,7 @@ export const SelectIcon = /*#__PURE__*/React.forwardRef(function SelectIcon(comp
   const {
     className,
     render,
+    style,
     ...elementProps
   } = componentProps;
   const {

package/esm/select/item/SelectItem.js

@@ -3,8 +3,6 @@
 import * as React from 'react';
 import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
 import { useValueAsRef } from '@base-ui/utils/useValueAsRef';
-import { isMouseWithinBounds } from '@base-ui/utils/isMouseWithinBounds';
-import { useTimeout } from '@base-ui/utils/useTimeout';
 import { useStore } from '@base-ui/utils/store';
 import { useSelectRootContext } from "../root/SelectRootContext.js";
 import { useCompositeListItem, IndexGuessBehavior } from "../../composite/list/useCompositeListItem.js";
@@ -31,6 +29,7 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
     label,
     disabled = false,
     nativeButton = false,
+    style,
     ...elementProps
   } = componentProps;
   const textRef = React.useRef(null);
@@ -47,11 +46,9 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
     selectionRef,
     typingRef,
     valuesRef,
-    keyboardActiveRef,
     multiple,
-    highlightItemOnHover
+    selectedItemTextRef
   } = useSelectRootContext();
-  const highlightTimeout = useTimeout();
   const highlighted = useStore(store, selectors.isActive, listItem.index);
   const selected = useStore(store, selectors.isSelected, listItem.index, itemValue);
   const selectedByFocus = useStore(store, selectors.isSelectedByFocus, listItem.index);
@@ -72,7 +69,7 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
   }, [hasRegistered, index, itemValue, valuesRef]);
   useIsoLayoutEffect(() => {
     if (!hasRegistered) {
-      return undefined;
+      return;
     }
     const selectedValue = store.state.value;
     let selectedCandidate = selectedValue;
@@ -81,9 +78,13 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
     }
     if (selectedCandidate !== undefined && compareItemEquality(itemValue, selectedCandidate, isItemEqualToValue)) {
       store.set('selectedIndex', index);
+      // Make sure SelectPopup can measure the selected item on first open.
+      // SelectItemText can still update this ref later when focus moves.
+      if (textRef.current) {
+        selectedItemTextRef.current = textRef.current;
+      }
     }
-    return undefined;
-  }, [hasRegistered, index, multiple, isItemEqualToValue, store, itemValue]);
+  }, [hasRegistered, index, multiple, isItemEqualToValue, store, itemValue, selectedItemTextRef]);
   const state = {
     disabled,
     selected,
@@ -93,9 +94,6 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
     active: highlighted,
     selected
   });
-  // With our custom `focusItemOnHover` implementation, this interferes with the logic and can
-  // cause the index state to be stuck when leaving the select popup.
-  rootProps.onFocus = undefined;
   rootProps.id = undefined;
   const lastKeyRef = React.useRef(null);
   const pointerTypeRef = React.useRef('mouse');
@@ -124,29 +122,6 @@ export const SelectItem = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(
     role: 'option',
     'aria-selected': selected,
     tabIndex: highlighted ? 0 : -1,
-    onFocus() {
-      store.set('activeIndex', index);
-    },
-    onMouseEnter() {
-      if (!keyboardActiveRef.current && store.state.selectedIndex === null && highlightItemOnHover) {
-        store.set('activeIndex', index);
-      }
-    },
-    onMouseMove() {
-      if (highlightItemOnHover) {
-        store.set('activeIndex', index);
-      }
-    },
-    onMouseLeave(event) {
-      if (!highlightItemOnHover || keyboardActiveRef.current || isMouseWithinBounds(event)) {
-        return;
-      }
-      highlightTimeout.start(0, () => {
-        if (store.state.activeIndex === index) {
-          store.set('activeIndex', null);
-        }
-      });
-    },
     onTouchStart() {
       selectionRef.current = {
         allowSelectedMouseUp: false,

package/esm/select/item-indicator/SelectItemIndicator.js

@@ -38,6 +38,7 @@ const Inner = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef((componentPr
   const {
     render,
     className,
+    style,
     keepMounted,
     ...elementProps
   } = componentProps;

package/esm/select/item-text/SelectItemText.js

@@ -24,6 +24,7 @@ export const SelectItemText = /*#__PURE__*/React.memo(/*#__PURE__*/React.forward
   const {
     className,
     render,
+    style,
     ...elementProps
   } = componentProps;
   const localRef = React.useCallback(node => {

package/esm/select/label/SelectLabel.js

@@ -20,6 +20,7 @@ export const SelectLabel = /*#__PURE__*/React.forwardRef(function SelectLabel(co
   const {
     render,
     className,
+    style,
     ...elementProps
   } = componentProps;
   // Keep label id derived from the root and ignore runtime `id` overrides from untyped consumers.

package/esm/select/list/SelectList.js

@@ -20,6 +20,7 @@ export const SelectList = /*#__PURE__*/React.forwardRef(function SelectList(comp
   const {
     className,
     render,
+    style,
     ...elementProps
   } = componentProps;
   const {