@base-ui/react 1.3.0 → 1.4.0

package/esm/slider/thumb/SliderThumb.js

@@ -3,30 +3,30 @@
 import * as React from 'react';
 import { useStableCallback } from '@base-ui/utils/useStableCallback';
 import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
-import { useOnMount } from '@base-ui/utils/useOnMount';
 import { useMergedRefs } from '@base-ui/utils/useMergedRefs';
 import { visuallyHidden } from '@base-ui/utils/visuallyHidden';
+import { clamp } from "../../utils/clamp.js";
 import { formatNumber } from "../../utils/formatNumber.js";
 import { mergeProps } from "../../merge-props/index.js";
 import { useBaseUiId } from "../../utils/useBaseUiId.js";
+import { useIsHydrating } from "../../utils/useIsHydrating.js";
 import { useRenderElement } from "../../utils/useRenderElement.js";
 import { valueToPercent } from "../../utils/valueToPercent.js";
-import { ARROW_DOWN, ARROW_UP, ARROW_RIGHT, ARROW_LEFT, HOME, END, COMPOSITE_KEYS } from "../../composite/composite.js";
+import { ARROW_DOWN, ARROW_UP, ARROW_RIGHT, ARROW_LEFT, HOME, END, COMPOSITE_KEYS, PAGE_UP, PAGE_DOWN } from "../../composite/composite.js";
 import { useCompositeListItem } from "../../composite/list/useCompositeListItem.js";
 import { useDirection } from "../../direction-provider/DirectionContext.js";
 import { useCSPContext } from "../../csp-provider/CSPContext.js";
 import { useFieldRootContext } from "../../field/root/FieldRootContext.js";
+import { matchesFocusVisible } from "../../floating-ui-react/utils/element.js";
 import { useLabelableId } from "../../labelable-provider/useLabelableId.js";
 import { getMidpoint } from "../utils/getMidpoint.js";
 import { getSliderValue } from "../utils/getSliderValue.js";
-import { roundValueToStep } from "../utils/roundValueToStep.js";
+import { getDecimalPrecision, roundValueToStep } from "../utils/roundValueToStep.js";
 import { useSliderRootContext } from "../root/SliderRootContext.js";
 import { sliderStateAttributesMapping } from "../root/stateAttributesMapping.js";
 import { SliderThumbDataAttributes } from "./SliderThumbDataAttributes.js";
 import { script as prehydrationScript } from "./prehydrationScript.min.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const PAGE_UP = 'PageUp';
