@mui/material 9.0.0-alpha.3 → 9.0.0-beta.0

package/Slider/Slider.mjs

@@ -6,14 +6,13 @@ import clsx from 'clsx';
 import chainPropTypes from '@mui/utils/chainPropTypes';
 import composeClasses from '@mui/utils/composeClasses';
 import { useRtl } from '@mui/system/RtlProvider';
-import useSlotProps from '@mui/utils/useSlotProps';
 import isHostComponent from '@mui/utils/isHostComponent';
 import { useSlider, valueToPercent } from "./useSlider.mjs";
 import { styled } from "../zero-styled/index.mjs";
 import memoTheme from "../utils/memoTheme.mjs";
 import { useDefaultProps } from "../DefaultPropsProvider/index.mjs";
+import useSlot from "../utils/useSlot.mjs";
 import slotShouldForwardProp from "../styles/slotShouldForwardProp.mjs";
-import shouldSpreadAdditionalProps from "../utils/shouldSpreadAdditionalProps.mjs";
 import capitalize from "../utils/capitalize.mjs";
 import createSimplePaletteValueFilter from "../utils/createSimplePaletteValueFilter.mjs";
 import BaseSliderValueLabel from "./SliderValueLabel.mjs";
@@ -233,13 +232,7 @@ export const SliderTrack = styled('span', {
 }));
 export const SliderThumb = styled('span', {
   name: 'MuiSlider',
-  slot: 'Thumb',
-  overridesResolver: (props, styles) => {
-    const {
-      ownerState
-    } = props;
-    return [styles.thumb, styles[`thumbColor${capitalize(ownerState.color)}`], ownerState.size !== 'medium' && styles[`thumbSize${capitalize(ownerState.size)}`]];
-  }
+  slot: 'Thumb'
 })(memoTheme(({
   theme
 }) => ({
@@ -537,7 +530,7 @@ const useUtilityClasses = ownerState => {
     markLabel: ['markLabel'],
     markLabelActive: ['markLabelActive'],
     valueLabel: ['valueLabel'],
-    thumb: ['thumb', disabled && 'disabled', size && `thumbSize${capitalize(size)}`, color && `thumbColor${capitalize(color)}`],
+    thumb: ['thumb', disabled && 'disabled'],
     active: ['active'],
     disabled: ['disabled'],
     focusVisible: ['focusVisible']
@@ -547,9 +540,9 @@ const useUtilityClasses = ownerState => {
 const Forward = ({
   children
 }) => children;
-const Slider = /*#__PURE__*/React.forwardRef(function Slider(inputProps, ref) {
+const Slider = /*#__PURE__*/React.forwardRef(function Slider(inProps, ref) {
   const props = useDefaultProps({
-    props: inputProps,
+    props: inProps,
     name: 'MuiSlider'
   });
   const isRtl = useRtl();
@@ -557,10 +550,6 @@ const Slider = /*#__PURE__*/React.forwardRef(function Slider(inputProps, ref) {
     'aria-label': ariaLabel,
     'aria-valuetext': ariaValuetext,
     'aria-labelledby': ariaLabelledby,
-    // eslint-disable-next-line react/prop-types
-    component = 'span',
-    components = {},
-    componentsProps = {},
     color = 'primary',
     classes: classesProp,
     className,
@@ -579,8 +568,8 @@ const Slider = /*#__PURE__*/React.forwardRef(function Slider(inputProps, ref) {
     size = 'medium',
     step = 1,
     scale = Identity,
-    slotProps,
-    slots,
+    slotProps = {},
+    slots = {},
     tabIndex,
     track = 'normal',
     value: valueProp,
@@ -631,96 +620,67 @@ const Slider = /*#__PURE__*/React.forwardRef(function Slider(inputProps, ref) {
   ownerState.dragging = dragging;
   ownerState.focusedThumbIndex = focusedThumbIndex;
   const classes = useUtilityClasses(ownerState);
-
-  // support both `slots` and `components` for backward compatibility
-  const RootSlot = slots?.root ?? components.Root ?? SliderRoot;
-  const RailSlot = slots?.rail ?? components.Rail ?? SliderRail;
-  const TrackSlot = slots?.track ?? components.Track ?? SliderTrack;
-  const ThumbSlot = slots?.thumb ?? components.Thumb ?? SliderThumb;
-  const ValueLabelSlot = slots?.valueLabel ?? components.ValueLabel ?? SliderValueLabel;
-  const MarkSlot = slots?.mark ?? components.Mark ?? SliderMark;
-  const MarkLabelSlot = slots?.markLabel ?? components.MarkLabel ?? SliderMarkLabel;
-  const InputSlot = slots?.input ?? components.Input ?? 'input';
-  const rootSlotProps = slotProps?.root ?? componentsProps.root;
-  const railSlotProps = slotProps?.rail ?? componentsProps.rail;
-  const trackSlotProps = slotProps?.track ?? componentsProps.track;
-  const thumbSlotProps = slotProps?.thumb ?? componentsProps.thumb;
-  const valueLabelSlotProps = slotProps?.valueLabel ?? componentsProps.valueLabel;
-  const markSlotProps = slotProps?.mark ?? componentsProps.mark;
-  const markLabelSlotProps = slotProps?.markLabel ?? componentsProps.markLabel;
-  const inputSlotProps = slotProps?.input ?? componentsProps.input;
-  const rootProps = useSlotProps({
-    elementType: RootSlot,
+  const externalForwardedProps = {
+    slots,
+    slotProps
+  };
+  const [RootSlot, rootProps] = useSlot('root', {
+    elementType: SliderRoot,
     getSlotProps: getRootProps,
-    externalSlotProps: rootSlotProps,
-    externalForwardedProps: other,
-    additionalProps: {
-      ...(shouldSpreadAdditionalProps(RootSlot) && {
-        as: component
-      })
-    },
-    ownerState: {
-      ...ownerState,
-      ...rootSlotProps?.ownerState
+    externalForwardedProps: {
+      ...externalForwardedProps,
+      ...other
     },
+    ownerState,
     className: [classes.root, className]
   });
-  const railProps = useSlotProps({
-    elementType: RailSlot,
-    externalSlotProps: railSlotProps,
+  const [RailSlot, railProps] = useSlot('rail', {
+    elementType: SliderRail,
+    externalForwardedProps,
     ownerState,
     className: classes.rail
   });
-  const trackProps = useSlotProps({
-    elementType: TrackSlot,
-    externalSlotProps: trackSlotProps,
+  const [TrackSlot, trackProps] = useSlot('track', {
+    elementType: SliderTrack,
+    externalForwardedProps,
     additionalProps: {
       style: {
         ...axisProps[axis].offset(trackOffset),
         ...axisProps[axis].leap(trackLeap)
       }
     },
-    ownerState: {
-      ...ownerState,
-      ...trackSlotProps?.ownerState
-    },
+    ownerState,
     className: classes.track
   });
-  const thumbProps = useSlotProps({
-    elementType: ThumbSlot,
+  const [ThumbSlot, thumbProps] = useSlot('thumb', {
+    elementType: SliderThumb,
     getSlotProps: getThumbProps,
-    externalSlotProps: thumbSlotProps,
-    ownerState: {
-      ...ownerState,
-      ...thumbSlotProps?.ownerState
-    },
+    externalForwardedProps,
+    ownerState,
     className: classes.thumb
   });
-  const valueLabelProps = useSlotProps({
-    elementType: ValueLabelSlot,
-    externalSlotProps: valueLabelSlotProps,
-    ownerState: {
-      ...ownerState,
-      ...valueLabelSlotProps?.ownerState
-    },
+  const [ValueLabelSlot, valueLabelProps] = useSlot('valueLabel', {
+    elementType: SliderValueLabel,
+    externalForwardedProps,
+    ownerState,
     className: classes.valueLabel
   });
-  const markProps = useSlotProps({
-    elementType: MarkSlot,
-    externalSlotProps: markSlotProps,
+  const [MarkSlot, markProps] = useSlot('mark', {
+    elementType: SliderMark,
+    externalForwardedProps,
     ownerState,
     className: classes.mark
   });
-  const markLabelProps = useSlotProps({
-    elementType: MarkLabelSlot,
-    externalSlotProps: markLabelSlotProps,
+  const [MarkLabelSlot, markLabelProps] = useSlot('markLabel', {
+    elementType: SliderMarkLabel,
+    externalForwardedProps,
     ownerState,
     className: classes.markLabel
   });
-  const inputSliderProps = useSlotProps({
-    elementType: InputSlot,
+  const [InputSliderSlot, inputSliderProps] = useSlot('input', {
+    elementType: 'input',
     getSlotProps: getHiddenInputProps,
-    externalSlotProps: inputSlotProps,
+    externalForwardedProps,
     ownerState
   });
   return /*#__PURE__*/_jsxs(RootSlot, {
@@ -788,7 +748,7 @@ const Slider = /*#__PURE__*/React.forwardRef(function Slider(inputProps, ref) {
             ...getThumbStyle(index),
             ...thumbProps.style
           },
-          children: /*#__PURE__*/_jsx(InputSlot, {
+          children: /*#__PURE__*/_jsx(InputSliderSlot, {
             "data-index": index,
             "aria-label": getAriaLabel ? getAriaLabel(index) : ariaLabel,
             "aria-valuenow": scale(value),
@@ -850,48 +810,6 @@ process.env.NODE_ENV !== "production" ? Slider.propTypes /* remove-proptypes */
    * @default 'primary'
    */
   color: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['primary', 'secondary', 'error', 'info', 'success', 'warning']), PropTypes.string]),
-  /**
-   * The components used for each slot inside.
-   *
-   * @deprecated use the `slots` prop instead. This prop will be removed in a future major release. See [Migrating from deprecated APIs](https://mui.com/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   *
-   * @default {}
-   */
-  components: PropTypes.shape({
-    Input: PropTypes.elementType,
-    Mark: PropTypes.elementType,
-    MarkLabel: PropTypes.elementType,
-    Rail: PropTypes.elementType,
-    Root: PropTypes.elementType,
-    Thumb: PropTypes.elementType,
-    Track: PropTypes.elementType,
-    ValueLabel: PropTypes.elementType
-  }),
-  /**
-   * The extra props for the slot components.
-   * You can override the existing props or add new ones.
-   *
-   * @deprecated use the `slotProps` prop instead. This prop will be removed in a future major release. See [Migrating from deprecated APIs](https://mui.com/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   *
-   * @default {}
-   */
-  componentsProps: PropTypes.shape({
-    input: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-    mark: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-    markLabel: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-    rail: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-    root: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-    thumb: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-    track: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-    valueLabel: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({
-      children: PropTypes.element,
-      className: PropTypes.string,
-      open: PropTypes.bool,
-      style: PropTypes.object,
-      value: PropTypes.node,
-      valueLabelDisplay: PropTypes.oneOf(['auto', 'off', 'on'])
-    })])
-  }),
   /**
    * The default value. Use when the component is not controlled.
    */
@@ -989,7 +907,7 @@ process.env.NODE_ENV !== "production" ? Slider.propTypes /* remove-proptypes */
    */
   size: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['small', 'medium']), PropTypes.string]),
   /**
-   * The props used for each slot inside the Slider.
+   * The props used for each slot inside.
    * @default {}
    */
   slotProps: PropTypes.shape({
@@ -1010,8 +928,7 @@ process.env.NODE_ENV !== "production" ? Slider.propTypes /* remove-proptypes */
     })])
   }),
   /**
-   * The components used for each slot inside the Slider.
-   * Either a string to use a HTML element or a component.
+   * The components used for each slot inside.
    * @default {}
    */
   slots: PropTypes.shape({

package/Slider/sliderClasses.d.mts

@@ -45,34 +45,6 @@ export interface SliderClasses {
   markLabelActive: string;
   /** Styles applied to the root element if `size="small"`. */
   sizeSmall: string;
-  /** Styles applied to the thumb element if `color="primary"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorPrimary](/material-ui/api/slider/#slider-classes-MuiSlider-colorPrimary) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorPrimary: string;
-  /** Styles applied to the thumb element if `color="secondary"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorSecondary](/material-ui/api/slider/#slider-classes-MuiSlider-colorSecondary) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorSecondary: string;
-  /** Styles applied to the thumb element if `color="error"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorError](/material-ui/api/slider/#slider-classes-MuiSlider-colorError) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorError: string;
-  /** Styles applied to the thumb element if `color="info"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorInfo](/material-ui/api/slider/#slider-classes-MuiSlider-colorInfo) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorInfo: string;
-  /** Styles applied to the thumb element if `color="success"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorSuccess](/material-ui/api/slider/#slider-classes-MuiSlider-colorSuccess) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorSuccess: string;
-  /** Styles applied to the thumb element if `color="warning"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorWarning](/material-ui/api/slider/#slider-classes-MuiSlider-colorWarning) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorWarning: string;
-  /** Styles applied to the thumb element if `size="small"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-sizeSmall](/material-ui/api/slider/#slider-classes-MuiSlider-sizeSmall) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbSizeSmall: string;
   /** Styles applied to the thumb label element. */
   valueLabel: string;
   /** Styles applied to the thumb label element if it's open. */

package/Slider/sliderClasses.d.ts

@@ -45,34 +45,6 @@ export interface SliderClasses {
   markLabelActive: string;
   /** Styles applied to the root element if `size="small"`. */
   sizeSmall: string;
-  /** Styles applied to the thumb element if `color="primary"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorPrimary](/material-ui/api/slider/#slider-classes-MuiSlider-colorPrimary) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorPrimary: string;
-  /** Styles applied to the thumb element if `color="secondary"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorSecondary](/material-ui/api/slider/#slider-classes-MuiSlider-colorSecondary) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorSecondary: string;
-  /** Styles applied to the thumb element if `color="error"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorError](/material-ui/api/slider/#slider-classes-MuiSlider-colorError) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorError: string;
-  /** Styles applied to the thumb element if `color="info"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorInfo](/material-ui/api/slider/#slider-classes-MuiSlider-colorInfo) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorInfo: string;
-  /** Styles applied to the thumb element if `color="success"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorSuccess](/material-ui/api/slider/#slider-classes-MuiSlider-colorSuccess) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorSuccess: string;
-  /** Styles applied to the thumb element if `color="warning"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-colorWarning](/material-ui/api/slider/#slider-classes-MuiSlider-colorWarning) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbColorWarning: string;
-  /** Styles applied to the thumb element if `size="small"`.
-   * @deprecated Combine the [.MuiSlider-thumb](/material-ui/api/slider/#slider-classes-MuiSlider-thumb) and [.MuiSlider-sizeSmall](/material-ui/api/slider/#slider-classes-MuiSlider-sizeSmall) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  thumbSizeSmall: string;
   /** Styles applied to the thumb label element. */
   valueLabel: string;
   /** Styles applied to the thumb label element if it's open. */

package/Slider/sliderClasses.js

@@ -11,5 +11,5 @@ var _generateUtilityClass = _interopRequireDefault(require("@mui/utils/generateU
 function getSliderUtilityClass(slot) {
   return (0, _generateUtilityClass.default)('MuiSlider', slot);
 }
-const sliderClasses = (0, _generateUtilityClasses.default)('MuiSlider', ['root', 'active', 'colorPrimary', 'colorSecondary', 'colorError', 'colorInfo', 'colorSuccess', 'colorWarning', 'disabled', 'dragging', 'focusVisible', 'mark', 'markActive', 'marked', 'markLabel', 'markLabelActive', 'rail', 'sizeSmall', 'thumb', 'thumbColorPrimary', 'thumbColorSecondary', 'thumbColorError', 'thumbColorSuccess', 'thumbColorInfo', 'thumbColorWarning', 'track', 'trackInverted', 'trackFalse', 'thumbSizeSmall', 'valueLabel', 'valueLabelOpen', 'valueLabelCircle', 'valueLabelLabel', 'vertical']);
+const sliderClasses = (0, _generateUtilityClasses.default)('MuiSlider', ['root', 'active', 'colorPrimary', 'colorSecondary', 'colorError', 'colorInfo', 'colorSuccess', 'colorWarning', 'disabled', 'dragging', 'focusVisible', 'mark', 'markActive', 'marked', 'markLabel', 'markLabelActive', 'rail', 'sizeSmall', 'thumb', 'track', 'trackInverted', 'trackFalse', 'valueLabel', 'valueLabelOpen', 'valueLabelCircle', 'valueLabelLabel', 'vertical']);
 var _default = exports.default = sliderClasses;

package/Slider/sliderClasses.mjs

@@ -3,5 +3,5 @@ import generateUtilityClass from '@mui/utils/generateUtilityClass';
 export function getSliderUtilityClass(slot) {
   return generateUtilityClass('MuiSlider', slot);
 }
-const sliderClasses = generateUtilityClasses('MuiSlider', ['root', 'active', 'colorPrimary', 'colorSecondary', 'colorError', 'colorInfo', 'colorSuccess', 'colorWarning', 'disabled', 'dragging', 'focusVisible', 'mark', 'markActive', 'marked', 'markLabel', 'markLabelActive', 'rail', 'sizeSmall', 'thumb', 'thumbColorPrimary', 'thumbColorSecondary', 'thumbColorError', 'thumbColorSuccess', 'thumbColorInfo', 'thumbColorWarning', 'track', 'trackInverted', 'trackFalse', 'thumbSizeSmall', 'valueLabel', 'valueLabelOpen', 'valueLabelCircle', 'valueLabelLabel', 'vertical']);
+const sliderClasses = generateUtilityClasses('MuiSlider', ['root', 'active', 'colorPrimary', 'colorSecondary', 'colorError', 'colorInfo', 'colorSuccess', 'colorWarning', 'disabled', 'dragging', 'focusVisible', 'mark', 'markActive', 'marked', 'markLabel', 'markLabelActive', 'rail', 'sizeSmall', 'thumb', 'track', 'trackInverted', 'trackFalse', 'valueLabel', 'valueLabelOpen', 'valueLabelCircle', 'valueLabelLabel', 'vertical']);
 export default sliderClasses;

package/Slider/useSlider.js

@@ -97,11 +97,27 @@ function setValueIndex({
 function focusThumb({
   sliderRef,
   activeIndex,
-  setActive
+  setActive,
+  focusVisible
 }) {
   const doc = (0, _ownerDocument.default)(sliderRef.current);
   if (!sliderRef.current?.contains(doc.activeElement) || Number(doc?.activeElement?.getAttribute('data-index')) !== activeIndex) {
-    sliderRef.current?.querySelector(`[type="range"][data-index="${activeIndex}"]`).focus();
+    const input = sliderRef.current?.querySelector(`[type="range"][data-index="${activeIndex}"]`);
+    if (input != null) {
+      if (focusVisible === undefined) {
+        input.focus({
+          preventScroll: true
+        });
+      } else {
+        input.focus({
+          preventScroll: true,
+          // Prevent pointer-driven focus rings in browsers that support this option.
+          // Chrome 144+ supports `focusVisible` in `HTMLElement.focus()` options.
+          // @ts-ignore - `focusVisible` is not yet in TypeScript's lib.dom FocusOptions.
+          focusVisible
+        });
+      }
+    }
   }
   if (setActive) {
     setActive(activeIndex);
@@ -188,6 +204,7 @@ function useSlider(parameters) {
     value: valueProp
   } = parameters;
   const touchId = React.useRef(undefined);
+  const focusFrame = React.useRef(null);
   // We can't use the :active browser pseudo-classes.
   // - The active state isn't triggered when clicking on the rail.
   // - The active state isn't transferred when inversing a range slider.
@@ -195,6 +212,12 @@ function useSlider(parameters) {
   const [open, setOpen] = React.useState(-1);
   const [dragging, setDragging] = React.useState(false);
   const moveCount = React.useRef(0);
+  const cancelFocusFrame = (0, _useEventCallback.default)(() => {
+    if (focusFrame.current != null) {
+      cancelAnimationFrame(focusFrame.current);
+      focusFrame.current = null;
+    }
+  });
   // lastChangedValue is updated whenever onChange is triggered.
   const lastChangedValue = React.useRef(null);
   const [valueDerived, setValueState] = (0, _useControlled.default)({
@@ -467,7 +490,8 @@ function useSlider(parameters) {
     focusThumb({
       sliderRef,
       activeIndex,
-      setActive
+      setActive,
+      focusVisible: false
     });
     setValueState(newValue);
     if (!dragging && moveCount.current > INTENTIONAL_DRAG_COUNT_THRESHOLD) {
@@ -525,7 +549,8 @@ function useSlider(parameters) {
       focusThumb({
         sliderRef,
         activeIndex,
-        setActive
+        setActive,
+        focusVisible: false
       });
       setValueState(newValue);
       if (handleChange && !areValuesEqual(newValue, valueDerived)) {
@@ -557,14 +582,16 @@ function useSlider(parameters) {
     });
     return () => {
       slider.removeEventListener('touchstart', handleTouchStart);
+      cancelFocusFrame();
       stopListening();
     };
-  }, [stopListening, handleTouchStart]);
+  }, [stopListening, handleTouchStart, cancelFocusFrame]);
   React.useEffect(() => {
     if (disabled) {
       stopListening();
+      cancelFocusFrame();
     }
-  }, [disabled, stopListening]);
+  }, [disabled, stopListening, cancelFocusFrame]);
   const createHandleMouseDown = otherHandlers => event => {
     otherHandlers.onMouseDown?.(event);
     if (disabled) {
@@ -578,9 +605,6 @@ function useSlider(parameters) {
     if (event.button !== 0) {
       return;
     }
-
-    // Avoid text selection
-    event.preventDefault();
     const finger = trackFinger(event, touchId);
     if (finger !== false) {
       const {
@@ -589,11 +613,23 @@ function useSlider(parameters) {
       } = getFingerNewValue({
         finger
       });
-      focusThumb({
-        sliderRef,
-        activeIndex,
-        setActive
-      });
+      const doc = (0, _ownerDocument.default)(sliderRef.current);
+      const activeElement = doc.activeElement;
+      const pressedOnFocusedThumb = sliderRef.current?.contains(activeElement) && Number(activeElement?.getAttribute('data-index')) === activeIndex;
+      setActive(activeIndex);
+      if (pressedOnFocusedThumb) {
+        event.preventDefault();
+      } else {
+        cancelFocusFrame();
+        focusFrame.current = requestAnimationFrame(() => {
+          focusFrame.current = null;
+          focusThumb({
+            sliderRef,
+            activeIndex,
+            focusVisible: false
+          });
+        });
+      }
       setValueState(newValue);
       if (handleChange && !areValuesEqual(newValue, valueDerived)) {
         handleChange(event, newValue, activeIndex);

package/Slider/useSlider.mjs

@@ -88,11 +88,27 @@ function setValueIndex({
 function focusThumb({
   sliderRef,
   activeIndex,
-  setActive
+  setActive,
+  focusVisible
 }) {
   const doc = ownerDocument(sliderRef.current);
   if (!sliderRef.current?.contains(doc.activeElement) || Number(doc?.activeElement?.getAttribute('data-index')) !== activeIndex) {
-    sliderRef.current?.querySelector(`[type="range"][data-index="${activeIndex}"]`).focus();
+    const input = sliderRef.current?.querySelector(`[type="range"][data-index="${activeIndex}"]`);
+    if (input != null) {
+      if (focusVisible === undefined) {
+        input.focus({
+          preventScroll: true
+        });
+      } else {
+        input.focus({
+          preventScroll: true,
+          // Prevent pointer-driven focus rings in browsers that support this option.
+          // Chrome 144+ supports `focusVisible` in `HTMLElement.focus()` options.
+          // @ts-ignore - `focusVisible` is not yet in TypeScript's lib.dom FocusOptions.
+          focusVisible
+        });
+      }
+    }
   }
   if (setActive) {
     setActive(activeIndex);
@@ -178,6 +194,7 @@ export function useSlider(parameters) {
     value: valueProp
   } = parameters;
   const touchId = React.useRef(undefined);
+  const focusFrame = React.useRef(null);
   // We can't use the :active browser pseudo-classes.
   // - The active state isn't triggered when clicking on the rail.
   // - The active state isn't transferred when inversing a range slider.
@@ -185,6 +202,12 @@ export function useSlider(parameters) {
   const [open, setOpen] = React.useState(-1);
   const [dragging, setDragging] = React.useState(false);
   const moveCount = React.useRef(0);
+  const cancelFocusFrame = useEventCallback(() => {
+    if (focusFrame.current != null) {
+      cancelAnimationFrame(focusFrame.current);
+      focusFrame.current = null;
+    }
+  });
   // lastChangedValue is updated whenever onChange is triggered.
   const lastChangedValue = React.useRef(null);
   const [valueDerived, setValueState] = useControlled({
@@ -457,7 +480,8 @@ export function useSlider(parameters) {
     focusThumb({
       sliderRef,
       activeIndex,
-      setActive
+      setActive,
+      focusVisible: false
     });
     setValueState(newValue);
     if (!dragging && moveCount.current > INTENTIONAL_DRAG_COUNT_THRESHOLD) {
@@ -515,7 +539,8 @@ export function useSlider(parameters) {
       focusThumb({
         sliderRef,
         activeIndex,
-        setActive
+        setActive,
+        focusVisible: false
       });
       setValueState(newValue);
       if (handleChange && !areValuesEqual(newValue, valueDerived)) {
@@ -547,14 +572,16 @@ export function useSlider(parameters) {
     });
     return () => {
       slider.removeEventListener('touchstart', handleTouchStart);
+      cancelFocusFrame();
       stopListening();
     };
-  }, [stopListening, handleTouchStart]);
+  }, [stopListening, handleTouchStart, cancelFocusFrame]);
   React.useEffect(() => {
     if (disabled) {
       stopListening();
+      cancelFocusFrame();
     }
-  }, [disabled, stopListening]);
+  }, [disabled, stopListening, cancelFocusFrame]);
   const createHandleMouseDown = otherHandlers => event => {
     otherHandlers.onMouseDown?.(event);
     if (disabled) {
@@ -568,9 +595,6 @@ export function useSlider(parameters) {
     if (event.button !== 0) {
       return;
     }
-
-    // Avoid text selection
-    event.preventDefault();
     const finger = trackFinger(event, touchId);
     if (finger !== false) {
       const {
@@ -579,11 +603,23 @@ export function useSlider(parameters) {
       } = getFingerNewValue({
         finger
       });
-      focusThumb({
-        sliderRef,
-        activeIndex,
-        setActive
-      });
+      const doc = ownerDocument(sliderRef.current);
+      const activeElement = doc.activeElement;
+      const pressedOnFocusedThumb = sliderRef.current?.contains(activeElement) && Number(activeElement?.getAttribute('data-index')) === activeIndex;
+      setActive(activeIndex);
+      if (pressedOnFocusedThumb) {
+        event.preventDefault();
+      } else {
+        cancelFocusFrame();
+        focusFrame.current = requestAnimationFrame(() => {
+          focusFrame.current = null;
+          focusThumb({
+            sliderRef,
+            activeIndex,
+            focusVisible: false
+          });
+        });
+      }
       setValueState(newValue);
       if (handleChange && !areValuesEqual(newValue, valueDerived)) {
         handleChange(event, newValue, activeIndex);