@mui/material 9.0.0-alpha.2 → 9.0.0-alpha.4

package/Slider/Slider.d.ts

@@ -2,20 +2,116 @@ import * as React from 'react';
 import { SxProps } from '@mui/system';
 import { OverridableStringUnion } from '@mui/types';
 import { Mark } from "./useSlider.types.js";
-import { SlotComponentProps } from "../utils/types.js";
+import { CreateSlotsAndSlotProps, SlotComponentProps, SlotProps } from "../utils/types.js";
 import { Theme } from "../styles/index.js";
 import { OverrideProps, OverridableComponent } from "../OverridableComponent/index.js";
 import SliderValueLabelComponent from "./SliderValueLabel.js";
 import { SliderClasses } from "./sliderClasses.js";
 export interface SliderPropsColorOverrides {}
 export interface SliderPropsSizeOverrides {}
+export interface SliderSlots {
+  /**
+   * The component that renders the root.
+   * @default 'span'
+   */
+  root: React.ElementType;
+  /**
+   * The component that renders the track.
+   * @default 'span'
+   */
+  track: React.ElementType;
+  /**
+   * The component that renders the rail.
+   * @default 'span'
+   */
+  rail: React.ElementType;
+  /**
+   * The component that renders the thumb.
+   * @default 'span'
+   */
+  thumb: React.ElementType;
+  /**
+   * The component that renders the mark.
+   * @default 'span'
+   */
+  mark: React.ElementType;
+  /**
+   * The component that renders the mark label.
+   * @default 'span'
+   */
+  markLabel: React.ElementType;
+  /**
+   * The component that renders the value label.
+   * @default SliderValueLabel
+   */
+  valueLabel: React.ElementType;
+  /**
+   * The component that renders the input.
+   * @default 'input'
+   */
+  input: React.ElementType;
+}
+export interface SliderRootSlotPropsOverrides {}
+export interface SliderTrackSlotPropsOverrides {}
+export interface SliderRailSlotPropsOverrides {}
+export interface SliderThumbSlotPropsOverrides {}
+export interface SliderMarkSlotPropsOverrides {}
+export interface SliderMarkLabelSlotPropsOverrides {}
+export interface SliderValueLabelSlotPropsOverrides {}
+export interface SliderInputSlotPropsOverrides {}
+export type SliderSlotsAndSlotProps = CreateSlotsAndSlotProps<SliderSlots, {
+  /**
+   * Props forwarded to the root slot.
+   * By default, the available props are based on the span element.
+   */
+  root: SlotProps<'span', SliderRootSlotPropsOverrides, SliderOwnerState>;
+  /**
+   * Props forwarded to the track slot.
+   * By default, the available props are based on the span element.
+   */
+  track: SlotProps<'span', SliderTrackSlotPropsOverrides, SliderOwnerState>;
+  /**
+   * Props forwarded to the rail slot.
+   * By default, the available props are based on the span element.
+   */
+  rail: SlotProps<'span', SliderRailSlotPropsOverrides, SliderOwnerState>;
+  /**
+   * Props forwarded to the thumb slot.
+   * By default, the available props are based on the span element.
+   */
+  thumb: SlotProps<'span', SliderThumbSlotPropsOverrides, SliderOwnerState>;
+  /**
+   * Props forwarded to the mark slot.
+   * By default, the available props are based on the span element.
+   */
+  mark: SlotProps<'span', SliderMarkSlotPropsOverrides, SliderOwnerState>;
+  /**
+   * Props forwarded to the mark label slot.
+   * By default, the available props are based on the span element.
+   */
+  markLabel: SlotProps<'span', SliderMarkLabelSlotPropsOverrides, SliderOwnerState>;
+  /**
+   * Props forwarded to the value label slot.
+   * By default, the available props are based on the [SliderValueLabel](https://next.mui.com/material-ui/api/slider/) component.
+   */
+  valueLabel: SlotComponentProps<typeof SliderValueLabelComponent, SliderValueLabelSlotPropsOverrides, SliderOwnerState>;
+  /**
+   * Props forwarded to the input slot.
+   * By default, the available props are based on the input element.
+   */
+  input: SlotProps<'input', SliderInputSlotPropsOverrides, SliderOwnerState>;
+}>;
+
+/**
+ * @deprecated Use `SliderRootSlotPropsOverrides` instead.
+ */
 export interface SliderComponentsPropsOverrides {}
 export interface SliderOwnerState extends SliderProps {
   dragging: boolean;
   marked: boolean;
   focusedThumbIndex: number;
 }
