@micromag/core 0.3.727 → 0.3.729

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.
Files changed (2) hide show
  1. package/es/index.js +25 -20
  2. package/package.json +2 -2
package/es/index.js CHANGED
@@ -2251,6 +2251,11 @@ var ThemeParser = /*#__PURE__*/function () {
2251
2251
  if (innerFieldTextStyle === null && innerFieldColor === null && innerFieldBoxStyle === null) {
2252
2252
  return newInnerField;
2253
2253
  }
2254
+ var _ref0 = innerField[innerFieldName] || {},
2255
+ _ref0$textStyle = _ref0.textStyle,
2256
+ valueTextStyle = _ref0$textStyle === void 0 ? false : _ref0$textStyle,
2257
+ _ref0$boxStyle = _ref0.boxStyle,
2258
+ valueBoxStyle = _ref0$boxStyle === void 0 ? false : _ref0$boxStyle;
2254
2259
 
2255
2260
  // Color
2256
2261
  var colorValue = innerFieldColor !== null ? {
@@ -2259,10 +2264,10 @@ var ThemeParser = /*#__PURE__*/function () {
2259
2264
 
2260
2265
  // Text style
2261
2266
  var textStyleValue = innerFieldTextStyle !== null ? {
2262
- textStyle: _objectSpread(_objectSpread({}, innerFieldTextStyle !== null && themeTextStyles !== null ? themeTextStyles[innerFieldTextStyle] || null : null), innerField[innerFieldName].textStyle || null)
2267
+ textStyle: valueTextStyle !== false ? valueTextStyle : _objectSpread(_objectSpread({}, innerFieldTextStyle !== null && themeTextStyles !== null ? themeTextStyles[innerFieldTextStyle] || null : null), valueTextStyle)
2263
2268
  } : null;
2264
2269
  var boxStyleValue = innerFieldBoxStyle !== null ? {
2265
- boxStyle: _objectSpread(_objectSpread({}, innerFieldBoxStyle !== null && themeBoxStyles !== null ? themeBoxStyles[innerFieldBoxStyle] || null : null), innerField[innerFieldName].boxStyle || null)
2270
+ boxStyle: valueBoxStyle !== false ? valueBoxStyle : _objectSpread(_objectSpread({}, innerFieldBoxStyle !== null && themeBoxStyles !== null ? themeBoxStyles[innerFieldBoxStyle] || null : null), valueBoxStyle)
2266
2271
  } : null;
2267
2272
  if (colorValue === null && textStyleValue === null && boxStyleValue === null) {
2268
2273
  return newInnerField;
@@ -2285,9 +2290,9 @@ var ThemeParser = /*#__PURE__*/function () {
2285
2290
  var innerDefinition = isArray(fieldsOrDefinition) ? fieldsOrDefinition.find(function (it) {
2286
2291
  return it.name === innerFieldName;
2287
2292
  }) || null : fieldsOrDefinition;
2288
- var _ref0 = innerDefinition || {},
2289
- _ref0$theme = _ref0.theme,
2290
- idfTheme = _ref0$theme === void 0 ? null : _ref0$theme;
2293
+ var _ref1 = innerDefinition || {},
2294
+ _ref1$theme = _ref1.theme,
2295
+ idfTheme = _ref1$theme === void 0 ? null : _ref1$theme;
2291
2296
  var innerValue = value[innerFieldName];
2292
2297
 
2293
2298
  // For items fields
@@ -2318,14 +2323,14 @@ var ThemeParser = /*#__PURE__*/function () {
2318
2323
  var _this5 = this;
2319
2324
  if (isObject(initialValue) || isObject(fieldTheme)) {
2320
2325
  var value = initialValue || null;
2321
- var _ref1 = fieldTheme || {},
2322
- _ref1$textStyle = _ref1.textStyle,
2323
- fieldTextStyleName = _ref1$textStyle === void 0 ? null : _ref1$textStyle,
2324
- _ref1$color = _ref1.color,
2325
- fieldColorName = _ref1$color === void 0 ? null : _ref1$color,
2326
- _ref1$boxStyle = _ref1.boxStyle,
2327
- fieldBoxStyleName = _ref1$boxStyle === void 0 ? null : _ref1$boxStyle,
2328
- otherProps = _objectWithoutProperties(_ref1, _excluded$1);
2326
+ var _ref10 = fieldTheme || {},
2327
+ _ref10$textStyle = _ref10.textStyle,
2328
+ fieldTextStyleName = _ref10$textStyle === void 0 ? null : _ref10$textStyle,
2329
+ _ref10$color = _ref10.color,
2330
+ fieldColorName = _ref10$color === void 0 ? null : _ref10$color,
2331
+ _ref10$boxStyle = _ref10.boxStyle,
2332
+ fieldBoxStyleName = _ref10$boxStyle === void 0 ? null : _ref10$boxStyle,
2333
+ otherProps = _objectWithoutProperties(_ref10, _excluded$1);
2329
2334
  if (fieldTextStyleName === null && fieldColorName === null && fieldBoxStyleName === null && isEmpty(otherProps) && !isObject(fieldTheme)) {
2330
2335
  return value;
2331
2336
  }
@@ -2337,11 +2342,11 @@ var ThemeParser = /*#__PURE__*/function () {
2337
2342
  return _objectSpread(_objectSpread({}, newObject), newValue !== null ? _defineProperty({}, key, newValue) : null);
2338
2343
  }, {});
2339
2344
  }
2340
- var _ref11 = value || {},
2341
- _ref11$textStyle = _ref11.textStyle,
2342
- valueTextStyle = _ref11$textStyle === void 0 ? null : _ref11$textStyle,
2343
- _ref11$boxStyle = _ref11.boxStyle,
2344
- valueBoxStyle = _ref11$boxStyle === void 0 ? null : _ref11$boxStyle;
2345
+ var _ref12 = value || {},
2346
+ _ref12$textStyle = _ref12.textStyle,
2347
+ valueTextStyle = _ref12$textStyle === void 0 ? false : _ref12$textStyle,
2348
+ _ref12$boxStyle = _ref12.boxStyle,
2349
+ valueBoxStyle = _ref12$boxStyle === void 0 ? false : _ref12$boxStyle;
2345
2350
 
2346
2351
  // Color
2347
2352
  var fieldColor = fieldColorName !== null && themeColors !== null ? themeColors[fieldColorName] || null : null;
@@ -2353,14 +2358,14 @@ var ThemeParser = /*#__PURE__*/function () {
2353
2358
  var fieldTextStyle = fieldTextStyleName !== null && themeTextStyles !== null ? themeTextStyles[fieldTextStyleName] || null : null;
2354
2359
  var fieldThemeComponentTextStyle = themeValue !== null ? themeValue.textStyle || null : null;
2355
2360
  var textStyleValue = fieldTextStyle !== null || fieldThemeComponentTextStyle !== null ? {
2356
- textStyle: _objectSpread(_objectSpread(_objectSpread({}, fieldTextStyle), fieldThemeComponentTextStyle), valueTextStyle || null)
2361
+ textStyle: valueTextStyle !== false ? valueTextStyle : _objectSpread(_objectSpread(_objectSpread({}, fieldTextStyle), fieldThemeComponentTextStyle), valueTextStyle || null)
2357
2362
  } : null;
2358
2363
 
2359
2364
  // Box style
2360
2365
  var fieldBoxStyle = fieldBoxStyleName !== null && themeBoxStyles !== null ? themeBoxStyles[fieldBoxStyleName] || null : null;
2361
2366
  var fieldThemeComponentBoxStyle = themeValue !== null ? themeValue.boxStyle || null : null;
2362
2367
  var boxStyleValue = fieldBoxStyle !== null || fieldThemeComponentBoxStyle !== null ? {
2363
- boxStyle: _objectSpread(_objectSpread(_objectSpread({}, fieldBoxStyle), fieldThemeComponentBoxStyle), valueBoxStyle || null)
2368
+ boxStyle: valueBoxStyle !== false ? valueBoxStyle : _objectSpread(_objectSpread(_objectSpread({}, fieldBoxStyle), fieldThemeComponentBoxStyle), valueBoxStyle || null)
2364
2369
  } : null;
2365
2370
 
2366
2371
  // 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.727",
3
+ "version": "0.3.729",
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": "ece81997f27ddf1a9c5974782db105cb5c039e82"
148
+ "gitHead": "73301f7162ae8e4211831c727a6fb1972e6c6e75"
149
149
  }