@mui/material 6.0.0-dev.240424162023-9968b4889d → 6.0.0

package/modern/FormControlLabel/FormControlLabel.js

@@ -1,22 +1,20 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["checked", "className", "componentsProps", "control", "disabled", "disableTypography", "inputRef", "label", "labelPlacement", "name", "onChange", "required", "slotProps", "value"];
 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 { useFormControl } from '../FormControl';
-import { styled, createUseThemeProps } from '../zero-styled';
-import Stack from '../Stack';
-import Typography from '../Typography';
-import capitalize from '../utils/capitalize';
-import formControlLabelClasses, { getFormControlLabelUtilityClasses } from './formControlLabelClasses';
-import formControlState from '../FormControl/formControlState';
+import { useFormControl } from "../FormControl/index.js";
+import { styled } from "../zero-styled/index.js";
+import memoTheme from "../utils/memoTheme.js";
+import { useDefaultProps } from "../DefaultPropsProvider/index.js";
+import Typography from "../Typography/index.js";
+import capitalize from "../utils/capitalize.js";
+import formControlLabelClasses, { getFormControlLabelUtilityClasses } from "./formControlLabelClasses.js";
+import formControlState from "../FormControl/formControlState.js";
+import useSlot from "../utils/useSlot.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const useThemeProps = createUseThemeProps('MuiFormControlLabel');
 const useUtilityClasses = ownerState => {
   const {
     classes,
@@ -43,7 +41,7 @@ export const FormControlLabelRoot = styled('label', {
       [`& .${formControlLabelClasses.label}`]: styles.label
     }, styles.root, styles[`labelPlacement${capitalize(ownerState.labelPlacement)}`]];
   }
-})(({
+})(memoTheme(({
   theme
 }) => ({
   display: 'inline-flex',
@@ -93,40 +91,46 @@ export const FormControlLabelRoot = styled('label', {
       marginLeft: 16 // used for row presentation of radio/checkbox
     }
   }]
-}));
+})));
 const AsteriskComponent = styled('span', {
   name: 'MuiFormControlLabel',
   slot: 'Asterisk',
   overridesResolver: (props, styles) => styles.asterisk
-})(({
+})(memoTheme(({
   theme
 }) => ({
   [`&.${formControlLabelClasses.error}`]: {
     color: (theme.vars || theme).palette.error.main
   }
-}));
+})));
 
 /**
  * Drop-in replacement of the `Radio`, `Switch` and `Checkbox` component.
  * Use this component if you want to display an extra label.
  */
 const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel(inProps, ref) {
-  const props = useThemeProps({
+  const props = useDefaultProps({
     props: inProps,
     name: 'MuiFormControlLabel'
   });
   const {
-      className,
-      componentsProps = {},
-      control,
-      disabled: disabledProp,
-      disableTypography,
-      label: labelProp,
-      labelPlacement = 'end',
-      required: requiredProp,
-      slotProps = {}
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    checked,
+    className,
+    componentsProps = {},
+    control,
+    disabled: disabledProp,
+    disableTypography,
+    inputRef,
+    label: labelProp,
+    labelPlacement = 'end',
+    name,
+    onChange,
+    required: requiredProp,
+    slots = {},
+    slotProps = {},
+    value,
+    ...other
+  } = props;
   const muiFormControl = useFormControl();
   const disabled = disabledProp ?? control.props.disabled ?? muiFormControl?.disabled;
   const required = requiredProp ?? control.props.required;
@@ -144,30 +148,41 @@ const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel
     muiFormControl,
     states: ['error']
   });
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     disabled,
     labelPlacement,
     required,
     error: fcs.error
-  });
+  };
   const classes = useUtilityClasses(ownerState);
