@mui/material 6.4.4 → 6.4.6

package/Tabs/Tabs.js

@@ -19,6 +19,7 @@ import useEventCallback from "../utils/useEventCallback.js";
 import tabsClasses, { getTabsUtilityClass } from "./tabsClasses.js";
 import ownerDocument from "../utils/ownerDocument.js";
 import ownerWindow from "../utils/ownerWindow.js";
+import useSlot from "../utils/useSlot.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const nextItem = (list, item) => {
   if (list === item) {
@@ -75,7 +76,7 @@ const useUtilityClasses = ownerState => {
   const slots = {
     root: ['root', vertical && 'vertical'],
     scroller: ['scroller', fixed && 'fixed', hideScrollbar && 'hideScrollbar', scrollableX && 'scrollableX', scrollableY && 'scrollableY'],
-    flexContainer: ['flexContainer', vertical && 'flexContainerVertical', centered && 'centered'],
+    list: ['list', 'flexContainer', vertical && 'flexContainerVertical', vertical && 'vertical', centered && 'centered'],
     indicator: ['indicator'],
     scrollButtons: ['scrollButtons', scrollButtonsHideMobile && 'scrollButtonsHideMobile'],
     scrollableX: [scrollableX && 'scrollableX'],
@@ -176,14 +177,14 @@ const TabsScroller = styled('div', {
     }
   }]
 });
