@mui/material 6.0.0-alpha.1 → 6.0.0-alpha.11

package/modern/InputAdornment/InputAdornment.js

@@ -1,9 +1,6 @@
 '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", "disablePointerEvents", "disableTypography", "position", "variant"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
@@ -12,10 +9,10 @@ import capitalize from '../utils/capitalize';
 import Typography from '../Typography';
 import FormControlContext from '../FormControl/FormControlContext';
 import useFormControl from '../FormControl/useFormControl';
-import styled from '../styles/styled';
+import { styled, createUseThemeProps } from '../zero-styled';
 import inputAdornmentClasses, { getInputAdornmentUtilityClass } from './inputAdornmentClasses';
-import useThemeProps from '../styles/useThemeProps';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const useThemeProps = createUseThemeProps('MuiInputAdornment');
 const overridesResolver = (props, styles) => {
   const {
     ownerState
@@ -41,30 +38,44 @@ const InputAdornmentRoot = styled('div', {
   slot: 'Root',
   overridesResolver
 })(({
-  theme,
-  ownerState
-}) => _extends({
+  theme
+}) => ({
   display: 'flex',
-  height: '0.01em',
-  // Fix IE11 flexbox alignment. To remove at some point.
   maxHeight: '2em',
   alignItems: 'center',
   whiteSpace: 'nowrap',
-  color: (theme.vars || theme).palette.action.active
-}, ownerState.variant === 'filled' && {
-  // Styles applied to the root element if `variant="filled"`.
-  [`&.${inputAdornmentClasses.positionStart}&:not(.${inputAdornmentClasses.hiddenLabel})`]: {
-    marginTop: 16
-  }
-}, ownerState.position === 'start' && {
-  // Styles applied to the root element if `position="start"`.
-  marginRight: 8
-}, ownerState.position === 'end' && {
-  // Styles applied to the root element if `position="end"`.
-  marginLeft: 8
-}, ownerState.disablePointerEvents === true && {
-  // Styles applied to the root element if `disablePointerEvents={true}`.
-  pointerEvents: 'none'
+  color: (theme.vars || theme).palette.action.active,
+  variants: [{
+    props: {
+      variant: 'filled'
+    },
+    style: {
+      [`&.${inputAdornmentClasses.positionStart}&:not(.${inputAdornmentClasses.hiddenLabel})`]: {
+        marginTop: 16
+      }
+    }
+  }, {
+    props: {
+      position: 'start'
+    },
+    style: {
+      marginRight: 8
+    }
+  }, {
+    props: {
+      position: 'end'
+    },
+    style: {
+      marginLeft: 8
+    }
+  }, {
+    props: {
+      disablePointerEvents: true
+    },
+    style: {
+      pointerEvents: 'none'
+    }
+  }]
 }));
 const InputAdornment = /*#__PURE__*/React.forwardRef(function InputAdornment(inProps, ref) {
   const props = useThemeProps({
@@ -72,15 +83,15 @@ const InputAdornment = /*#__PURE__*/React.forwardRef(function InputAdornment(inP
     name: 'MuiInputAdornment'
   });
   const {
-      children,
-      className,
-      component = 'div',
-      disablePointerEvents = false,
-      disableTypography = false,
-      position,
-      variant: variantProp
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    children,
+    className,
+    component = 'div',
+    disablePointerEvents = false,
+    disableTypography = false,
+    position,
+    variant: variantProp,
+    ...other
+  } = props;
   const muiFormControl = useFormControl() || {};
   let variant = variantProp;
   if (variantProp && muiFormControl.variant) {
@@ -93,22 +104,23 @@ const InputAdornment = /*#__PURE__*/React.forwardRef(function InputAdornment(inP
   if (muiFormControl && !variant) {
     variant = muiFormControl.variant;
   }
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     hiddenLabel: muiFormControl.hiddenLabel,
     size: muiFormControl.size,
     disablePointerEvents,
     position,
     variant
-  });
+  };
   const classes = useUtilityClasses(ownerState);
   return /*#__PURE__*/_jsx(FormControlContext.Provider, {
     value: null,
-    children: /*#__PURE__*/_jsx(InputAdornmentRoot, _extends({
+    children: /*#__PURE__*/_jsx(InputAdornmentRoot, {
       as: component,
       ownerState: ownerState,
       className: clsx(classes.root, className),
-      ref: ref
-    }, other, {
+      ref: ref,
+      ...other,
       children: typeof children === 'string' && !disableTypography ? /*#__PURE__*/_jsx(Typography, {
         color: "text.secondary",
         children: children
@@ -118,7 +130,7 @@ const InputAdornment = /*#__PURE__*/React.forwardRef(function InputAdornment(inP
           children: "\u200B"
         }))) : null, children]
       })
-    }))
+    })
   });
 });
 process.env.NODE_ENV !== "production" ? InputAdornment.propTypes /* remove-proptypes */ = {

package/modern/InputBase/InputBase.js

@@ -1,9 +1,7 @@
 'use client';
 
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-import _extends from "@babel/runtime/helpers/esm/extends";
 import _formatMuiErrorMessage from "@mui/utils/formatMuiErrorMessage";
-const _excluded = ["aria-describedby", "autoComplete", "autoFocus", "className", "color", "components", "componentsProps", "defaultValue", "disabled", "disableInjectingGlobalStyles", "endAdornment", "error", "fullWidth", "id", "inputComponent", "inputProps", "inputRef", "margin", "maxRows", "minRows", "multiline", "name", "onBlur", "onChange", "onClick", "onFocus", "onKeyDown", "onKeyUp", "placeholder", "readOnly", "renderSuffix", "rows", "size", "slotProps", "slots", "startAdornment", "type", "value"];
+var _InputGlobalStyles;
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
@@ -15,15 +13,14 @@ import composeClasses from '@mui/utils/composeClasses';
 import formControlState from '../FormControl/formControlState';
 import FormControlContext from '../FormControl/FormControlContext';
 import useFormControl from '../FormControl/useFormControl';
-import styled from '../styles/styled';
-import useThemeProps from '../styles/useThemeProps';
+import { styled, createUseThemeProps, globalCss } from '../zero-styled';
 import capitalize from '../utils/capitalize';
 import useForkRef from '../utils/useForkRef';
 import useEnhancedEffect from '../utils/useEnhancedEffect';
-import GlobalStyles from '../GlobalStyles';
 import { isFilled } from './utils';
 import inputBaseClasses, { getInputBaseUtilityClass } from './inputBaseClasses';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const useThemeProps = createUseThemeProps('MuiInputBase');
 export const rootOverridesResolver = (props, styles) => {
   const {
     ownerState
@@ -64,9 +61,9 @@ export const InputBaseRoot = styled('div', {
   slot: 'Root',
   overridesResolver: rootOverridesResolver
 })(({
-  theme,
-  ownerState
-}) => _extends({}, theme.typography.body1, {
+  theme
+}) => ({
+  ...theme.typography.body1,
   color: (theme.vars || theme).palette.text.primary,
   lineHeight: '1.4375em',
   // 23px
@@ -79,34 +76,50 @@ export const InputBaseRoot = styled('div', {
   [`&.${inputBaseClasses.disabled}`]: {
     color: (theme.vars || theme).palette.text.disabled,
     cursor: 'default'
-  }
-}, ownerState.multiline && _extends({
-  padding: '4px 0 5px'
-}, ownerState.size === 'small' && {
-  paddingTop: 1
-}), ownerState.fullWidth && {
-  width: '100%'
+  },
+  variants: [{
+    props: ({
+      ownerState
+    }) => ownerState.multiline,
+    style: {
+      padding: '4px 0 5px'
+    }
+  }, {
+    props: ({
+      ownerState,
+      size
+    }) => ownerState.multiline && size === 'small',
+    style: {
+      paddingTop: 1
+    }
+  }, {
+    props: ({
+      ownerState
+    }) => ownerState.fullWidth,
+    style: {
+      width: '100%'
+    }
+  }]
 }));
-export const InputBaseComponent = styled('input', {
+export const InputBaseInput = styled('input', {
   name: 'MuiInputBase',
   slot: 'Input',
   overridesResolver: inputOverridesResolver
 })(({
-  theme,
-  ownerState
+  theme
 }) => {
   const light = theme.palette.mode === 'light';
-  const placeholder = _extends({
-    color: 'currentColor'
-  }, theme.vars ? {
-    opacity: theme.vars.opacity.inputPlaceholder
-  } : {
-    opacity: light ? 0.42 : 0.5
-  }, {
+  const placeholder = {
+    color: 'currentColor',
+    ...(theme.vars ? {
+      opacity: theme.vars.opacity.inputPlaceholder
+    } : {
+      opacity: light ? 0.42 : 0.5
+    }),
     transition: theme.transitions.create('opacity', {
       duration: theme.transitions.duration.shorter
     })
-  });
+  };
   const placeholderHidden = {
     opacity: '0 !important'
   };
@@ -115,7 +128,7 @@ export const InputBaseComponent = styled('input', {
   } : {
     opacity: light ? 0.42 : 0.5
   };
-  return _extends({
+  return {
     font: 'inherit',
     letterSpacing: 'inherit',
     color: 'currentColor',
@@ -131,15 +144,10 @@ export const InputBaseComponent = styled('input', {
     display: 'block',
     // Make the flex item shrink with Firefox
     minWidth: 0,
-    width: '100%',
-    // Fix IE11 width issue
-    animationName: 'mui-auto-fill-cancel',
-    animationDuration: '10ms',
+    flexGrow: 1,
     '&::-webkit-input-placeholder': placeholder,
     '&::-moz-placeholder': placeholder,
     // Firefox 19+
-    '&:-ms-input-placeholder': placeholder,
-    // IE11
     '&::-ms-input-placeholder': placeholder,
     // Edge
     '&:focus': {
@@ -158,15 +166,11 @@ export const InputBaseComponent = styled('input', {
       '&::-webkit-input-placeholder': placeholderHidden,
       '&::-moz-placeholder': placeholderHidden,
       // Firefox 19+
-      '&:-ms-input-placeholder': placeholderHidden,
-      // IE11
       '&::-ms-input-placeholder': placeholderHidden,
       // Edge
       '&:focus::-webkit-input-placeholder': placeholderVisible,
       '&:focus::-moz-placeholder': placeholderVisible,
       // Firefox 19+
-      '&:focus:-ms-input-placeholder': placeholderVisible,
-      // IE11
       '&:focus::-ms-input-placeholder': placeholderVisible // Edge
     },
     [`&.${inputBaseClasses.disabled}`]: {
@@ -174,33 +178,54 @@ export const InputBaseComponent = styled('input', {
       // Reset iOS opacity
       WebkitTextFillColor: (theme.vars || theme).palette.text.disabled // Fix opacity Safari bug
     },
-    '&:-webkit-autofill': {
-      animationDuration: '5000s',
-      animationName: 'mui-auto-fill'
-    }
-  }, ownerState.size === 'small' && {
-    paddingTop: 1
-  }, ownerState.multiline && {
-    height: 'auto',
-    resize: 'none',
-    padding: 0,
-    paddingTop: 0
-  }, ownerState.type === 'search' && {
-    // Improve type search style.
-    MozAppearance: 'textfield'
-  });
-});
-const inputGlobalStyles = /*#__PURE__*/_jsx(GlobalStyles, {
-  styles: {
-    '@keyframes mui-auto-fill': {
-      from: {
-        display: 'block'
+    variants: [{
+      props: ({
+        ownerState
+      }) => !ownerState.disableInjectingGlobalStyles,
+      style: {
+        animationName: 'mui-auto-fill-cancel',
+        animationDuration: '10ms',
+        '&:-webkit-autofill': {
+          animationDuration: '5000s',
+          animationName: 'mui-auto-fill'
+        }
       }
-    },
-    '@keyframes mui-auto-fill-cancel': {
-      from: {
-        display: 'block'
+    }, {
+      props: {
+        size: 'small'
+      },
+      style: {
+        paddingTop: 1
+      }
+    }, {
+      props: ({
+        ownerState
+      }) => ownerState.multiline,
+      style: {
+        height: 'auto',
+        resize: 'none',
+        padding: 0,
+        paddingTop: 0
+      }
+    }, {
+      props: {
+        type: 'search'
+      },
+      style: {
+        MozAppearance: 'textfield' // Improve type search style.
       }
+    }]
+  };
+});
+const InputGlobalStyles = globalCss({
+  '@keyframes mui-auto-fill': {
+    from: {
+      display: 'block'
+    }
+  },
+  '@keyframes mui-auto-fill-cancel': {
+    from: {
+      display: 'block'
     }
   }
 });
@@ -216,42 +241,46 @@ const InputBase = /*#__PURE__*/React.forwardRef(function InputBase(inProps, ref)
     name: 'MuiInputBase'
   });
   const {
-      'aria-describedby': ariaDescribedby,
-      autoComplete,
-      autoFocus,
-      className,
-      components = {},
-      componentsProps = {},
-      defaultValue,
-      disabled,
-      disableInjectingGlobalStyles,
-      endAdornment,
-      fullWidth = false,
-      id,
-      inputComponent = 'input',
-      inputProps: inputPropsProp = {},
-      inputRef: inputRefProp,
-      maxRows,
-      minRows,
-      multiline = false,
-      name,
-      onBlur,
-      onChange,
-      onClick,
-      onFocus,
-      onKeyDown,
-      onKeyUp,
-      placeholder,
-      readOnly,
-      renderSuffix,
-      rows,
-      slotProps = {},
-      slots = {},
-      startAdornment,
-      type = 'text',
-      value: valueProp
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    'aria-describedby': ariaDescribedby,
+    autoComplete,
+    autoFocus,
+    className,
+    color,
+    components = {},
+    componentsProps = {},
+    defaultValue,
+    disabled,
+    disableInjectingGlobalStyles,
+    endAdornment,
+    error,
+    fullWidth = false,
+    id,
+    inputComponent = 'input',
+    inputProps: inputPropsProp = {},
+    inputRef: inputRefProp,
+    margin,
+    maxRows,
+    minRows,
+    multiline = false,
+    name,
+    onBlur,
+    onChange,
+    onClick,
+    onFocus,
+    onKeyDown,
+    onKeyUp,
+    placeholder,
+    readOnly,
+    renderSuffix,
+    rows,
+    size,
+    slotProps = {},
+    slots = {},
+    startAdornment,
+    type = 'text',
+    value: valueProp,
+    ...other
+  } = props;
   const value = inputPropsProp.value != null ? inputPropsProp.value : valueProp;
   const {
     current: isControlled
@@ -312,12 +341,6 @@ const InputBase = /*#__PURE__*/React.forwardRef(function InputBase(inProps, ref)
     }
   }, [value, checkDirty, isControlled]);
   const handleFocus = event => {
-    // Fix a bug with IE11 where the focus/blur events are triggered
-    // while the component is disabled.
-    if (fcs.disabled) {
-      event.stopPropagation();
-      return;
-    }
     if (onFocus) {
       onFocus(event);
     }
@@ -386,17 +409,19 @@ const InputBase = /*#__PURE__*/React.forwardRef(function InputBase(inProps, ref)
           console.warn('MUI: You can not use the `minRows` or `maxRows` props when the input `rows` prop is set.');
         }
       }
-      inputProps = _extends({
+      inputProps = {
         type: undefined,
         minRows: rows,
-        maxRows: rows
-      }, inputProps);
+        maxRows: rows,
+        ...inputProps
+      };
     } else {
-      inputProps = _extends({
+      inputProps = {
         type: undefined,
         maxRows,
-        minRows
-      }, inputProps);
+        minRows,
+        ...inputProps
+      };
     }
     InputComponent = TextareaAutosize;
   }
@@ -411,7 +436,8 @@ const InputBase = /*#__PURE__*/React.forwardRef(function InputBase(inProps, ref)
       muiFormControl.setAdornedStart(Boolean(startAdornment));
     }
   }, [muiFormControl, startAdornment]);
-  const ownerState = _extends({}, props, {
+  const ownerState = {
+    ...props,
     color: fcs.color || 'primary',
     disabled: fcs.disabled,
     endAdornment,
@@ -424,24 +450,33 @@ const InputBase = /*#__PURE__*/React.forwardRef(function InputBase(inProps, ref)
     size: fcs.size,
     startAdornment,
     type
-  });
+  };
   const classes = useUtilityClasses(ownerState);
   const Root = slots.root || components.Root || InputBaseRoot;
   const rootProps = slotProps.root || componentsProps.root || {};
-  const Input = slots.input || components.Input || InputBaseComponent;
-  inputProps = _extends({}, inputProps, slotProps.input ?? componentsProps.input);
+  const Input = slots.input || components.Input || InputBaseInput;
+  inputProps = {
+    ...inputProps,
+    ...(slotProps.input ?? componentsProps.input)
+  };
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [!disableInjectingGlobalStyles && inputGlobalStyles, /*#__PURE__*/_jsxs(Root, _extends({}, rootProps, !isHostComponent(Root) && {
-      ownerState: _extends({}, ownerState, rootProps.ownerState)
-    }, {
+    children: [!disableInjectingGlobalStyles && typeof InputGlobalStyles === 'function' && ( // For Emotion/Styled-components, InputGlobalStyles will be a function
+    // For Pigment CSS, this has no effect because the InputGlobalStyles will be null.
+    _InputGlobalStyles || (_InputGlobalStyles = /*#__PURE__*/_jsx(InputGlobalStyles, {}))), /*#__PURE__*/_jsxs(Root, {
+      ...rootProps,
       ref: ref,
-      onClick: handleClick
-    }, other, {
+      onClick: handleClick,
+      ...other,
+      ...(!isHostComponent(Root) && {
+        ownerState: {
+          ...ownerState,
+          ...rootProps.ownerState
+        }
+      }),
       className: clsx(classes.root, rootProps.className, className, readOnly && 'MuiInputBase-readOnly'),
       children: [startAdornment, /*#__PURE__*/_jsx(FormControlContext.Provider, {
         value: null,
-        children: /*#__PURE__*/_jsx(Input, _extends({
-          ownerState: ownerState,
+        children: /*#__PURE__*/_jsx(Input, {
           "aria-invalid": fcs.error,
           "aria-describedby": ariaDescribedby,
           autoComplete: autoComplete,
@@ -458,21 +493,26 @@ const InputBase = /*#__PURE__*/React.forwardRef(function InputBase(inProps, ref)
           value: value,
           onKeyDown: onKeyDown,
           onKeyUp: onKeyUp,
-          type: type
-        }, inputProps, !isHostComponent(Input) && {
-          as: InputComponent,
-          ownerState: _extends({}, ownerState, inputProps.ownerState)
-        }, {
+          type: type,
+          ...inputProps,
+          ...(!isHostComponent(Input) && {
+            as: InputComponent,
+            ownerState: {
+              ...ownerState,
+              ...inputProps.ownerState
+            }
+          }),
           ref: handleInputRef,
           className: clsx(classes.input, inputProps.className, readOnly && 'MuiInputBase-readOnly'),
           onBlur: handleBlur,
           onChange: handleChange,
           onFocus: handleFocus
-        }))
-      }), endAdornment, renderSuffix ? renderSuffix(_extends({}, fcs, {
+        })
+      }), endAdornment, renderSuffix ? renderSuffix({
+        ...fcs,
         startAdornment
-      })) : null]
-    }))]
+      }) : null]
+    })]
   });
 });
 process.env.NODE_ENV !== "production" ? InputBase.propTypes /* remove-proptypes */ = {
@@ -512,8 +552,7 @@ process.env.NODE_ENV !== "production" ? InputBase.propTypes /* remove-proptypes
   /**
    * The components used for each slot inside.
    *
-   * This prop is an alias for the `slots` prop.
-   * It's recommended to use the `slots` prop instead.
+   * @deprecated use the `slots` prop instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    *
    * @default {}
    */
@@ -525,8 +564,7 @@ process.env.NODE_ENV !== "production" ? InputBase.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 `slotProps` prop.
-   * It's recommended to use the `slotProps` prop instead, as `componentsProps` will be deprecated in the future.
+   * @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.
    *
    * @default {}
    */