@micromag/core 0.3.55 → 0.3.58

package/es/components.js

@@ -6,13 +6,13 @@ import classNames from 'classnames';
 import { Link as Link$1 } from 'react-router-dom';
 import { PropTypes } from '@micromag/core';
 import { FormattedMessage, defineMessages, FormattedDate, FormattedTime } from 'react-intl';
-import { isMessage, getFieldFromPath, setFieldValue, getComponentFromName, validateFields, getDisplayName, pascalCase, convertStyleToString } from '@micromag/core/utils';
+import { isMessage, getFieldFromPath, getComponentFromName, setFieldValue, validateFields, getDisplayName, pascalCase, convertStyleToString } from '@micromag/core/utils';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faAngleLeft, faAngleUp, faAngleDown, faAd, faImage, faMusic, faMapMarkerAlt, faMapMarkedAlt, faVideo, faPlay, faRedo, faCommentDots, faCheck, faTimes, faPercent } from '@fortawesome/free-solid-svg-icons';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import { useForm, useDocumentEvent, useIntersectionObserver, useResizeObserver } from '@micromag/core/hooks';
 import { useFieldsManager, useFieldComponent, FieldContextProvider, withModals, useModals, useUppy, withPanels, usePanels, ScreenSizeProvider, useScreenComponent, ScreenProvider, useScreenRenderContext, useScreenSize } from '@micromag/core/contexts';
+import { useForm, useDocumentEvent, useIntersectionObserver, useResizeObserver } from '@micromag/core/hooks';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import get from 'lodash/get';
 import ReactDOM from 'react-dom';