-const FlexContainer = styled('div', {
+const List = styled('div', {
   name: 'MuiTabs',
-  slot: 'FlexContainer',
+  slot: 'List',
   overridesResolver: (props, styles) => {
     const {
       ownerState
     } = props;
-    return [styles.flexContainer, ownerState.vertical && styles.flexContainerVertical, ownerState.centered && styles.centered];
+    return [styles.list, styles.flexContainer, ownerState.vertical && styles.flexContainerVertical, ownerState.centered && styles.centered];
   }
 })({
   display: 'flex',
@@ -271,13 +272,16 @@ const Tabs = /*#__PURE__*/React.forwardRef(function Tabs(inProps, ref) {
     indicatorColor = 'primary',
     onChange,
     orientation = 'horizontal',
-    ScrollButtonComponent = TabScrollButton,
+    ScrollButtonComponent,
+    // TODO: remove in v7 (deprecated in v6)
     scrollButtons = 'auto',
     selectionFollowsFocus,
     slots = {},
     slotProps = {},
     TabIndicatorProps = {},
+    // TODO: remove in v7 (deprecated in v6)
     TabScrollButtonProps = {},
+    // TODO: remove in v7 (deprecated in v6)
     textColor = 'primary',
     value,
     variant = 'standard',
@@ -337,6 +341,14 @@ const Tabs = /*#__PURE__*/React.forwardRef(function Tabs(inProps, ref) {
   const valueToIndex = new Map();
   const tabsRef = React.useRef(null);
   const tabListRef = React.useRef(null);
+  const externalForwardedProps = {
+    slots,
+    slotProps: {
+      indicator: TabIndicatorProps,
+      scrollButton: TabScrollButtonProps,
+      ...slotProps
+    }
+  };
   const getTabsMeta = () => {
     const tabsNode = tabsRef.current;
     let tabsMeta;
@@ -458,50 +470,62 @@ const Tabs = /*#__PURE__*/React.forwardRef(function Tabs(inProps, ref) {
   const handleEndScrollClick = () => {
     moveTabsScroll(getScrollSize());
   };
+  const [ScrollbarSlot, {
+    onChange: scrollbarOnChange,
+    ...scrollbarSlotProps
+  }] = useSlot('scrollbar', {
+    className: clsx(classes.scrollableX, classes.hideScrollbar),
+    elementType: TabsScrollbarSize,
+    shouldForwardComponentProp: true,
+    externalForwardedProps,
+    ownerState
+  });
 
   // TODO Remove <ScrollbarSize /> as browser support for hiding the scrollbar
   // with CSS improves.
   const handleScrollbarSizeChange = React.useCallback(scrollbarWidth => {
+    scrollbarOnChange?.(scrollbarWidth);
     setScrollerStyle({
       overflow: null,
       scrollbarWidth
     });
-  }, []);
+  }, [scrollbarOnChange]);
+  const [ScrollButtonsSlot, scrollButtonSlotProps] = useSlot('scrollButtons', {
+    className: clsx(classes.scrollButtons, TabScrollButtonProps.className),
+    elementType: TabScrollButton,
+    externalForwardedProps,
+    ownerState,
+    additionalProps: {
+      orientation,
+      slots: {
+        StartScrollButtonIcon: slots.startScrollButtonIcon || slots.StartScrollButtonIcon,
+        EndScrollButtonIcon: slots.endScrollButtonIcon || slots.EndScrollButtonIcon
+      },
+      slotProps: {
+        startScrollButtonIcon: startScrollButtonIconProps,
+        endScrollButtonIcon: endScrollButtonIconProps
+      }
+    }
+  });
   const getConditionalElements = () => {
     const conditionalElements = {};
-    conditionalElements.scrollbarSizeListener = scrollable ? /*#__PURE__*/_jsx(TabsScrollbarSize, {
-      onChange: handleScrollbarSizeChange,
-      className: clsx(classes.scrollableX, classes.hideScrollbar)
+    conditionalElements.scrollbarSizeListener = scrollable ? /*#__PURE__*/_jsx(ScrollbarSlot, {
+      ...scrollbarSlotProps,
+      onChange: handleScrollbarSizeChange
     }) : null;
     const scrollButtonsActive = displayStartScroll || displayEndScroll;
     const showScrollButtons = scrollable && (scrollButtons === 'auto' && scrollButtonsActive || scrollButtons === true);
-    conditionalElements.scrollButtonStart = showScrollButtons ? /*#__PURE__*/_jsx(ScrollButtonComponent, {
-      slots: {
-        StartScrollButtonIcon: slots.StartScrollButtonIcon
-      },
-      slotProps: {
-        startScrollButtonIcon: startScrollButtonIconProps
-      },
-      orientation: orientation,
+    conditionalElements.scrollButtonStart = showScrollButtons ? /*#__PURE__*/_jsx(ScrollButtonsSlot, {
       direction: isRtl ? 'right' : 'left',
       onClick: handleStartScrollClick,
       disabled: !displayStartScroll,
-      ...TabScrollButtonProps,
-      className: clsx(classes.scrollButtons, TabScrollButtonProps.className)
+      ...scrollButtonSlotProps
     }) : null;
-    conditionalElements.scrollButtonEnd = showScrollButtons ? /*#__PURE__*/_jsx(ScrollButtonComponent, {
-      slots: {
-        EndScrollButtonIcon: slots.EndScrollButtonIcon
-      },
-      slotProps: {
-        endScrollButtonIcon: endScrollButtonIconProps
-      },
-      orientation: orientation,
+    conditionalElements.scrollButtonEnd = showScrollButtons ? /*#__PURE__*/_jsx(ScrollButtonsSlot, {
       direction: isRtl ? 'left' : 'right',
       onClick: handleEndScrollClick,
       disabled: !displayEndScroll,
-      ...TabScrollButtonProps,
-      className: clsx(classes.scrollButtons, TabScrollButtonProps.className)
+      ...scrollButtonSlotProps
     }) : null;
     return conditionalElements;
   };
@@ -629,15 +653,18 @@ const Tabs = /*#__PURE__*/React.forwardRef(function Tabs(inProps, ref) {
     updateIndicator: updateIndicatorState,
     updateScrollButtons: updateScrollButtonState
   }), [updateIndicatorState, updateScrollButtonState]);
-  const indicator = /*#__PURE__*/_jsx(TabsIndicator, {
-    ...TabIndicatorProps,
+  const [IndicatorSlot, indicatorSlotProps] = useSlot('indicator', {
     className: clsx(classes.indicator, TabIndicatorProps.className),
-    ownerState: ownerState,
-    style: {
-      ...indicatorStyle,
-      ...TabIndicatorProps.style
+    elementType: TabsIndicator,
+    externalForwardedProps,
+    ownerState,
+    additionalProps: {
+      style: indicatorStyle
     }
   });
+  const indicator = /*#__PURE__*/_jsx(IndicatorSlot, {
+    ...indicatorSlotProps
+  });
   let childIndex = 0;
   const children = React.Children.map(childrenProp, child => {
     if (! /*#__PURE__*/React.isValidElement(child)) {
@@ -704,29 +731,54 @@ const Tabs = /*#__PURE__*/React.forwardRef(function Tabs(inProps, ref) {
     }
   };
   const conditionalElements = getConditionalElements();
-  return /*#__PURE__*/_jsxs(TabsRoot, {
+  const [RootSlot, rootSlotProps] = useSlot('root', {
+    ref,
     className: clsx(classes.root, className),
-    ownerState: ownerState,
-    ref: ref,
-    as: component,
-    ...other,
-    children: [conditionalElements.scrollButtonStart, conditionalElements.scrollbarSizeListener, /*#__PURE__*/_jsxs(TabsScroller, {
-      className: classes.scroller,
-      ownerState: ownerState,
+    elementType: TabsRoot,
+    externalForwardedProps: {
+      ...externalForwardedProps,
+      ...other,
+      component
+    },
+    ownerState
+  });
+  const [ScrollerSlot, scrollerSlotProps] = useSlot('scroller', {
+    ref: tabsRef,
+    className: classes.scroller,
+    elementType: TabsScroller,
+    externalForwardedProps,
+    ownerState,
+    additionalProps: {
       style: {
         overflow: scrollerStyle.overflow,
         [vertical ? `margin${isRtl ? 'Left' : 'Right'}` : 'marginBottom']: visibleScrollbar ? undefined : -scrollerStyle.scrollbarWidth
-      },
-      ref: tabsRef,
-      children: [/*#__PURE__*/_jsx(FlexContainer, {
+      }
+    }
+  });
+  const [ListSlot, listSlotProps] = useSlot('list', {
+    ref: tabListRef,
+    className: clsx(classes.list, classes.flexContainer),
+    elementType: List,
+    externalForwardedProps,
+    ownerState,
+    getSlotProps: handlers => ({
+      ...handlers,
+      onKeyDown: event => {
+        handleKeyDown(event);
+        handlers.onKeyDown?.(event);
+      }
+    })
+  });
+  return /*#__PURE__*/_jsxs(RootSlot, {
+    ...rootSlotProps,
+    children: [conditionalElements.scrollButtonStart, conditionalElements.scrollbarSizeListener, /*#__PURE__*/_jsxs(ScrollerSlot, {
+      ...scrollerSlotProps,
+      children: [/*#__PURE__*/_jsx(ListSlot, {
         "aria-label": ariaLabel,
         "aria-labelledby": ariaLabelledBy,
         "aria-orientation": orientation === 'vertical' ? 'vertical' : null,
-        className: classes.flexContainer,
-        ownerState: ownerState,
-        onKeyDown: handleKeyDown,
-        ref: tabListRef,
         role: "tablist",
+        ...listSlotProps,
         children: children
       }), mounted && indicator]
     }), conditionalElements.scrollButtonEnd]
@@ -802,6 +854,7 @@ process.env.NODE_ENV !== "production" ? Tabs.propTypes /* remove-proptypes */ =
   orientation: PropTypes.oneOf(['horizontal', 'vertical']),
   /**
    * The component used to render the scroll buttons.
+   * @deprecated use the `slots.scrollButtons` prop instead. This prop will be removed in v7. See [Migrating from deprecated APIs](https://mui.com/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    * @default TabScrollButton
    */
   ScrollButtonComponent: PropTypes.elementType,
@@ -823,12 +876,17 @@ process.env.NODE_ENV !== "production" ? Tabs.propTypes /* remove-proptypes */ =
    */
   selectionFollowsFocus: PropTypes.bool,
   /**
-   * The extra props for the slot components.
-   * You can override the existing props or add new ones.
+   * The props used for each slot inside.
    * @default {}
    */
   slotProps: PropTypes.shape({
     endScrollButtonIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+    indicator: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+    list: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+    root: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+    scrollbar: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+    scrollButtons: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+    scroller: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
     startScrollButtonIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
   }),
   /**
@@ -836,7 +894,15 @@ process.env.NODE_ENV !== "production" ? Tabs.propTypes /* remove-proptypes */ =
    * @default {}
    */
   slots: PropTypes.shape({
+    endScrollButtonIcon: PropTypes.elementType,
     EndScrollButtonIcon: PropTypes.elementType,
+    indicator: PropTypes.elementType,
+    list: PropTypes.elementType,
+    root: PropTypes.elementType,
+    scrollbar: PropTypes.elementType,
+    scrollButtons: PropTypes.elementType,
+    scroller: PropTypes.elementType,
+    startScrollButtonIcon: PropTypes.elementType,
     StartScrollButtonIcon: PropTypes.elementType
   }),
   /**
@@ -845,11 +911,13 @@ process.env.NODE_ENV !== "production" ? Tabs.propTypes /* remove-proptypes */ =
   sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
   /**
    * Props applied to the tab indicator element.
+   * @deprecated use the `slotProps.indicator` prop instead. This prop will be removed in v7. See [Migrating from deprecated APIs](https://mui.com/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    * @default  {}
    */
   TabIndicatorProps: PropTypes.object,
   /**
    * Props applied to the [`TabScrollButton`](https://mui.com/material-ui/api/tab-scroll-button/) element.
+   * @deprecated use the `slotProps.scrollButtons` prop instead. This prop will be removed in v7. See [Migrating from deprecated APIs](https://mui.com/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    * @default {}
    */
   TabScrollButtonProps: PropTypes.object,

package/Tabs/tabsClasses.d.ts

@@ -4,9 +4,13 @@ export interface TabsClasses {
     /** Styles applied to the root element if `orientation="vertical"`. */
     vertical: string;
     /** Styles applied to the flex container element. */
+    /** @deprecated use `list` instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */
     flexContainer: string;
     /** Styles applied to the flex container element if `orientation="vertical"`. */
+    /** @deprecated use a combination of `list` and `vertical` instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */
     flexContainerVertical: string;
+    /** Styles applied to the list element. */
+    list: string;
     /** Styles applied to the flex container element if `centered={true}` & `!variant="scrollable"`. */
     centered: string;
     /** Styles applied to the tablist element. */

package/Tabs/tabsClasses.js

@@ -3,5 +3,5 @@ import generateUtilityClass from '@mui/utils/generateUtilityClass';
 export function getTabsUtilityClass(slot) {
   return generateUtilityClass('MuiTabs', slot);
 }
-const tabsClasses = generateUtilityClasses('MuiTabs', ['root', 'vertical', 'flexContainer', 'flexContainerVertical', 'centered', 'scroller', 'fixed', 'scrollableX', 'scrollableY', 'hideScrollbar', 'scrollButtons', 'scrollButtonsHideMobile', 'indicator']);
+const tabsClasses = generateUtilityClasses('MuiTabs', ['root', 'vertical', 'list', 'flexContainer', 'flexContainerVertical', 'centered', 'scroller', 'fixed', 'scrollableX', 'scrollableY', 'hideScrollbar', 'scrollButtons', 'scrollButtonsHideMobile', 'indicator']);
 export default tabsClasses;

package/Tooltip/Tooltip.d.ts

@@ -41,26 +41,34 @@ export interface TooltipSlots {
 export type TooltipSlotsAndSlotProps = CreateSlotsAndSlotProps<
   TooltipSlots,
   {
+    /**
+     * Props forwarded to the popper slot.
+     * By default, the avaible props are based on the [Popper](https://mui.com/material-ui/api/popper/#props) component.
+     */
     popper: SlotProps<
       React.ElementType<PopperProps>,
       TooltipPopperSlotPropsOverrides,
       TooltipOwnerState
     >;
+    /**
+     * Props forwarded to the transition slot.
+     * By default, the avaible props are based on the [Grow](https://mui.com/material-ui/api/grow/#props) component.
+     */
     transition: SlotProps<
-      React.ElementType<TransitionProps>,
-      TooltipTransitionSlotPropsOverrides,
-      TooltipOwnerState
-    >;
-    tooltip: SlotProps<
-      React.ElementType<React.HTMLProps<HTMLDivElement>>,
-      TooltipTooltipSlotPropsOverrides,
-      TooltipOwnerState
-    >;
-    arrow: SlotProps<
-      React.ElementType<React.HTMLProps<HTMLSpanElement>>,
-      TooltipArrowSlotPropsOverrides,
+      React.ElementType,
+      TransitionProps & TooltipTransitionSlotPropsOverrides,
       TooltipOwnerState
     >;
+    /**
+     * Props forwarded to the tooltip slot.
+     * By default, the avaible props are based on the div element.
+     */
+    tooltip: SlotProps<'div', TooltipTooltipSlotPropsOverrides, TooltipOwnerState>;
+    /**
+     * Props forwarded to the tooltip slot.
+     * By default, the avaible props are based on the span element.
+     */
+    arrow: SlotProps<'span', TooltipArrowSlotPropsOverrides, TooltipOwnerState>;
   }
 >;
 

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/material v6.4.4
+ * @mui/material v6.4.6
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/internal/SwitchBase.d.ts

@@ -2,9 +2,39 @@ import * as React from 'react';
 import { InternalStandardProps as StandardProps } from '..';
 import { ButtonBaseProps } from '../ButtonBase';
 import { SwitchBaseClasses } from './switchBaseClasses';
+import { CreateSlotsAndSlotProps, SlotProps } from '../utils/types';
+
+interface SwitchBaseSlots {
+  /**
+   * The component that renders the root slot.
+   * @default ButtonBase
+   */
+  root: React.ElementType;
+  /**
+   * The component that renders the input slot.
+   * @default 'input'
+   */
+  input: React.ElementType;
+}
+
+type SwitchBaseSlotsAndSlotProps = CreateSlotsAndSlotProps<
+  SwitchBaseSlots,
+  {
+    /**
+     * Props forwarded to the root slot.
+     * By default, the avaible props are based on the [ButtonBase](https://mui.com/material-ui/api/button-base/#props) component.
+     */
+    root: SlotProps<React.ElementType<ButtonBaseProps>, {}, SwitchBaseOwnerState>;
+    /**
+     * Props forwarded to the input slot.
+     */
+    input: SlotProps<'input', {}, SwitchBaseOwnerState>;
+  }
+>;
 
 export interface SwitchBaseProps
-  extends StandardProps<ButtonBaseProps, 'children' | 'onChange' | 'type' | 'value'> {
+  extends StandardProps<ButtonBaseProps, 'children' | 'onChange' | 'type' | 'value'>,
+    SwitchBaseSlotsAndSlotProps {
   autoFocus?: boolean;
   /**
    * If `true`, the component is checked.
@@ -48,10 +78,12 @@ export interface SwitchBaseProps
   id?: string;
   /**
    * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element.
+   * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    */
   inputProps?: React.InputHTMLAttributes<HTMLInputElement>;
   /**
    * Pass a ref to the `input` element.
+   * @deprecated Use `slotProps.input.ref` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    */
   inputRef?: React.Ref<any>;
   /**
@@ -80,6 +112,8 @@ export interface SwitchBaseProps
   value?: unknown;
 }
 
+export interface SwitchBaseOwnerState extends Omit<SwitchBaseProps, 'slots' | 'slotProps'> {}
+
 declare const SwitchBase: React.JSXElementConstructor<SwitchBaseProps>;
 
 export default SwitchBase;

package/internal/SwitchBase.js

@@ -2,7 +2,6 @@
 
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import clsx from 'clsx';
 import refType from '@mui/utils/refType';
 import composeClasses from '@mui/utils/composeClasses';
 import capitalize from "../utils/capitalize.js";
@@ -12,6 +11,7 @@ import useControlled from "../utils/useControlled.js";
 import useFormControl from "../FormControl/useFormControl.js";
 import ButtonBase from "../ButtonBase/index.js";
 import { getSwitchBaseUtilityClass } from "./switchBaseClasses.js";
+import useSlot from "../utils/useSlot.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -86,7 +86,6 @@ const SwitchBase = /*#__PURE__*/React.forwardRef(function SwitchBase(props, ref)
     autoFocus,
     checked: checkedProp,
     checkedIcon,
-    className,
     defaultChecked,
     disabled: disabledProp,
     disableFocusRipple = false,
@@ -104,6 +103,8 @@ const SwitchBase = /*#__PURE__*/React.forwardRef(function SwitchBase(props, ref)
     tabIndex,
     type,
     value,
+    slots = {},
+    slotProps = {},
     ...other
   } = props;
   const [checked, setCheckedState] = useControlled({
@@ -156,38 +157,75 @@ const SwitchBase = /*#__PURE__*/React.forwardRef(function SwitchBase(props, ref)
     edge
   };
   const classes = useUtilityClasses(ownerState);
-  return /*#__PURE__*/_jsxs(SwitchBaseRoot, {
-    component: "span",
-    className: clsx(classes.root, className),
-    centerRipple: true,
-    focusRipple: !disableFocusRipple,
-    disabled: disabled,
-    tabIndex: null,
-    role: undefined,
-    onFocus: handleFocus,
-    onBlur: handleBlur,
-    ownerState: ownerState,
-    ref: ref,
-    ...other,
-    children: [/*#__PURE__*/_jsx(SwitchBaseInput, {
-      autoFocus: autoFocus,
+  const externalForwardedProps = {
+    slots,
+    slotProps: {
+      input: inputProps,
+      ...slotProps
+    }
+  };
+  const [RootSlot, rootSlotProps] = useSlot('root', {
+    ref,
+    elementType: SwitchBaseRoot,
+    className: classes.root,
+    shouldForwardComponentProp: true,
+    externalForwardedProps: {
+      ...externalForwardedProps,
+      component: 'span',
+      ...other
+    },
+    getSlotProps: handlers => ({
+      ...handlers,
+      onFocus: event => {
+        handlers.onFocus?.(event);
+        handleFocus(event);
+      },
+      onBlur: event => {
+        handlers.onBlur?.(event);
+        handleBlur(event);
+      }
+    }),
+    ownerState,
+    additionalProps: {
+      centerRipple: true,
+      focusRipple: !disableFocusRipple,
+      disabled,
+      role: undefined,
+      tabIndex: null
+    }
+  });
+  const [InputSlot, inputSlotProps] = useSlot('input', {
+    ref: inputRef,
+    elementType: SwitchBaseInput,
+    className: classes.input,
+    externalForwardedProps,
+    getSlotProps: handlers => ({
+      onChange: event => {
+        handlers.onChange?.(event);
+        handleInputChange(event);
+      }
+    }),
+    ownerState,
+    additionalProps: {
+      autoFocus,
       checked: checkedProp,
-      defaultChecked: defaultChecked,
-      className: classes.input,
-      disabled: disabled,
+      defaultChecked,
+      disabled,
       id: hasLabelFor ? id : undefined,
-      name: name,
-      onChange: handleInputChange,
-      readOnly: readOnly,
-      ref: inputRef,
-      required: required,
-      ownerState: ownerState,
-      tabIndex: tabIndex,
-      type: type,
+      name,
+      readOnly,
+      required,
+      tabIndex,
+      type,
       ...(type === 'checkbox' && value === undefined ? {} : {
         value
-      }),
-      ...inputProps
+      })
+    }
+  });
+  return /*#__PURE__*/_jsxs(RootSlot, {
+    ...rootSlotProps,
+    children: [/*#__PURE__*/_jsx(InputSlot, {
+      ...inputSlotProps
     }), checked ? checkedIcon : icon]
   });
 });
@@ -280,6 +318,22 @@ process.env.NODE_ENV !== "production" ? SwitchBase.propTypes = {
    * If `true`, the `input` element is required.
    */
   required: PropTypes.bool,
+  /**
+   * The props used for each slot inside.
+   * @default {}
+   */
+  slotProps: PropTypes.shape({
+    input: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+    root: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
+  }),
+  /**
+   * The components used for each slot inside.
+   * @default {}
+   */
+  slots: PropTypes.shape({
+    input: PropTypes.elementType,
+    root: PropTypes.elementType
+  }),
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.
    */

package/modern/Button/Button.js

@@ -501,9 +501,9 @@ const Button = /*#__PURE__*/React.forwardRef(function Button(inProps, ref) {
     variant = 'text',
     ...other
   } = props;
-  const id = useId(idProp);
+  const loadingId = useId(idProp);
   const loadingIndicator = loadingIndicatorProp ?? /*#__PURE__*/_jsx(CircularProgress, {
-    "aria-labelledby": id,
+    "aria-labelledby": loadingId,
     color: "inherit",
     size: 16
   });
@@ -563,7 +563,7 @@ const Button = /*#__PURE__*/React.forwardRef(function Button(inProps, ref) {
     focusVisibleClassName: clsx(classes.focusVisible, focusVisibleClassName),
     ref: ref,
     type: type,
-    id: id,
+    id: loading ? loadingId : idProp,
     ...other,
     classes: classes,
     children: [startIcon, loadingPosition !== 'end' && loader, children, loadingPosition === 'end' && loader, endIcon]