@micromag/core 0.3.354 → 0.3.360

package/es/components.js

@@ -1292,8 +1292,9 @@ var Dropdown = function Dropdown(_ref) {
         onClickItem(e);
       }
     } : null;
-    return ItemComponent !== null ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ItemComponent, Object.assign({
-      key: "item-".concat(index, "-").concat(label, "-").concat(type),
+    return ItemComponent !== null ? /*#__PURE__*/React.createElement("div", {
+      key: "item-".concat(index + 1, "-").concat(label, "-").concat(type)
+    }, /*#__PURE__*/React.createElement(ItemComponent, Object.assign({
       className: classNames([(_ref3 = {
         'dropdown-item': type === 'link' || type === 'button',
         'dropdown-divider': type === 'divider',

package/es/index.js

@@ -1714,6 +1714,7 @@ var ThemeParser = /*#__PURE__*/function () {
     value: function parseField(key, definition, value, themeValue, themeColors, themeTextStyles, themeBoxStyles) {
       var _definition$theme = definition.theme,
         fieldTheme = _definition$theme === void 0 ? null : _definition$theme;
+      // console.log('fieldTheme', id, fieldTheme);
 
       // Early return
       if (fieldTheme === null || !isObject(fieldTheme)) {
@@ -1724,6 +1725,7 @@ var ThemeParser = /*#__PURE__*/function () {
       if (isArray(value)) {
         var newFieldValue = value.map(function (innerField) {
           return innerField !== null ? Object.keys(innerField).reduce(function (newInnerField, innerFieldName) {
+            // console.log('innerField', innerField);
             // Early return
             if (!isObject(innerField[innerFieldName])) {
               return newInnerField;
@@ -1789,9 +1791,9 @@ var ThemeParser = /*#__PURE__*/function () {
         }
         var complexValue = null;
         if (!isEmpty(otherProps)) {
-          complexValue = Object.keys(fieldTheme).reduce(function (newObject, key) {
+          complexValue = Object.keys(otherProps).reduce(function (newObject, key) {
             var innerValue = value !== null ? value[key] || null : null;
-            var newValue = _this3.parseValue(innerValue, fieldTheme[key], themeValue, themeColors, themeTextStyles, themeBoxStyles);
+            var newValue = _this3.parseValue(innerValue, otherProps[key], themeValue, themeColors, themeTextStyles, themeBoxStyles);
             return _objectSpread(_objectSpread({}, newObject), newValue !== null ? _defineProperty({}, key, newValue) : null);
           }, {});
         }
@@ -1821,6 +1823,8 @@ var ThemeParser = /*#__PURE__*/function () {
           boxStyle: _objectSpread(_objectSpread(_objectSpread({}, fieldBoxStyle), fieldThemeComponentBoxStyle), valueBoxStyle || null)
         } : null;
 
+        // console.log('hell', boxStyleValue, complexValue);
+
         // Only change value if something is overrided
         return colorValue !== null || themeValue !== null || textStyleValue !== null || boxStyleValue !== null || complexValue !== null ? _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, colorValue), themeValue), value), boxStyleValue), textStyleValue), complexValue) : value;
       }

package/lib/components.js

@@ -1333,8 +1333,9 @@ var Dropdown = function Dropdown(_ref) {
         onClickItem(e);
       }
     } : null;
-    return ItemComponent !== null ? /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(ItemComponent, Object.assign({
-      key: "item-".concat(index, "-").concat(label, "-").concat(type),
+    return ItemComponent !== null ? /*#__PURE__*/React__default["default"].createElement("div", {
+      key: "item-".concat(index + 1, "-").concat(label, "-").concat(type)
+    }, /*#__PURE__*/React__default["default"].createElement(ItemComponent, Object.assign({
       className: classNames__default["default"]([(_ref3 = {
         'dropdown-item': type === 'link' || type === 'button',
         'dropdown-divider': type === 'divider',

package/lib/index.js

@@ -1741,6 +1741,7 @@ var ThemeParser = /*#__PURE__*/function () {
     value: function parseField(key, definition, value, themeValue, themeColors, themeTextStyles, themeBoxStyles) {
       var _definition$theme = definition.theme,
         fieldTheme = _definition$theme === void 0 ? null : _definition$theme;
+      // console.log('fieldTheme', id, fieldTheme);
 
       // Early return
       if (fieldTheme === null || !isObject__default["default"](fieldTheme)) {
@@ -1751,6 +1752,7 @@ var ThemeParser = /*#__PURE__*/function () {
       if (isArray__default["default"](value)) {
         var newFieldValue = value.map(function (innerField) {
           return innerField !== null ? Object.keys(innerField).reduce(function (newInnerField, innerFieldName) {
+            // console.log('innerField', innerField);
             // Early return
             if (!isObject__default["default"](innerField[innerFieldName])) {
               return newInnerField;
@@ -1816,9 +1818,9 @@ var ThemeParser = /*#__PURE__*/function () {
         }
         var complexValue = null;
         if (!isEmpty__default["default"](otherProps)) {
-          complexValue = Object.keys(fieldTheme).reduce(function (newObject, key) {
+          complexValue = Object.keys(otherProps).reduce(function (newObject, key) {
             var innerValue = value !== null ? value[key] || null : null;
-            var newValue = _this3.parseValue(innerValue, fieldTheme[key], themeValue, themeColors, themeTextStyles, themeBoxStyles);
+            var newValue = _this3.parseValue(innerValue, otherProps[key], themeValue, themeColors, themeTextStyles, themeBoxStyles);
             return _objectSpread__default["default"](_objectSpread__default["default"]({}, newObject), newValue !== null ? _defineProperty__default["default"]({}, key, newValue) : null);
           }, {});
         }
@@ -1848,6 +1850,8 @@ var ThemeParser = /*#__PURE__*/function () {
           boxStyle: _objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"]({}, fieldBoxStyle), fieldThemeComponentBoxStyle), valueBoxStyle || null)
         } : null;
 
+        // console.log('hell', boxStyleValue, complexValue);
+
         // Only change value if something is overrided
         return colorValue !== null || themeValue !== null || textStyleValue !== null || boxStyleValue !== null || complexValue !== null ? _objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"]({}, colorValue), themeValue), value), boxStyleValue), textStyleValue), complexValue) : value;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.354",
+    "version": "0.3.360",
     "description": "",
     "keywords": [
         "javascript"
@@ -133,5 +133,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ccf852d0a7df8f222365088e7de3843492e720e7"
+    "gitHead": "5531b1c55e0dd7e7a9c6eeee217ca28d985c7921"
 }