@mui/material 6.0.0-alpha.7 → 6.0.0-alpha.8

package/node/Autocomplete/Autocomplete.js

@@ -12,10 +12,7 @@ Object.defineProperty(exports, "createFilterOptions", {
   }
 });
 exports.default = void 0;
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireWildcard(require("react"));
-var React = _react;
+var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _clsx = _interopRequireDefault(require("clsx"));
 var _integerPropType = _interopRequireDefault(require("@mui/utils/integerPropType"));
@@ -40,9 +37,6 @@ var _capitalize = _interopRequireDefault(require("../utils/capitalize"));
 var _useSlot = _interopRequireDefault(require("../utils/useSlot"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _ClearIcon, _ArrowDropDownIcon;
-const _excluded = ["autoComplete", "autoHighlight", "autoSelect", "blurOnSelect", "ChipProps", "className", "clearIcon", "clearOnBlur", "clearOnEscape", "clearText", "closeText", "componentsProps", "defaultValue", "disableClearable", "disableCloseOnSelect", "disabled", "disabledItemsFocusable", "disableListWrap", "disablePortal", "filterOptions", "filterSelectedOptions", "forcePopupIcon", "freeSolo", "fullWidth", "getLimitTagsText", "getOptionDisabled", "getOptionKey", "getOptionLabel", "isOptionEqualToValue", "groupBy", "handleHomeEndKeys", "id", "includeInputInList", "inputValue", "limitTags", "ListboxComponent", "ListboxProps", "loading", "loadingText", "multiple", "noOptionsText", "onChange", "onClose", "onHighlightChange", "onInputChange", "onOpen", "open", "openOnFocus", "openText", "options", "PaperComponent", "PopperComponent", "popupIcon", "readOnly", "renderGroup", "renderInput", "renderOption", "renderTags", "selectOnFocus", "size", "slots", "slotProps", "value"],
-  _excluded2 = ["ref"],
-  _excluded3 = ["key"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const useThemeProps = (0, _zeroStyled.createUseThemeProps)('MuiAutocomplete');
@@ -280,7 +274,10 @@ const AutocompletePopupIndicator = (0, _zeroStyled.styled)(_IconButton.default,
   slot: 'PopupIndicator',
   overridesResolver: ({
     ownerState
-  }, styles) => (0, _extends2.default)({}, styles.popupIndicator, ownerState.popupOpen && styles.popupIndicatorOpen)
+  }, styles) => ({
+    ...styles.popupIndicator,
+    ...(ownerState.popupOpen && styles.popupIndicatorOpen)
+  })
 })({
   padding: 2,
   marginRight: -2,
@@ -323,7 +320,8 @@ const AutocompletePaper = (0, _zeroStyled.styled)(_Paper.default, {
   overridesResolver: (props, styles) => styles.paper
 })(({
   theme
-}) => (0, _extends2.default)({}, theme.typography.body1, {
+}) => ({
+  ...theme.typography.body1,
   overflow: 'auto'
 }));
 const AutocompleteLoading = (0, _zeroStyled.styled)('div', {
@@ -433,59 +431,73 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
 
   /* eslint-disable @typescript-eslint/no-unused-vars */
   const {
-      autoComplete = false,
-      autoHighlight = false,
-      autoSelect = false,
-      blurOnSelect = false,
-      ChipProps: ChipPropsProp,
-      className,
-      clearIcon = _ClearIcon || (_ClearIcon = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Close.default, {
-        fontSize: "small"
-      })),
-      clearOnBlur = !props.freeSolo,
-      clearOnEscape = false,
-      clearText = 'Clear',
-      closeText = 'Close',
-      componentsProps,
-      defaultValue = props.multiple ? [] : null,
-      disableClearable = false,
-      disableCloseOnSelect = false,
-      disabled = false,
-      disabledItemsFocusable = false,
-      disableListWrap = false,
-      disablePortal = false,
-      filterSelectedOptions = false,
-      forcePopupIcon = 'auto',
-      freeSolo = false,
-      fullWidth = false,
-      getLimitTagsText = more => `+${more}`,
-      getOptionLabel: getOptionLabelProp,
-      groupBy,
-      handleHomeEndKeys = !props.freeSolo,
-      includeInputInList = false,
-      limitTags = -1,
-      ListboxComponent: ListboxComponentProp,
-      ListboxProps: ListboxPropsProp,
-      loading = false,
-      loadingText = 'Loading…',
-      multiple = false,
-      noOptionsText = 'No options',
-      openOnFocus = false,
-      openText = 'Open',
-      PaperComponent: PaperComponentProp,
-      PopperComponent: PopperComponentProp,
-      popupIcon = _ArrowDropDownIcon || (_ArrowDropDownIcon = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ArrowDropDown.default, {})),
-      readOnly = false,
-      renderGroup: renderGroupProp,
-      renderInput,
-      renderOption: renderOptionProp,
-      renderTags,
-      selectOnFocus = !props.freeSolo,
-      size = 'medium',
-      slots = {},
-      slotProps = {}
-    } = props,
-    other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+    autoComplete = false,
+    autoHighlight = false,
+    autoSelect = false,
+    blurOnSelect = false,
+    ChipProps: ChipPropsProp,
+    className,
+    clearIcon = _ClearIcon || (_ClearIcon = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Close.default, {
+      fontSize: "small"
+    })),
+    clearOnBlur = !props.freeSolo,
+    clearOnEscape = false,
+    clearText = 'Clear',
+    closeText = 'Close',
+    componentsProps,
+    defaultValue = props.multiple ? [] : null,
+    disableClearable = false,
+    disableCloseOnSelect = false,
+    disabled = false,
+    disabledItemsFocusable = false,
+    disableListWrap = false,
+    disablePortal = false,
+    filterOptions,
+    filterSelectedOptions = false,
+    forcePopupIcon = 'auto',
+    freeSolo = false,
+    fullWidth = false,
+    getLimitTagsText = more => `+${more}`,
+    getOptionDisabled,
+    getOptionKey,
+    getOptionLabel: getOptionLabelProp,
+    isOptionEqualToValue,
+    groupBy,
+    handleHomeEndKeys = !props.freeSolo,
+    id: idProp,
+    includeInputInList = false,
+    inputValue: inputValueProp,
+    limitTags = -1,
+    ListboxComponent: ListboxComponentProp,
+    ListboxProps: ListboxPropsProp,
+    loading = false,
+    loadingText = 'Loading…',
+    multiple = false,
+    noOptionsText = 'No options',
+    onChange,
+    onClose,
+    onHighlightChange,
+    onInputChange,
+    onOpen,
+    open,
+    openOnFocus = false,
+    openText = 'Open',
+    options,
+    PaperComponent: PaperComponentProp,
+    PopperComponent: PopperComponentProp,
+    popupIcon = _ArrowDropDownIcon || (_ArrowDropDownIcon = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ArrowDropDown.default, {})),
+    readOnly = false,
+    renderGroup: renderGroupProp,
+    renderInput,
+    renderOption: renderOptionProp,
+    renderTags,
+    selectOnFocus = !props.freeSolo,
+    size = 'medium',
+    slots = {},
+    slotProps = {},
+    value: valueProp,
+    ...other
+  } = props;
   /* eslint-enable @typescript-eslint/no-unused-vars */
 
   const {
@@ -508,19 +520,19 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
     setAnchorEl,
     inputValue,
     groupedOptions
-  } = (0, _base.useAutocomplete)((0, _extends2.default)({}, props, {
+  } = (0, _base.useAutocomplete)({
+    ...props,
     componentName: 'Autocomplete'
-  }));
+  });
   const hasClearIcon = !disableClearable && !disabled && dirty && !readOnly;
   const hasPopupIcon = (!freeSolo || forcePopupIcon === true) && forcePopupIcon !== false;
   const {
     onMouseDown: handleInputMouseDown
   } = getInputProps();
