@micromag/core 0.3.726 → 0.3.728
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/es/index.js +6 -6
- package/package.json +2 -2
package/es/index.js
CHANGED
|
@@ -2145,8 +2145,8 @@ var ThemeParser = /*#__PURE__*/function () {
|
|
|
2145
2145
|
var newComponents = components.reduce(function (currentComponents, screen, index) {
|
|
2146
2146
|
var type = screen.type;
|
|
2147
2147
|
var _this$getDefinitionBy = _this.getDefinitionByScreen(type, themeComponents),
|
|
2148
|
-
definition = _this$getDefinitionBy.definition
|
|
2149
|
-
|
|
2148
|
+
definition = _this$getDefinitionBy.definition;
|
|
2149
|
+
var themeScreen = null;
|
|
2150
2150
|
var newScreen = _this.parseScreen(definition, screen, themeScreen, themeBackground, themeColors, themeTextStyles, themeBoxStyles);
|
|
2151
2151
|
|
|
2152
2152
|
// Only switch screen if it has changed
|
|
@@ -2339,9 +2339,9 @@ var ThemeParser = /*#__PURE__*/function () {
|
|
|
2339
2339
|
}
|
|
2340
2340
|
var _ref11 = value || {},
|
|
2341
2341
|
_ref11$textStyle = _ref11.textStyle,
|
|
2342
|
-
valueTextStyle = _ref11$textStyle === void 0 ?
|
|
2342
|
+
valueTextStyle = _ref11$textStyle === void 0 ? false : _ref11$textStyle,
|
|
2343
2343
|
_ref11$boxStyle = _ref11.boxStyle,
|
|
2344
|
-
valueBoxStyle = _ref11$boxStyle === void 0 ?
|
|
2344
|
+
valueBoxStyle = _ref11$boxStyle === void 0 ? false : _ref11$boxStyle;
|
|
2345
2345
|
|
|
2346
2346
|
// Color
|
|
2347
2347
|
var fieldColor = fieldColorName !== null && themeColors !== null ? themeColors[fieldColorName] || null : null;
|
|
@@ -2353,14 +2353,14 @@ var ThemeParser = /*#__PURE__*/function () {
|
|
|
2353
2353
|
var fieldTextStyle = fieldTextStyleName !== null && themeTextStyles !== null ? themeTextStyles[fieldTextStyleName] || null : null;
|
|
2354
2354
|
var fieldThemeComponentTextStyle = themeValue !== null ? themeValue.textStyle || null : null;
|
|
2355
2355
|
var textStyleValue = fieldTextStyle !== null || fieldThemeComponentTextStyle !== null ? {
|
|
2356
|
-
textStyle: _objectSpread(_objectSpread(_objectSpread({}, fieldTextStyle), fieldThemeComponentTextStyle), valueTextStyle || null)
|
|
2356
|
+
textStyle: valueTextStyle !== false ? valueTextStyle : _objectSpread(_objectSpread(_objectSpread({}, fieldTextStyle), fieldThemeComponentTextStyle), valueTextStyle || null)
|
|
2357
2357
|
} : null;
|
|
2358
2358
|
|
|
2359
2359
|
// Box style
|
|
2360
2360
|
var fieldBoxStyle = fieldBoxStyleName !== null && themeBoxStyles !== null ? themeBoxStyles[fieldBoxStyleName] || null : null;
|
|
2361
2361
|
var fieldThemeComponentBoxStyle = themeValue !== null ? themeValue.boxStyle || null : null;
|
|
2362
2362
|
var boxStyleValue = fieldBoxStyle !== null || fieldThemeComponentBoxStyle !== null ? {
|
|
2363
|
-
boxStyle: _objectSpread(_objectSpread(_objectSpread({}, fieldBoxStyle), fieldThemeComponentBoxStyle), valueBoxStyle || null)
|
|
2363
|
+
boxStyle: valueBoxStyle !== false ? valueBoxStyle : _objectSpread(_objectSpread(_objectSpread({}, fieldBoxStyle), fieldThemeComponentBoxStyle), valueBoxStyle || null)
|
|
2364
2364
|
} : null;
|
|
2365
2365
|
|
|
2366
2366
|
// Only change value if something is overrided
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@micromag/core",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.728",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "",
|
|
6
6
|
"keywords": [
|
|
@@ -145,5 +145,5 @@
|
|
|
145
145
|
"access": "public",
|
|
146
146
|
"registry": "https://registry.npmjs.org/"
|
|
147
147
|
},
|
|
148
|
-
"gitHead": "
|
|
148
|
+
"gitHead": "4d8f86f7cfc281d90fe797eba1ad229b0981bd12"
|
|
149
149
|
}
|