@arcblock/ux 2.4.0 → 2.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.
|
@@ -29,13 +29,14 @@ const defaultTheme = (0, _theme.create)();
|
|
|
29
29
|
function ThemeProvider(_ref) {
|
|
30
30
|
let {
|
|
31
31
|
children,
|
|
32
|
-
theme
|
|
32
|
+
theme,
|
|
33
|
+
injectFirst
|
|
33
34
|
} = _ref;
|
|
34
35
|
return (
|
|
35
36
|
/*#__PURE__*/
|
|
36
37
|
// injectFirst 会影响 makeStyles 自定义样式和 mui styles 覆盖问题
|
|
37
38
|
(0, _jsxRuntime.jsx)(_StyledEngineProvider.default, {
|
|
38
|
-
injectFirst:
|
|
39
|
+
injectFirst: injectFirst,
|
|
39
40
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.ThemeProvider, {
|
|
40
41
|
theme: theme,
|
|
41
42
|
children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_react.ThemeProvider, {
|
|
@@ -49,9 +50,11 @@ function ThemeProvider(_ref) {
|
|
|
49
50
|
|
|
50
51
|
ThemeProvider.propTypes = {
|
|
51
52
|
children: _propTypes.default.any,
|
|
52
|
-
theme: _propTypes.default.any
|
|
53
|
+
theme: _propTypes.default.any,
|
|
54
|
+
injectFirst: _propTypes.default.bool
|
|
53
55
|
};
|
|
54
56
|
ThemeProvider.defaultProps = {
|
|
55
57
|
children: null,
|
|
56
|
-
theme: defaultTheme
|
|
58
|
+
theme: defaultTheme,
|
|
59
|
+
injectFirst: true
|
|
57
60
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arcblock/ux",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.1",
|
|
4
4
|
"description": "Common used react components for arcblock products",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -47,10 +47,10 @@
|
|
|
47
47
|
"react": ">=18.1.0",
|
|
48
48
|
"react-ga": "^2.7.0"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "f9811866bb818ee7eac47a5173346e24931c2b32",
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@arcblock/icons": "^2.4.
|
|
53
|
-
"@arcblock/react-hooks": "^2.4.
|
|
52
|
+
"@arcblock/icons": "^2.4.1",
|
|
53
|
+
"@arcblock/react-hooks": "^2.4.1",
|
|
54
54
|
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
|
|
55
55
|
"@emotion/react": "^11.10.0",
|
|
56
56
|
"@emotion/styled": "^11.10.0",
|
|
@@ -10,10 +10,10 @@ const defaultTheme = create();
|
|
|
10
10
|
/**
|
|
11
11
|
* 默认的 theme provider, 可以为 webapp/blocklet 快捷的配置好 mui theme provider
|
|
12
12
|
*/
|
|
13
|
-
export default function ThemeProvider({ children, theme }) {
|
|
13
|
+
export default function ThemeProvider({ children, theme, injectFirst }) {
|
|
14
14
|
return (
|
|
15
15
|
// injectFirst 会影响 makeStyles 自定义样式和 mui styles 覆盖问题
|
|
16
|
-
<StyledEngineProvider injectFirst>
|
|
16
|
+
<StyledEngineProvider injectFirst={injectFirst}>
|
|
17
17
|
<MuiThemeProvider theme={theme}>
|
|
18
18
|
<EmotionThemeProvider theme={theme}>
|
|
19
19
|
<CssBaseline />
|
|
@@ -27,9 +27,11 @@ export default function ThemeProvider({ children, theme }) {
|
|
|
27
27
|
ThemeProvider.propTypes = {
|
|
28
28
|
children: PropTypes.any,
|
|
29
29
|
theme: PropTypes.any,
|
|
30
|
+
injectFirst: PropTypes.bool,
|
|
30
31
|
};
|
|
31
32
|
|
|
32
33
|
ThemeProvider.defaultProps = {
|
|
33
34
|
children: null,
|
|
34
35
|
theme: defaultTheme,
|
|
36
|
+
injectFirst: true,
|
|
35
37
|
};
|