@@ -299,6 +299,8 @@ var BackButton = function BackButton(_ref) {
 BackButton.propTypes = propTypes$H;
 BackButton.defaultProps = defaultProps$H;
 
+var styles$t = {"actions":"micromag-core-forms-form-actions","left":"micromag-core-forms-form-left","right":"micromag-core-forms-form-right"};
+
 var _excluded$7 = ["type"],
     _excluded2 = ["component", "id", "settings"];
 var propTypes$G = {
@@ -353,8 +355,10 @@ var FieldForm = function FieldForm(_ref) {
       var definitionProps = _objectWithoutProperties(_ref3, _excluded2);
 
   var FieldComponent = useFieldComponent(fieldComponent);
+  var FormComponent = getComponentFromName(form, formComponents);
   var fieldValue = get(value, name, null);
-  var onFieldChange = useCallback(function (newFieldValue) {
+
+  var onFieldChange = function onFieldChange(newFieldValue) {
     // const { name, fields: subFields = null } = field || {};
     var newValue = setFieldValue(value, name.split('.'), newFieldValue // field === null || subFields !== null ? newFieldValue : newFieldValue[name],
     );
@@ -362,7 +366,8 @@ var FieldForm = function FieldForm(_ref) {
     if (onChange !== null) {
       onChange(newValue);
     }
-  }, [value, name, onChange]);
+  };
+
   var closeForm = useCallback(function () {
     return closeFieldForm(name, form);
   }, [name, form, closeFieldForm]);
@@ -376,7 +381,6 @@ var FieldForm = function FieldForm(_ref) {
   };
 
   if (form !== null) {
-    var FormComponent = getComponentFromName(form, formComponents);
     return FormComponent !== null ? /*#__PURE__*/React.createElement(FieldContextProvider, {
       context: fieldContext
     }, /*#__PURE__*/React.createElement(FormComponent, Object.assign({
@@ -399,8 +403,6 @@ var FieldForm = function FieldForm(_ref) {
 FieldForm.propTypes = propTypes$G;
 FieldForm.defaultProps = defaultProps$G;
 
-var styles$t = {"actions":"micromag-core-forms-form-actions","left":"micromag-core-forms-form-left","right":"micromag-core-forms-form-right"};
-
 var propTypes$F = {
   action: PropTypes$1.string.isRequired,
   method: PropTypes$1.string,
@@ -570,7 +572,8 @@ var Form = function Form(_ref) {
     }
   }, [fieldPaths, setFieldPaths]); // The last path
 
-  var fieldParams = fieldPaths.length > 0 ? fieldPaths[fieldPaths.length - 1] : null; // Get transition value
+  var fieldParams = fieldPaths.length > 0 ? fieldPaths[fieldPaths.length - 1] : null;
+  var fieldName = fieldParams !== null ? fieldParams.replace(/\//g, '.') : null; // Get transition value
   // const { name: transitionName, timeout: transitionTimeout } = useFormTransition(
   //     fieldPaths,
   //     styles,
@@ -587,11 +590,11 @@ var Form = function Form(_ref) {
     theme: "secondary",
     outline: true,
     onClick: closeFieldForm
-  })) : null, fields && fields.length > 0 && fieldParams !== null ? /*#__PURE__*/React.createElement("div", {
+  })) : null, fields !== null && fields.length > 0 && fieldParams !== null ? /*#__PURE__*/React.createElement("div", {
     className: classNames(['w-100', styles$t.panel]),
     key: "field"
   }, /*#__PURE__*/React.createElement(FieldForm, {
-    name: fieldParams.replace(/\//g, '.'),
+    name: fieldName,
     fields: fields,
     value: value,
     onChange: setValue,
@@ -1000,10 +1003,10 @@ var Breadcrumb = function Breadcrumb(_ref) {
     }, active ? /*#__PURE__*/React.createElement(Label, null, label) : null, !active && url ? /*#__PURE__*/React.createElement(Link$1, {
       to: url,
       onClick: onClick,
-      className: classNames(_defineProperty({}, "text-".concat(theme), theme !== null))
+      className: classNames(['font-weight-bold', 'text-decoration-none', _defineProperty({}, "text-".concat(theme), theme !== null)])
     }, /*#__PURE__*/React.createElement(Label, null, label)) : null, !active && onClick ? /*#__PURE__*/React.createElement(Button$1, {
       onClick: onClick,
-      className: classNames(_defineProperty({}, "text-".concat(theme), theme !== null))
+      className: classNames(['font-weight-bold', 'text-decoration-none', _defineProperty({}, "text-".concat(theme), theme !== null)])
     }, /*#__PURE__*/React.createElement(Label, null, label)) : null);
   })));
 };

package/es/contexts.js

@@ -214,21 +214,21 @@ var useScreensManager = function useScreensManager() {
 };
 var propTypes$g = {
   screens: PropTypes$1.screenDefinitions,
-  withoutCustomScreens: PropTypes.bool,
-  customScreens: PropTypes.arrayOf(PropTypes.string),
+  namespaces: PropTypes.arrayOf(PropTypes.string),
+  filterNamespaces: PropTypes.bool,
   manager: PropTypes.instanceOf(ScreensManager),
   children: PropTypes.node.isRequired
 };
 var defaultProps$g = {
   screens: null,
-  withoutCustomScreens: false,
-  customScreens: null,
+  namespaces: null,
+  filterNamespaces: false,
   manager: null
 };
 var ScreensProvider = function ScreensProvider(_ref) {
   var screens = _ref.screens,
-      customScreens = _ref.customScreens,
-      withoutCustomScreens = _ref.withoutCustomScreens,
+      namespaces = _ref.namespaces,
+      filterNamespaces = _ref.filterNamespaces,
       manager = _ref.manager,
       children = _ref.children;
   var previousManager = useScreensManager();
@@ -239,17 +239,18 @@ var ScreensProvider = function ScreensProvider(_ref) {
       newManager = previousManager.merge(newManager);
     }
 
-    if (withoutCustomScreens) {
+    if (filterNamespaces) {
       newManager = previousManager.filter(function (_ref2) {
-        var id = _ref2.id,
-            _ref2$custom = _ref2.custom,
-            custom = _ref2$custom === void 0 ? false : _ref2$custom;
-        return !custom || customScreens !== null && customScreens.indexOf(id) !== -1;
+        var _ref2$namespaces = _ref2.namespaces,
+            screenGroups = _ref2$namespaces === void 0 ? null : _ref2$namespaces;
+        return screenGroups === null || namespaces !== null && screenGroups.reduce(function (acc, id) {
+          return acc || namespaces.indexOf(id) !== -1;
+        }, false);
       });
     }
 
     return newManager;
-  }, [manager, screens, customScreens, withoutCustomScreens, previousManager]);
+  }, [manager, screens, namespaces, filterNamespaces, previousManager]);
   var initialComponents = useMemo(function () {
     return finalManager.getComponents();
   }, [finalManager]);

package/es/index.js

@@ -997,7 +997,8 @@ var DefinitionsManager = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "filter",
     value: function filter(_filter) {
-      return new DefinitionsManager(this.definitions.filter(_filter));
+      this.definitions = this.definitions.filter(_filter);
+      return this; // return new DefinitionsManager(this.definitions.filter(filter));
     }
   }, {
     key: "getDefinition",
@@ -1134,7 +1135,9 @@ var FieldsManager = /*#__PURE__*/function (_DefinitionsManager) {
   _createClass(FieldsManager, [{
     key: "filter",
     value: function filter(_filter) {
-      return new FieldsManager(this.definitions.filter(_filter));
+      // return new FieldsManager(this.definitions.filter(filter));
+      this.definitions = this.definitions.filter(_filter);
+      return this;
     }
   }]);
 
@@ -1450,7 +1453,9 @@ var ScreensManager = /*#__PURE__*/function (_DefinitionsManager) {
   }, {
     key: "filter",
     value: function filter(_filter) {
-      return new ScreensManager(this.definitions.filter(_filter));
+      // return new ScreensManager(this.definitions.filter(filter));
+      this.definitions = this.definitions.filter(_filter);
+      return this;
     }
   }]);
 

package/lib/components.js

@@ -15,8 +15,8 @@ var reactFontawesome = require('@fortawesome/react-fontawesome');
 var freeSolidSvgIcons = require('@fortawesome/free-solid-svg-icons');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var hooks = require('@micromag/core/hooks');
 var contexts = require('@micromag/core/contexts');
+var hooks = require('@micromag/core/hooks');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var get = require('lodash/get');
 var ReactDOM = require('react-dom');
@@ -322,6 +322,8 @@ var BackButton = function BackButton(_ref) {
 BackButton.propTypes = propTypes$H;
 BackButton.defaultProps = defaultProps$H;
 
+var styles$t = {"actions":"micromag-core-forms-form-actions","left":"micromag-core-forms-form-left","right":"micromag-core-forms-form-right"};
+
 var _excluded$7 = ["type"],
     _excluded2 = ["component", "id", "settings"];
 var propTypes$G = {
@@ -376,8 +378,10 @@ var FieldForm = function FieldForm(_ref) {
       var definitionProps = _objectWithoutProperties__default["default"](_ref3, _excluded2);
 
   var FieldComponent = contexts.useFieldComponent(fieldComponent);
+  var FormComponent = utils.getComponentFromName(form, formComponents);
   var fieldValue = get__default["default"](value, name, null);
-  var onFieldChange = React.useCallback(function (newFieldValue) {
+
+  var onFieldChange = function onFieldChange(newFieldValue) {
     // const { name, fields: subFields = null } = field || {};
     var newValue = utils.setFieldValue(value, name.split('.'), newFieldValue // field === null || subFields !== null ? newFieldValue : newFieldValue[name],
     );
@@ -385,7 +389,8 @@ var FieldForm = function FieldForm(_ref) {
     if (onChange !== null) {
       onChange(newValue);
     }
-  }, [value, name, onChange]);
+  };
+
   var closeForm = React.useCallback(function () {
     return closeFieldForm(name, form);
   }, [name, form, closeFieldForm]);
@@ -399,7 +404,6 @@ var FieldForm = function FieldForm(_ref) {
   };
 
   if (form !== null) {
-    var FormComponent = utils.getComponentFromName(form, formComponents);
     return FormComponent !== null ? /*#__PURE__*/React__default["default"].createElement(contexts.FieldContextProvider, {
       context: fieldContext
     }, /*#__PURE__*/React__default["default"].createElement(FormComponent, Object.assign({
@@ -422,8 +426,6 @@ var FieldForm = function FieldForm(_ref) {
 FieldForm.propTypes = propTypes$G;
 FieldForm.defaultProps = defaultProps$G;
 
-var styles$t = {"actions":"micromag-core-forms-form-actions","left":"micromag-core-forms-form-left","right":"micromag-core-forms-form-right"};
-
 var propTypes$F = {
   action: PropTypes__default["default"].string.isRequired,
   method: PropTypes__default["default"].string,
@@ -593,7 +595,8 @@ var Form = function Form(_ref) {
     }
   }, [fieldPaths, setFieldPaths]); // The last path
 
-  var fieldParams = fieldPaths.length > 0 ? fieldPaths[fieldPaths.length - 1] : null; // Get transition value
+  var fieldParams = fieldPaths.length > 0 ? fieldPaths[fieldPaths.length - 1] : null;
+  var fieldName = fieldParams !== null ? fieldParams.replace(/\//g, '.') : null; // Get transition value
   // const { name: transitionName, timeout: transitionTimeout } = useFormTransition(
   //     fieldPaths,
   //     styles,
@@ -610,11 +613,11 @@ var Form = function Form(_ref) {
     theme: "secondary",
     outline: true,
     onClick: closeFieldForm
-  })) : null, fields && fields.length > 0 && fieldParams !== null ? /*#__PURE__*/React__default["default"].createElement("div", {
+  })) : null, fields !== null && fields.length > 0 && fieldParams !== null ? /*#__PURE__*/React__default["default"].createElement("div", {
     className: classNames__default["default"](['w-100', styles$t.panel]),
     key: "field"
   }, /*#__PURE__*/React__default["default"].createElement(FieldForm, {
-    name: fieldParams.replace(/\//g, '.'),
+    name: fieldName,
     fields: fields,
     value: value,
     onChange: setValue,
@@ -1023,10 +1026,10 @@ var Breadcrumb = function Breadcrumb(_ref) {
     }, active ? /*#__PURE__*/React__default["default"].createElement(Label, null, label) : null, !active && url ? /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
       to: url,
       onClick: onClick,
-      className: classNames__default["default"](_defineProperty__default["default"]({}, "text-".concat(theme), theme !== null))
+      className: classNames__default["default"](['font-weight-bold', 'text-decoration-none', _defineProperty__default["default"]({}, "text-".concat(theme), theme !== null)])
     }, /*#__PURE__*/React__default["default"].createElement(Label, null, label)) : null, !active && onClick ? /*#__PURE__*/React__default["default"].createElement(Button$1, {
       onClick: onClick,
-      className: classNames__default["default"](_defineProperty__default["default"]({}, "text-".concat(theme), theme !== null))
+      className: classNames__default["default"](['font-weight-bold', 'text-decoration-none', _defineProperty__default["default"]({}, "text-".concat(theme), theme !== null)])
     }, /*#__PURE__*/React__default["default"].createElement(Label, null, label)) : null);
   })));
 };

package/lib/contexts.js

@@ -249,21 +249,21 @@ var useScreensManager = function useScreensManager() {
 };
 var propTypes$g = {
   screens: core.PropTypes.screenDefinitions,
-  withoutCustomScreens: PropTypes__default["default"].bool,
-  customScreens: PropTypes__default["default"].arrayOf(PropTypes__default["default"].string),
+  namespaces: PropTypes__default["default"].arrayOf(PropTypes__default["default"].string),
+  filterNamespaces: PropTypes__default["default"].bool,
   manager: PropTypes__default["default"].instanceOf(core.ScreensManager),
   children: PropTypes__default["default"].node.isRequired
 };
 var defaultProps$g = {
   screens: null,
-  withoutCustomScreens: false,
-  customScreens: null,
+  namespaces: null,
+  filterNamespaces: false,
   manager: null
 };
 var ScreensProvider = function ScreensProvider(_ref) {
   var screens = _ref.screens,
-      customScreens = _ref.customScreens,
-      withoutCustomScreens = _ref.withoutCustomScreens,
+      namespaces = _ref.namespaces,
+      filterNamespaces = _ref.filterNamespaces,
       manager = _ref.manager,
       children = _ref.children;
   var previousManager = useScreensManager();
@@ -274,17 +274,18 @@ var ScreensProvider = function ScreensProvider(_ref) {
       newManager = previousManager.merge(newManager);
     }
 
-    if (withoutCustomScreens) {
+    if (filterNamespaces) {
       newManager = previousManager.filter(function (_ref2) {
-        var id = _ref2.id,
-            _ref2$custom = _ref2.custom,
-            custom = _ref2$custom === void 0 ? false : _ref2$custom;
-        return !custom || customScreens !== null && customScreens.indexOf(id) !== -1;
+        var _ref2$namespaces = _ref2.namespaces,
+            screenGroups = _ref2$namespaces === void 0 ? null : _ref2$namespaces;
+        return screenGroups === null || namespaces !== null && screenGroups.reduce(function (acc, id) {
+          return acc || namespaces.indexOf(id) !== -1;
+        }, false);
       });
     }
 
     return newManager;
-  }, [manager, screens, customScreens, withoutCustomScreens, previousManager]);
+  }, [manager, screens, namespaces, filterNamespaces, previousManager]);
   var initialComponents = React.useMemo(function () {
     return finalManager.getComponents();
   }, [finalManager]);

package/lib/index.js

@@ -1023,7 +1023,8 @@ var DefinitionsManager = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "filter",
     value: function filter(_filter) {
-      return new DefinitionsManager(this.definitions.filter(_filter));
+      this.definitions = this.definitions.filter(_filter);
+      return this; // return new DefinitionsManager(this.definitions.filter(filter));
     }
   }, {
     key: "getDefinition",
@@ -1160,7 +1161,9 @@ var FieldsManager = /*#__PURE__*/function (_DefinitionsManager) {
   _createClass__default["default"](FieldsManager, [{
     key: "filter",
     value: function filter(_filter) {
-      return new FieldsManager(this.definitions.filter(_filter));
+      // return new FieldsManager(this.definitions.filter(filter));
+      this.definitions = this.definitions.filter(_filter);
+      return this;
     }
   }]);
 
@@ -1476,7 +1479,9 @@ var ScreensManager = /*#__PURE__*/function (_DefinitionsManager) {
   }, {
     key: "filter",
     value: function filter(_filter) {
-      return new ScreensManager(this.definitions.filter(_filter));
+      // return new ScreensManager(this.definitions.filter(filter));
+      this.definitions = this.definitions.filter(_filter);
+      return this;
     }
   }]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.55",
+    "version": "0.3.58",
     "description": "",
     "keywords": [
         "javascript"
@@ -84,7 +84,7 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.13.10",
-        "@folklore/fetch": "^0.1.10",
+        "@folklore/fetch": "^0.1.15",
         "@folklore/forms": "^0.0.10",
         "@folklore/services": "^0.1.24",
         "@folklore/size": "^0.1.20",
@@ -132,5 +132,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "ce5792070a5d2907937bac05f5f5e63e0e524157"
+    "gitHead": "80fc5af53d50e031d2516967d52ca61e789d52de"
 }