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

package/node/Grid/Grid.js

@@ -22,8 +22,6 @@ exports.generateGrid = generateGrid;
 exports.generateRowGap = generateRowGap;
 exports.resolveSpacingClasses = resolveSpacingClasses;
 exports.resolveSpacingStyles = resolveSpacingStyles;
-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"));
@@ -37,16 +35,8 @@ var _useTheme = _interopRequireDefault(require("../styles/useTheme"));
 var _GridContext = _interopRequireDefault(require("./GridContext"));
 var _gridClasses = _interopRequireWildcard(require("./gridClasses"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["className", "columns", "columnSpacing", "component", "container", "direction", "item", "rowSpacing", "spacing", "wrap", "zeroMinWidth"];
 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; }
-function getOffset(val) {
-  const parse = parseFloat(val);
-  if (Number.isNaN(parse)) {
-    return val;
-  }
-  return `${parse}${String(val).replace(String(parse), '') || 'px'}`;
-}
 function generateGrid({
   theme,
   ownerState
@@ -91,7 +81,7 @@ function generateGrid({
       if (ownerState.container && ownerState.item && ownerState.columnSpacing !== 0) {
         const themeSpacing = theme.spacing(ownerState.columnSpacing);
         if (themeSpacing !== '0px') {
-          const fullWidth = `calc(${width} + ${getOffset(themeSpacing)})`;
+          const fullWidth = `calc(${width} + ${themeSpacing})`;
           more = {
             flexBasis: fullWidth,
             maxWidth: fullWidth
@@ -101,11 +91,12 @@ function generateGrid({
 
       // Close to the bootstrap implementation:
       // https://github.com/twbs/bootstrap/blob/8fccaa2439e97ec72a4b7dc42ccc1f649790adb0/scss/mixins/_grid.scss#L41
-      styles = (0, _extends2.default)({
+      styles = {
         flexBasis: width,
         flexGrow: 0,
-        maxWidth: width
-      }, more);
+        maxWidth: width,
+        ...more
+      };
     }
 
     // No need for a media query for the first size.
@@ -191,9 +182,9 @@ function generateRowGap({
       const themeSpacing = theme.spacing(propValue);
       if (themeSpacing !== '0px') {
         return {
-          marginTop: `-${getOffset(themeSpacing)}`,
+          marginTop: theme.spacing(-propValue),
           [`& > .${_gridClasses.default.item}`]: {
-            paddingTop: getOffset(themeSpacing)
+            paddingTop: themeSpacing
           }
         };
       }
@@ -237,11 +228,12 @@ function generateColumnGap({
       var _zeroValueBreakpointK2;
       const themeSpacing = theme.spacing(propValue);
       if (themeSpacing !== '0px') {
+        const negativeValue = theme.spacing(-propValue);
         return {
-          width: `calc(100% + ${getOffset(themeSpacing)})`,
-          marginLeft: `-${getOffset(themeSpacing)}`,
+          width: `calc(100% + ${themeSpacing})`,
+          marginLeft: negativeValue,
           [`& > .${_gridClasses.default.item}`]: {
-            paddingLeft: getOffset(themeSpacing)
+            paddingLeft: themeSpacing
           }
         };
       }
@@ -318,18 +310,22 @@ const GridRoot = (0, _styled.default)('div', {
   }
 })(({
   ownerState
-}) => (0, _extends2.default)({
-  boxSizing: 'border-box'
-}, ownerState.container && {
-  display: 'flex',
-  flexWrap: 'wrap',
-  width: '100%'
-}, ownerState.item && {
-  margin: 0 // For instance, it's useful when used with a `figure` element.
-}, ownerState.zeroMinWidth && {
-  minWidth: 0
-}, ownerState.wrap !== 'wrap' && {
-  flexWrap: ownerState.wrap
+}) => ({
+  boxSizing: 'border-box',
+  ...(ownerState.container && {
+    display: 'flex',
+    flexWrap: 'wrap',
+    width: '100%'
+  }),
+  ...(ownerState.item && {
+    margin: 0 // For instance, it's useful when used with a `figure` element.
+  }),
+  ...(ownerState.zeroMinWidth && {
+    minWidth: 0
+  }),
+  ...(ownerState.wrap !== 'wrap' && {
+    flexWrap: ownerState.wrap
+  })
 }), generateDirection, generateRowGap, generateColumnGap, generateGrid);
 function resolveSpacingClasses(spacing, breakpoints) {
   // undefined/null or `spacing` <= 0
@@ -390,19 +386,19 @@ const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
   } = (0, _useTheme.default)();
   const props = (0, _styleFunctionSx.extendSxProp)(themeProps);
   const {
-      className,
-      columns: columnsProp,
-      columnSpacing: columnSpacingProp,
-      component = 'div',
-      container = false,
-      direction = 'row',
-      item = false,
-      rowSpacing: rowSpacingProp,
-      spacing = 0,
-      wrap = 'wrap',
-      zeroMinWidth = false
-    } = props,
-    other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+    className,
+    columns: columnsProp,
+    columnSpacing: columnSpacingProp,
+    component = 'div',
+    container = false,
+    direction = 'row',
+    item = false,
+    rowSpacing: rowSpacingProp,
+    spacing = 0,
+    wrap = 'wrap',
+    zeroMinWidth = false,
+    ...other
+  } = props;
   const rowSpacing = rowSpacingProp || spacing;
   const columnSpacing = columnSpacingProp || spacing;
   const columnsContext = React.useContext(_GridContext.default);
@@ -410,14 +406,17 @@ const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
   // columns set with default breakpoint unit of 12
   const columns = container ? columnsProp || 12 : columnsContext;
   const breakpointsValues = {};
-  const otherFiltered = (0, _extends2.default)({}, other);
+  const otherFiltered = {
+    ...other
+  };
   breakpoints.keys.forEach(breakpoint => {
     if (other[breakpoint] != null) {
       breakpointsValues[breakpoint] = other[breakpoint];
       delete otherFiltered[breakpoint];
     }
   });
-  const ownerState = (0, _extends2.default)({}, props, {
+  const ownerState = {
+    ...props,
     columns,
     container,
     direction,
@@ -426,19 +425,20 @@ const Grid = /*#__PURE__*/React.forwardRef(function Grid(inProps, ref) {
     columnSpacing,
     wrap,
     zeroMinWidth,
-    spacing
-  }, breakpointsValues, {
+    spacing,
+    ...breakpointsValues,
     breakpoints: breakpoints.keys
-  });
+  };
   const classes = useUtilityClasses(ownerState);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_GridContext.default.Provider, {
     value: columns,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(GridRoot, (0, _extends2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(GridRoot, {
       ownerState: ownerState,
       className: (0, _clsx.default)(classes.root, className),
       as: component,
-      ref: ref
-    }, otherFiltered))
+      ref: ref,
+      ...otherFiltered
+    })
   });
 });
 process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ = {
@@ -540,6 +540,7 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
    * Defines the `flex-wrap` style property.
    * It's applied for all screen sizes.
    * @default 'wrap'
+   * @deprecated Use `flexWrap` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
    */
   wrap: _propTypes.default.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
   /**
@@ -572,7 +573,9 @@ process.env.NODE_ENV !== "production" ? Grid.propTypes /* remove-proptypes */ =
 if (process.env.NODE_ENV !== 'production') {
   const requireProp = (0, _requirePropFactory.default)('Grid', Grid);
   // eslint-disable-next-line no-useless-concat
-  Grid['propTypes' + ''] = (0, _extends2.default)({}, Grid.propTypes, {
+  Grid['propTypes' + ''] = {
+    // eslint-disable-next-line react/forbid-foreign-prop-types
+    ...Grid.propTypes,
     direction: requireProp('container'),
     lg: requireProp('item'),
     md: requireProp('item'),
@@ -581,6 +584,6 @@ if (process.env.NODE_ENV !== 'production') {
     wrap: requireProp('container'),
     xs: requireProp('item'),
     zeroMinWidth: requireProp('item')
-  });
+  };
 }
 var _default = exports.default = Grid;

package/node/Grow/Grow.js

@@ -6,18 +6,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _useTimeout = _interopRequireDefault(require("@mui/utils/useTimeout"));
 var _elementAcceptingRef = _interopRequireDefault(require("@mui/utils/elementAcceptingRef"));
 var _reactTransitionGroup = require("react-transition-group");
-var _useTheme = _interopRequireDefault(require("../styles/useTheme"));
+var _zeroStyled = require("../zero-styled");
 var _utils = require("../transitions/utils");
 var _useForkRef = _interopRequireDefault(require("../utils/useForkRef"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["addEndListener", "appear", "children", "easing", "in", "onEnter", "onEntered", "onEntering", "onExit", "onExited", "onExiting", "style", "timeout", "TransitionComponent"];
 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; }
 function getScale(value) {
@@ -47,26 +44,26 @@ const isWebKit154 = typeof navigator !== 'undefined' && /^((?!chrome|android).)*
  */
 const Grow = /*#__PURE__*/React.forwardRef(function Grow(props, ref) {
   const {
-      addEndListener,
-      appear = true,
-      children,
-      easing,
-      in: inProp,
-      onEnter,
-      onEntered,
-      onEntering,
-      onExit,
-      onExited,
-      onExiting,
-      style,
-      timeout = 'auto',
-      // eslint-disable-next-line react/prop-types
-      TransitionComponent = _reactTransitionGroup.Transition
-    } = props,
-    other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+    addEndListener,
+    appear = true,
+    children,
+    easing,
+    in: inProp,
+    onEnter,
+    onEntered,
+    onEntering,
+    onExit,
+    onExited,
+    onExiting,
+    style,
+    timeout = 'auto',
+    // eslint-disable-next-line react/prop-types
+    TransitionComponent = _reactTransitionGroup.Transition,
+    ...other
+  } = props;
   const timer = (0, _useTimeout.default)();
   const autoTimeout = React.useRef();
-  const theme = (0, _useTheme.default)();
+  const theme = (0, _zeroStyled.useTheme)();
   const nodeRef = React.useRef(null);
   const handleRef = (0, _useForkRef.default)(nodeRef, children.ref, ref);
   const normalizedTransitionCallback = callback => maybeIsAppearing => {
@@ -160,7 +157,7 @@ const Grow = /*#__PURE__*/React.forwardRef(function Grow(props, ref) {
       addEndListener(nodeRef.current, next);
     }
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(TransitionComponent, (0, _extends2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(TransitionComponent, {
     appear: appear,
     in: inProp,
     nodeRef: nodeRef,
@@ -171,19 +168,23 @@ const Grow = /*#__PURE__*/React.forwardRef(function Grow(props, ref) {
     onExited: handleExited,
     onExiting: handleExiting,
     addEndListener: handleAddEndListener,
-    timeout: timeout === 'auto' ? null : timeout
-  }, other, {
+    timeout: timeout === 'auto' ? null : timeout,
+    ...other,
     children: (state, childProps) => {
-      return /*#__PURE__*/React.cloneElement(children, (0, _extends2.default)({
-        style: (0, _extends2.default)({
+      return /*#__PURE__*/React.cloneElement(children, {
+        style: {
           opacity: 0,
           transform: getScale(0.75),
-          visibility: state === 'exited' && !inProp ? 'hidden' : undefined
-        }, styles[state], style, children.props.style),
-        ref: handleRef
-      }, childProps));
+          visibility: state === 'exited' && !inProp ? 'hidden' : undefined,
+          ...styles[state],
+          ...style,
+          ...children.props.style
+        },
+        ref: handleRef,
+        ...childProps
+      });
     }
-  }));
+  });
 });
 process.env.NODE_ENV !== "production" ? Grow.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐
@@ -259,5 +260,7 @@ process.env.NODE_ENV !== "production" ? Grow.propTypes /* remove-proptypes */ =
     exit: _propTypes.default.number
   })])
 } : void 0;
-Grow.muiSupportAuto = true;
+if (Grow) {
+  Grow.muiSupportAuto = true;
+}
 var _default = exports.default = Grow;

package/node/Hidden/Hidden.js

@@ -6,36 +6,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _HiddenJs = _interopRequireDefault(require("./HiddenJs"));
 var _HiddenCss = _interopRequireDefault(require("./HiddenCss"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["implementation", "lgDown", "lgUp", "mdDown", "mdUp", "smDown", "smUp", "xlDown", "xlUp", "xsDown", "xsUp"];
-/**
- * Responsively hides children based on the selected implementation.
- */
 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; }
-function Hidden(props) {
+/**
+ * Responsively hides children based on the selected implementation.
+ *
+ * @deprecated The Hidden component was deprecated in Material UI v5. To learn more, see [the Hidden section](/material-ui/migration/v5-component-changes/#hidden) of the migration docs.
+ */function Hidden(props) {
   const {
-      implementation = 'js',
-      lgDown = false,
-      lgUp = false,
-      mdDown = false,
-      mdUp = false,
-      smDown = false,
-      smUp = false,
-      xlDown = false,
-      xlUp = false,
-      xsDown = false,
-      xsUp = false
-    } = props,
-    other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+    implementation = 'js',
+    lgDown = false,
+    lgUp = false,
+    mdDown = false,
+    mdUp = false,
+    smDown = false,
+    smUp = false,
+    xlDown = false,
+    xlUp = false,
+    xsDown = false,
+    xsUp = false,
+    ...other
+  } = props;
   if (implementation === 'js') {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_HiddenJs.default, (0, _extends2.default)({
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_HiddenJs.default, {
       lgDown: lgDown,
       lgUp: lgUp,
       mdDown: mdDown,
@@ -45,10 +43,11 @@ function Hidden(props) {
       xlDown: xlDown,
       xlUp: xlUp,
       xsDown: xsDown,
-      xsUp: xsUp
-    }, other));
+      xsUp: xsUp,
+      ...other
+    });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_HiddenCss.default, (0, _extends2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_HiddenCss.default, {
     lgDown: lgDown,
     lgUp: lgUp,
     mdDown: mdDown,
@@ -58,8 +57,9 @@ function Hidden(props) {
     xlDown: xlDown,
     xlUp: xlUp,
     xsDown: xsDown,
-    xsUp: xsUp
-  }, other));
+    xsUp: xsUp,
+    ...other
+  });
 }
 process.env.NODE_ENV !== "production" ? Hidden.propTypes /* remove-proptypes */ = {
   // ┌────────────────────────────── Warning ──────────────────────────────┐

package/node/Hidden/HiddenCss.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 _clsx = _interopRequireDefault(require("clsx"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -17,7 +15,6 @@ var _styled = _interopRequireDefault(require("../styles/styled"));
 var _useTheme = _interopRequireDefault(require("../styles/useTheme"));
 var _hiddenCssClasses = require("./hiddenCssClasses");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["children", "className", "only"];
 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 useUtilityClasses = ownerState => {
@@ -45,26 +42,28 @@ const HiddenCssRoot = (0, _styled.default)('div', {
   const hidden = {
     display: 'none'
   };
-  return (0, _extends2.default)({}, ownerState.breakpoints.map(({
-    breakpoint,
-    dir
-  }) => {
-    if (dir === 'only') {
-      return {
-        [theme.breakpoints.only(breakpoint)]: hidden
+  return {
+    ...ownerState.breakpoints.map(({
+      breakpoint,
+      dir
+    }) => {
+      if (dir === 'only') {
+        return {
+          [theme.breakpoints.only(breakpoint)]: hidden
+        };
+      }
+      return dir === 'up' ? {
+        [theme.breakpoints.up(breakpoint)]: hidden
+      } : {
+        [theme.breakpoints.down(breakpoint)]: hidden
       };
-    }
-    return dir === 'up' ? {
-      [theme.breakpoints.up(breakpoint)]: hidden
-    } : {
-      [theme.breakpoints.down(breakpoint)]: hidden
-    };
-  }).reduce((r, o) => {
-    Object.keys(o).forEach(k => {
-      r[k] = o[k];
-    });
-    return r;
-  }, {}));
+    }).reduce((r, o) => {
+      Object.keys(o).forEach(k => {
+        r[k] = o[k];
+      });
+      return r;
+    }, {})
+  };
 });
 
 /**
@@ -72,11 +71,11 @@ const HiddenCssRoot = (0, _styled.default)('div', {
  */
 function HiddenCss(props) {
   const {
-      children,
-      className,
-      only
-    } = props,
-    other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
+    children,
+    className,
+    only,
+    ...other
+  } = props;
   const theme = (0, _useTheme.default)();
   if (process.env.NODE_ENV !== 'production') {
     const unknownProps = Object.keys(other).filter(propName => {
@@ -116,9 +115,10 @@ function HiddenCss(props) {
       });
     });
   }
-  const ownerState = (0, _extends2.default)({}, props, {
+  const ownerState = {
+    ...props,
     breakpoints
-  });
+  };
   const classes = useUtilityClasses(ownerState);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(HiddenCssRoot, {
     className: (0, _clsx.default)(classes.root, className),

package/node/Hidden/withWidth.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isWidthUp = exports.isWidthDown = exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _getDisplayName = _interopRequireDefault(require("@mui/utils/getDisplayName"));
@@ -15,7 +13,6 @@ var _useTheme = _interopRequireDefault(require("../styles/useTheme"));
 var _useEnhancedEffect = _interopRequireDefault(require("../utils/useEnhancedEffect"));
 var _useMediaQuery = _interopRequireDefault(require("../useMediaQuery"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["initialWidth", "width"];
 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 breakpointKeys = ['xs', 'sm', 'md', 'lg', 'xl'];
@@ -46,16 +43,15 @@ const withWidth = (options = {}) => Component => {
   function WithWidth(props) {
     const contextTheme = (0, _useTheme.default)();
     const theme = props.theme || contextTheme;
-    const _getThemeProps = (0, _useThemeProps.getThemeProps)({
-        theme,
-        name: 'MuiWithWidth',
-        props
-      }),
-      {
-        initialWidth,
-        width
-      } = _getThemeProps,
-      other = (0, _objectWithoutPropertiesLoose2.default)(_getThemeProps, _excluded);
+    const {
+      initialWidth,
+      width,
+      ...other
+    } = (0, _useThemeProps.getThemeProps)({
+      theme,
+      name: 'MuiWithWidth',
+      props
+    });
     const [mountedState, setMountedState] = React.useState(false);
     (0, _useEnhancedEffect.default)(() => {
       setMountedState(true);
@@ -72,11 +68,13 @@ const withWidth = (options = {}) => Component => {
       const matches = (0, _useMediaQuery.default)(theme.breakpoints.up(key));
       return !output && matches ? key : output;
     }, null);
-    const more = (0, _extends2.default)({
-      width: width || (mountedState || noSSR ? widthComputed : undefined) || initialWidth || initialWidthOption
-    }, withThemeOption ? {
-      theme
-    } : {}, other);
+    const more = {
+      width: width || (mountedState || noSSR ? widthComputed : undefined) || initialWidth || initialWidthOption,
+      ...(withThemeOption ? {
+        theme
+      } : {}),
+      ...other
+    };
 
     // When rendering the component on the server,
     // we have no idea about the client browser screen width.
@@ -87,7 +85,9 @@ const withWidth = (options = {}) => Component => {
     if (more.width === undefined) {
       return null;
     }
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, (0, _extends2.default)({}, more));
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
+      ...more
+    });
   }
   process.env.NODE_ENV !== "production" ? WithWidth.propTypes = {
     /**