@instructure/emotion 8.18.0 → 8.18.1-snapshot.12
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/LICENSE.md
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
---
|
|
2
|
+
title: The MIT License (MIT)
|
|
3
|
+
category: Getting Started
|
|
4
|
+
order: 9
|
|
5
|
+
---
|
|
6
|
+
|
|
7
|
+
# The MIT License (MIT)
|
|
8
|
+
|
|
9
|
+
Copyright (c) 2015 Instructure, Inc.
|
|
10
|
+
|
|
11
|
+
**Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
12
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
13
|
+
in the Software without restriction, including without limitation the rights
|
|
14
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
15
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
16
|
+
furnished to do so, subject to the following conditions.**
|
|
17
|
+
|
|
18
|
+
The above copyright notice and this permission notice shall be included in all
|
|
19
|
+
copies or substantial portions of the Software.
|
|
20
|
+
|
|
21
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
22
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
23
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
24
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
25
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
26
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
27
|
+
SOFTWARE.
|
|
@@ -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.18.
|
|
3
|
+
"version": "8.18.1-snapshot.12+ca14b3dc8",
|
|
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.18.
|
|
29
|
-
"@instructure/shared-types": "8.18.
|
|
30
|
-
"@instructure/ui-decorator": "8.18.
|
|
31
|
-
"@instructure/ui-i18n": "8.18.
|
|
32
|
-
"@instructure/ui-react-utils": "8.18.
|
|
33
|
-
"@instructure/ui-themes": "8.18.
|
|
34
|
-
"@instructure/ui-utils": "8.18.
|
|
28
|
+
"@instructure/console": "8.18.1-snapshot.12+ca14b3dc8",
|
|
29
|
+
"@instructure/shared-types": "8.18.1-snapshot.12+ca14b3dc8",
|
|
30
|
+
"@instructure/ui-decorator": "8.18.1-snapshot.12+ca14b3dc8",
|
|
31
|
+
"@instructure/ui-i18n": "8.18.1-snapshot.12+ca14b3dc8",
|
|
32
|
+
"@instructure/ui-react-utils": "8.18.1-snapshot.12+ca14b3dc8",
|
|
33
|
+
"@instructure/ui-themes": "8.18.1-snapshot.12+ca14b3dc8",
|
|
34
|
+
"@instructure/ui-utils": "8.18.1-snapshot.12+ca14b3dc8",
|
|
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.18.
|
|
42
|
-
"@instructure/ui-test-utils": "8.18.
|
|
41
|
+
"@instructure/ui-babel-preset": "8.18.1-snapshot.12+ca14b3dc8",
|
|
42
|
+
"@instructure/ui-test-utils": "8.18.1-snapshot.12+ca14b3dc8",
|
|
43
43
|
"@types/lodash": "^4.14.171",
|
|
44
44
|
"cpy-cli": "^3.1.1"
|
|
45
45
|
},
|
|
@@ -49,5 +49,6 @@
|
|
|
49
49
|
"publishConfig": {
|
|
50
50
|
"access": "public"
|
|
51
51
|
},
|
|
52
|
-
"sideEffects": false
|
|
52
|
+
"sideEffects": false,
|
|
53
|
+
"gitHead": "ca14b3dc8f0315daef7b86aa05f711e6d6684c58"
|
|
53
54
|
}
|