-  const _getListboxProps = getListboxProps(),
-    {
-      ref: listboxRef
-    } = _getListboxProps,
-    otherListboxProps = (0, _objectWithoutPropertiesLoose2.default)(_getListboxProps, _excluded2);
+  const {
+    ref: listboxRef,
+    ...otherListboxProps
+  } = getListboxProps();
   const defaultGetOptionLabel = option => {
     var _option$label;
     return (_option$label = option.label) != null ? _option$label : option;
@@ -528,7 +540,8 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
   const getOptionLabel = getOptionLabelProp || defaultGetOptionLabel;
 
   // If you modify this, make sure to keep the `AutocompleteOwnerState` type in sync.
-  const ownerState = (0, _extends2.default)({}, props, {
+  const ownerState = {
+    ...props,
     disablePortal,
     expanded,
     focused,
@@ -539,18 +552,21 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
     inputFocused: focusedTag === -1,
     popupOpen,
     size
-  });
+  };
   const classes = useUtilityClasses(ownerState);
   const externalForwardedProps = {
-    slots: (0, _extends2.default)({
+    slots: {
       listbox: ListboxComponentProp,
       paper: PaperComponentProp,
-      popper: PopperComponentProp
-    }, slots),
-    slotProps: (0, _extends2.default)({
+      popper: PopperComponentProp,
+      ...slots
+    },
+    slotProps: {
       chip: ChipPropsProp,
-      listbox: ListboxPropsProp
-    }, componentsProps, slotProps)
+      listbox: ListboxPropsProp,
+      ...componentsProps,
+      ...slotProps
+    }
   };
   const [ListboxSlot, listboxProps] = (0, _useSlot.default)('listbox', {
     elementType: 'ul',
@@ -583,25 +599,27 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
   });
   let startAdornment;
   if (multiple && value.length > 0) {
-    const getCustomizedTagProps = params => (0, _extends2.default)({
+    const getCustomizedTagProps = params => ({
       className: classes.tag,
-      disabled
-    }, getTagProps(params));
+      disabled,
+      ...getTagProps(params)
+    });
     if (renderTags) {
       startAdornment = renderTags(value, getCustomizedTagProps, ownerState);
     } else {
       startAdornment = value.map((option, index) => {
-        const _getCustomizedTagProp = getCustomizedTagProps({
-            index
-          }),
-          {
-            key
-          } = _getCustomizedTagProp,
-          customTagProps = (0, _objectWithoutPropertiesLoose2.default)(_getCustomizedTagProp, _excluded3);
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, (0, _extends2.default)({
+        const {
+          key,
+          ...customTagProps
+        } = getCustomizedTagProps({
+          index
+        });
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Chip.default, {
           label: getOptionLabel(option),
-          size: size
-        }, customTagProps, externalForwardedProps.slotProps.chip), key);
+          size: size,
+          ...customTagProps,
+          ...externalForwardedProps.slotProps.chip
+        }, key);
       });
     }
   }