-  const typographySlotProps = slotProps.typography ?? componentsProps.typography;
+  const externalForwardedProps = {
+    slots,
+    slotProps: {
+      ...componentsProps,
+      ...slotProps
+    }
+  };
+  const [TypographySlot, typographySlotProps] = useSlot('typography', {
+    elementType: Typography,
+    externalForwardedProps,
+    ownerState
+  });
   let label = labelProp;
   if (label != null && label.type !== Typography && !disableTypography) {
-    label = /*#__PURE__*/_jsx(Typography, _extends({
-      component: "span"
-    }, typographySlotProps, {
+    label = /*#__PURE__*/_jsx(TypographySlot, {
+      component: "span",
+      ...typographySlotProps,
       className: clsx(classes.label, typographySlotProps?.className),
       children: label
-    }));
+    });
   }
-  return /*#__PURE__*/_jsxs(FormControlLabelRoot, _extends({
+  return /*#__PURE__*/_jsxs(FormControlLabelRoot, {
     className: clsx(classes.root, className),
     ownerState: ownerState,
-    ref: ref
-  }, other, {
-    children: [/*#__PURE__*/React.cloneElement(control, controlProps), required ? /*#__PURE__*/_jsxs(Stack, {
-      display: "block",
+    ref: ref,
+    ...other,
+    children: [/*#__PURE__*/React.cloneElement(control, controlProps), required ? /*#__PURE__*/_jsxs("div", {
       children: [label, /*#__PURE__*/_jsxs(AsteriskComponent, {
         ownerState: ownerState,
         "aria-hidden": true,
@@ -175,7 +190,7 @@ const FormControlLabel = /*#__PURE__*/React.forwardRef(function FormControlLabel
         children: ["\u2009", '*']
       })]
     }) : label]
-  }));
+  });
 });
 process.env.NODE_ENV !== "production" ? FormControlLabel.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐
@@ -197,6 +212,7 @@ process.env.NODE_ENV !== "production" ? FormControlLabel.propTypes /* remove-pro
   /**
    * The props used for each slot inside.
    * @default {}
+   * @deprecated use the `slotProps` prop instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    */
   componentsProps: PropTypes.shape({
     typography: PropTypes.object
@@ -246,7 +262,14 @@ process.env.NODE_ENV !== "production" ? FormControlLabel.propTypes /* remove-pro
    * @default {}
    */
   slotProps: PropTypes.shape({
-    typography: PropTypes.object
+    typography: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
+  }),
+  /**
+   * The components used for each slot inside.
+   * @default {}
+   */
+  slots: PropTypes.shape({
+    typography: PropTypes.elementType
   }),
   /**
    * The system prop that allows defining system overrides as well as additional CSS styles.

package/modern/FormControlLabel/index.js

@@ -1,5 +1,5 @@
 'use client';
 
-export { default } from './FormControlLabel';
-export { default as formControlLabelClasses } from './formControlLabelClasses';
-export * from './formControlLabelClasses';
+export { default } from "./FormControlLabel.js";
+export { default as formControlLabelClasses } from "./formControlLabelClasses.js";
+export * from "./formControlLabelClasses.js";

package/modern/FormGroup/FormGroup.js

@@ -1,18 +1,15 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["className", "row"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
-import { getFormGroupUtilityClass } from './formGroupClasses';
-import useFormControl from '../FormControl/useFormControl';
-import formControlState from '../FormControl/formControlState';
+import { styled } from "../zero-styled/index.js";
+import { useDefaultProps } from "../DefaultPropsProvider/index.js";
+import { getFormGroupUtilityClass } from "./formGroupClasses.js";
+import useFormControl from "../FormControl/useFormControl.js";
+import formControlState from "../FormControl/formControlState.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-const useThemeProps = createUseThemeProps('MuiFormGroup');
 const useUtilityClasses = ownerState => {
   const {
     classes,
@@ -53,31 +50,33 @@ const FormGroupRoot = styled('div', {
  * For the `Radio`, you should be using the `RadioGroup` component instead of this one.
  */
 const FormGroup = /*#__PURE__*/React.forwardRef(function FormGroup(inProps, ref) {
-  const props = useThemeProps({
+  const props = useDefaultProps({
     props: inProps,
     name: 'MuiFormGroup'
   });
   const {
-      className,
-      row = false
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    className,
+    row = false,
+    ...other
+  } = props;
   const muiFormControl = useFormControl();
   const fcs = formControlState({
     props,
     muiFormControl,
     states: ['error']
   });
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     row,
     error: fcs.error
-  });
+  };
   const classes = useUtilityClasses(ownerState);
-  return /*#__PURE__*/_jsx(FormGroupRoot, _extends({
+  return /*#__PURE__*/_jsx(FormGroupRoot, {
     className: clsx(classes.root, className),
     ownerState: ownerState,
-    ref: ref
-  }, other));
+    ref: ref,
+    ...other
+  });
 });
 process.env.NODE_ENV !== "production" ? FormGroup.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐

package/modern/FormGroup/index.js

@@ -1,5 +1,5 @@
 'use client';
 
-export { default } from './FormGroup';
-export { default as formGroupClasses } from './formGroupClasses';
-export * from './formGroupClasses';
+export { default } from "./FormGroup.js";
+export { default as formGroupClasses } from "./formGroupClasses.js";
+export * from "./formGroupClasses.js";

package/modern/FormHelperText/FormHelperText.js

@@ -1,19 +1,17 @@
 'use client';
 
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import _extends from "@babel/runtime/helpers/esm/extends";
 var _span;
-const _excluded = ["children", "className", "component", "disabled", "error", "filled", "focused", "margin", "required", "variant"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import composeClasses from '@mui/utils/composeClasses';
-import formControlState from '../FormControl/formControlState';
-import useFormControl from '../FormControl/useFormControl';
-import styled from '../styles/styled';
-import capitalize from '../utils/capitalize';
-import formHelperTextClasses, { getFormHelperTextUtilityClasses } from './formHelperTextClasses';
-import useThemeProps from '../styles/useThemeProps';
+import formControlState from "../FormControl/formControlState.js";
+import useFormControl from "../FormControl/useFormControl.js";
+import { styled } from "../zero-styled/index.js";
+import memoTheme from "../utils/memoTheme.js";
+import { useDefaultProps } from "../DefaultPropsProvider/index.js";
+import capitalize from "../utils/capitalize.js";
+import formHelperTextClasses, { getFormHelperTextUtilityClasses } from "./formHelperTextClasses.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -40,11 +38,11 @@ const FormHelperTextRoot = styled('p', {
     } = props;
     return [styles.root, ownerState.size && styles[`size${capitalize(ownerState.size)}`], ownerState.contained && styles.contained, ownerState.filled && styles.filled];
   }
-})(({
+})(memoTheme(({
   theme
-}) => _extends({
-  color: (theme.vars || theme).palette.text.secondary
-}, theme.typography.caption, {
+}) => ({
+  color: (theme.vars || theme).palette.text.secondary,
+  ...theme.typography.caption,
   textAlign: 'left',
   marginTop: 3,
   marginRight: 0,
@@ -72,25 +70,33 @@ const FormHelperTextRoot = styled('p', {
       marginRight: 14
     }
   }]
-}));
+})));
 const FormHelperText = /*#__PURE__*/React.forwardRef(function FormHelperText(inProps, ref) {
-  const props = useThemeProps({
+  const props = useDefaultProps({
     props: inProps,
     name: 'MuiFormHelperText'
   });
   const {
-      children,
-      className,
-      component = 'p'
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    children,
+    className,
+    component = 'p',
+    disabled,
+    error,
+    filled,
+    focused,
+    margin,
+    required,
+    variant,
+    ...other
+  } = props;
   const muiFormControl = useFormControl();
   const fcs = formControlState({
     props,
     muiFormControl,
     states: ['variant', 'size', 'disabled', 'error', 'filled', 'focused', 'required']
   });
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     component,
     contained: fcs.variant === 'filled' || fcs.variant === 'outlined',
     variant: fcs.variant,
@@ -100,20 +106,23 @@ const FormHelperText = /*#__PURE__*/React.forwardRef(function FormHelperText(inP
     filled: fcs.filled,
     focused: fcs.focused,
     required: fcs.required
-  });
+  };
+
+  // This issue explains why this is required: https://github.com/mui/material-ui/issues/42184
+  delete ownerState.ownerState;
   const classes = useUtilityClasses(ownerState);
-  return /*#__PURE__*/_jsx(FormHelperTextRoot, _extends({
+  return /*#__PURE__*/_jsx(FormHelperTextRoot, {
     as: component,
-    ownerState: ownerState,
     className: clsx(classes.root, className),
-    ref: ref
-  }, other, {
+    ref: ref,
+    ...other,
+    ownerState: ownerState,
     children: children === ' ' ? // notranslate needed while Google Translate will not fix zero-width space issue
     _span || (_span = /*#__PURE__*/_jsx("span", {
       className: "notranslate",
       children: "\u200B"
     })) : children
-  }));
+  });
 });
 process.env.NODE_ENV !== "production" ? FormHelperText.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐

package/modern/FormHelperText/index.js

@@ -1,5 +1,5 @@
 'use client';
 
-export { default } from './FormHelperText';
-export { default as formHelperTextClasses } from './formHelperTextClasses';
-export * from './formHelperTextClasses';
+export { default } from "./FormHelperText.js";
+export { default as formHelperTextClasses } from "./formHelperTextClasses.js";
+export * from "./formHelperTextClasses.js";

package/modern/FormLabel/FormLabel.js

@@ -1,18 +1,16 @@
 'use client';
 
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["children", "className", "color", "component", "disabled", "error", "filled", "focused", "required"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import composeClasses from '@mui/utils/composeClasses';
-import formControlState from '../FormControl/formControlState';
-import useFormControl from '../FormControl/useFormControl';
-import capitalize from '../utils/capitalize';
-import useThemeProps from '../styles/useThemeProps';
-import styled from '../styles/styled';
-import formLabelClasses, { getFormLabelUtilityClasses } from './formLabelClasses';
+import formControlState from "../FormControl/formControlState.js";
+import useFormControl from "../FormControl/useFormControl.js";
+import capitalize from "../utils/capitalize.js";
+import { styled } from "../zero-styled/index.js";
+import memoTheme from "../utils/memoTheme.js";
+import { useDefaultProps } from "../DefaultPropsProvider/index.js";
+import formLabelClasses, { getFormLabelUtilityClasses } from "./formLabelClasses.js";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -36,56 +34,77 @@ export const FormLabelRoot = styled('label', {
   overridesResolver: ({
     ownerState
   }, styles) => {
-    return _extends({}, styles.root, ownerState.color === 'secondary' && styles.colorSecondary, ownerState.filled && styles.filled);
+    return {
+      ...styles.root,
+      ...(ownerState.color === 'secondary' && styles.colorSecondary),
+      ...(ownerState.filled && styles.filled)
+    };
   }
-})(({
-  theme,
-  ownerState
-}) => _extends({
-  color: (theme.vars || theme).palette.text.secondary
-}, theme.typography.body1, {
+})(memoTheme(({
+  theme
+}) => ({
+  color: (theme.vars || theme).palette.text.secondary,
+  ...theme.typography.body1,
   lineHeight: '1.4375em',
   padding: 0,
   position: 'relative',
-  [`&.${formLabelClasses.focused}`]: {
-    color: (theme.vars || theme).palette[ownerState.color].main
-  },
-  [`&.${formLabelClasses.disabled}`]: {
-    color: (theme.vars || theme).palette.text.disabled
-  },
-  [`&.${formLabelClasses.error}`]: {
-    color: (theme.vars || theme).palette.error.main
-  }
-}));
+  variants: [...Object.entries(theme.palette).filter(([, value]) => value && value.main).map(([color]) => ({
+    props: {
+      color
+    },
+    style: {
+      [`&.${formLabelClasses.focused}`]: {
+        color: (theme.vars || theme).palette[color].main
+      }
+    }
+  })), {
+    props: {},
+    style: {
+      [`&.${formLabelClasses.disabled}`]: {
+        color: (theme.vars || theme).palette.text.disabled
+      },
+      [`&.${formLabelClasses.error}`]: {
+        color: (theme.vars || theme).palette.error.main
+      }
+    }
+  }]
+})));
 const AsteriskComponent = styled('span', {
   name: 'MuiFormLabel',
   slot: 'Asterisk',
   overridesResolver: (props, styles) => styles.asterisk
-})(({
+})(memoTheme(({
   theme
 }) => ({
   [`&.${formLabelClasses.error}`]: {
     color: (theme.vars || theme).palette.error.main
   }
-}));
+})));
 const FormLabel = /*#__PURE__*/React.forwardRef(function FormLabel(inProps, ref) {
-  const props = useThemeProps({
+  const props = useDefaultProps({
     props: inProps,
     name: 'MuiFormLabel'
   });
   const {
-      children,
-      className,
-      component = 'label'
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    children,
+    className,
+    color,
+    component = 'label',
+    disabled,
+    error,
+    filled,
+    focused,
+    required,
+    ...other
+  } = props;
   const muiFormControl = useFormControl();
   const fcs = formControlState({
     props,
     muiFormControl,
     states: ['color', 'required', 'focused', 'disabled', 'error', 'filled']
   });
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     color: fcs.color || 'primary',
     component,
     disabled: fcs.disabled,
@@ -93,21 +112,21 @@ const FormLabel = /*#__PURE__*/React.forwardRef(function FormLabel(inProps, ref)
     filled: fcs.filled,
     focused: fcs.focused,
     required: fcs.required
-  });
+  };
   const classes = useUtilityClasses(ownerState);
-  return /*#__PURE__*/_jsxs(FormLabelRoot, _extends({
+  return /*#__PURE__*/_jsxs(FormLabelRoot, {
     as: component,
     ownerState: ownerState,
     className: clsx(classes.root, className),
-    ref: ref
-  }, other, {
+    ref: ref,
+    ...other,
     children: [children, fcs.required && /*#__PURE__*/_jsxs(AsteriskComponent, {
       ownerState: ownerState,
       "aria-hidden": true,
       className: classes.asterisk,
       children: ["\u2009", '*']
     })]
-  }));
+  });
 });
 process.env.NODE_ENV !== "production" ? FormLabel.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐

