@micromag/core 0.3.728 → 0.3.729

package/es/index.js

@@ -2251,6 +2251,11 @@ var ThemeParser = /*#__PURE__*/function () {
             if (innerFieldTextStyle === null && innerFieldColor === null && innerFieldBoxStyle === null) {
               return newInnerField;
             }
+            var _ref0 = innerField[innerFieldName] || {},
+              _ref0$textStyle = _ref0.textStyle,
+              valueTextStyle = _ref0$textStyle === void 0 ? false : _ref0$textStyle,
+              _ref0$boxStyle = _ref0.boxStyle,
+              valueBoxStyle = _ref0$boxStyle === void 0 ? false : _ref0$boxStyle;
 
             // Color
             var colorValue = innerFieldColor !== null ? {
@@ -2259,10 +2264,10 @@ var ThemeParser = /*#__PURE__*/function () {
 
             // Text style
             var textStyleValue = innerFieldTextStyle !== null ? {
-              textStyle: _objectSpread(_objectSpread({}, innerFieldTextStyle !== null && themeTextStyles !== null ? themeTextStyles[innerFieldTextStyle] || null : null), innerField[innerFieldName].textStyle || null)
+              textStyle: valueTextStyle !== false ? valueTextStyle : _objectSpread(_objectSpread({}, innerFieldTextStyle !== null && themeTextStyles !== null ? themeTextStyles[innerFieldTextStyle] || null : null), valueTextStyle)
             } : null;
             var boxStyleValue = innerFieldBoxStyle !== null ? {
-              boxStyle: _objectSpread(_objectSpread({}, innerFieldBoxStyle !== null && themeBoxStyles !== null ? themeBoxStyles[innerFieldBoxStyle] || null : null), innerField[innerFieldName].boxStyle || null)
+              boxStyle: valueBoxStyle !== false ? valueBoxStyle : _objectSpread(_objectSpread({}, innerFieldBoxStyle !== null && themeBoxStyles !== null ? themeBoxStyles[innerFieldBoxStyle] || null : null), valueBoxStyle)
             } : null;
             if (colorValue === null && textStyleValue === null && boxStyleValue === null) {
               return newInnerField;
@@ -2285,9 +2290,9 @@ var ThemeParser = /*#__PURE__*/function () {
         var innerDefinition = isArray(fieldsOrDefinition) ? fieldsOrDefinition.find(function (it) {
           return it.name === innerFieldName;
         }) || null : fieldsOrDefinition;
-        var _ref0 = innerDefinition || {},
-          _ref0$theme = _ref0.theme,
-          idfTheme = _ref0$theme === void 0 ? null : _ref0$theme;
+        var _ref1 = innerDefinition || {},
+          _ref1$theme = _ref1.theme,
+          idfTheme = _ref1$theme === void 0 ? null : _ref1$theme;
         var innerValue = value[innerFieldName];
 
         // For items fields
@@ -2318,14 +2323,14 @@ var ThemeParser = /*#__PURE__*/function () {
       var _this5 = this;
       if (isObject(initialValue) || isObject(fieldTheme)) {
         var value = initialValue || null;
-        var _ref1 = fieldTheme || {},
-          _ref1$textStyle = _ref1.textStyle,
-          fieldTextStyleName = _ref1$textStyle === void 0 ? null : _ref1$textStyle,
-          _ref1$color = _ref1.color,
-          fieldColorName = _ref1$color === void 0 ? null : _ref1$color,
-          _ref1$boxStyle = _ref1.boxStyle,
-          fieldBoxStyleName = _ref1$boxStyle === void 0 ? null : _ref1$boxStyle,
-          otherProps = _objectWithoutProperties(_ref1, _excluded$1);
+        var _ref10 = fieldTheme || {},
+          _ref10$textStyle = _ref10.textStyle,
+          fieldTextStyleName = _ref10$textStyle === void 0 ? null : _ref10$textStyle,
+          _ref10$color = _ref10.color,
+          fieldColorName = _ref10$color === void 0 ? null : _ref10$color,
+          _ref10$boxStyle = _ref10.boxStyle,
+          fieldBoxStyleName = _ref10$boxStyle === void 0 ? null : _ref10$boxStyle,
+          otherProps = _objectWithoutProperties(_ref10, _excluded$1);
         if (fieldTextStyleName === null && fieldColorName === null && fieldBoxStyleName === null && isEmpty(otherProps) && !isObject(fieldTheme)) {
           return value;
         }
@@ -2337,11 +2342,11 @@ var ThemeParser = /*#__PURE__*/function () {
             return _objectSpread(_objectSpread({}, newObject), newValue !== null ? _defineProperty({}, key, newValue) : null);
           }, {});
         }
-        var _ref11 = value || {},
-          _ref11$textStyle = _ref11.textStyle,
-          valueTextStyle = _ref11$textStyle === void 0 ? false : _ref11$textStyle,
-          _ref11$boxStyle = _ref11.boxStyle,
-          valueBoxStyle = _ref11$boxStyle === void 0 ? false : _ref11$boxStyle;
+        var _ref12 = value || {},
+          _ref12$textStyle = _ref12.textStyle,
+          valueTextStyle = _ref12$textStyle === void 0 ? false : _ref12$textStyle,
+          _ref12$boxStyle = _ref12.boxStyle,
+          valueBoxStyle = _ref12$boxStyle === void 0 ? false : _ref12$boxStyle;
 
         // Color
         var fieldColor = fieldColorName !== null && themeColors !== null ? themeColors[fieldColorName] || null : null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.728",
+    "version": "0.3.729",
     "private": false,
     "description": "",
     "keywords": [
@@ -145,5 +145,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "4d8f86f7cfc281d90fe797eba1ad229b0981bd12"
+    "gitHead": "73301f7162ae8e4211831c727a6fb1972e6c6e75"
 }