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

package/FilledInput/FilledInput.mjs

@@ -273,8 +273,6 @@ const FilledInput = /*#__PURE__*/React.forwardRef(function FilledInput(inProps,
   });
   const {
     disableUnderline = false,
-    components = {},
-    componentsProps: componentsPropsProp,
     fullWidth = false,
     hiddenLabel,
     // declare here to prevent spreading to DOM
@@ -302,9 +300,9 @@ const FilledInput = /*#__PURE__*/React.forwardRef(function FilledInput(inProps,
       ownerState
     }
   };
-  const componentsProps = slotProps ?? componentsPropsProp ? deepmerge(filledInputComponentsProps, slotProps ?? componentsPropsProp) : filledInputComponentsProps;
-  const RootSlot = slots.root ?? components.Root ?? FilledInputRoot;
-  const InputSlot = slots.input ?? components.Input ?? FilledInputInput;
+  const componentsProps = slotProps ? deepmerge(filledInputComponentsProps, slotProps) : filledInputComponentsProps;
+  const RootSlot = slots.root ?? FilledInputRoot;
+  const InputSlot = slots.input ?? FilledInputInput;
   return /*#__PURE__*/_jsx(InputBase, {
     slots: {
       root: RootSlot,
@@ -346,29 +344,6 @@ process.env.NODE_ENV !== "production" ? FilledInput.propTypes /* remove-proptype
    * The prop defaults to the value (`'primary'`) inherited from the parent FormControl component.
    */
   color: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['primary', 'secondary']), 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,
-    Root: 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.object,
-    root: PropTypes.object
-  }),
   /**
    * The default value. Use when the component is not controlled.
    */
@@ -475,8 +450,6 @@ process.env.NODE_ENV !== "production" ? FilledInput.propTypes /* remove-proptype
    * The extra props for the slot components.
    * You can override the existing props or add new ones.
    *
-   * This prop is an alias for the `componentsProps` prop, which will be deprecated in the future.
-   *
    * @default {}
    */
   slotProps: PropTypes.shape({
@@ -486,8 +459,6 @@ process.env.NODE_ENV !== "production" ? FilledInput.propTypes /* remove-proptype
   /**
    * The components used for each slot inside.
    *
-   * This prop is an alias for the `components` prop, which will be deprecated in the future.
-   *
    * @default {}
    */
   slots: PropTypes.shape({

package/FormControlLabel/FormControlLabel.d.mts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { SxProps } from '@mui/system';
 import { Theme } from "../styles/index.mjs";
 import { InternalStandardProps as StandardProps } from "../internal/index.mjs";
-import Typography, { TypographyProps } from "../Typography/index.mjs";
+import Typography from "../Typography/index.mjs";
 import { FormControlLabelClasses } from "./formControlLabelClasses.mjs";
 import { CreateSlotsAndSlotProps, SlotProps } from "../utils/types.mjs";
 export interface FormControlLabelSlots {
@@ -25,19 +25,6 @@ export interface FormControlLabelProps extends StandardProps<React.LabelHTMLAttr
    * Override or extend the styles applied to the component.
    */
   classes?: Partial<FormControlLabelClasses> | undefined;
-  /**
-   * The props used for each slot inside.
-   * @default {}
-   * @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.
-   */
-  componentsProps?: {
-    /**
-     * Props applied to the Typography wrapper of the passed label.
-     * This is unused if disableTypography is true.
-     * @default {}
-     */
-    typography?: TypographyProps | undefined;
-  } | undefined;
   /**
    * A control element. For instance, it can be a `Radio`, a `Switch` or a `Checkbox`.
    */

package/FormControlLabel/FormControlLabel.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { SxProps } from '@mui/system';
 import { Theme } from "../styles/index.js";
 import { InternalStandardProps as StandardProps } from "../internal/index.js";
-import Typography, { TypographyProps } from "../Typography/index.js";
+import Typography from "../Typography/index.js";
 import { FormControlLabelClasses } from "./formControlLabelClasses.js";
 import { CreateSlotsAndSlotProps, SlotProps } from "../utils/types.js";
 export interface FormControlLabelSlots {
@@ -25,19 +25,6 @@ export interface FormControlLabelProps extends StandardProps<React.LabelHTMLAttr
    * Override or extend the styles applied to the component.
    */
   classes?: Partial<FormControlLabelClasses> | undefined;
-  /**
-   * The props used for each slot inside.
-   * @default {}
-   * @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.
-   */
-  componentsProps?: {
-    /**
-     * Props applied to the Typography wrapper of the passed label.
-     * This is unused if disableTypography is true.
-     * @default {}
-     */
-    typography?: TypographyProps | undefined;
-  } | undefined;
   /**
    * A control element. For instance, it can be a `Radio`, a `Switch` or a `Checkbox`.
    */

package/FormControlLabel/FormControlLabel.js

@@ -122,7 +122,6 @@ const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel
   const {
     checked,
     className,
-    componentsProps = {},
     control,
     disabled: disabledProp,
     disableTypography,
@@ -164,10 +163,7 @@ const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel
   const classes = useUtilityClasses(ownerState);
   const externalForwardedProps = {
     slots,
-    slotProps: {
-      ...componentsProps,
-      ...slotProps
-    }
+    slotProps
   };
   const [TypographySlot, typographySlotProps] = (0, _useSlot.default)('typography', {
     elementType: _Typography.default,
@@ -215,14 +211,6 @@ process.env.NODE_ENV !== "production" ? FormControlLabel.propTypes /* remove-pro
    * @ignore
    */
   className: _propTypes.default.string,
-  /**
-   * The props used for each slot inside.
-   * @default {}
-   * @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.
-   */
-  componentsProps: _propTypes.default.shape({
-    typography: _propTypes.default.object
-  }),
   /**
    * A control element. For instance, it can be a `Radio`, a `Switch` or a `Checkbox`.
    */

package/FormControlLabel/FormControlLabel.mjs

@@ -115,7 +115,6 @@ const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel
   const {
     checked,
     className,
-    componentsProps = {},
     control,
     disabled: disabledProp,
     disableTypography,
@@ -157,10 +156,7 @@ const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel
   const classes = useUtilityClasses(ownerState);
   const externalForwardedProps = {
     slots,
-    slotProps: {
-      ...componentsProps,
-      ...slotProps
-    }
+    slotProps
   };
   const [TypographySlot, typographySlotProps] = useSlot('typography', {
     elementType: Typography,
@@ -208,14 +204,6 @@ process.env.NODE_ENV !== "production" ? FormControlLabel.propTypes /* remove-pro
    * @ignore
    */
   className: PropTypes.string,
-  /**
-   * The props used for each slot inside.
-   * @default {}
-   * @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.
-   */
-  componentsProps: PropTypes.shape({
-    typography: PropTypes.object
-  }),
   /**
    * A control element. For instance, it can be a `Radio`, a `Switch` or a `Checkbox`.
    */

package/ImageListItemBar/ImageListItemBar.js

@@ -21,15 +21,14 @@ const useUtilityClasses = ownerState => {
   const {
     classes,
     position,
-    actionIcon,
     actionPosition
   } = ownerState;
   const slots = {
     root: ['root', `position${(0, _capitalize.default)(position)}`, `actionPosition${(0, _capitalize.default)(actionPosition)}`],
-    titleWrap: ['titleWrap', `titleWrap${(0, _capitalize.default)(position)}`, actionIcon && `titleWrapActionPos${(0, _capitalize.default)(actionPosition)}`],
+    titleWrap: ['titleWrap'],
     title: ['title'],
     subtitle: ['subtitle'],
-    actionIcon: ['actionIcon', `actionIconActionPos${(0, _capitalize.default)(actionPosition)}`]
+    actionIcon: ['actionIcon']
   };
   return (0, _composeClasses.default)(slots, _imageListItemBarClasses.getImageListItemBarUtilityClass, classes);
 };
@@ -81,13 +80,7 @@ const ImageListItemBarRoot = (0, _zeroStyled.styled)('div', {
 }));
 const ImageListItemBarTitleWrap = (0, _zeroStyled.styled)('div', {
   name: 'MuiImageListItemBar',
-  slot: 'TitleWrap',
-  overridesResolver: (props, styles) => {
-    const {
-      ownerState
-    } = props;
-    return [styles.titleWrap, styles[`titleWrap${(0, _capitalize.default)(ownerState.position)}`], ownerState.actionIcon && styles[`titleWrapActionPos${(0, _capitalize.default)(ownerState.actionPosition)}`]];
-  }
+  slot: 'TitleWrap'
 })((0, _memoTheme.default)(({
   theme
 }) => {
@@ -151,13 +144,7 @@ const ImageListItemBarSubtitle = (0, _zeroStyled.styled)('div', {
 }));
 const ImageListItemBarActionIcon = (0, _zeroStyled.styled)('div', {
   name: 'MuiImageListItemBar',
-  slot: 'ActionIcon',
-  overridesResolver: (props, styles) => {
-    const {
-      ownerState
-    } = props;
-    return [styles.actionIcon, styles[`actionIconActionPos${(0, _capitalize.default)(ownerState.actionPosition)}`]];
-  }
+  slot: 'ActionIcon'
 })({
   variants: [{
     props: {

package/ImageListItemBar/ImageListItemBar.mjs

@@ -14,15 +14,14 @@ const useUtilityClasses = ownerState => {
   const {
     classes,
     position,
-    actionIcon,
     actionPosition
   } = ownerState;
   const slots = {
     root: ['root', `position${capitalize(position)}`, `actionPosition${capitalize(actionPosition)}`],
-    titleWrap: ['titleWrap', `titleWrap${capitalize(position)}`, actionIcon && `titleWrapActionPos${capitalize(actionPosition)}`],
+    titleWrap: ['titleWrap'],
     title: ['title'],
     subtitle: ['subtitle'],
-    actionIcon: ['actionIcon', `actionIconActionPos${capitalize(actionPosition)}`]
+    actionIcon: ['actionIcon']
   };
   return composeClasses(slots, getImageListItemBarUtilityClass, classes);
 };
@@ -74,13 +73,7 @@ const ImageListItemBarRoot = styled('div', {
 }));
 const ImageListItemBarTitleWrap = styled('div', {
   name: 'MuiImageListItemBar',
-  slot: 'TitleWrap',
-  overridesResolver: (props, styles) => {
-    const {
-      ownerState
-    } = props;
-    return [styles.titleWrap, styles[`titleWrap${capitalize(ownerState.position)}`], ownerState.actionIcon && styles[`titleWrapActionPos${capitalize(ownerState.actionPosition)}`]];
-  }
+  slot: 'TitleWrap'
 })(memoTheme(({
   theme
 }) => {
@@ -144,13 +137,7 @@ const ImageListItemBarSubtitle = styled('div', {
 }));
 const ImageListItemBarActionIcon = styled('div', {
   name: 'MuiImageListItemBar',
-  slot: 'ActionIcon',
-  overridesResolver: (props, styles) => {
-    const {
-      ownerState
-    } = props;
-    return [styles.actionIcon, styles[`actionIconActionPos${capitalize(ownerState.actionPosition)}`]];
-  }
+  slot: 'ActionIcon'
 })({
   variants: [{
     props: {

package/ImageListItemBar/imageListItemBarClasses.d.mts

@@ -13,28 +13,12 @@ export interface ImageListItemBarClasses {
   actionPositionRight: string;
   /** Styles applied to the title and subtitle container element. */
   titleWrap: string;
-  /** Styles applied to the title and subtitle container element if `position="below"`.
-   * @deprecated Combine the [.MuiImageListItemBar-titleWrap](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-titleWrap) and [.MuiImageListItemBar-positionBelow](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-positionBelow) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  titleWrapBelow: string;
-  /** Styles applied to the container element if `actionPosition="left"`.
-   * @deprecated Combine the [.MuiImageListItemBar-titleWrap](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-titleWrap) and [.MuiImageListItemBar-actionPositionLeft](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-actionPositionLeft) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  titleWrapActionPosLeft: string;
-  /** Styles applied to the container element if `actionPosition="right"`.
-   * @deprecated Combine the [.MuiImageListItemBar-titleWrap](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-titleWrap) and [.MuiImageListItemBar-actionPositionRight](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-actionPositionRight) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  titleWrapActionPosRight: string;
   /** Styles applied to the title container element. */
   title: string;
   /** Styles applied to the subtitle container element. */
   subtitle: string;
   /** Styles applied to the actionIcon if supplied. */
   actionIcon: string;
-  /** Styles applied to the actionIcon if `actionPosition="left"`.
-   * @deprecated Combine the [.MuiImageListItemBar-actionIcon](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-actionIcon) and [.MuiImageListItemBar-actionPositionLeft](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-actionPositionLeft) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  actionIconActionPosLeft: string;
 }
 export type ImageListItemBarClassKey = keyof ImageListItemBarClasses;
 export declare function getImageListItemBarUtilityClass(slot: string): string;

package/ImageListItemBar/imageListItemBarClasses.d.ts

@@ -13,28 +13,12 @@ export interface ImageListItemBarClasses {
   actionPositionRight: string;
   /** Styles applied to the title and subtitle container element. */
   titleWrap: string;
-  /** Styles applied to the title and subtitle container element if `position="below"`.
-   * @deprecated Combine the [.MuiImageListItemBar-titleWrap](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-titleWrap) and [.MuiImageListItemBar-positionBelow](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-positionBelow) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  titleWrapBelow: string;
-  /** Styles applied to the container element if `actionPosition="left"`.
-   * @deprecated Combine the [.MuiImageListItemBar-titleWrap](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-titleWrap) and [.MuiImageListItemBar-actionPositionLeft](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-actionPositionLeft) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  titleWrapActionPosLeft: string;
-  /** Styles applied to the container element if `actionPosition="right"`.
-   * @deprecated Combine the [.MuiImageListItemBar-titleWrap](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-titleWrap) and [.MuiImageListItemBar-actionPositionRight](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-actionPositionRight) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  titleWrapActionPosRight: string;
   /** Styles applied to the title container element. */
   title: string;
   /** Styles applied to the subtitle container element. */
   subtitle: string;
   /** Styles applied to the actionIcon if supplied. */
   actionIcon: string;
-  /** Styles applied to the actionIcon if `actionPosition="left"`.
-   * @deprecated Combine the [.MuiImageListItemBar-actionIcon](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-actionIcon) and [.MuiImageListItemBar-actionPositionLeft](/material-ui/api/image-list-item-bar/#image-list-item-bar-classes-MuiImageListItemBar-actionPositionLeft) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  actionIconActionPosLeft: string;
 }
 export type ImageListItemBarClassKey = keyof ImageListItemBarClasses;
 export declare function getImageListItemBarUtilityClass(slot: string): string;

package/ImageListItemBar/imageListItemBarClasses.js

@@ -11,5 +11,5 @@ var _generateUtilityClass = _interopRequireDefault(require("@mui/utils/generateU
 function getImageListItemBarUtilityClass(slot) {
   return (0, _generateUtilityClass.default)('MuiImageListItemBar', slot);
 }
-const imageListItemBarClasses = (0, _generateUtilityClasses.default)('MuiImageListItemBar', ['root', 'positionBottom', 'positionTop', 'positionBelow', 'actionPositionLeft', 'actionPositionRight', 'titleWrap', 'titleWrapBottom', 'titleWrapTop', 'titleWrapBelow', 'titleWrapActionPosLeft', 'titleWrapActionPosRight', 'title', 'subtitle', 'actionIcon', 'actionIconActionPosLeft', 'actionIconActionPosRight']);
+const imageListItemBarClasses = (0, _generateUtilityClasses.default)('MuiImageListItemBar', ['root', 'positionBottom', 'positionTop', 'positionBelow', 'actionPositionLeft', 'actionPositionRight', 'titleWrap', 'title', 'subtitle', 'actionIcon']);
 var _default = exports.default = imageListItemBarClasses;

package/ImageListItemBar/imageListItemBarClasses.mjs

@@ -3,5 +3,5 @@ import generateUtilityClass from '@mui/utils/generateUtilityClass';
 export function getImageListItemBarUtilityClass(slot) {
   return generateUtilityClass('MuiImageListItemBar', slot);
 }
-const imageListItemBarClasses = generateUtilityClasses('MuiImageListItemBar', ['root', 'positionBottom', 'positionTop', 'positionBelow', 'actionPositionLeft', 'actionPositionRight', 'titleWrap', 'titleWrapBottom', 'titleWrapTop', 'titleWrapBelow', 'titleWrapActionPosLeft', 'titleWrapActionPosRight', 'title', 'subtitle', 'actionIcon', 'actionIconActionPosLeft', 'actionIconActionPosRight']);
+const imageListItemBarClasses = generateUtilityClasses('MuiImageListItemBar', ['root', 'positionBottom', 'positionTop', 'positionBelow', 'actionPositionLeft', 'actionPositionRight', 'titleWrap', 'title', 'subtitle', 'actionIcon']);
 export default imageListItemBarClasses;

package/Input/Input.js

@@ -18,6 +18,7 @@ var _zeroStyled = require("../zero-styled");
 var _memoTheme = _interopRequireDefault(require("../utils/memoTheme"));
 var _createSimplePaletteValueFilter = _interopRequireDefault(require("../utils/createSimplePaletteValueFilter"));
 var _DefaultPropsProvider = require("../DefaultPropsProvider");
+var _inputLabelClasses = _interopRequireDefault(require("../InputLabel/inputLabelClasses"));
 var _inputClasses = _interopRequireWildcard(require("./inputClasses"));
 var _InputBase2 = require("../InputBase/InputBase");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -62,7 +63,7 @@ const InputRoot = (0, _zeroStyled.styled)(_InputBase2.InputBaseRoot, {
         ownerState
       }) => ownerState.formControl,
       style: {
-        'label + &': {
+        [`label + &, .${_inputLabelClasses.default.root} + &`]: {
           marginTop: 16
         }
       }
@@ -142,8 +143,6 @@ const Input = /*#__PURE__*/React.forwardRef(function Input(inProps, ref) {
   });
   const {
     disableUnderline = false,
-    components = {},
-    componentsProps: componentsPropsProp,
     fullWidth = false,
     inputComponent = 'input',
     multiline = false,
@@ -161,9 +160,9 @@ const Input = /*#__PURE__*/React.forwardRef(function Input(inProps, ref) {
       ownerState
     }
   };
-  const componentsProps = slotProps ?? componentsPropsProp ? (0, _deepmerge.default)(slotProps ?? componentsPropsProp, inputComponentsProps) : inputComponentsProps;
-  const RootSlot = slots.root ?? components.Root ?? InputRoot;
-  const InputSlot = slots.input ?? components.Input ?? InputInput;
+  const componentsProps = slotProps ? (0, _deepmerge.default)(slotProps, inputComponentsProps) : inputComponentsProps;
+  const RootSlot = slots.root ?? InputRoot;
+  const InputSlot = slots.input ?? InputInput;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InputBase.default, {
     slots: {
       root: RootSlot,
@@ -205,29 +204,6 @@ process.env.NODE_ENV !== "production" ? Input.propTypes /* remove-proptypes */ =
    * The prop defaults to the value (`'primary'`) inherited from the parent FormControl component.
    */
   color: _propTypes.default /* @typescript-to-proptypes-ignore */.oneOfType([_propTypes.default.oneOf(['primary', 'secondary']), _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,
-    Root: _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.object,
-    root: _propTypes.default.object
-  }),
   /**
    * The default value. Use when the component is not controlled.
    */
@@ -327,8 +303,6 @@ process.env.NODE_ENV !== "production" ? Input.propTypes /* remove-proptypes */ =
    * The extra props for the slot components.
    * You can override the existing props or add new ones.
    *
-   * This prop is an alias for the `componentsProps` prop, which will be deprecated in the future.
-   *
    * @default {}
    */
   slotProps: _propTypes.default.shape({
@@ -338,8 +312,6 @@ process.env.NODE_ENV !== "production" ? Input.propTypes /* remove-proptypes */ =
   /**
    * The components used for each slot inside.
    *
-   * This prop is an alias for the `components` prop, which will be deprecated in the future.
-   *
    * @default {}
    */
   slots: _propTypes.default.shape({

package/Input/Input.mjs

@@ -11,6 +11,7 @@ import { styled } from "../zero-styled/index.mjs";
 import memoTheme from "../utils/memoTheme.mjs";
 import createSimplePaletteValueFilter from "../utils/createSimplePaletteValueFilter.mjs";
 import { useDefaultProps } from "../DefaultPropsProvider/index.mjs";
+import inputLabelClasses from "../InputLabel/inputLabelClasses.mjs";
 import inputClasses, { getInputUtilityClass } from "./inputClasses.mjs";
 import { rootOverridesResolver as inputBaseRootOverridesResolver, inputOverridesResolver as inputBaseInputOverridesResolver, InputBaseRoot, InputBaseInput } from "../InputBase/InputBase.mjs";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -55,7 +56,7 @@ const InputRoot = styled(InputBaseRoot, {
         ownerState
       }) => ownerState.formControl,
       style: {
-        'label + &': {
+        [`label + &, .${inputLabelClasses.root} + &`]: {
           marginTop: 16
         }
       }
@@ -135,8 +136,6 @@ const Input = /*#__PURE__*/React.forwardRef(function Input(inProps, ref) {
   });
   const {
     disableUnderline = false,
-    components = {},
-    componentsProps: componentsPropsProp,
     fullWidth = false,
     inputComponent = 'input',
     multiline = false,
@@ -154,9 +153,9 @@ const Input = /*#__PURE__*/React.forwardRef(function Input(inProps, ref) {
       ownerState
     }
   };
-  const componentsProps = slotProps ?? componentsPropsProp ? deepmerge(slotProps ?? componentsPropsProp, inputComponentsProps) : inputComponentsProps;
-  const RootSlot = slots.root ?? components.Root ?? InputRoot;
-  const InputSlot = slots.input ?? components.Input ?? InputInput;
+  const componentsProps = slotProps ? deepmerge(slotProps, inputComponentsProps) : inputComponentsProps;
+  const RootSlot = slots.root ?? InputRoot;
+  const InputSlot = slots.input ?? InputInput;
   return /*#__PURE__*/_jsx(InputBase, {
     slots: {
       root: RootSlot,
@@ -198,29 +197,6 @@ process.env.NODE_ENV !== "production" ? Input.propTypes /* remove-proptypes */ =
    * The prop defaults to the value (`'primary'`) inherited from the parent FormControl component.
    */
   color: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([PropTypes.oneOf(['primary', 'secondary']), 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,
-    Root: 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.object,
-    root: PropTypes.object
-  }),
   /**
    * The default value. Use when the component is not controlled.
    */
@@ -320,8 +296,6 @@ process.env.NODE_ENV !== "production" ? Input.propTypes /* remove-proptypes */ =
    * The extra props for the slot components.
    * You can override the existing props or add new ones.
    *
-   * This prop is an alias for the `componentsProps` prop, which will be deprecated in the future.
-   *
    * @default {}
    */
   slotProps: PropTypes.shape({
@@ -331,8 +305,6 @@ process.env.NODE_ENV !== "production" ? Input.propTypes /* remove-proptypes */ =
   /**
    * The components used for each slot inside.
    *
-   * This prop is an alias for the `components` prop, which will be deprecated in the future.
-   *
    * @default {}
    */
   slots: PropTypes.shape({

package/Input/inputClasses.d.mts

@@ -21,22 +21,6 @@ export interface InputClasses {
   fullWidth: string;
   /** Styles applied to the input element. */
   input: string;
-  /** Styles applied to the input element if `size="small"`.
-   * @deprecated Combine the [.MuiInputBase-input](/material-ui/api/input-base/#input-base-classes-MuiInputBase-input) and [.MuiInputBase-sizeSmall](/material-ui/api/input-base/#input-base-classes-MuiInputBase-sizeSmall) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  inputSizeSmall: string;
-  /** Styles applied to the input element if `multiline={true}`.
-   * @deprecated Combine the [.MuiInputBase-input](/material-ui/api/input-base/#input-base-classes-MuiInputBase-input) and [.MuiInputBase-multiline](/material-ui/api/input-base/#input-base-classes-MuiInputBase-multiline) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  inputMultiline: string;
-  /** Styles applied to the input element if `startAdornment` is provided.
-   * @deprecated Combine the [.MuiInputBase-input](/material-ui/api/input-base/#input-base-classes-MuiInputBase-input) and [.MuiInputBase-adornedStart](/material-ui/api/input-base/#input-base-classes-MuiInputBase-adornedStart) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  inputAdornedStart: string;
-  /** Styles applied to the input element if `endAdornment` is provided.
-   * @deprecated Combine the [.MuiInputBase-input](/material-ui/api/input-base/#input-base-classes-MuiInputBase-input) and [.MuiInputBase-adornedEnd](/material-ui/api/input-base/#input-base-classes-MuiInputBase-adornedEnd) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  inputAdornedEnd: string;
   /** Styles applied to the input element if `type="search"`. */
   inputTypeSearch: string;
 }

package/Input/inputClasses.d.ts

@@ -21,22 +21,6 @@ export interface InputClasses {
   fullWidth: string;
   /** Styles applied to the input element. */
   input: string;
-  /** Styles applied to the input element if `size="small"`.
-   * @deprecated Combine the [.MuiInputBase-input](/material-ui/api/input-base/#input-base-classes-MuiInputBase-input) and [.MuiInputBase-sizeSmall](/material-ui/api/input-base/#input-base-classes-MuiInputBase-sizeSmall) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  inputSizeSmall: string;
-  /** Styles applied to the input element if `multiline={true}`.
-   * @deprecated Combine the [.MuiInputBase-input](/material-ui/api/input-base/#input-base-classes-MuiInputBase-input) and [.MuiInputBase-multiline](/material-ui/api/input-base/#input-base-classes-MuiInputBase-multiline) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  inputMultiline: string;
-  /** Styles applied to the input element if `startAdornment` is provided.
-   * @deprecated Combine the [.MuiInputBase-input](/material-ui/api/input-base/#input-base-classes-MuiInputBase-input) and [.MuiInputBase-adornedStart](/material-ui/api/input-base/#input-base-classes-MuiInputBase-adornedStart) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  inputAdornedStart: string;
-  /** Styles applied to the input element if `endAdornment` is provided.
-   * @deprecated Combine the [.MuiInputBase-input](/material-ui/api/input-base/#input-base-classes-MuiInputBase-input) and [.MuiInputBase-adornedEnd](/material-ui/api/input-base/#input-base-classes-MuiInputBase-adornedEnd) classes instead. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
-   */
-  inputAdornedEnd: string;
   /** Styles applied to the input element if `type="search"`. */
   inputTypeSearch: string;
 }

package/InputBase/InputBase.d.mts

@@ -36,29 +36,6 @@ export interface InputBaseProps extends StandardProps<React.HTMLAttributes<HTMLD
    * The prop defaults to the value (`'primary'`) inherited from the parent FormControl component.
    */
   color?: OverridableStringUnion<'primary' | 'secondary' | 'error' | 'info' | 'success' | 'warning', InputBasePropsColorOverrides> | 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;
-    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?: (React.HTMLAttributes<HTMLDivElement> & InputBaseComponentsPropsOverrides) | undefined;
-    input?: (React.InputHTMLAttributes<HTMLInputElement> & InputBaseComponentsPropsOverrides) | undefined;
-  } | undefined;
   /**
    * The default value. Use when the component is not controlled.
    */
@@ -185,8 +162,6 @@ export interface InputBaseProps extends StandardProps<React.HTMLAttributes<HTMLD
    * The extra props for the slot components.
    * You can override the existing props or add new ones.
    *
-   * This prop is an alias for the `componentsProps` prop, which will be deprecated in the future.
-   *
    * @default {}
    */
   slotProps?: {
@@ -200,8 +175,6 @@ export interface InputBaseProps extends StandardProps<React.HTMLAttributes<HTMLD
   /**
    * The components used for each slot inside.
    *
-   * This prop is an alias for the `components` prop, which will be deprecated in the future.
-   *
    * @default {}
    */
   slots?: {