@micromag/editor 0.3.18 → 0.3.19

package/es/index.js

@@ -19,8 +19,8 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import 'lodash/isArray';
 import 'lodash/get';
 import 'lodash/set';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faEllipsisV, faCogs, faPlus, faGripLines, faTimes, faAngleDown } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Fields, FieldsProvider } from '@micromag/fields';
 import { getSizeWithinBounds } from '@folklore/size';
 import { Viewer } from '@micromag/viewer';
@@ -839,15 +839,38 @@ var EditForm = function EditForm(_ref) {
     setScreenSettingsOpened(false);
   }, [setScreenSettingsOpened, setDeleteScreenModalOpened]);
   var onSettingsClick = useCallback(function () {
+    console.log('screenSettingsOpened', screenSettingsOpened); // eslint-disable-line
+
     setScreenSettingsOpened(!screenSettingsOpened);
   }, [screenSettingsOpened, setScreenSettingsOpened]);
   var onDropdownClickOutside = useCallback(function () {
     setScreenSettingsOpened(false);
   }, [setScreenSettingsOpened]);
   var onDeleteScreenConfirm = useCallback(function () {
+    var current = screens.findIndex(function (_ref8) {
+      var _ref8$id = _ref8.id,
+          scrId = _ref8$id === void 0 ? null : _ref8$id;
+      return scrId === screenId;
+    }) || 0;
+    var previous = screens.find(function (_ref9, i) {
+      var _ref9$id = _ref9.id,
+          scrId = _ref9$id === void 0 ? null : _ref9$id;
+      return scrId !== screenId && (i === current - 1 || current === 0);
+    }) || null;
+
+    if (previous !== null) {
+      var _ref10 = previous || {},
+          _ref10$id = _ref10.id,
+          firstScreenId = _ref10$id === void 0 ? null : _ref10$id;
+
+      routePush('screen', {
+        screen: firstScreenId
+      });
+    }
+
     triggerOnChange(deleteScreen(value, screenId));
     setDeleteScreenModalOpened(false);
-  }, [value, triggerOnChange, screenId, setScreenSettingsOpened]);
+  }, [value, triggerOnChange, screenId, setScreenSettingsOpened, routePush, screens]);
   var onDeleteScreenCancel = useCallback(function () {
     setDeleteScreenModalOpened(false);
   }, [setDeleteScreenModalOpened]);
@@ -876,6 +899,8 @@ var EditForm = function EditForm(_ref) {
   }].filter(function (it) {
     return it !== null;
   });
+  console.log(screenSettingsOpened); // eslint-disable-line
+
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(['d-flex', 'flex-column', className])
   }, screenId !== null ? /*#__PURE__*/React.createElement(Navbar, {

package/lib/index.js

@@ -23,8 +23,8 @@ var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProp
 require('lodash/isArray');
 require('lodash/get');
 require('lodash/set');
-var reactFontawesome = require('@fortawesome/react-fontawesome');
 var freeSolidSvgIcons = require('@fortawesome/free-solid-svg-icons');
+var reactFontawesome = require('@fortawesome/react-fontawesome');
 var fields = require('@micromag/fields');
 var size = require('@folklore/size');
 var viewer = require('@micromag/viewer');
@@ -859,15 +859,38 @@ var EditForm = function EditForm(_ref) {
     setScreenSettingsOpened(false);
   }, [setScreenSettingsOpened, setDeleteScreenModalOpened]);
   var onSettingsClick = React.useCallback(function () {
+    console.log('screenSettingsOpened', screenSettingsOpened); // eslint-disable-line
+
     setScreenSettingsOpened(!screenSettingsOpened);
   }, [screenSettingsOpened, setScreenSettingsOpened]);
   var onDropdownClickOutside = React.useCallback(function () {
     setScreenSettingsOpened(false);
   }, [setScreenSettingsOpened]);
   var onDeleteScreenConfirm = React.useCallback(function () {
+    var current = screens.findIndex(function (_ref8) {
+      var _ref8$id = _ref8.id,
+          scrId = _ref8$id === void 0 ? null : _ref8$id;
+      return scrId === screenId;
+    }) || 0;
+    var previous = screens.find(function (_ref9, i) {
+      var _ref9$id = _ref9.id,
+          scrId = _ref9$id === void 0 ? null : _ref9$id;
+      return scrId !== screenId && (i === current - 1 || current === 0);
+    }) || null;
+
+    if (previous !== null) {
+      var _ref10 = previous || {},
+          _ref10$id = _ref10.id,
+          firstScreenId = _ref10$id === void 0 ? null : _ref10$id;
+
+      routePush('screen', {
+        screen: firstScreenId
+      });
+    }
+
     triggerOnChange(deleteScreen(value, screenId));
     setDeleteScreenModalOpened(false);
-  }, [value, triggerOnChange, screenId, setScreenSettingsOpened]);
+  }, [value, triggerOnChange, screenId, setScreenSettingsOpened, routePush, screens]);
   var onDeleteScreenCancel = React.useCallback(function () {
     setDeleteScreenModalOpened(false);
   }, [setDeleteScreenModalOpened]);
@@ -896,6 +919,8 @@ var EditForm = function EditForm(_ref) {
   }].filter(function (it) {
     return it !== null;
   });
+  console.log(screenSettingsOpened); // eslint-disable-line
+
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: classNames__default["default"](['d-flex', 'flex-column', className])
   }, screenId !== null ? /*#__PURE__*/React__default["default"].createElement(components.Navbar, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/editor",
-    "version": "0.3.18",
+    "version": "0.3.19",
     "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.18",
-        "@micromag/elements": "^0.3.18",
-        "@micromag/fields": "^0.3.18",
-        "@micromag/screens": "^0.3.18",
-        "@micromag/viewer": "^0.3.18",
+        "@micromag/core": "^0.3.19",
+        "@micromag/elements": "^0.3.19",
+        "@micromag/fields": "^0.3.19",
+        "@micromag/screens": "^0.3.19",
+        "@micromag/viewer": "^0.3.19",
         "classnames": "^2.2.6",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -81,5 +81,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "24f426ccd37e27c953634cd1dd3c204264549acc"
+    "gitHead": "567326b79369a96c8c4cfed8ec08a3e67114261f"
 }