@micromag/editor 0.3.506 → 0.3.508

package/es/index.js

@@ -9,7 +9,7 @@ import { PropTypes as PropTypes$1 } from '@micromag/core';
 import { Button, FieldForm, BackButton, Breadcrumb as Breadcrumb$2, Modal, ModalDialog, Label, Navbar, DropdownMenu, Empty, Tabs, ScreenPlaceholder, ScreenPreview, Modals } from '@micromag/core/components';
 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 { useIsVisible, useParsedStory, useDimensionObserver, useScreenSizeFromElement, useMediasParser } from '@micromag/core/hooks';
-import { getScreenExtraField, isMessage, slug, getComponentFromName, getDeviceScreens } from '@micromag/core/utils';
+import { getScreenFieldsWithStates, getScreenExtraField, isMessage, slug, getComponentFromName, getDeviceScreens } from '@micromag/core/utils';
 import { useRouteMatcher, createPathToRegexpParser, useMemoryRouter } from '@folklore/routes';
 import { useLocation, Switch, Route, Router } from 'wouter';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
@@ -122,52 +122,6 @@ var useFormTransition = function useFormTransition(url, screenIndex, styles) {
   };
 };
 
-function getScreenFieldsWithStates(definition) {
-  var _ref = definition || {},
-    _ref$fields = _ref.fields,
-    screenFields = _ref$fields === void 0 ? null : _ref$fields,
-    _ref$states = _ref.states,
-    states = _ref$states === void 0 ? null : _ref$states;
-  if (states === null) {
-    return screenFields;
-  }
-  var extraFields = states.reduce(function (statesFields, current) {
-    var _ref2 = current || {},
-      id = _ref2.id,
-      _ref2$fields = _ref2.fields,
-      fields = _ref2$fields === void 0 ? [] : _ref2$fields,
-      _ref2$repeatable = _ref2.repeatable,
-      repeatable = _ref2$repeatable === void 0 ? false : _ref2$repeatable,
-      _ref2$fieldName = _ref2.fieldName,
-      fieldName = _ref2$fieldName === void 0 ? null : _ref2$fieldName,
-      label = _ref2.label,
-      _ref2$defaultValue = _ref2.defaultValue,
-      defaultValue = _ref2$defaultValue === void 0 ? null : _ref2$defaultValue;
-    return [].concat(_toConsumableArray(statesFields), _toConsumableArray(repeatable ? [{
-      type: 'items',
-      name: fieldName || id,
-      label: label,
-      defaultValue: defaultValue,
-      stateId: id,
-      itemsField: {
-        label: label,
-        type: 'fields',
-        fields: fields
-      }
-    }] : []), _toConsumableArray(!repeatable && fieldName !== null ? [{
-      type: 'fields',
-      name: fieldName,
-      stateId: id,
-      fields: fields
-    }] : []), _toConsumableArray(!repeatable && fieldName === null ? fields.map(function (it) {
-      return _objectSpread(_objectSpread({}, it), {}, {
-        stateId: id
-      });
-    }) : []));
-  }, []);
-  return [].concat(_toConsumableArray(extraFields), _toConsumableArray(screenFields));
-}
-
 var createScreen = function createScreen(definition) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var finalDefinition = isString(definition) ? {

package/lib/index.js

@@ -672,59 +672,13 @@ var useFormTransition = function useFormTransition(url, screenIndex, styles) {
   };
 };
 
