From 24263d3f009f0917ce51593407591e9ec1f56cc1 Mon Sep 17 00:00:00 2001 From: Konstantin Tarkus Date: Sat, 16 Nov 2019 02:00:44 +0300 Subject: [PATCH] Allow to pass mixins as a function to createMuiTheme() --- packages/material-ui/src/styles/createMixins.d.ts | 2 +- packages/material-ui/src/styles/createMixins.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/material-ui/src/styles/createMixins.d.ts b/packages/material-ui/src/styles/createMixins.d.ts index cbf7aced080d69..794b8714d86345 100644 --- 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 { 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 index 1c2b84869fa0ac..64a8fa5b52146f 100644 --- 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), }; }