fixes

mui · Jun 3, 2021 · 1b26150 · 1b26150
1 parent 849da33
commit 1b26150
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/packages/material-ui/src/styles/createMixins.test.js b/packages/material-ui/src/styles/createMixins.test.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
-import createMixins from './createMixins';
 import { createTheme } from '@material-ui/core/styles';
+import createMixins from './createMixins';
 
 describe('createMixins', () => {
   it('should be able add other mixins', () => {

diff --git a/packages/material-ui/src/styles/createTheme.js b/packages/material-ui/src/styles/createTheme.js
@@ -10,28 +10,28 @@ import zIndex from './zIndex';
 
 function createTheme(options = {}, ...args) {
   const {
+    breakpoints: breakpointsInput,
     mixins: mixinsInput = {},
+    spacing: spacingInput,
     palette: paletteInput = {},
     transitions: transitionsInput = {},
     typography: typographyInput = {},
+    shape: shapeInput,
     ...other
   } = options;
 
   const palette = createPalette(paletteInput);
   const systemTheme = systemCreateTheme(options);
 
-  let muiTheme = deepmerge(
-    systemTheme,
-    {
-      mixins: createMixins(systemTheme.breakpoints, systemTheme.spacing, mixinsInput),
-      palette,
-      // Don't use [...shadows] until you've verified its transpiled code is not invoking the iterator protocol.
-      shadows: shadows.slice(),
-      typography: createTypography(palette, typographyInput),
-      transitions: createTransitions(transitionsInput),
-      zIndex: { ...zIndex },
-    },
-  );
+  let muiTheme = deepmerge(systemTheme, {
+    mixins: createMixins(systemTheme.breakpoints, systemTheme.spacing, mixinsInput),
+    palette,
+    // Don't use [...shadows] until you've verified its transpiled code is not invoking the iterator protocol.
+    shadows: shadows.slice(),
+    typography: createTypography(palette, typographyInput),
+    transitions: createTransitions(transitionsInput),
+    zIndex: { ...zIndex },
+  });
 
   muiTheme = deepmerge(muiTheme, other);
   muiTheme = args.reduce((acc, argument) => deepmerge(acc, argument), muiTheme);