@micromag/editor 0.3.324 → 0.3.326

package/es/index.js

@@ -7,7 +7,7 @@ import React, { useMemo, useRef, useCallback, useState, forwardRef, useEffect }
 import { useIntl, FormattedMessage } from 'react-intl';
 import { PropTypes as PropTypes$1 } from '@micromag/core';
 import { Button, FieldForm, BackButton, Breadcrumb as Breadcrumb$1, Modal, ModalDialog, Label, Navbar, DropdownMenu, Empty, Tabs, ScreenPlaceholder, ScreenPreview, Modals } from '@micromag/core/components';
-import { useRoutes, useScreenDefinition, useFormsComponents, useScreensManager, useFieldsManager, useUrlGenerator, useRoutePush, ScreenProvider, useScreenSize, PlaybackProvider, ModalsProvider, PanelsProvider, ScreenSizeProvider, useFieldComponent, ComponentsProvider, FORMS_NAMESPACE, UppyProvider, StoryProvider, GoogleKeysProvider, GoogleMapsClientProvider, FontsProvider, EditorProvider, VisitorProvider, ComponentsContext, RoutesProvider } from '@micromag/core/contexts';
+import { useRoutes, useScreenDefinition, useFormsComponents, useScreensManager, useFieldsManager, useFieldsComponentsManager, useUrlGenerator, useRoutePush, ScreenProvider, useScreenSize, PlaybackProvider, ModalsProvider, PanelsProvider, ScreenSizeProvider, useFieldComponent, ComponentsProvider, FORMS_NAMESPACE, UppyProvider, StoryProvider, GoogleKeysProvider, GoogleMapsClientProvider, FontsProvider, EditorProvider, VisitorProvider, ComponentsContext, RoutesProvider } from '@micromag/core/contexts';
 import { useParsedStory, useDimensionObserver, useScreenSizeFromElement, useMediasParser } from '@micromag/core/hooks';
 import { getScreenExtraField, isMessage, slug, getComponentFromName, getDeviceScreens } from '@micromag/core/utils';
 import { useRouteMatch, useHistory, Route, MemoryRouter } from 'react-router';