package/modern/FormLabel/index.js

@@ -1,6 +1,6 @@
 'use client';
 
-export { default } from './FormLabel';
-export * from './FormLabel';
-export { default as formLabelClasses } from './formLabelClasses';
-export * from './formLabelClasses';
+export { default } from "./FormLabel.js";
+export * from "./FormLabel.js";
+export { default as formLabelClasses } from "./formLabelClasses.js";
+export * from "./formLabelClasses.js";

package/modern/GlobalStyles/GlobalStyles.js

@@ -1,17 +1,17 @@
 'use client';
 
-import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { GlobalStyles as SystemGlobalStyles } from '@mui/system';
-import defaultTheme from '../styles/defaultTheme';
-import THEME_ID from '../styles/identifier';
+import defaultTheme from "../styles/defaultTheme.js";
+import THEME_ID from "../styles/identifier.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 function GlobalStyles(props) {
-  return /*#__PURE__*/_jsx(SystemGlobalStyles, _extends({}, props, {
+  return /*#__PURE__*/_jsx(SystemGlobalStyles, {
+    ...props,
     defaultTheme: defaultTheme,
     themeId: THEME_ID
-  }));
+  });
 }
 process.env.NODE_ENV !== "production" ? GlobalStyles.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐

package/modern/GlobalStyles/index.js

@@ -1 +1 @@
-export { default } from './GlobalStyles';
+export { default } from "./GlobalStyles.js";