@mui/system 5.2.6 → 5.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Box/Box.d.ts +1 -0
- package/CHANGELOG.md +423 -60
- package/ThemeProvider/ThemeProvider.d.ts +1 -1
- package/createStyled.js +9 -1
- package/cssVars/createCssVarsProvider.js +2 -2
- package/cssVars/createGetCssVar.d.ts +5 -0
- package/cssVars/createGetCssVar.js +27 -0
- package/esm/createStyled.js +9 -1
- package/esm/cssVars/createCssVarsProvider.js +2 -2
- package/esm/cssVars/createGetCssVar.js +20 -0
- package/esm/index.js +1 -1
- package/esm/typography.js +4 -1
- package/index.d.ts +2 -1
- package/index.js +5 -5
- package/legacy/createStyled.js +17 -4
- package/legacy/cssVars/createCssVarsProvider.js +2 -2
- package/legacy/cssVars/{createGetThemeVar.js → createGetCssVar.js} +10 -4
- package/legacy/index.js +2 -2
- package/legacy/typography.js +4 -1
- package/modern/createStyled.js +9 -1
- package/modern/cssVars/createCssVarsProvider.js +2 -2
- package/modern/cssVars/createGetCssVar.js +20 -0
- package/modern/index.js +2 -2
- package/modern/typography.js +4 -1
- package/package.json +9 -9
- package/styleFunctionSx/styleFunctionSx.d.ts +1 -0
- package/typography.js +6 -2
- package/cssVars/createGetThemeVar.d.ts +0 -1
- package/cssVars/createGetThemeVar.js +0 -22
- package/esm/cssVars/createGetThemeVar.js +0 -15
- package/modern/cssVars/createGetThemeVar.js +0 -15
|
@@ -10,7 +10,7 @@ export interface ThemeProviderProps<Theme = DefaultTheme> {
|
|
|
10
10
|
* It should preferably be used at **the root of your component tree**.
|
|
11
11
|
* API:
|
|
12
12
|
*
|
|
13
|
-
* - [ThemeProvider API](
|
|
13
|
+
* - [ThemeProvider API](/customization/theming/#themeprovider)
|
|
14
14
|
*/
|
|
15
15
|
export default function ThemeProvider<T = DefaultTheme>(
|
|
16
16
|
props: ThemeProviderProps<T>,
|
package/createStyled.js
CHANGED
|
@@ -156,7 +156,11 @@ function createStyled(input = {}) {
|
|
|
156
156
|
const styleOverrides = getStyleOverrides(componentName, theme);
|
|
157
157
|
|
|
158
158
|
if (styleOverrides) {
|
|
159
|
-
|
|
159
|
+
const resolvedStyleOverrides = {};
|
|
160
|
+
Object.entries(styleOverrides).forEach(([slotKey, slotStyle]) => {
|
|
161
|
+
resolvedStyleOverrides[slotKey] = typeof slotStyle === 'function' ? slotStyle(props) : slotStyle;
|
|
162
|
+
});
|
|
163
|
+
return overridesResolver(props, resolvedStyleOverrides);
|
|
160
164
|
}
|
|
161
165
|
|
|
162
166
|
return null;
|
|
@@ -218,6 +222,10 @@ function createStyled(input = {}) {
|
|
|
218
222
|
return Component;
|
|
219
223
|
};
|
|
220
224
|
|
|
225
|
+
if (defaultStyledResolver.withConfig) {
|
|
226
|
+
muiStyledResolver.withConfig = defaultStyledResolver.withConfig;
|
|
227
|
+
}
|
|
228
|
+
|
|
221
229
|
return muiStyledResolver;
|
|
222
230
|
};
|
|
223
231
|
}
|
|
@@ -32,7 +32,7 @@ var _getInitColorSchemeScript = _interopRequireWildcard(require("./getInitColorS
|
|
|
32
32
|
|
|
33
33
|
var _useCurrentColorScheme = _interopRequireDefault(require("./useCurrentColorScheme"));
|
|
34
34
|
|
|
35
|
-
var
|
|
35
|
+
var _createGetCssVar = _interopRequireDefault(require("./createGetCssVar"));
|
|
36
36
|
|
|
37
37
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
38
38
|
|
|
@@ -154,7 +154,7 @@ function createCssVarsProvider(options) {
|
|
|
154
154
|
vars: rootVars,
|
|
155
155
|
spacing: themeProp.spacing ? (0, _createSpacing.default)(themeProp.spacing) : systemSpacing,
|
|
156
156
|
breakpoints: themeProp.breakpoints ? (0, _createBreakpoints.default)(themeProp.breakpoints) : systemBreakpoints,
|
|
157
|
-
|
|
157
|
+
getCssVar: (0, _createGetCssVar.default)(prefix)
|
|
158
158
|
});
|
|
159
159
|
const styleSheet = {};
|
|
160
160
|
Object.entries(colorSchemes).forEach(([key, scheme]) => {
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The benefit of this function is to help developers get CSS var from theme without specifying the whole variable
|
|
3
|
+
* and they does not need to remember the prefix (defined once).
|
|
4
|
+
*/
|
|
5
|
+
export default function createGetCssVar<T extends string = string>(prefix?: string): <AdditionalVars extends string = never>(field: T | AdditionalVars, ...vars: (T | AdditionalVars)[]) => string;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.default = createGetCssVar;
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* The benefit of this function is to help developers get CSS var from theme without specifying the whole variable
|
|
10
|
+
* and they does not need to remember the prefix (defined once).
|
|
11
|
+
*/
|
|
12
|
+
function createGetCssVar(prefix = '') {
|
|
13
|
+
function appendVar(...vars) {
|
|
14
|
+
if (!vars.length) {
|
|
15
|
+
return '';
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
return `, var(--${prefix ? `${prefix}-` : ''}${vars[0]}${appendVar(...vars.slice(1))})`;
|
|
19
|
+
} // AdditionalVars makes `getCssVar` less strict, so it can be use like this `getCssVar('non-mui-variable')` without type error.
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
const getCssVar = (field, ...vars) => {
|
|
23
|
+
return `var(--${prefix ? `${prefix}-` : ''}${field}${appendVar(...vars)})`;
|
|
24
|
+
};
|
|
25
|
+
|
|
26
|
+
return getCssVar;
|
|
27
|
+
}
|
package/esm/createStyled.js
CHANGED
|
@@ -138,7 +138,11 @@ export default function createStyled(input = {}) {
|
|
|
138
138
|
const styleOverrides = getStyleOverrides(componentName, theme);
|
|
139
139
|
|
|
140
140
|
if (styleOverrides) {
|
|
141
|
-
|
|
141
|
+
const resolvedStyleOverrides = {};
|
|
142
|
+
Object.entries(styleOverrides).forEach(([slotKey, slotStyle]) => {
|
|
143
|
+
resolvedStyleOverrides[slotKey] = typeof slotStyle === 'function' ? slotStyle(props) : slotStyle;
|
|
144
|
+
});
|
|
145
|
+
return overridesResolver(props, resolvedStyleOverrides);
|
|
142
146
|
}
|
|
143
147
|
|
|
144
148
|
return null;
|
|
@@ -201,6 +205,10 @@ export default function createStyled(input = {}) {
|
|
|
201
205
|
return Component;
|
|
202
206
|
};
|
|
203
207
|
|
|
208
|
+
if (defaultStyledResolver.withConfig) {
|
|
209
|
+
muiStyledResolver.withConfig = defaultStyledResolver.withConfig;
|
|
210
|
+
}
|
|
211
|
+
|
|
204
212
|
return muiStyledResolver;
|
|
205
213
|
};
|
|
206
214
|
}
|
|
@@ -14,7 +14,7 @@ import cssVarsParser from './cssVarsParser';
|
|
|
14
14
|
import ThemeProvider from '../ThemeProvider';
|
|
15
15
|
import getInitColorSchemeScript, { DEFAULT_ATTRIBUTE, DEFAULT_MODE_STORAGE_KEY } from './getInitColorSchemeScript';
|
|
16
16
|
import useCurrentColorScheme from './useCurrentColorScheme';
|
|
17
|
-
import
|
|
17
|
+
import createGetCssVar from './createGetCssVar';
|
|
18
18
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
19
19
|
import { jsxs as _jsxs } from "react/jsx-runtime";
|
|
20
20
|
export const DISABLE_CSS_TRANSITION = '*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}';
|
|
@@ -128,7 +128,7 @@ export default function createCssVarsProvider(options) {
|
|
|
128
128
|
vars: rootVars,
|
|
129
129
|
spacing: themeProp.spacing ? createSpacing(themeProp.spacing) : systemSpacing,
|
|
130
130
|
breakpoints: themeProp.breakpoints ? createBreakpoints(themeProp.breakpoints) : systemBreakpoints,
|
|
131
|
-
|
|
131
|
+
getCssVar: createGetCssVar(prefix)
|
|
132
132
|
});
|
|
133
133
|
const styleSheet = {};
|
|
134
134
|
Object.entries(colorSchemes).forEach(([key, scheme]) => {
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The benefit of this function is to help developers get CSS var from theme without specifying the whole variable
|
|
3
|
+
* and they does not need to remember the prefix (defined once).
|
|
4
|
+
*/
|
|
5
|
+
export default function createGetCssVar(prefix = '') {
|
|
6
|
+
function appendVar(...vars) {
|
|
7
|
+
if (!vars.length) {
|
|
8
|
+
return '';
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
return `, var(--${prefix ? `${prefix}-` : ''}${vars[0]}${appendVar(...vars.slice(1))})`;
|
|
12
|
+
} // AdditionalVars makes `getCssVar` less strict, so it can be use like this `getCssVar('non-mui-variable')` without type error.
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
const getCssVar = (field, ...vars) => {
|
|
16
|
+
return `var(--${prefix ? `${prefix}-` : ''}${field}${appendVar(...vars)})`;
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
return getCssVar;
|
|
20
|
+
}
|
package/esm/index.js
CHANGED
|
@@ -39,4 +39,4 @@ export { default as useThemeWithoutDefault } from './useThemeWithoutDefault';
|
|
|
39
39
|
export * from './colorManipulator';
|
|
40
40
|
export { default as ThemeProvider } from './ThemeProvider';
|
|
41
41
|
export { default as unstable_createCssVarsProvider } from './cssVars/createCssVarsProvider';
|
|
42
|
-
export { default as
|
|
42
|
+
export { default as unstable_createGetCssVar } from './cssVars/createGetCssVar';
|
package/esm/typography.js
CHANGED
|
@@ -19,6 +19,9 @@ export const fontWeight = style({
|
|
|
19
19
|
export const letterSpacing = style({
|
|
20
20
|
prop: 'letterSpacing'
|
|
21
21
|
});
|
|
22
|
+
export const textTransform = style({
|
|
23
|
+
prop: 'textTransform'
|
|
24
|
+
});
|
|
22
25
|
export const lineHeight = style({
|
|
23
26
|
prop: 'lineHeight'
|
|
24
27
|
});
|
|
@@ -30,5 +33,5 @@ export const typographyVariant = style({
|
|
|
30
33
|
cssProperty: false,
|
|
31
34
|
themeKey: 'typography'
|
|
32
35
|
});
|
|
33
|
-
const typography = compose(typographyVariant, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign);
|
|
36
|
+
const typography = compose(typographyVariant, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign, textTransform);
|
|
34
37
|
export default typography;
|
package/index.d.ts
CHANGED
|
@@ -88,6 +88,7 @@ export const fontWeight: SimpleStyleFunction<'fontWeight'>;
|
|
|
88
88
|
export const letterSpacing: SimpleStyleFunction<'letterSpacing'>;
|
|
89
89
|
export const lineHeight: SimpleStyleFunction<'lineHeight'>;
|
|
90
90
|
export const textAlign: SimpleStyleFunction<'textAlign'>;
|
|
91
|
+
export const textTransform: SimpleStyleFunction<'textTransform'>;
|
|
91
92
|
export type TypographyProps = PropsFor<typeof typography>;
|
|
92
93
|
|
|
93
94
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
@@ -161,5 +162,5 @@ export { default as ThemeProvider } from './ThemeProvider';
|
|
|
161
162
|
export * from './ThemeProvider';
|
|
162
163
|
|
|
163
164
|
export { default as unstable_createCssVarsProvider } from './cssVars';
|
|
164
|
-
export { default as
|
|
165
|
+
export { default as unstable_createGetCssVar } from './cssVars/createGetCssVar';
|
|
165
166
|
export * from './cssVars';
|
package/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** @license MUI v5.
|
|
1
|
+
/** @license MUI v5.4.1
|
|
2
2
|
*
|
|
3
3
|
* This source code is licensed under the MIT license found in the
|
|
4
4
|
* LICENSE file in the root directory of this source tree.
|
|
@@ -50,7 +50,7 @@ var _exportNames = {
|
|
|
50
50
|
useThemeWithoutDefault: true,
|
|
51
51
|
ThemeProvider: true,
|
|
52
52
|
unstable_createCssVarsProvider: true,
|
|
53
|
-
|
|
53
|
+
unstable_createGetCssVar: true
|
|
54
54
|
};
|
|
55
55
|
Object.defineProperty(exports, "Box", {
|
|
56
56
|
enumerable: true,
|
|
@@ -244,10 +244,10 @@ Object.defineProperty(exports, "unstable_createCssVarsProvider", {
|
|
|
244
244
|
return _createCssVarsProvider.default;
|
|
245
245
|
}
|
|
246
246
|
});
|
|
247
|
-
Object.defineProperty(exports, "
|
|
247
|
+
Object.defineProperty(exports, "unstable_createGetCssVar", {
|
|
248
248
|
enumerable: true,
|
|
249
249
|
get: function () {
|
|
250
|
-
return
|
|
250
|
+
return _createGetCssVar.default;
|
|
251
251
|
}
|
|
252
252
|
});
|
|
253
253
|
Object.defineProperty(exports, "unstable_extendSxProp", {
|
|
@@ -475,7 +475,7 @@ var _ThemeProvider = _interopRequireDefault(require("./ThemeProvider"));
|
|
|
475
475
|
|
|
476
476
|
var _createCssVarsProvider = _interopRequireDefault(require("./cssVars/createCssVarsProvider"));
|
|
477
477
|
|
|
478
|
-
var
|
|
478
|
+
var _createGetCssVar = _interopRequireDefault(require("./cssVars/createGetCssVar"));
|
|
479
479
|
|
|
480
480
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
481
481
|
|
package/legacy/createStyled.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
2
|
+
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
3
|
import _extends from "@babel/runtime/helpers/esm/extends";
|
|
3
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
4
5
|
import styledEngineStyled from '@mui/styled-engine';
|
|
@@ -139,7 +140,15 @@ export default function createStyled() {
|
|
|
139
140
|
var styleOverrides = getStyleOverrides(componentName, theme);
|
|
140
141
|
|
|
141
142
|
if (styleOverrides) {
|
|
142
|
-
|
|
143
|
+
var resolvedStyleOverrides = {};
|
|
144
|
+
Object.entries(styleOverrides).forEach(function (_ref2) {
|
|
145
|
+
var _ref3 = _slicedToArray(_ref2, 2),
|
|
146
|
+
slotKey = _ref3[0],
|
|
147
|
+
slotStyle = _ref3[1];
|
|
148
|
+
|
|
149
|
+
resolvedStyleOverrides[slotKey] = typeof slotStyle === 'function' ? slotStyle(props) : slotStyle;
|
|
150
|
+
});
|
|
151
|
+
return overridesResolver(props, resolvedStyleOverrides);
|
|
143
152
|
}
|
|
144
153
|
|
|
145
154
|
return null;
|
|
@@ -171,9 +180,9 @@ export default function createStyled() {
|
|
|
171
180
|
transformedStyleArg.raw = [].concat(_toConsumableArray(styleArg.raw), _toConsumableArray(placeholders));
|
|
172
181
|
} else if (typeof styleArg === 'function') {
|
|
173
182
|
// If the type is function, we need to define the default theme.
|
|
174
|
-
transformedStyleArg = function transformedStyleArg(
|
|
175
|
-
var themeInput =
|
|
176
|
-
other = _objectWithoutProperties(
|
|
183
|
+
transformedStyleArg = function transformedStyleArg(_ref4) {
|
|
184
|
+
var themeInput = _ref4.theme,
|
|
185
|
+
other = _objectWithoutProperties(_ref4, ["theme"]);
|
|
177
186
|
|
|
178
187
|
return styleArg(_extends({
|
|
179
188
|
theme: isEmpty(themeInput) ? defaultTheme : themeInput
|
|
@@ -200,6 +209,10 @@ export default function createStyled() {
|
|
|
200
209
|
return Component;
|
|
201
210
|
};
|
|
202
211
|
|
|
212
|
+
if (defaultStyledResolver.withConfig) {
|
|
213
|
+
muiStyledResolver.withConfig = defaultStyledResolver.withConfig;
|
|
214
|
+
}
|
|
215
|
+
|
|
203
216
|
return muiStyledResolver;
|
|
204
217
|
};
|
|
205
218
|
}
|
|
@@ -13,7 +13,7 @@ import cssVarsParser from './cssVarsParser';
|
|
|
13
13
|
import ThemeProvider from '../ThemeProvider';
|
|
14
14
|
import getInitColorSchemeScript, { DEFAULT_ATTRIBUTE, DEFAULT_MODE_STORAGE_KEY } from './getInitColorSchemeScript';
|
|
15
15
|
import useCurrentColorScheme from './useCurrentColorScheme';
|
|
16
|
-
import
|
|
16
|
+
import createGetCssVar from './createGetCssVar';
|
|
17
17
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
18
18
|
import { jsxs as _jsxs } from "react/jsx-runtime";
|
|
19
19
|
export var DISABLE_CSS_TRANSITION = '*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}';
|
|
@@ -134,7 +134,7 @@ export default function createCssVarsProvider(options) {
|
|
|
134
134
|
vars: rootVars,
|
|
135
135
|
spacing: themeProp.spacing ? createSpacing(themeProp.spacing) : systemSpacing,
|
|
136
136
|
breakpoints: themeProp.breakpoints ? createBreakpoints(themeProp.breakpoints) : systemBreakpoints,
|
|
137
|
-
|
|
137
|
+
getCssVar: createGetCssVar(prefix)
|
|
138
138
|
});
|
|
139
139
|
var styleSheet = {};
|
|
140
140
|
Object.entries(colorSchemes).forEach(function (_ref2) {
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
2
|
-
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* The benefit of this function is to help developers get CSS var from theme without specifying the whole variable
|
|
5
|
+
* and they does not need to remember the prefix (defined once).
|
|
6
|
+
*/
|
|
7
|
+
export default function createGetCssVar() {
|
|
3
8
|
var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
|
|
4
9
|
|
|
5
10
|
function appendVar() {
|
|
@@ -12,9 +17,10 @@ export default function createGetThemeVar() {
|
|
|
12
17
|
}
|
|
13
18
|
|
|
14
19
|
return ", var(--".concat(prefix ? "".concat(prefix, "-") : '').concat(vars[0]).concat(appendVar.apply(void 0, _toConsumableArray(vars.slice(1))), ")");
|
|
15
|
-
}
|
|
20
|
+
} // AdditionalVars makes `getCssVar` less strict, so it can be use like this `getCssVar('non-mui-variable')` without type error.
|
|
21
|
+
|
|
16
22
|
|
|
17
|
-
var
|
|
23
|
+
var getCssVar = function getCssVar(field) {
|
|
18
24
|
for (var _len2 = arguments.length, vars = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
|
|
19
25
|
vars[_key2 - 1] = arguments[_key2];
|
|
20
26
|
}
|
|
@@ -22,5 +28,5 @@ export default function createGetThemeVar() {
|
|
|
22
28
|
return "var(--".concat(prefix ? "".concat(prefix, "-") : '').concat(field).concat(appendVar.apply(void 0, vars), ")");
|
|
23
29
|
};
|
|
24
30
|
|
|
25
|
-
return
|
|
31
|
+
return getCssVar;
|
|
26
32
|
}
|
package/legacy/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** @license MUI v5.
|
|
1
|
+
/** @license MUI v5.4.1
|
|
2
2
|
*
|
|
3
3
|
* This source code is licensed under the MIT license found in the
|
|
4
4
|
* LICENSE file in the root directory of this source tree.
|
|
@@ -44,4 +44,4 @@ export { default as useThemeWithoutDefault } from './useThemeWithoutDefault';
|
|
|
44
44
|
export * from './colorManipulator';
|
|
45
45
|
export { default as ThemeProvider } from './ThemeProvider';
|
|
46
46
|
export { default as unstable_createCssVarsProvider } from './cssVars/createCssVarsProvider';
|
|
47
|
-
export { default as
|
|
47
|
+
export { default as unstable_createGetCssVar } from './cssVars/createGetCssVar';
|
package/legacy/typography.js
CHANGED
|
@@ -19,6 +19,9 @@ export var fontWeight = style({
|
|
|
19
19
|
export var letterSpacing = style({
|
|
20
20
|
prop: 'letterSpacing'
|
|
21
21
|
});
|
|
22
|
+
export var textTransform = style({
|
|
23
|
+
prop: 'textTransform'
|
|
24
|
+
});
|
|
22
25
|
export var lineHeight = style({
|
|
23
26
|
prop: 'lineHeight'
|
|
24
27
|
});
|
|
@@ -30,5 +33,5 @@ export var typographyVariant = style({
|
|
|
30
33
|
cssProperty: false,
|
|
31
34
|
themeKey: 'typography'
|
|
32
35
|
});
|
|
33
|
-
var typography = compose(typographyVariant, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign);
|
|
36
|
+
var typography = compose(typographyVariant, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign, textTransform);
|
|
34
37
|
export default typography;
|
package/modern/createStyled.js
CHANGED
|
@@ -136,7 +136,11 @@ export default function createStyled(input = {}) {
|
|
|
136
136
|
const styleOverrides = getStyleOverrides(componentName, theme);
|
|
137
137
|
|
|
138
138
|
if (styleOverrides) {
|
|
139
|
-
|
|
139
|
+
const resolvedStyleOverrides = {};
|
|
140
|
+
Object.entries(styleOverrides).forEach(([slotKey, slotStyle]) => {
|
|
141
|
+
resolvedStyleOverrides[slotKey] = typeof slotStyle === 'function' ? slotStyle(props) : slotStyle;
|
|
142
|
+
});
|
|
143
|
+
return overridesResolver(props, resolvedStyleOverrides);
|
|
140
144
|
}
|
|
141
145
|
|
|
142
146
|
return null;
|
|
@@ -199,6 +203,10 @@ export default function createStyled(input = {}) {
|
|
|
199
203
|
return Component;
|
|
200
204
|
};
|
|
201
205
|
|
|
206
|
+
if (defaultStyledResolver.withConfig) {
|
|
207
|
+
muiStyledResolver.withConfig = defaultStyledResolver.withConfig;
|
|
208
|
+
}
|
|
209
|
+
|
|
202
210
|
return muiStyledResolver;
|
|
203
211
|
};
|
|
204
212
|
}
|
|
@@ -14,7 +14,7 @@ import cssVarsParser from './cssVarsParser';
|
|
|
14
14
|
import ThemeProvider from '../ThemeProvider';
|
|
15
15
|
import getInitColorSchemeScript, { DEFAULT_ATTRIBUTE, DEFAULT_MODE_STORAGE_KEY } from './getInitColorSchemeScript';
|
|
16
16
|
import useCurrentColorScheme from './useCurrentColorScheme';
|
|
17
|
-
import
|
|
17
|
+
import createGetCssVar from './createGetCssVar';
|
|
18
18
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
19
19
|
import { jsxs as _jsxs } from "react/jsx-runtime";
|
|
20
20
|
export const DISABLE_CSS_TRANSITION = '*{-webkit-transition:none!important;-moz-transition:none!important;-o-transition:none!important;-ms-transition:none!important;transition:none!important}';
|
|
@@ -126,7 +126,7 @@ export default function createCssVarsProvider(options) {
|
|
|
126
126
|
vars: rootVars,
|
|
127
127
|
spacing: themeProp.spacing ? createSpacing(themeProp.spacing) : systemSpacing,
|
|
128
128
|
breakpoints: themeProp.breakpoints ? createBreakpoints(themeProp.breakpoints) : systemBreakpoints,
|
|
129
|
-
|
|
129
|
+
getCssVar: createGetCssVar(prefix)
|
|
130
130
|
});
|
|
131
131
|
const styleSheet = {};
|
|
132
132
|
Object.entries(colorSchemes).forEach(([key, scheme]) => {
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The benefit of this function is to help developers get CSS var from theme without specifying the whole variable
|
|
3
|
+
* and they does not need to remember the prefix (defined once).
|
|
4
|
+
*/
|
|
5
|
+
export default function createGetCssVar(prefix = '') {
|
|
6
|
+
function appendVar(...vars) {
|
|
7
|
+
if (!vars.length) {
|
|
8
|
+
return '';
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
return `, var(--${prefix ? `${prefix}-` : ''}${vars[0]}${appendVar(...vars.slice(1))})`;
|
|
12
|
+
} // AdditionalVars makes `getCssVar` less strict, so it can be use like this `getCssVar('non-mui-variable')` without type error.
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
const getCssVar = (field, ...vars) => {
|
|
16
|
+
return `var(--${prefix ? `${prefix}-` : ''}${field}${appendVar(...vars)})`;
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
return getCssVar;
|
|
20
|
+
}
|
package/modern/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/** @license MUI v5.
|
|
1
|
+
/** @license MUI v5.4.1
|
|
2
2
|
*
|
|
3
3
|
* This source code is licensed under the MIT license found in the
|
|
4
4
|
* LICENSE file in the root directory of this source tree.
|
|
@@ -44,4 +44,4 @@ export { default as useThemeWithoutDefault } from './useThemeWithoutDefault';
|
|
|
44
44
|
export * from './colorManipulator';
|
|
45
45
|
export { default as ThemeProvider } from './ThemeProvider';
|
|
46
46
|
export { default as unstable_createCssVarsProvider } from './cssVars/createCssVarsProvider';
|
|
47
|
-
export { default as
|
|
47
|
+
export { default as unstable_createGetCssVar } from './cssVars/createGetCssVar';
|
package/modern/typography.js
CHANGED
|
@@ -19,6 +19,9 @@ export const fontWeight = style({
|
|
|
19
19
|
export const letterSpacing = style({
|
|
20
20
|
prop: 'letterSpacing'
|
|
21
21
|
});
|
|
22
|
+
export const textTransform = style({
|
|
23
|
+
prop: 'textTransform'
|
|
24
|
+
});
|
|
22
25
|
export const lineHeight = style({
|
|
23
26
|
prop: 'lineHeight'
|
|
24
27
|
});
|
|
@@ -30,5 +33,5 @@ export const typographyVariant = style({
|
|
|
30
33
|
cssProperty: false,
|
|
31
34
|
themeKey: 'typography'
|
|
32
35
|
});
|
|
33
|
-
const typography = compose(typographyVariant, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign);
|
|
36
|
+
const typography = compose(typographyVariant, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign, textTransform);
|
|
34
37
|
export default typography;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mui/system",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.4.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"author": "MUI Team",
|
|
6
6
|
"description": "CSS utilities for rapidly laying out custom designs.",
|
|
@@ -13,12 +13,12 @@
|
|
|
13
13
|
],
|
|
14
14
|
"repository": {
|
|
15
15
|
"type": "git",
|
|
16
|
-
"url": "https://github.com/mui
|
|
16
|
+
"url": "https://github.com/mui/material-ui.git",
|
|
17
17
|
"directory": "packages/mui-system"
|
|
18
18
|
},
|
|
19
19
|
"license": "MIT",
|
|
20
20
|
"bugs": {
|
|
21
|
-
"url": "https://github.com/mui
|
|
21
|
+
"url": "https://github.com/mui/material-ui/issues"
|
|
22
22
|
},
|
|
23
23
|
"homepage": "https://mui.com/system/basics/",
|
|
24
24
|
"funding": {
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@emotion/react": "^11.5.0",
|
|
30
30
|
"@emotion/styled": "^11.3.0",
|
|
31
31
|
"@types/react": "^16.8.6 || ^17.0.0",
|
|
32
|
-
"react": "^17.0.
|
|
32
|
+
"react": "^17.0.0"
|
|
33
33
|
},
|
|
34
34
|
"peerDependenciesMeta": {
|
|
35
35
|
"@types/react": {
|
|
@@ -43,11 +43,11 @@
|
|
|
43
43
|
}
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@babel/runtime": "^7.
|
|
47
|
-
"@mui/private-theming": "^5.
|
|
48
|
-
"@mui/styled-engine": "^5.
|
|
49
|
-
"@mui/types": "^7.1.
|
|
50
|
-
"@mui/utils": "^5.
|
|
46
|
+
"@babel/runtime": "^7.17.0",
|
|
47
|
+
"@mui/private-theming": "^5.4.1",
|
|
48
|
+
"@mui/styled-engine": "^5.4.1",
|
|
49
|
+
"@mui/types": "^7.1.1",
|
|
50
|
+
"@mui/utils": "^5.4.1",
|
|
51
51
|
"clsx": "^1.1.1",
|
|
52
52
|
"csstype": "^3.0.10",
|
|
53
53
|
"prop-types": "^15.7.2"
|
package/typography.js
CHANGED
|
@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
exports.typographyVariant = exports.textAlign = exports.lineHeight = exports.letterSpacing = exports.fontWeight = exports.fontStyle = exports.fontSize = exports.fontFamily = exports.default = void 0;
|
|
8
|
+
exports.typographyVariant = exports.textTransform = exports.textAlign = exports.lineHeight = exports.letterSpacing = exports.fontWeight = exports.fontStyle = exports.fontSize = exports.fontFamily = exports.default = void 0;
|
|
9
9
|
|
|
10
10
|
var _style = _interopRequireDefault(require("./style"));
|
|
11
11
|
|
|
@@ -35,6 +35,10 @@ const letterSpacing = (0, _style.default)({
|
|
|
35
35
|
prop: 'letterSpacing'
|
|
36
36
|
});
|
|
37
37
|
exports.letterSpacing = letterSpacing;
|
|
38
|
+
const textTransform = (0, _style.default)({
|
|
39
|
+
prop: 'textTransform'
|
|
40
|
+
});
|
|
41
|
+
exports.textTransform = textTransform;
|
|
38
42
|
const lineHeight = (0, _style.default)({
|
|
39
43
|
prop: 'lineHeight'
|
|
40
44
|
});
|
|
@@ -49,6 +53,6 @@ const typographyVariant = (0, _style.default)({
|
|
|
49
53
|
themeKey: 'typography'
|
|
50
54
|
});
|
|
51
55
|
exports.typographyVariant = typographyVariant;
|
|
52
|
-
const typography = (0, _compose.default)(typographyVariant, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign);
|
|
56
|
+
const typography = (0, _compose.default)(typographyVariant, fontFamily, fontSize, fontStyle, fontWeight, letterSpacing, lineHeight, textAlign, textTransform);
|
|
53
57
|
var _default = typography;
|
|
54
58
|
exports.default = _default;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export default function createGetThemeVar<T extends string = string>(prefix?: string): (field: T, ...vars: T[]) => string;
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.default = createGetThemeVar;
|
|
7
|
-
|
|
8
|
-
function createGetThemeVar(prefix = '') {
|
|
9
|
-
function appendVar(...vars) {
|
|
10
|
-
if (!vars.length) {
|
|
11
|
-
return '';
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
return `, var(--${prefix ? `${prefix}-` : ''}${vars[0]}${appendVar(...vars.slice(1))})`;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
const getThemeVar = (field, ...vars) => {
|
|
18
|
-
return `var(--${prefix ? `${prefix}-` : ''}${field}${appendVar(...vars)})`;
|
|
19
|
-
};
|
|
20
|
-
|
|
21
|
-
return getThemeVar;
|
|
22
|
-
}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
export default function createGetThemeVar(prefix = '') {
|
|
2
|
-
function appendVar(...vars) {
|
|
3
|
-
if (!vars.length) {
|
|
4
|
-
return '';
|
|
5
|
-
}
|
|
6
|
-
|
|
7
|
-
return `, var(--${prefix ? `${prefix}-` : ''}${vars[0]}${appendVar(...vars.slice(1))})`;
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
const getThemeVar = (field, ...vars) => {
|
|
11
|
-
return `var(--${prefix ? `${prefix}-` : ''}${field}${appendVar(...vars)})`;
|
|
12
|
-
};
|
|
13
|
-
|
|
14
|
-
return getThemeVar;
|
|
15
|
-
}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
export default function createGetThemeVar(prefix = '') {
|
|
2
|
-
function appendVar(...vars) {
|
|
3
|
-
if (!vars.length) {
|
|
4
|
-
return '';
|
|
5
|
-
}
|
|
6
|
-
|
|
7
|
-
return `, var(--${prefix ? `${prefix}-` : ''}${vars[0]}${appendVar(...vars.slice(1))})`;
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
const getThemeVar = (field, ...vars) => {
|
|
11
|
-
return `var(--${prefix ? `${prefix}-` : ''}${field}${appendVar(...vars)})`;
|
|
12
|
-
};
|
|
13
|
-
|
|
14
|
-
return getThemeVar;
|
|
15
|
-
}
|