@@ -630,9 +648,14 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
   const renderGroup = renderGroupProp || defaultRenderGroup;
   const defaultRenderOption = (props2, option) => {
     // Need to clearly apply key because of https://github.com/vercel/next.js/issues/55642
-    return /*#__PURE__*/(0, _react.createElement)("li", (0, _extends2.default)({}, props2, {
-      key: props2.key
-    }), getOptionLabel(option));
+    const {
+      key,
+      ...otherProps
+    } = props2;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
+      ...otherProps,
+      children: getOptionLabel(option)
+    }, key);
   };
   const renderOption = renderOptionProp || defaultRenderOption;
   const renderListOption = (option, index) => {
@@ -640,9 +663,10 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
       option,
       index
     });
-    return renderOption((0, _extends2.default)({}, optionProps, {
+    return renderOption({
+      ...optionProps,
       className: classes.option
-    }), option, {
+    }, option, {
       selected: optionProps['aria-selected'],
       index,
       inputValue
@@ -650,20 +674,20 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
   };
   const clearIndicatorSlotProps = externalForwardedProps.slotProps.clearIndicator;
   const popupIndicatorSlotProps = externalForwardedProps.slotProps.popupIndicator;
-  const renderAutocompletePopperChildren = children => /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompletePopper, (0, _extends2.default)({
-    as: PopperSlot
-  }, popperProps, {
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompletePaper, (0, _extends2.default)({
-      as: PaperSlot
-    }, paperProps, {
+  const renderAutocompletePopperChildren = children => /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompletePopper, {
+    as: PopperSlot,
+    ...popperProps,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompletePaper, {
+      as: PaperSlot,
+      ...paperProps,
       children: children
-    }))
-  }));
+    })
+  });
   let autocompletePopper = null;
   if (groupedOptions.length > 0) {
-    autocompletePopper = renderAutocompletePopperChildren( /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompleteListbox, (0, _extends2.default)({
-      as: ListboxSlot
-    }, listboxProps, {
+    autocompletePopper = renderAutocompletePopperChildren( /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompleteListbox, {
+      as: ListboxSlot,
+      ...listboxProps,
       children: groupedOptions.map((option, index) => {
         if (groupBy) {
           return renderGroup({
@@ -674,7 +698,7 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
         }
         return renderListOption(option, index);
       })
-    })));
+    }));
   } else if (loading && groupedOptions.length === 0) {
     autocompletePopper = renderAutocompletePopperChildren( /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompleteLoading, {
       className: classes.loading,
@@ -694,18 +718,18 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
     }));
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompleteRoot, (0, _extends2.default)({
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompleteRoot, {
       ref: ref,
       className: (0, _clsx.default)(classes.root, className),
-      ownerState: ownerState
-    }, getRootProps(other), {
+      ownerState: ownerState,
+      ...getRootProps(other),
       children: renderInput({
         id,
         disabled,
         fullWidth: true,
         size: size === 'small' ? 'small' : undefined,
         InputLabelProps: getInputLabelProps(),
-        InputProps: (0, _extends2.default)({
+        InputProps: {
           ref: setAnchorEl,
           className: classes.inputRoot,
           startAdornment,
@@ -713,36 +737,40 @@ const Autocomplete = /*#__PURE__*/React.forwardRef(function Autocomplete(inProps
             if (event.target === event.currentTarget) {
               handleInputMouseDown(event);
             }
-          }
-        }, (hasClearIcon || hasPopupIcon) && {
-          endAdornment: /*#__PURE__*/(0, _jsxRuntime.jsxs)(AutocompleteEndAdornment, {
-            className: classes.endAdornment,
-            ownerState: ownerState,
-            children: [hasClearIcon ? /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompleteClearIndicator, (0, _extends2.default)({}, getClearProps(), {
-              "aria-label": clearText,
-              title: clearText,
-              ownerState: ownerState
-            }, clearIndicatorSlotProps, {
-              className: (0, _clsx.default)(classes.clearIndicator, clearIndicatorSlotProps == null ? void 0 : clearIndicatorSlotProps.className),
-              children: clearIcon
-            })) : null, hasPopupIcon ? /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompletePopupIndicator, (0, _extends2.default)({}, getPopupIndicatorProps(), {
-              disabled: disabled,
-              "aria-label": popupOpen ? closeText : openText,
-              title: popupOpen ? closeText : openText,
-              ownerState: ownerState
-            }, popupIndicatorSlotProps, {
-              className: (0, _clsx.default)(classes.popupIndicator, popupIndicatorSlotProps == null ? void 0 : popupIndicatorSlotProps.className),
-              children: popupIcon
-            })) : null]
+          },
+          ...((hasClearIcon || hasPopupIcon) && {
+            endAdornment: /*#__PURE__*/(0, _jsxRuntime.jsxs)(AutocompleteEndAdornment, {
+              className: classes.endAdornment,
+              ownerState: ownerState,
+              children: [hasClearIcon ? /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompleteClearIndicator, {
+                ...getClearProps(),
+                "aria-label": clearText,
+                title: clearText,
+                ownerState: ownerState,
+                ...clearIndicatorSlotProps,
+                className: (0, _clsx.default)(classes.clearIndicator, clearIndicatorSlotProps == null ? void 0 : clearIndicatorSlotProps.className),
+                children: clearIcon
+              }) : null, hasPopupIcon ? /*#__PURE__*/(0, _jsxRuntime.jsx)(AutocompletePopupIndicator, {
+                ...getPopupIndicatorProps(),
+                disabled: disabled,
+                "aria-label": popupOpen ? closeText : openText,
+                title: popupOpen ? closeText : openText,
+                ownerState: ownerState,
+                ...popupIndicatorSlotProps,
+                className: (0, _clsx.default)(classes.popupIndicator, popupIndicatorSlotProps == null ? void 0 : popupIndicatorSlotProps.className),
+                children: popupIcon
+              }) : null]
+            })
           })
-        }),
-        inputProps: (0, _extends2.default)({
+        },
+        inputProps: {
           className: classes.input,
           disabled,
-          readOnly
-        }, getInputProps())
+          readOnly,
+          ...getInputProps()
+        }
       })
-    })), anchorEl ? autocompletePopper : null]
+    }), anchorEl ? autocompletePopper : null]
   });
 });
 process.env.NODE_ENV !== "production" ? Autocomplete.propTypes /* remove-proptypes */ = {

package/node/Avatar/Avatar.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _clsx = _interopRequireDefault(require("clsx"));
@@ -17,7 +15,6 @@ var _Person = _interopRequireDefault(require("../internal/svg-icons/Person"));
 var _avatarClasses = require("./avatarClasses");
 var _useSlot = _interopRequireDefault(require("../utils/useSlot"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["alt", "children", "className", "component", "slots", "slotProps", "imgProps", "sizes", "src", "srcSet", "variant"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const useThemeProps = (0, _zeroStyled.createUseThemeProps)('MuiAvatar');
@@ -77,15 +74,17 @@ const AvatarRoot = (0, _zeroStyled.styled)('div', {
     props: {
       colorDefault: true
     },
-    style: (0, _extends2.default)({
-      color: (theme.vars || theme).palette.background.default
-    }, theme.vars ? {
-      backgroundColor: theme.vars.palette.Avatar.defaultBg
-    } : (0, _extends2.default)({
-      backgroundColor: theme.palette.grey[400]
-    }, theme.applyStyles('dark', {
-      backgroundColor: theme.palette.grey[600]
-    })))
+    style: {
+      color: (theme.vars || theme).palette.background.default,
+      ...(theme.vars ? {
+        backgroundColor: theme.vars.palette.Avatar.defaultBg
+      } : {
+        backgroundColor: theme.palette.grey[400],
+        ...theme.applyStyles('dark', {
+          backgroundColor: theme.palette.grey[600]
+        })
+      })
+    }
   }]
 }));
 const AvatarImg = (0, _zeroStyled.styled)('img', {
@@ -155,33 +154,35 @@ const Avatar = /*#__PURE__*/React.forwardRef(function Avatar(inProps, ref) {
     name: 'MuiAvatar'
   });
   const {
-      alt,
-      children: childrenProp,
-      className,
-      component = 'div',
-      slots = {},
-      slotProps = {},
-      imgProps,
-      sizes,
-      src,
-      srcSet,
-      variant = 'circular'
-    } = props,
-    other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+    alt,
+    children: childrenProp,
+    className,
+    component = 'div',
+    slots = {},
+    slotProps = {},
+    imgProps,
+    sizes,
+    src,
+    srcSet,
+    variant = 'circular',
+    ...other
+  } = props;
   let children = null;
 
   // Use a hook instead of onError on the img element to support server-side rendering.
-  const loaded = useLoaded((0, _extends2.default)({}, imgProps, {
+  const loaded = useLoaded({
+    ...imgProps,
     src,
     srcSet
-  }));
+  });
   const hasImg = src || srcSet;
   const hasImgNotFailing = hasImg && loaded !== 'error';
-  const ownerState = (0, _extends2.default)({}, props, {
+  const ownerState = {
+    ...props,
     colorDefault: !hasImgNotFailing,
     component,
     variant
-  });
+  };
   const classes = useUtilityClasses(ownerState);
   const [ImgSlot, imgSlotProps] = (0, _useSlot.default)('img', {
     className: classes.img,
@@ -189,7 +190,10 @@ const Avatar = /*#__PURE__*/React.forwardRef(function Avatar(inProps, ref) {
     externalForwardedProps: {
       slots,
       slotProps: {
-        img: (0, _extends2.default)({}, imgProps, slotProps.img)
+        img: {
+          ...imgProps,
+          ...slotProps.img
+        }
       }
     },
     additionalProps: {
@@ -201,7 +205,9 @@ const Avatar = /*#__PURE__*/React.forwardRef(function Avatar(inProps, ref) {
     ownerState
   });
   if (hasImgNotFailing) {
-    children = /*#__PURE__*/(0, _jsxRuntime.jsx)(ImgSlot, (0, _extends2.default)({}, imgSlotProps));
+    children = /*#__PURE__*/(0, _jsxRuntime.jsx)(ImgSlot, {
+      ...imgSlotProps
+    });
     // We only render valid children, non valid children are rendered with a fallback
     // We consider that invalid children are all falsy values, except 0, which is valid.
   } else if (!!childrenProp || childrenProp === 0) {
@@ -214,14 +220,14 @@ const Avatar = /*#__PURE__*/React.forwardRef(function Avatar(inProps, ref) {
       className: classes.fallback
     });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(AvatarRoot, (0, _extends2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(AvatarRoot, {
     as: component,
     ownerState: ownerState,
     className: (0, _clsx.default)(classes.root, className),
-    ref: ref
-  }, other, {
+    ref: ref,
+    ...other,
     children: children
-  }));
+  });
 });
 process.env.NODE_ENV !== "production" ? Avatar.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