Allow to pass mixins as a function to createMuiTheme()

mui · Nov 15, 2019 · 24263d3 · 24263d3
1 parent 64ae0c6
commit 24263d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/material-ui/src/styles/createMixins.d.ts b/packages/material-ui/src/styles/createMixins.d.ts
@@ -15,5 +15,5 @@ export interface MixinsOptions extends Partial<Mixins> {
 export default function createMixins(
   breakpoints: Breakpoints,
   spacing: Spacing,
-  mixins: MixinsOptions,
+  mixins: MixinsOptions | ((breakpoints: Breakpoints, spacing: Spacing) => MixinsOptions),
 ): Mixins;
diff --git a/packages/material-ui/src/styles/createMixins.js b/packages/material-ui/src/styles/createMixins.js
@@ -38,6 +38,6 @@ export default function createMixins(breakpoints, spacing, mixins) {
         minHeight: 64,
       },
     },
-    ...mixins,
+    ...(typeof mixins === 'function' ? mixins(breakpoints, spacing) : mixins),
   };
 }