-export interface SliderOwnProps<Value extends number | number[]> {
+export interface SliderOwnProps<Value extends number | readonly number[]> {
   /**
    * The label of the slider.
    */
@@ -35,41 +131,6 @@ export interface SliderOwnProps<Value extends number | number[]> {
    * @default 'primary'
    */
   color?: OverridableStringUnion<'primary' | 'secondary' | 'error' | 'info' | 'success' | 'warning', SliderPropsColorOverrides> | undefined;
-  /**
-   * 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?: {
-    Root?: React.ElementType | undefined;
-    Track?: React.ElementType | undefined;
-    Rail?: React.ElementType | undefined;
-    Thumb?: React.ElementType | undefined;
-    Mark?: React.ElementType | undefined;
-    MarkLabel?: React.ElementType | undefined;
-    ValueLabel?: React.ElementType | undefined;
-    Input?: React.ElementType | undefined;
-  } | undefined;
-  /**
-   * 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?: {
-    root?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    track?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    rail?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    thumb?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    mark?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    markLabel?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    valueLabel?: SlotComponentProps<typeof SliderValueLabelComponent, SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    input?: SlotComponentProps<'input', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-  } | undefined;
   /**
    * Override or extend the styles applied to the component.
    */
@@ -171,35 +232,6 @@ export interface SliderOwnProps<Value extends number | number[]> {
    * @default 'medium'
    */
   size?: OverridableStringUnion<'small' | 'medium', SliderPropsSizeOverrides> | undefined;
-  /**
-   * The props used for each slot inside the Slider.
-   * @default {}
-   */
-  slotProps?: {
-    root?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    track?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    rail?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    thumb?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    mark?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    markLabel?: SlotComponentProps<'span', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    valueLabel?: SlotComponentProps<typeof SliderValueLabelComponent, SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-    input?: SlotComponentProps<'input', SliderComponentsPropsOverrides, SliderOwnerState> | undefined;
-  } | undefined;
-  /**
-   * The components used for each slot inside the Slider.
-   * Either a string to use a HTML element or a component.
-   * @default {}
-   */
-  slots?: {
-    root?: React.ElementType | undefined;
-    track?: React.ElementType | undefined;
-    rail?: React.ElementType | undefined;
-    thumb?: React.ElementType | undefined;
-    mark?: React.ElementType | undefined;
-    markLabel?: React.ElementType | undefined;
-    valueLabel?: React.ElementType | undefined;
-    input?: React.ElementType | undefined;
-  } | undefined;
   /**
    * The granularity with which the slider can step through values. (A "discrete" slider.)
    * The `min` prop serves as the origin for the valid values.
@@ -255,24 +287,24 @@ export interface SliderOwnProps<Value extends number | number[]> {
    */
   valueLabelFormat?: string | ((value: number, index: number) => React.ReactNode) | undefined;
 }
-export interface SliderTypeMap<RootComponent extends React.ElementType = 'span', AdditionalProps = {}, Value extends number | number[] = number | number[]> {
-  props: AdditionalProps & SliderOwnProps<Value>;
+export interface SliderTypeMap<RootComponent extends React.ElementType = 'span', AdditionalProps = {}, Value extends number | readonly number[] = number | number[]> {
+  props: AdditionalProps & SliderOwnProps<Value> & SliderSlotsAndSlotProps;
   defaultComponent: RootComponent;
 }
-export type SliderComponent<Value extends number | number[]> = OverridableComponent<SliderTypeMap<'span', {}, Value>>;
-export type SliderType = SliderComponent<number> & SliderComponent<number[]> & SliderComponent<number | number[]>;
+export type SliderComponent<Value extends number | readonly number[]> = OverridableComponent<SliderTypeMap<'span', {}, Value>>;
+export type SliderType = SliderComponent<number> & SliderComponent<number[]> & SliderComponent<readonly number[]> & SliderComponent<number | number[]>;
 export interface SliderValueLabelProps extends React.HTMLAttributes<HTMLSpanElement> {
   children: React.ReactElement<unknown>;
   index: number;
   open: boolean;
   value: React.ReactNode;
 }
-type SliderRootProps = NonNullable<SliderTypeMap['props']['componentsProps']>['root'];
-type SliderMarkProps = NonNullable<SliderTypeMap['props']['componentsProps']>['mark'];
-type SliderMarkLabelProps = NonNullable<SliderTypeMap['props']['componentsProps']>['markLabel'];
-type SliderRailProps = NonNullable<SliderTypeMap['props']['componentsProps']>['rail'];
-type SliderTrackProps = NonNullable<SliderTypeMap['props']['componentsProps']>['track'];
-type SliderThumbProps = NonNullable<SliderTypeMap['props']['componentsProps']>['thumb'];
+type SliderRootProps = NonNullable<SliderTypeMap['props']['slotProps']>['root'];
+type SliderMarkProps = NonNullable<SliderTypeMap['props']['slotProps']>['mark'];
+type SliderMarkLabelProps = NonNullable<SliderTypeMap['props']['slotProps']>['markLabel'];
+type SliderRailProps = NonNullable<SliderTypeMap['props']['slotProps']>['rail'];
+type SliderTrackProps = NonNullable<SliderTypeMap['props']['slotProps']>['track'];
+type SliderThumbProps = NonNullable<SliderTypeMap['props']['slotProps']>['thumb'];
 export declare const SliderRoot: React.FC<SliderRootProps>;
 export declare const SliderMark: React.FC<SliderMarkProps>;
 export declare const SliderMarkLabel: React.FC<SliderMarkLabelProps>;
@@ -292,7 +324,7 @@ export declare const SliderValueLabel: React.FC<SliderValueLabelProps>;
  * - [Slider API](https://next.mui.com/material-ui/api/slider/)
  */
 declare const Slider: SliderType;
-export type SliderProps<RootComponent extends React.ElementType = SliderTypeMap['defaultComponent'], AdditionalProps = {}> = OverrideProps<SliderTypeMap<RootComponent, AdditionalProps>, RootComponent> & {
+export type SliderProps<RootComponent extends React.ElementType = SliderTypeMap['defaultComponent'], AdditionalProps = {}, Value extends number | readonly number[] = number | number[]> = OverrideProps<SliderTypeMap<RootComponent, AdditionalProps, Value>, RootComponent> & {
   component?: React.ElementType | undefined;
 };
 export default Slider;

package/Slider/Slider.js

@@ -13,14 +13,13 @@ var _clsx = _interopRequireDefault(require("clsx"));
 var _chainPropTypes = _interopRequireDefault(require("@mui/utils/chainPropTypes"));
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
 var _RtlProvider = require("@mui/system/RtlProvider");
-var _useSlotProps = _interopRequireDefault(require("@mui/utils/useSlotProps"));
 var _isHostComponent = _interopRequireDefault(require("@mui/utils/isHostComponent"));
 var _useSlider = require("./useSlider");
 var _zeroStyled = require("../zero-styled");
 var _memoTheme = _interopRequireDefault(require("../utils/memoTheme"));
 var _DefaultPropsProvider = require("../DefaultPropsProvider");
+var _useSlot = _interopRequireDefault(require("../utils/useSlot"));
 var _slotShouldForwardProp = _interopRequireDefault(require("../styles/slotShouldForwardProp"));
-var _shouldSpreadAdditionalProps = _interopRequireDefault(require("../utils/shouldSpreadAdditionalProps"));
 var _capitalize = _interopRequireDefault(require("../utils/capitalize"));
 var _createSimplePaletteValueFilter = _interopRequireDefault(require("../utils/createSimplePaletteValueFilter"));
 var _SliderValueLabel = _interopRequireDefault(require("./SliderValueLabel"));
@@ -553,9 +552,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 = (0, _DefaultPropsProvider.useDefaultProps)({
-    props: inputProps,
+    props: inProps,
     name: 'MuiSlider'
   });
   const isRtl = (0, _RtlProvider.useRtl)();
@@ -563,10 +562,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,
@@ -585,8 +580,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,
@@ -637,96 +632,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 = (0, _useSlotProps.default)({
-    elementType: RootSlot,
+  const externalForwardedProps = {
+    slots,
+    slotProps
+  };
+  const [RootSlot, rootProps] = (0, _useSlot.default)('root', {
+    elementType: SliderRoot,
     getSlotProps: getRootProps,
-    externalSlotProps: rootSlotProps,
-    externalForwardedProps: other,
-    additionalProps: {
-      ...((0, _shouldSpreadAdditionalProps.default)(RootSlot) && {
-        as: component
-      })
-    },
-    ownerState: {
-      ...ownerState,
-      ...rootSlotProps?.ownerState
+    externalForwardedProps: {
+      ...externalForwardedProps,
+      ...other
     },
+    ownerState,
     className: [classes.root, className]
   });
-  const railProps = (0, _useSlotProps.default)({
-    elementType: RailSlot,
-    externalSlotProps: railSlotProps,
+  const [RailSlot, railProps] = (0, _useSlot.default)('rail', {
+    elementType: SliderRail,
+    externalForwardedProps,
     ownerState,
     className: classes.rail
   });
-  const trackProps = (0, _useSlotProps.default)({
-    elementType: TrackSlot,
-    externalSlotProps: trackSlotProps,
+  const [TrackSlot, trackProps] = (0, _useSlot.default)('track', {
+    elementType: SliderTrack,
+    externalForwardedProps,
     additionalProps: {
       style: {
         ...axisProps[axis].offset(trackOffset),
         ...axisProps[axis].leap(trackLeap)
       }
     },
-    ownerState: {
-      ...ownerState,
-      ...trackSlotProps?.ownerState
-    },
+    ownerState,
     className: classes.track
   });
-  const thumbProps = (0, _useSlotProps.default)({
-    elementType: ThumbSlot,
+  const [ThumbSlot, thumbProps] = (0, _useSlot.default)('thumb', {
+    elementType: SliderThumb,
     getSlotProps: getThumbProps,
-    externalSlotProps: thumbSlotProps,
-    ownerState: {
-      ...ownerState,
-      ...thumbSlotProps?.ownerState
-    },
+    externalForwardedProps,
+    ownerState,
     className: classes.thumb
   });
-  const valueLabelProps = (0, _useSlotProps.default)({
-    elementType: ValueLabelSlot,
-    externalSlotProps: valueLabelSlotProps,
-    ownerState: {
-      ...ownerState,
-      ...valueLabelSlotProps?.ownerState
-    },
+  const [ValueLabelSlot, valueLabelProps] = (0, _useSlot.default)('valueLabel', {
+    elementType: SliderValueLabel,
+    externalForwardedProps,
+    ownerState,
     className: classes.valueLabel
   });
-  const markProps = (0, _useSlotProps.default)({
-    elementType: MarkSlot,
-    externalSlotProps: markSlotProps,
+  const [MarkSlot, markProps] = (0, _useSlot.default)('mark', {
+    elementType: SliderMark,
+    externalForwardedProps,
     ownerState,
     className: classes.mark
   });
-  const markLabelProps = (0, _useSlotProps.default)({
-    elementType: MarkLabelSlot,
-    externalSlotProps: markLabelSlotProps,
+  const [MarkLabelSlot, markLabelProps] = (0, _useSlot.default)('markLabel', {
+    elementType: SliderMarkLabel,
+    externalForwardedProps,
     ownerState,
     className: classes.markLabel
   });
-  const inputSliderProps = (0, _useSlotProps.default)({
-    elementType: InputSlot,
+  const [InputSliderSlot, inputSliderProps] = (0, _useSlot.default)('input', {
+    elementType: 'input',
     getSlotProps: getHiddenInputProps,
-    externalSlotProps: inputSlotProps,
+    externalForwardedProps,
     ownerState
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(RootSlot, {
@@ -794,7 +760,7 @@ const Slider = /*#__PURE__*/React.forwardRef(function Slider(inputProps, ref) {
             ...getThumbStyle(index),
             ...thumbProps.style
           },
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(InputSlot, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(InputSliderSlot, {
             "data-index": index,
             "aria-label": getAriaLabel ? getAriaLabel(index) : ariaLabel,
             "aria-valuenow": scale(value),
@@ -856,48 +822,6 @@ process.env.NODE_ENV !== "production" ? Slider.propTypes /* remove-proptypes */
    * @default 'primary'
    */
   color: _propTypes.default /* @typescript-to-proptypes-ignore */.oneOfType([_propTypes.default.oneOf(['primary', 'secondary', 'error', 'info', 'success', 'warning']), _propTypes.default.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.default.shape({
-    Input: _propTypes.default.elementType,
-    Mark: _propTypes.default.elementType,
-    MarkLabel: _propTypes.default.elementType,
-    Rail: _propTypes.default.elementType,
-    Root: _propTypes.default.elementType,
-    Thumb: _propTypes.default.elementType,
-    Track: _propTypes.default.elementType,
-    ValueLabel: _propTypes.default.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.default.shape({
-    input: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    mark: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    markLabel: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    rail: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    root: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    thumb: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    track: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
-    valueLabel: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.shape({
-      children: _propTypes.default.element,
-      className: _propTypes.default.string,
-      open: _propTypes.default.bool,
-      style: _propTypes.default.object,
-      value: _propTypes.default.node,
-      valueLabelDisplay: _propTypes.default.oneOf(['auto', 'off', 'on'])
-    })])
-  }),
   /**
    * The default value. Use when the component is not controlled.
    */
@@ -995,7 +919,7 @@ process.env.NODE_ENV !== "production" ? Slider.propTypes /* remove-proptypes */
    */
   size: _propTypes.default /* @typescript-to-proptypes-ignore */.oneOfType([_propTypes.default.oneOf(['small', 'medium']), _propTypes.default.string]),
   /**
-   * The props used for each slot inside the Slider.
+   * The props used for each slot inside.
    * @default {}
    */
   slotProps: _propTypes.default.shape({
@@ -1016,8 +940,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.default.shape({