@instructure/emotion 8.17.1-snapshot.81 → 8.18.1-snapshot.0
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/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [8.18.0](https://github.com/instructure/instructure-ui/compare/v8.17.0...v8.18.0) (2022-02-23)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @instructure/emotion
|
|
9
|
+
|
|
6
10
|
# [8.17.0](https://github.com/instructure/instructure-ui/compare/v8.16.0...v8.17.0) (2022-02-07)
|
|
7
11
|
|
|
8
12
|
### Bug Fixes
|
|
@@ -100,6 +100,8 @@ EmotionThemeProvider.defaultProps = {
|
|
|
100
100
|
*/
|
|
101
101
|
|
|
102
102
|
const getTheme = themeOrOverride => function () {
|
|
103
|
+
var _themeOrOverride, _themeOrOverride$them;
|
|
104
|
+
|
|
103
105
|
let ancestorTheme = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
|
|
104
106
|
|
|
105
107
|
try {
|
|
@@ -130,7 +132,7 @@ const getTheme = themeOrOverride => function () {
|
|
|
130
132
|
|
|
131
133
|
const themeName = currentTheme.key; // we pick the overrides for the current theme from the override object
|
|
132
134
|
|
|
133
|
-
const currentThemeOverrides = themeOrOverride
|
|
135
|
+
const currentThemeOverrides = ((_themeOrOverride = themeOrOverride) === null || _themeOrOverride === void 0 ? void 0 : (_themeOrOverride$them = _themeOrOverride.themeOverrides) === null || _themeOrOverride$them === void 0 ? void 0 : _themeOrOverride$them[themeName]) || {};
|
|
134
136
|
return merge({}, currentTheme, merge({}, themeOrOverride, currentThemeOverrides));
|
|
135
137
|
};
|
|
136
138
|
|
|
@@ -48,7 +48,7 @@ const getComponentThemeOverride = (theme, displayName, componentId, props) => {
|
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
return { ...componentOverride,
|
|
51
|
-
...((_props$themeOverride = props
|
|
51
|
+
...((_props$themeOverride = props === null || props === void 0 ? void 0 : props.themeOverride) !== null && _props$themeOverride !== void 0 ? _props$themeOverride : {})
|
|
52
52
|
};
|
|
53
53
|
};
|
|
54
54
|
|
|
@@ -114,6 +114,8 @@ EmotionThemeProvider.defaultProps = {
|
|
|
114
114
|
*/
|
|
115
115
|
|
|
116
116
|
const getTheme = themeOrOverride => function () {
|
|
117
|
+
var _themeOrOverride, _themeOrOverride$them;
|
|
118
|
+
|
|
117
119
|
let ancestorTheme = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
|
|
118
120
|
|
|
119
121
|
try {
|
|
@@ -144,7 +146,7 @@ const getTheme = themeOrOverride => function () {
|
|
|
144
146
|
|
|
145
147
|
const themeName = currentTheme.key; // we pick the overrides for the current theme from the override object
|
|
146
148
|
|
|
147
|
-
const currentThemeOverrides = themeOrOverride
|
|
149
|
+
const currentThemeOverrides = ((_themeOrOverride = themeOrOverride) === null || _themeOrOverride === void 0 ? void 0 : (_themeOrOverride$them = _themeOrOverride.themeOverrides) === null || _themeOrOverride$them === void 0 ? void 0 : _themeOrOverride$them[themeName]) || {};
|
|
148
150
|
return (0, _lodash.merge)({}, currentTheme, (0, _lodash.merge)({}, themeOrOverride, currentThemeOverrides));
|
|
149
151
|
};
|
|
150
152
|
|
|
@@ -55,7 +55,7 @@ const getComponentThemeOverride = (theme, displayName, componentId, props) => {
|
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
return { ...componentOverride,
|
|
58
|
-
...((_props$themeOverride = props
|
|
58
|
+
...((_props$themeOverride = props === null || props === void 0 ? void 0 : props.themeOverride) !== null && _props$themeOverride !== void 0 ? _props$themeOverride : {})
|
|
59
59
|
};
|
|
60
60
|
};
|
|
61
61
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@instructure/emotion",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.18.1-snapshot.0+435c9ae79",
|
|
4
4
|
"description": "A UI component library made by Instructure Inc.",
|
|
5
5
|
"author": "Instructure, Inc. Engineering and Product Design",
|
|
6
6
|
"module": "./es/index.js",
|
|
@@ -25,21 +25,21 @@
|
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@babel/runtime": "^7.13.10",
|
|
27
27
|
"@emotion/react": "^11",
|
|
28
|
-
"@instructure/console": "8.
|
|
29
|
-
"@instructure/shared-types": "8.
|
|
30
|
-
"@instructure/ui-decorator": "8.
|
|
31
|
-
"@instructure/ui-i18n": "8.
|
|
32
|
-
"@instructure/ui-react-utils": "8.
|
|
33
|
-
"@instructure/ui-themes": "8.
|
|
34
|
-
"@instructure/ui-utils": "8.
|
|
28
|
+
"@instructure/console": "8.18.1-snapshot.0+435c9ae79",
|
|
29
|
+
"@instructure/shared-types": "8.18.1-snapshot.0+435c9ae79",
|
|
30
|
+
"@instructure/ui-decorator": "8.18.1-snapshot.0+435c9ae79",
|
|
31
|
+
"@instructure/ui-i18n": "8.18.1-snapshot.0+435c9ae79",
|
|
32
|
+
"@instructure/ui-react-utils": "8.18.1-snapshot.0+435c9ae79",
|
|
33
|
+
"@instructure/ui-themes": "8.18.1-snapshot.0+435c9ae79",
|
|
34
|
+
"@instructure/ui-utils": "8.18.1-snapshot.0+435c9ae79",
|
|
35
35
|
"emotion-theming": "^11",
|
|
36
36
|
"hoist-non-react-statics": "^3.3.2",
|
|
37
37
|
"lodash": "^4",
|
|
38
38
|
"prop-types": "^15"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@instructure/ui-babel-preset": "8.
|
|
42
|
-
"@instructure/ui-test-utils": "8.
|
|
41
|
+
"@instructure/ui-babel-preset": "8.18.1-snapshot.0+435c9ae79",
|
|
42
|
+
"@instructure/ui-test-utils": "8.18.1-snapshot.0+435c9ae79",
|
|
43
43
|
"@types/lodash": "^4.14.171",
|
|
44
44
|
"cpy-cli": "^3.1.1"
|
|
45
45
|
},
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"access": "public"
|
|
51
51
|
},
|
|
52
52
|
"sideEffects": false,
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "435c9ae794c15e2bd103f700f8c4e946d91c1b59"
|
|
54
54
|
}
|