@@ -422,6 +422,7 @@ var Breadcrumb = function Breadcrumb(_ref) {
   var history = useHistory();
   var screensManager = useScreensManager();
   var fieldsManager = useFieldsManager();
+  var fieldsComponentManager = useFieldsComponentsManager();
   var route = useUrlGenerator();
   var _useMemo = useMemo(function () {
       var screenIndex = screens.findIndex(function (it) {
@@ -495,13 +496,18 @@ var Breadcrumb = function Breadcrumb(_ref) {
           _ref7$settings = _ref7.settings,
           settings = _ref7$settings === void 0 ? null : _ref7$settings,
           _ref7$itemsField = _ref7.itemsField,
-          defItemsField = _ref7$itemsField === void 0 ? null : _ref7$itemsField;
+          defItemsField = _ref7$itemsField === void 0 ? null : _ref7$itemsField,
+          _ref7$component = _ref7.component,
+          defComponent = _ref7$component === void 0 ? null : _ref7$component;
+        var _ref8 = fieldsComponentManager.getComponent(defComponent) || {},
+          _ref8$withForm = _ref8.withForm,
+          withForm = _ref8$withForm === void 0 ? false : _ref8$withForm;
         var itemsField = currentItemsField || defItemsField;
         var subFields = currentSubFields || defSubFields;
-        var currentSubfields = subFields !== null ? getFieldByName(subFields, key) : null;
-        var currentSettings = settings !== null ? getFieldByName(settings, key) : null;
-        var isCurrentSubfields = currentSubfields !== null;
-        var isCurrentSettings = currentSettings !== null;
+        var finalSubField = subFields !== null ? getFieldByName(subFields, key) : null;
+        var finalSettingsField = settings !== null ? getFieldByName(settings, key) : null;
+        var isCurrentSubField = finalSubField !== null;
+        var isCurrentSettingsField = finalSettingsField !== null;
         var isListItems = itemsField !== null && !!key.match(/^[0-9]+$/);
         var isLastIndex = keyIndex === lastKeyIndex;
         var pathPrefix = route('screen.field', {
@@ -513,30 +519,35 @@ var Breadcrumb = function Breadcrumb(_ref) {
         var pathSuffix = isLastIndex && form !== null ? "/".concat(form) : '';
         var addNewItem = isLastIndex || isListItems;
         var itemPath = "".concat(pathPrefix).concat(pathSuffix);
-        var nextFields = null;
-        if (isCurrentSubfields) {
-          nextFields = currentSubfields;
-        } else if (isCurrentSettings) {
-          nextFields = currentSettings;
-          if (parentItem !== null) {
-            fieldItems.push(_objectSpread(_objectSpread({}, parentItem), {}, {
-              url: route('screen.field.form', {
-                screen: screenId,
-                field: [currentState !== null ? currentState.id : null].concat(_toConsumableArray(finalFieldPath.slice(0, keyIndex))).filter(function (it) {
-                  return it !== null;
-                }),
-                form: 'settings'
+        if (parentItem !== null && (withForm || isCurrentSettingsField)) {
+          fieldItems.push(_objectSpread(_objectSpread({}, parentItem), {}, {
+            url: isCurrentSettingsField ? route('screen.field.form', {
+              screen: screenId,
+              field: [currentState !== null ? currentState.id : null].concat(_toConsumableArray(finalFieldPath.slice(0, keyIndex))).filter(function (it) {
+                return it !== null;
+              }),
+              form: 'settings'
+            }) : route('screen.field', {
+              screen: screenId,
+              field: [currentState !== null ? currentState.id : null].concat(_toConsumableArray(finalFieldPath.slice(0, keyIndex))).filter(function (it) {
+                return it !== null;
               })
-            }));
-          }
+            })
+          }));
+        }
+        var nextField = null;
+        if (isCurrentSubField) {
+          nextField = finalSubField;
+        } else if (isCurrentSettingsField) {
+          nextField = finalSettingsField;
         } else if (isListItems) {
-          nextFields = itemsField;
+          nextField = itemsField;
         }
-        var fieldLabel = nextFields ? nextFields.breadcrumbLabel || nextFields.label : null;
+        var fieldLabel = nextField ? nextField.breadcrumbLabel || nextField.label : null;
         var itemLabel = isMessage(fieldLabel) ? intl.formatMessage(fieldLabel) : fieldLabel;
-        var _ref8 = parentItem || {},
-          _ref8$label = _ref8.label,
-          parentItemLabel = _ref8$label === void 0 ? null : _ref8$label;
+        var _ref9 = parentItem || {},
+          _ref9$label = _ref9.label,
+          parentItemLabel = _ref9$label === void 0 ? null : _ref9$label;
         var finalItemLabel = isListItems ? "".concat(itemLabel, " #").concat(parseInt(key, 10) + 1) : itemLabel || parentItemLabel;
         var item = {
           url: itemPath,
@@ -546,22 +557,22 @@ var Breadcrumb = function Breadcrumb(_ref) {
         if (addNewItem) {
           fieldItems.push(item);
         }
-        parentItem = item;
-        return nextFields;
+        parentItem = !addNewItem ? item : null;
+        return nextField;
       }, {
-        fields: stateId === null ? screenFields : screenFields.filter(function (_ref9) {
-          var _ref9$stateId = _ref9.stateId,
-            fieldStateId = _ref9$stateId === void 0 ? null : _ref9$stateId;
+        fields: stateId === null ? screenFields : screenFields.filter(function (_ref10) {
+          var _ref10$stateId = _ref10.stateId,
+            fieldStateId = _ref10$stateId === void 0 ? null : _ref10$stateId;
           return fieldStateId === null || fieldStateId === stateId;
         })
       });
     }
-    var _ref10 = screenParameters || {},
-      _ref10$metadata = _ref10.metadata,
-      metadata = _ref10$metadata === void 0 ? null : _ref10$metadata;
-    var _ref11 = metadata || {},
-      _ref11$title = _ref11.title,
-      title = _ref11$title === void 0 ? null : _ref11$title;
+    var _ref11 = screenParameters || {},
+      _ref11$metadata = _ref11.metadata,
+      metadata = _ref11$metadata === void 0 ? null : _ref11$metadata;
+    var _ref12 = metadata || {},
+      _ref12$title = _ref12.title,
+      title = _ref12$title === void 0 ? null : _ref12$title;
     var typeTitle = screenTitle !== null ? /*#__PURE__*/React.createElement(FormattedMessage, screenTitle) : null;
     var parametersMessage = intl.formatMessage({
       id: "AHvHaY",

package/lib/index.js

@@ -442,6 +442,7 @@ var Breadcrumb = function Breadcrumb(_ref) {
   var history = reactRouter.useHistory();
   var screensManager = contexts.useScreensManager();
   var fieldsManager = contexts.useFieldsManager();
+  var fieldsComponentManager = contexts.useFieldsComponentsManager();
   var route = contexts.useUrlGenerator();
   var _useMemo = React.useMemo(function () {
       var screenIndex = screens.findIndex(function (it) {
@@ -515,13 +516,18 @@ var Breadcrumb = function Breadcrumb(_ref) {
           _ref7$settings = _ref7.settings,
           settings = _ref7$settings === void 0 ? null : _ref7$settings,
           _ref7$itemsField = _ref7.itemsField,
-          defItemsField = _ref7$itemsField === void 0 ? null : _ref7$itemsField;
+          defItemsField = _ref7$itemsField === void 0 ? null : _ref7$itemsField,
+          _ref7$component = _ref7.component,
+          defComponent = _ref7$component === void 0 ? null : _ref7$component;
+        var _ref8 = fieldsComponentManager.getComponent(defComponent) || {},
+          _ref8$withForm = _ref8.withForm,
+          withForm = _ref8$withForm === void 0 ? false : _ref8$withForm;
         var itemsField = currentItemsField || defItemsField;
         var subFields = currentSubFields || defSubFields;
-        var currentSubfields = subFields !== null ? getFieldByName(subFields, key) : null;
-        var currentSettings = settings !== null ? getFieldByName(settings, key) : null;
-        var isCurrentSubfields = currentSubfields !== null;
-        var isCurrentSettings = currentSettings !== null;
+        var finalSubField = subFields !== null ? getFieldByName(subFields, key) : null;
+        var finalSettingsField = settings !== null ? getFieldByName(settings, key) : null;
+        var isCurrentSubField = finalSubField !== null;
+        var isCurrentSettingsField = finalSettingsField !== null;
         var isListItems = itemsField !== null && !!key.match(/^[0-9]+$/);
         var isLastIndex = keyIndex === lastKeyIndex;
         var pathPrefix = route('screen.field', {
@@ -533,30 +539,35 @@ var Breadcrumb = function Breadcrumb(_ref) {
         var pathSuffix = isLastIndex && form !== null ? "/".concat(form) : '';
         var addNewItem = isLastIndex || isListItems;
         var itemPath = "".concat(pathPrefix).concat(pathSuffix);
-        var nextFields = null;
-        if (isCurrentSubfields) {
-          nextFields = currentSubfields;
-        } else if (isCurrentSettings) {
-          nextFields = currentSettings;
-          if (parentItem !== null) {
-            fieldItems.push(_objectSpread__default["default"](_objectSpread__default["default"]({}, parentItem), {}, {
-              url: route('screen.field.form', {
-                screen: screenId,
-                field: [currentState !== null ? currentState.id : null].concat(_toConsumableArray__default["default"](finalFieldPath.slice(0, keyIndex))).filter(function (it) {
-                  return it !== null;
-                }),
-                form: 'settings'
+        if (parentItem !== null && (withForm || isCurrentSettingsField)) {
+          fieldItems.push(_objectSpread__default["default"](_objectSpread__default["default"]({}, parentItem), {}, {
+            url: isCurrentSettingsField ? route('screen.field.form', {
+              screen: screenId,
+              field: [currentState !== null ? currentState.id : null].concat(_toConsumableArray__default["default"](finalFieldPath.slice(0, keyIndex))).filter(function (it) {
+                return it !== null;
+              }),
+              form: 'settings'
+            }) : route('screen.field', {
+              screen: screenId,
+              field: [currentState !== null ? currentState.id : null].concat(_toConsumableArray__default["default"](finalFieldPath.slice(0, keyIndex))).filter(function (it) {
+                return it !== null;
               })
-            }));
-          }
+            })
+          }));
+        }
+        var nextField = null;
+        if (isCurrentSubField) {
+          nextField = finalSubField;
+        } else if (isCurrentSettingsField) {
+          nextField = finalSettingsField;
         } else if (isListItems) {
-          nextFields = itemsField;
+          nextField = itemsField;
         }
-        var fieldLabel = nextFields ? nextFields.breadcrumbLabel || nextFields.label : null;
+        var fieldLabel = nextField ? nextField.breadcrumbLabel || nextField.label : null;
         var itemLabel = utils.isMessage(fieldLabel) ? intl.formatMessage(fieldLabel) : fieldLabel;
-        var _ref8 = parentItem || {},
-          _ref8$label = _ref8.label,
-          parentItemLabel = _ref8$label === void 0 ? null : _ref8$label;
+        var _ref9 = parentItem || {},
+          _ref9$label = _ref9.label,
+          parentItemLabel = _ref9$label === void 0 ? null : _ref9$label;
         var finalItemLabel = isListItems ? "".concat(itemLabel, " #").concat(parseInt(key, 10) + 1) : itemLabel || parentItemLabel;
         var item = {
           url: itemPath,
@@ -566,22 +577,22 @@ var Breadcrumb = function Breadcrumb(_ref) {
         if (addNewItem) {
           fieldItems.push(item);
         }
-        parentItem = item;
-        return nextFields;
+        parentItem = !addNewItem ? item : null;
+        return nextField;
       }, {
-        fields: stateId === null ? screenFields : screenFields.filter(function (_ref9) {
-          var _ref9$stateId = _ref9.stateId,
-            fieldStateId = _ref9$stateId === void 0 ? null : _ref9$stateId;
+        fields: stateId === null ? screenFields : screenFields.filter(function (_ref10) {
+          var _ref10$stateId = _ref10.stateId,
+            fieldStateId = _ref10$stateId === void 0 ? null : _ref10$stateId;
           return fieldStateId === null || fieldStateId === stateId;
         })
       });
     }
-    var _ref10 = screenParameters || {},
-      _ref10$metadata = _ref10.metadata,
-      metadata = _ref10$metadata === void 0 ? null : _ref10$metadata;
-    var _ref11 = metadata || {},
-      _ref11$title = _ref11.title,
-      title = _ref11$title === void 0 ? null : _ref11$title;
+    var _ref11 = screenParameters || {},
+      _ref11$metadata = _ref11.metadata,
+      metadata = _ref11$metadata === void 0 ? null : _ref11$metadata;
+    var _ref12 = metadata || {},
+      _ref12$title = _ref12.title,
+      title = _ref12$title === void 0 ? null : _ref12$title;
     var typeTitle = screenTitle !== null ? /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, screenTitle) : null;
     var parametersMessage = intl.formatMessage({
       id: "AHvHaY",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/editor",
-    "version": "0.3.324",
+    "version": "0.3.326",
     "description": "",
     "keywords": [
         "javascript"
@@ -62,11 +62,11 @@
         "@fortawesome/fontawesome-svg-core": "^1.2.32",
         "@fortawesome/free-solid-svg-icons": "^5.15.1",
         "@fortawesome/react-fontawesome": "^0.1.13",
-        "@micromag/core": "^0.3.323",
-        "@micromag/elements": "^0.3.323",
-        "@micromag/fields": "^0.3.323",
-        "@micromag/screens": "^0.3.324",
-        "@micromag/viewer": "^0.3.324",
+        "@micromag/core": "^0.3.325",
+        "@micromag/elements": "^0.3.325",
+        "@micromag/fields": "^0.3.326",
+        "@micromag/screens": "^0.3.326",
+        "@micromag/viewer": "^0.3.326",
         "classnames": "^2.2.6",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -81,5 +81,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "b15f8d8d58ae9516151b72df1609290fecec1a9b"
+    "gitHead": "54b9410aeb770aa362e9f1c68876e5bdb67411ad"
 }