-function getScreenFieldsWithStates(definition) {
-  var _ref = definition || {},
-    _ref$fields = _ref.fields,
-    screenFields = _ref$fields === void 0 ? null : _ref$fields,
-    _ref$states = _ref.states,
-    states = _ref$states === void 0 ? null : _ref$states;
-  if (states === null) {
-    return screenFields;
-  }
-  var extraFields = states.reduce(function (statesFields, current) {
-    var _ref2 = current || {},
-      id = _ref2.id,
-      _ref2$fields = _ref2.fields,
-      fields = _ref2$fields === void 0 ? [] : _ref2$fields,
-      _ref2$repeatable = _ref2.repeatable,
-      repeatable = _ref2$repeatable === void 0 ? false : _ref2$repeatable,
-      _ref2$fieldName = _ref2.fieldName,
-      fieldName = _ref2$fieldName === void 0 ? null : _ref2$fieldName,
-      label = _ref2.label,
-      _ref2$defaultValue = _ref2.defaultValue,
-      defaultValue = _ref2$defaultValue === void 0 ? null : _ref2$defaultValue;
-    return [].concat(_toConsumableArray(statesFields), _toConsumableArray(repeatable ? [{
-      type: 'items',
-      name: fieldName || id,
-      label: label,
-      defaultValue: defaultValue,
-      stateId: id,
-      itemsField: {
-        label: label,
-        type: 'fields',
-        fields: fields
-      }
-    }] : []), _toConsumableArray(!repeatable && fieldName !== null ? [{
-      type: 'fields',
-      name: fieldName,
-      stateId: id,
-      fields: fields
-    }] : []), _toConsumableArray(!repeatable && fieldName === null ? fields.map(function (it) {
-      return _objectSpread(_objectSpread({}, it), {}, {
-        stateId: id
-      });
-    }) : []));
-  }, []);
-  return [].concat(_toConsumableArray(extraFields), _toConsumableArray(screenFields));
-}
-
 var createScreen = function createScreen(definition) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var finalDefinition = isString(definition) ? {
     id: definition
   } : definition;
   var id = finalDefinition.id;
-  var screenFields = getScreenFieldsWithStates(finalDefinition);
+  var screenFields = utils.getScreenFieldsWithStates(finalDefinition);
   var defaultValueFields = screenFields.reduce(function (all, curr) {
     var _ref = curr || {},
       _ref$name = _ref.name,
@@ -853,7 +807,7 @@ var FieldWithContexts = function FieldWithContexts(_ref) {
   var definition = contexts.useScreenDefinition() || null;
   var _definition$states = definition.states,
     states = _definition$states === void 0 ? null : _definition$states;
-  var screenFields = getScreenFieldsWithStates(definition);
+  var screenFields = utils.getScreenFieldsWithStates(definition);
   var nameParts = name.split('.');
   var _nameParts = _slicedToArray(nameParts, 1),
     _nameParts$ = _nameParts[0],
@@ -1005,7 +959,7 @@ var Breadcrumb = function Breadcrumb(_ref) {
         definitionTitle = _ref3$title === void 0 ? null : _ref3$title;
       return {
         title: definitionTitle,
-        fields: definition !== null ? [].concat(_toConsumableArray(getScreenFieldsWithStates(definition)), [utils.getScreenExtraField(intl)]) : null,
+        fields: definition !== null ? [].concat(_toConsumableArray(utils.getScreenFieldsWithStates(definition)), [utils.getScreenExtraField(intl)]) : null,
         states: states,
         parameters: parameters
       };
@@ -1291,7 +1245,7 @@ var EditForm = function EditForm(_ref) {
     var _ref3 = screen || {},
       type = _ref3.type;
     var definition = type !== null ? screensManager.getDefinition(type) : null;
-    return definition != null ? getScreenFieldsWithStates(definition) : [];
+    return definition != null ? utils.getScreenFieldsWithStates(definition) : [];
   }, [screensManager, screen]);
 
   // Get transition value

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/editor",
-    "version": "0.3.506",
+    "version": "0.3.508",
     "private": false,
     "description": "",
     "keywords": [
@@ -72,11 +72,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.506",
-        "@micromag/elements": "^0.3.506",
-        "@micromag/fields": "^0.3.506",
-        "@micromag/screens": "^0.3.506",
-        "@micromag/viewer": "^0.3.506",
+        "@micromag/core": "^0.3.508",
+        "@micromag/elements": "^0.3.508",
+        "@micromag/fields": "^0.3.508",
+        "@micromag/screens": "^0.3.508",
+        "@micromag/viewer": "^0.3.508",
         "classnames": "^2.2.6",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -91,5 +91,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "b3bc0905b6e926384f26f5807551c772ccc55452"
+    "gitHead": "9baca9a69d472a9bcdfd35d0ebcd833595492ba4"
 }