@micromag/editor 0.3.490 → 0.3.491

package/es/index.js

@@ -49,7 +49,7 @@ var useRouteParams = function useRouteParams() {
     location = _useLocation2[0];
   var matcher = useRouteMatcher();
   var _useMemo = useMemo(function () {
-      var paths = screenOnly ? [routes.screen] : [routes['screen.field.form'], routes['screen.field'], routes.screen, '*'];
+      var paths = screenOnly ? [routes.screen, '/:screen/*', '*'] : [routes['screen.field.form'], routes['screen.field'], routes.screen, '*'];
       return paths.reduce(function (currentParams, path) {
         if (currentParams !== null) {
           return currentParams;
@@ -617,7 +617,7 @@ var Breadcrumb = function Breadcrumb(_ref) {
   var itemsLength = items.length;
   var onClickBack = useCallback(function () {
     setLocation(items[itemsLength - 2].url);
-  }, [items, setLocation]);
+  }, [items, setLocation, itemsLength]);
   var withBack = itemsLength > 1;
   return /*#__PURE__*/React.createElement(React.Fragment, null, withBack ? /*#__PURE__*/React.createElement(BackButton, {
     onClick: onClickBack,
@@ -794,7 +794,8 @@ var EditForm = function EditForm(_ref) {
       }) : null,
       form: formName !== null ? slug(formName) : null
     });
-    setFieldForms(_objectSpread(_objectSpread({}, fieldForms), {}, _defineProperty({}, "".concat(field).concat(formName !== null ? ":".concat(formName) : ''), url)));
+    var nextFieldForms = _objectSpread(_objectSpread({}, fieldForms), {}, _defineProperty({}, "".concat(field).concat(formName !== null ? ":".concat(formName) : ''), url));
+    setFieldForms(nextFieldForms);
     setFieldContext(context);
   }, [routePush, screenId, screenFields, fieldParams, url, fieldForms, setFieldForms, fieldContext, setFieldContext]);
   var closeFieldForm = useCallback(function (field) {
@@ -3318,6 +3319,9 @@ var Editor = function Editor(_ref) {
       screens.scrollTop = cnt.offsetTop + item.offsetTop + item.offsetHeight / 2 - screens.clientHeight / 2;
     }
   }, [screenId]);
+
+  // console.log('screenId', screenId);
+
   return /*#__PURE__*/React.createElement(ModalsProvider, null, /*#__PURE__*/React.createElement(PanelsProvider, null, /*#__PURE__*/React.createElement(ScreenSizeProvider, {
     size: screenSize
   }, /*#__PURE__*/React.createElement("div", {
@@ -3544,18 +3548,18 @@ var EditorContainer = function EditorContainer(_ref) {
     props = _objectWithoutProperties(_ref, _excluded);
   var _useIntl = useIntl(),
     locale = _useIntl.locale;
-
-  // const { metadata } = value || {};
-  // const { language:finalLocale = locale } = metadata || {};
   var _useMemoryRouter = useMemoryRouter(),
     memoryLocationHook = _useMemoryRouter.hook,
     memorySearchHook = _useMemoryRouter.searchHook;
-  return /*#__PURE__*/React.createElement(Router, {
-    hook: memoryRouter ? memoryLocationHook : null,
-    searchHook: memoryRouter ? memorySearchHook : null,
-    parser: pathToRegexpParser,
-    base: !memoryRouter ? basePath : null
-  }, /*#__PURE__*/React.createElement(UppyProvider, uppy, /*#__PURE__*/React.createElement(StoryProvider, {
+  var routerProps = useMemo(function () {
+    return {
+      hook: memoryRouter ? memoryLocationHook : null,
+      searchHook: memoryRouter ? memorySearchHook : null,
+      parser: pathToRegexpParser,
+      base: !memoryRouter ? basePath : null
+    };
+  }, [basePath, memoryRouter]);
+  return /*#__PURE__*/React.createElement(Router, routerProps, /*#__PURE__*/React.createElement(UppyProvider, uppy, /*#__PURE__*/React.createElement(StoryProvider, {
     story: value
   }, /*#__PURE__*/React.createElement(ScreensProvider, {
     filterNamespaces: true,

package/lib/index.js

@@ -577,7 +577,7 @@ var useRouteParams = function useRouteParams() {
     location = _useLocation2[0];
   var matcher = useRouteMatcher();
   var _useMemo = React.useMemo(function () {
-      var paths = screenOnly ? [routes.screen] : [routes['screen.field.form'], routes['screen.field'], routes.screen, '*'];
+      var paths = screenOnly ? [routes.screen, '/:screen/*', '*'] : [routes['screen.field.form'], routes['screen.field'], routes.screen, '*'];
       return paths.reduce(function (currentParams, path) {
         if (currentParams !== null) {
           return currentParams;
@@ -1145,7 +1145,7 @@ var Breadcrumb = function Breadcrumb(_ref) {
   var itemsLength = items.length;
   var onClickBack = React.useCallback(function () {
     setLocation(items[itemsLength - 2].url);
-  }, [items, setLocation]);
+  }, [items, setLocation, itemsLength]);
   var withBack = itemsLength > 1;
   return /*#__PURE__*/React.createElement(React.Fragment, null, withBack ? /*#__PURE__*/React.createElement(components.BackButton, {
     onClick: onClickBack,
@@ -1322,7 +1322,8 @@ var EditForm = function EditForm(_ref) {
       }) : null,
       form: formName !== null ? utils.slug(formName) : null
     });
-    setFieldForms(_objectSpread(_objectSpread({}, fieldForms), {}, _defineProperty({}, "".concat(field).concat(formName !== null ? ":".concat(formName) : ''), url)));
+    var nextFieldForms = _objectSpread(_objectSpread({}, fieldForms), {}, _defineProperty({}, "".concat(field).concat(formName !== null ? ":".concat(formName) : ''), url));
+    setFieldForms(nextFieldForms);
     setFieldContext(context);
   }, [routePush, screenId, screenFields, fieldParams, url, fieldForms, setFieldForms, fieldContext, setFieldContext]);
   var closeFieldForm = React.useCallback(function (field) {
@@ -3846,6 +3847,9 @@ var Editor = function Editor(_ref) {
       screens.scrollTop = cnt.offsetTop + item.offsetTop + item.offsetHeight / 2 - screens.clientHeight / 2;
     }
   }, [screenId]);
+
+  // console.log('screenId', screenId);
+
   return /*#__PURE__*/React.createElement(contexts.ModalsProvider, null, /*#__PURE__*/React.createElement(contexts.PanelsProvider, null, /*#__PURE__*/React.createElement(contexts.ScreenSizeProvider, {
     size: screenSize
   }, /*#__PURE__*/React.createElement("div", {
@@ -4072,18 +4076,18 @@ var EditorContainer = function EditorContainer(_ref) {
     props = _objectWithoutProperties(_ref, _excluded);
   var _useIntl = reactIntl.useIntl(),
     locale = _useIntl.locale;
-
-  // const { metadata } = value || {};
-  // const { language:finalLocale = locale } = metadata || {};
   var _useMemoryRouter = useMemoryRouter(),
     memoryLocationHook = _useMemoryRouter.hook,
     memorySearchHook = _useMemoryRouter.searchHook;
-  return /*#__PURE__*/React.createElement(Router, {
-    hook: memoryRouter ? memoryLocationHook : null,
-    searchHook: memoryRouter ? memorySearchHook : null,
-    parser: pathToRegexpParser,
-    base: !memoryRouter ? basePath : null
-  }, /*#__PURE__*/React.createElement(contexts.UppyProvider, uppy, /*#__PURE__*/React.createElement(contexts.StoryProvider, {
+  var routerProps = React.useMemo(function () {
+    return {
+      hook: memoryRouter ? memoryLocationHook : null,
+      searchHook: memoryRouter ? memorySearchHook : null,
+      parser: pathToRegexpParser,
+      base: !memoryRouter ? basePath : null
+    };
+  }, [basePath, memoryRouter]);
+  return /*#__PURE__*/React.createElement(Router, routerProps, /*#__PURE__*/React.createElement(contexts.UppyProvider, uppy, /*#__PURE__*/React.createElement(contexts.StoryProvider, {
     story: value
   }, /*#__PURE__*/React.createElement(screens.ScreensProvider, {
     filterNamespaces: true,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/editor",
-    "version": "0.3.490",
+    "version": "0.3.491",
     "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.488",
-        "@micromag/elements": "^0.3.488",
-        "@micromag/fields": "^0.3.488",
-        "@micromag/screens": "^0.3.490",
-        "@micromag/viewer": "^0.3.490",
+        "@micromag/core": "^0.3.491",
+        "@micromag/elements": "^0.3.491",
+        "@micromag/fields": "^0.3.491",
+        "@micromag/screens": "^0.3.491",
+        "@micromag/viewer": "^0.3.491",
         "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": "58cf01e96ff336f5300b697cf83e220cb4f4a4e6"
+    "gitHead": "d4af8a992fad6d8d50e41e347a4b92e6e025b984"
 }