-const PAGE_DOWN = 'PageDown';
 const ALL_KEYS = new Set([ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT, HOME, END, PAGE_UP, PAGE_DOWN]);
 function getDefaultAriaValueText(values, index, format, locale) {
   if (index < 0) {
@@ -40,8 +40,10 @@ function getDefaultAriaValueText(values, index, format, locale) {
   }
   return format ? formatNumber(values[index], locale, format) : undefined;
 }
-function getNewValue(thumbValue, step, direction, min, max) {
-  return direction === 1 ? Math.min(thumbValue + step, max) : Math.max(thumbValue - step, min);
+function getNewValue(thumbValue, increment, direction, min, max) {
+  const value = direction === 1 ? thumbValue + increment : thumbValue - increment;
+  const roundedValue = Number(value.toFixed(Math.max(getDecimalPrecision(thumbValue), getDecimalPrecision(increment), getDecimalPrecision(min))));
+  return clamp(roundedValue, min, max);
 }
 
 /**
@@ -68,6 +70,7 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
     onFocus: onFocusProp,
     onKeyDown: onKeyDownProp,
     tabIndex: tabIndexProp,
+    style,
     ...elementProps
   } = componentProps;
   const {
@@ -89,6 +92,7 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
     max,
     min,
     minStepsBetweenValues,
+    form,
     name,
     orientation,
     pressedInputRef,
@@ -113,6 +117,7 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
   } = useFieldRootContext();
   const thumbRef = React.useRef(null);
   const inputRef = React.useRef(null);
+  const restoringFocusVisibleRef = React.useRef(false);
   const defaultInputId = useBaseUiId();
   const labelableId = useLabelableId();
   const inputId = range ? defaultInputId : labelableId;
@@ -129,9 +134,8 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
   const last = index === sliderValues.length - 1;
   const thumbValue = sliderValues[index];
   const thumbValuePercent = valueToPercent(thumbValue, min, max);
-  const [isMounted, setIsMounted] = React.useState(false);
   const [positionPercent, setPositionPercent] = React.useState();
-  useOnMount(() => setIsMounted(true));
+  const isHydrating = useIsHydrating();
   const safeLastUsedThumbIndex = lastUsedThumbIndex >= 0 && lastUsedThumbIndex < sliderValues.length ? lastUsedThumbIndex : -1;
   const getInsetPosition = useStableCallback(() => {
     const control = controlRef.current;
@@ -147,11 +151,12 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
     // px distance from the starting edge (inline-start or bottom) to the thumb center
     const thumbOffsetFromControlEdge = thumbRect[side] / 2 + controlSize * thumbValuePercent / 100;
     const nextPositionPercent = thumbOffsetFromControlEdge / controlRect[side] * 100;
-    setPositionPercent(nextPositionPercent);
+    const nextInsetPosition = Number.isFinite(nextPositionPercent) ? nextPositionPercent : undefined;
+    setPositionPercent(nextInsetPosition);
     if (index === 0) {
-      setIndicatorPosition(prevPosition => [nextPositionPercent, prevPosition[1]]);
+      setIndicatorPosition(prevPosition => [nextInsetPosition, prevPosition[1]]);
     } else if (last) {
-      setIndicatorPosition(prevPosition => [prevPosition[0], nextPositionPercent]);
+      setIndicatorPosition(prevPosition => [prevPosition[0], nextInsetPosition]);
     }
   });
   useIsoLayoutEffect(() => {
@@ -164,6 +169,22 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
       getInsetPosition();
     }
   }, [getInsetPosition, inset, thumbValuePercent]);
+  useIsoLayoutEffect(() => {
+    if (!inset || typeof ResizeObserver !== 'function') {
+      return undefined;
+    }
+    const control = controlRef.current;
+    const thumb = thumbRef.current;
+    if (!control || !thumb) {
+      return undefined;
+    }
+    const resizeObserver = new ResizeObserver(getInsetPosition);
+    resizeObserver.observe(control);
+    resizeObserver.observe(thumb);
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, [controlRef, getInsetPosition, inset]);
   const getThumbStyle = React.useCallback(() => {
     const startEdge = vertical ? 'bottom' : 'insetInlineStart';
     const crossOffsetProperty = vertical ? 'left' : 'top';
@@ -190,15 +211,15 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
       };
     }
     return {
-      ['--position']: `${positionPercent}%`,
-      visibility: renderBeforeHydration && !isMounted || positionPercent === undefined ? 'hidden' : undefined,
+      ['--position']: `${positionPercent ?? 0}%`,
+      visibility: renderBeforeHydration && isHydrating || positionPercent === undefined ? 'hidden' : undefined,
       position: 'absolute',
       [startEdge]: 'var(--position)',
       [crossOffsetProperty]: '50%',
       translate: `${(vertical || !rtl ? -1 : 1) * 50}% ${(vertical ? 1 : -1) * 50}%`,
       zIndex
     };
-  }, [activeIndex, index, inset, isMounted, positionPercent, range, renderBeforeHydration, rtl, safeLastUsedThumbIndex, thumbValuePercent, vertical]);
+  }, [activeIndex, index, inset, isHydrating, positionPercent, range, renderBeforeHydration, rtl, safeLastUsedThumbIndex, thumbValuePercent, vertical]);
   let cssWritingMode;
   if (orientation === 'vertical') {
     cssWritingMode = rtl ? 'vertical-rl' : 'vertical-lr';
@@ -212,18 +233,28 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
     'aria-valuenow': thumbValue,
     'aria-valuetext': typeof getAriaValueTextProp === 'function' ? getAriaValueTextProp(formatNumber(thumbValue, locale, formatOptionsRef.current ?? undefined), thumbValue, index) : getDefaultAriaValueText(sliderValues, index, formatOptionsRef.current ?? undefined, locale),
     disabled,
+    form,
     id: inputId,
     max,
     min,
     name,
     onChange(event) {
-      handleInputChange(event.target.valueAsNumber, index, event);
+      handleInputChange(event.currentTarget.valueAsNumber, index, event);
     },
-    onFocus() {
+    onFocus(event) {
+      const isRestoringFocusVisible = restoringFocusVisibleRef.current;
+      restoringFocusVisibleRef.current = false;
       setActive(index);
       setFocused(true);
+      if (isRestoringFocusVisible) {
+        event.stopPropagation();
+      }
     },
-    onBlur() {
+    onBlur(event) {
+      if (restoringFocusVisibleRef.current) {
+        event.stopPropagation();
+        return;
+      }
       if (!thumbRef.current) {
         return;
       }
@@ -278,6 +309,17 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
           break;
       }
       if (newValue !== null) {
+        const input = event.currentTarget;
+        if (!matchesFocusVisible(input)) {
+          restoringFocusVisibleRef.current = true;
+          input.blur();
+          input.focus({
+            preventScroll: true,
+            // Show `:focus-visible` after keyboard interaction, even if the
+            // thumb was previously focused by a pointer.
+            focusVisible: true
+          });
+        }
         handleInputChange(newValue, index, event);
         event.preventDefault();
       }
@@ -303,8 +345,9 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
       children: /*#__PURE__*/_jsxs(React.Fragment, {
         children: [childrenProp, /*#__PURE__*/_jsx("input", {
           ref: mergedInputRef,
-          ...inputProps
-        }), inset && !isMounted && renderBeforeHydration &&
+          ...inputProps,
+          suppressHydrationWarning: true
+        }), inset && isHydrating && renderBeforeHydration &&
         // this must be rendered with the last thumb to ensure all
         // preceding thumbs are already rendered in the DOM
         last && /*#__PURE__*/_jsx("script", {
@@ -333,8 +376,7 @@ export const SliderThumb = /*#__PURE__*/React.forwardRef(function SliderThumb(co
         }
       },
       style: getThumbStyle(),
-      suppressHydrationWarning: renderBeforeHydration || undefined,
-      tabIndex: -1
+      suppressHydrationWarning: renderBeforeHydration || undefined
     }, elementProps],
     stateAttributesMapping: sliderStateAttributesMapping
   });

package/esm/slider/track/SliderTrack.js

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

package/esm/slider/utils/roundValueToStep.d.ts

@@ -1 +1,2 @@
+export declare function getDecimalPrecision(num: number): number;
 export declare function roundValueToStep(value: number, step: number, min: number): number;

package/esm/slider/utils/roundValueToStep.js

@@ -1,4 +1,8 @@
-function getDecimalPrecision(num) {
+export function getDecimalPrecision(num) {
+  if (num === 0) {
+    return 0;
+  }
+
   // This handles the case when num is very small (0.00000001), js will turn this into 1e-8.
   // When num is bigger than 1 or less than -1 it won't get converted to this notation so it's fine.
   if (Math.abs(num) < 1) {
@@ -11,5 +15,5 @@ function getDecimalPrecision(num) {
 }
 export function roundValueToStep(value, step, min) {
   const nearest = Math.round((value - min) / step) * step + min;
-  return Number(nearest.toFixed(getDecimalPrecision(step)));
+  return Number(nearest.toFixed(Math.max(getDecimalPrecision(step), getDecimalPrecision(min))));
 }

package/esm/slider/value/SliderValue.js

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

package/esm/switch/root/SwitchRoot.d.ts

@@ -59,6 +59,11 @@ export interface SwitchRootProps extends NonNativeButtonProps, Omit<BaseUICompon
    * Identifies the field when a form is submitted.
    */
   name?: string | undefined;
+  /**
+   * Identifies the form that owns the hidden input.
+   * Useful when the switch is rendered outside the form.
+   */
+  form?: string | undefined;
   /**
    * Event handler called when the switch is activated or deactivated.
    */

package/esm/switch/root/SwitchRoot.js

@@ -13,8 +13,8 @@ import { useBaseUiId } from "../../utils/useBaseUiId.js";
 import { useButton } from "../../use-button/index.js";
 import { SwitchRootContext } from "./SwitchRootContext.js";
 import { stateAttributesMapping } from "../stateAttributesMapping.js";
-import { useField } from "../../field/useField.js";
 import { useFieldRootContext } from "../../field/root/FieldRootContext.js";
+import { useRegisterFieldControl } from "../../field/root/useRegisterFieldControl.js";
 import { useFormContext } from "../../form/FormContext.js";
 import { useLabelableContext } from "../../labelable-provider/LabelableContext.js";
 import { useAriaLabelledBy } from "../../labelable-provider/useAriaLabelledBy.js";
@@ -36,6 +36,7 @@ export const SwitchRoot = /*#__PURE__*/React.forwardRef(function SwitchRoot(comp
     className,
     defaultChecked,
     'aria-labelledby': ariaLabelledByProp,
+    form,
     id: idProp,
     inputRef: externalInputRef,
     name: nameProp,
@@ -47,6 +48,7 @@ export const SwitchRoot = /*#__PURE__*/React.forwardRef(function SwitchRoot(comp
     render,
     uncheckedValue,
     value,
+    style,
     ...elementProps
   } = componentProps;
   const {
@@ -87,13 +89,9 @@ export const SwitchRoot = /*#__PURE__*/React.forwardRef(function SwitchRoot(comp
     name: 'Switch',
     state: 'checked'
   });
-  useField({
+  useRegisterFieldControl(switchRef, {
     id,
-    commit: validation.commit,
-    value: checked,
-    controlRef: switchRef,
-    name,
-    getValue: () => checked
+    value: checked
   });
   useIsoLayoutEffect(() => {
     if (inputRef.current) {
@@ -158,6 +156,7 @@ export const SwitchRoot = /*#__PURE__*/React.forwardRef(function SwitchRoot(comp
   const inputProps = React.useMemo(() => mergeProps({
     checked,
     disabled,
+    form,
     id: hiddenInputId,
     name,
     required,
@@ -171,7 +170,11 @@ export const SwitchRoot = /*#__PURE__*/React.forwardRef(function SwitchRoot(comp
       if (event.nativeEvent.defaultPrevented) {
         return;
       }
-      const nextChecked = event.target.checked;
+      if (readOnly) {
+        event.preventDefault();
+        return;
+      }
+      const nextChecked = event.currentTarget.checked;
       const eventDetails = createChangeEventDetails(REASONS.none, event.nativeEvent);
       onCheckedChange?.(nextChecked, eventDetails);
       if (eventDetails.isCanceled) {
@@ -187,7 +190,7 @@ export const SwitchRoot = /*#__PURE__*/React.forwardRef(function SwitchRoot(comp
   // To avoid this, we only set the value if it's defined
   value !== undefined ? {
     value
-  } : EMPTY_OBJECT), [checked, disabled, handleInputRef, hiddenInputId, name, onCheckedChange, required, setCheckedState, validation, value]);
+  } : EMPTY_OBJECT), [checked, disabled, form, handleInputRef, hiddenInputId, name, onCheckedChange, readOnly, required, setCheckedState, validation, value]);
   const state = React.useMemo(() => ({
     ...fieldState,
     checked,
@@ -205,10 +208,12 @@ export const SwitchRoot = /*#__PURE__*/React.forwardRef(function SwitchRoot(comp
     value: state,
     children: [element, !checked && name && uncheckedValue !== undefined && /*#__PURE__*/_jsx("input", {
       type: "hidden",
+      form: form,
       name: name,
       value: uncheckedValue
     }), /*#__PURE__*/_jsx("input", {
-      ...inputProps
+      ...inputProps,
+      suppressHydrationWarning: true
     })]
   });
 });

package/esm/switch/thumb/SwitchThumb.js

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

package/esm/tabs/indicator/TabsIndicator.d.ts

@@ -26,7 +26,7 @@ export interface TabsIndicatorState extends TabsRootState {
 export interface TabsIndicatorProps extends BaseUIComponentProps<'span', TabsIndicatorState> {
   /**
    * Whether to render itself before React hydrates.
-   * This minimizes the time that the indicator isn’t visible after server-side rendering.
+   * This minimizes the time that the indicator isn't visible after server-side rendering.
    * @default false
    */
   renderBeforeHydration?: boolean | undefined;

package/esm/tabs/indicator/TabsIndicator.js

@@ -2,9 +2,9 @@
 
 import * as React from 'react';
 import { useForcedRerendering } from '@base-ui/utils/useForcedRerendering';
-import { useOnMount } from '@base-ui/utils/useOnMount';
 import { useRenderElement } from "../../utils/useRenderElement.js";
 import { getCssDimensions } from "../../utils/getCssDimensions.js";
+import { useIsHydrating } from "../../utils/useIsHydrating.js";
 import { useTabsRootContext } from "../root/TabsRootContext.js";
 import { tabsStateAttributesMapping } from "../root/stateAttributesMapping.js";
 import { useTabsListContext } from "../list/TabsListContext.js";
@@ -29,6 +29,7 @@ export const TabsIndicator = /*#__PURE__*/React.forwardRef(function TabIndicator
     className,
     render,
     renderBeforeHydration = false,
+    style: styleProp,
     ...elementProps
   } = componentProps;
   const {
@@ -44,8 +45,7 @@ export const TabsIndicator = /*#__PURE__*/React.forwardRef(function TabIndicator
     tabsListElement,
     registerIndicatorUpdateListener
   } = useTabsListContext();
-  const [isMounted, setIsMounted] = React.useState(false);
-  useOnMount(() => setIsMounted(true));
+  const isHydrating = useIsHydrating();
   const rerender = useForcedRerendering();
   React.useEffect(() => {
     return registerIndicatorUpdateListener(rerender);
@@ -135,7 +135,7 @@ export const TabsIndicator = /*#__PURE__*/React.forwardRef(function TabIndicator
     return null;
   }
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [element, !isMounted && renderBeforeHydration && /*#__PURE__*/_jsx("script", {
+    children: [element, isHydrating && renderBeforeHydration && /*#__PURE__*/_jsx("script", {
       nonce: nonce
       // eslint-disable-next-line react/no-danger
       ,

package/esm/tabs/list/TabsList.js

@@ -2,7 +2,6 @@
 
 import * as React from 'react';
 import { useStableCallback } from '@base-ui/utils/useStableCallback';
-import { useIsoLayoutEffect } from '@base-ui/utils/useIsoLayoutEffect';
 import { CompositeRoot } from "../../composite/root/CompositeRoot.js";
 import { tabsStateAttributesMapping } from "../root/stateAttributesMapping.js";
 import { useTabsRootContext } from "../root/TabsRootContext.js";
@@ -22,10 +21,10 @@ export const TabsList = /*#__PURE__*/React.forwardRef(function TabsList(componen
     className,
     loopFocus = true,
     render,
+    style,
     ...elementProps
   } = componentProps;
   const {
-    getTabElementBySelectedValue,
     onValueChange,
     orientation,
     value,
@@ -78,13 +77,8 @@ export const TabsList = /*#__PURE__*/React.forwardRef(function TabsList(componen
       resizeObserverRef.current?.unobserve(element);
     };
   });
-  const detectActivationDirection = useActivationDirectionDetector(value,
-  // the old value
-  orientation, tabsListElement, getTabElementBySelectedValue);
   const onTabActivation = useStableCallback((newValue, eventDetails) => {
     if (newValue !== value) {
-      const activationDirection = detectActivationDirection(newValue);
-      eventDetails.activationDirection = activationDirection;
       onValueChange(newValue, eventDetails);
     }
   });
@@ -110,6 +104,7 @@ export const TabsList = /*#__PURE__*/React.forwardRef(function TabsList(componen
     children: /*#__PURE__*/_jsx(CompositeRoot, {
       render: render,
       className: className,
+      style: style,
       state: state,
       refs: [forwardedRef, setTabsListElement],
       props: [defaultProps, elementProps],
@@ -124,81 +119,4 @@ export const TabsList = /*#__PURE__*/React.forwardRef(function TabsList(componen
     })
   });
 });
-if (process.env.NODE_ENV !== "production") TabsList.displayName = "TabsList";
-function getInset(tab, tabsList) {
-  const {
-    left: tabLeft,
-    top: tabTop
-  } = tab.getBoundingClientRect();
-  const {
-    left: listLeft,
-    top: listTop
-  } = tabsList.getBoundingClientRect();
-  const left = tabLeft - listLeft;
-  const top = tabTop - listTop;
-  return {
-    left,
-    top
-  };
-}
-function useActivationDirectionDetector(
-// the old value
-activeTabValue, orientation, tabsListElement, getTabElement) {
-  const [previousTabEdge, setPreviousTabEdge] = React.useState(null);
-  useIsoLayoutEffect(() => {
-    // Whenever orientation changes, reset the state.
-    if (activeTabValue == null || tabsListElement == null) {
-      setPreviousTabEdge(null);
-      return;
-    }
-    const activeTab = getTabElement(activeTabValue);
-    if (activeTab == null) {
-      setPreviousTabEdge(null);
-      return;
-    }
-    const {
-      left,
-      top
-    } = getInset(activeTab, tabsListElement);
-    setPreviousTabEdge(orientation === 'horizontal' ? left : top);
-  }, [orientation, getTabElement, tabsListElement, activeTabValue]);
-  return React.useCallback(newValue => {
-    if (newValue === activeTabValue) {
-      return 'none';
-    }
-    if (newValue == null) {
-      setPreviousTabEdge(null);
-      return 'none';
-    }
-    if (newValue != null && tabsListElement != null) {
-      const activeTabElement = getTabElement(newValue);
-      if (activeTabElement != null) {
-        const {
-          left,
-          top
-        } = getInset(activeTabElement, tabsListElement);
-        if (previousTabEdge == null) {
-          setPreviousTabEdge(orientation === 'horizontal' ? left : top);
-          return 'none';
-        }
-        if (orientation === 'horizontal') {
-          if (left < previousTabEdge) {
-            setPreviousTabEdge(left);
-            return 'left';
-          }
-          if (left > previousTabEdge) {
-            setPreviousTabEdge(left);
-            return 'right';
-          }
-        } else if (top < previousTabEdge) {
-          setPreviousTabEdge(top);
-          return 'up';
-        } else if (top > previousTabEdge) {
-          setPreviousTabEdge(top);
-          return 'down';
-        }
-      }
-    }
-    return 'none';
-  }, [getTabElement, orientation, previousTabEdge, tabsListElement, activeTabValue]);
-}
+if (process.env.NODE_ENV !== "production") TabsList.displayName = "TabsList";

package/esm/tabs/panel/TabsPanel.js

@@ -29,6 +29,7 @@ export const TabsPanel = /*#__PURE__*/React.forwardRef(function TabPanel(compone
     value,
     render,
     keepMounted = false,
+    style,
     ...elementProps
   } = componentProps;
   const {