kitchen-simulator 1.0.0-alin.5 → 1.0.0-alin.50

package/lib/index.js

@@ -15,19 +15,20 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function renderKitchenSimulator(container) {
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var currentProps = props;
-  var render = function render(newProps) {
-    _reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], newProps), container);
-  };
-  render(props);
+
+  // Initial render
+  var root = _reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], props), container);
   return {
-    updateExternalEvent: function updateExternalEvent(externalEvent) {
-      currentProps = _objectSpread(_objectSpread({}, currentProps), {}, {
-        externalEvent: externalEvent
-      });
-      render(currentProps);
-    },
-    unmount: function unmount() {
-      _reactDom["default"].unmountComponentAtNode(container);
+    root: root,
+    updateExternalEvent: function updateExternalEvent(newExternalEvent) {
+      var prevEvent = currentProps.externalEvent;
+      var isSameEvent = prevEvent && newExternalEvent && prevEvent.type === newExternalEvent.type && JSON.stringify(prevEvent.payload) === JSON.stringify(newExternalEvent.payload);
+      if (!isSameEvent) {
+        currentProps = _objectSpread(_objectSpread({}, currentProps), {}, {
+          externalEvent: newExternalEvent
+        });
+        _reactDom["default"].render(/*#__PURE__*/_react["default"].createElement(_LiteRenderer["default"], currentProps), container);
+      }
     }
   };
 }

package/lib/reducers/items-reducer.js

@@ -108,7 +108,7 @@ function _default(state, action) {
     case _constants.SELECT_TOOL_DRAWING_ITEM_3D:
       return _export.Item.selectToolDrawingItem3D(state, action.sceneComponentType).updatedState;
     case _constants.SET_DOOR_STYLE:
-      return _export.Item.setDoorStyle(state, action.doorStyle, action.pathes, action.isAll).updatedState;
+      return _export.Item.setDoorStyle(state, action.doorStyle, action.isAll).updatedState;
     case _constants.SET_HANDLE_MATERIAL:
       return _export.Item.setHandleMaterial(state, action.material).updatedState;
     case _constants.SET_DOOR_HANDLE:

package/lib/utils/geometry.js

@@ -972,18 +972,18 @@ function getAllItemSnap(allItemRects) {
     var snap4 = itemrectInfo(rect.rect[3].x + ox0, rect.rect[3].y + oy0, nrot, cur && cur.size, rect.layoutpos, rect.is_corner);
     var sizeinfo = otherItems[index].cat && otherItems[index].cat.info.sizeinfo;
     if (sizeinfo) {
-      var leftBlindLength = sizeinfo.leftBlindLength,
-        rightBlindLength = sizeinfo.rightBlindLength;
-      if (leftBlindLength > 0) {
-        var vx = leftBlindLength - ch;
+      var left_blind_length = sizeinfo.left_blind_length,
+        right_blind_length = sizeinfo.right_blind_length;
+      if (left_blind_length > 0) {
+        var vx = left_blind_length - ch;
         var vy = cw;
         var dx = vx * cos + vy * sin;
         var dy = vx * sin - vy * cos;
         var snap6 = itemrectInfo(rect.rect[0].x + dx, rect.rect[0].y + dy, rect.rotRad + Math.PI / 2, cur && cur.size, rect.layoutpos, rect.is_corner);
         allItemSnap.push(snap6);
       }
-      if (rightBlindLength > 0) {
-        var _vx = ch - rightBlindLength;
+      if (right_blind_length > 0) {
+        var _vx = ch - right_blind_length;
         var _vy = cw;
         var _dx = _vx * cos + _vy * sin;
         var _dy = _vx * sin - _vy * cos;

package/lib/utils/isolate-event-handler.js

@@ -69,42 +69,46 @@ var loadSVGsByItem = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-function handleExternalEvent(_x2, _x3) {
+var compareSVGRect = function compareSVGRect(value) {
+  return value.e <= 10 && value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth && value.f <= 80 && value.f + value.d * value.SVGHeight + 10 >= value.viewerHeight ? true : false;
+};
+function handleExternalEvent(_x2) {
   return _handleExternalEvent.apply(this, arguments);
 }
 function _handleExternalEvent() {
-  _handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(evt, props) {
-    var state, sLineCnt, element, catalog, outlineSVGData, catalogInstance, elementJs, _evt$payload, moveType, moveValue, value, defaulTitle, _t2, _t3;
+  _handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(props) {
+    var evt, state, sLineCnt, element, catalog, outlineSVGData, catalogInstance, elementJs, _evt$payload, moveType, moveValue, value, defaulTitle, _evt$payload2, doorStyle, isAll, _doorStyle, _value, _zoomValue, _value2, _zoomValue2, _t2, _t3;
     return _regenerator["default"].wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          state = props.state;
+          evt = props.externalEvent;
+          state = props.state.get('KitchenConfigurator');
           _t2 = evt === null || evt === void 0 ? void 0 : evt.type;
-          _context2.next = _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t2 === _constants.EXTERNAL_EVENT_ADD_WALL ? 4 : _t2 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 5 : _t2 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 9 : _t2 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 15 : 16;
+          _context2.next = _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t2 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t2 === _constants.EXTERNAL_EVENT_ADD_WALL ? 4 : _t2 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 5 : _t2 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 9 : _t2 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 15 : _t2 === _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 16 : _t2 === _constants.EXTERNAL_EVENT_SET_INITIAL_DATA ? 17 : _t2 === _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 18 : _t2 === _constants.EXTERNAL_EVENT_ZOOM_IN ? 19 : _t2 === _constants.EXTERNAL_EVENT_ZOOM_OUT ? 22 : 25;
           break;
         case 1:
           props.projectActions.setMode(_constants.MODE_IDLE_3D);
-          return _context2.abrupt("continue", 16);
+          return _context2.abrupt("continue", 25);
         case 2:
           props.projectActions.setMode(_constants.MODE_IDLE);
-          return _context2.abrupt("continue", 16);
+          return _context2.abrupt("continue", 25);
         case 3:
-          sLineCnt = state.getIn(['KitchenConfigurator', 'scene', 'layers', 'layer-1', 'selected', 'lines']).size;
+          sLineCnt = state.getIn(['scene', 'layers', 'layer-1', 'selected', 'lines']).size;
           if (sLineCnt > 0) props.projectActions.setMode(_constants.MODE_ELEVATION_VIEW);
-          return _context2.abrupt("continue", 16);
+          return _context2.abrupt("continue", 25);
         case 4:
           if (state.mode === _constants.MODE_IDLE || state.mode === _constants.MODE_2D_PAN) props.linesActions.selectToolDrawingLine('wall');else {
             props.projectActions.setMode(_constants.MODE_IDLE);
             props.linesActions.selectToolDrawingLine('wall');
           }
-          return _context2.abrupt("continue", 16);
+          return _context2.abrupt("continue", 25);
         case 5:
           if ((0, _helper.isEmpty)(evt === null || evt === void 0 ? void 0 : evt.payload)) {
             _context2.next = 8;
             break;
           }
           element = evt.payload;
-          catalog = state.getIn(['KitchenConfigurator', 'catalog']).toJS(); // add item to catalog of state
+          catalog = state.getIn(['catalog']).toJS(); // add item to catalog of state
           if (!(0, _helper.isEmpty)(catalog === null || catalog === void 0 ? void 0 : catalog.elements[element.name])) {
             _context2.next = 7;
             break;
@@ -121,6 +125,7 @@ function _handleExternalEvent() {
             render3DItem: _itemLoader.render3DItem
           }));
           if (catalogInstance !== null && catalogInstance !== void 0 && catalogInstance.validateElement(elementJs)) {
+            catalogInstance.registerElement(elementJs);
             props.projectActions.addElementToCatalog(elementJs);
           }
         case 7:
@@ -129,10 +134,10 @@ function _handleExternalEvent() {
           props.projectActions.pushLastSelectedCatalogElementToHistory(element);
           props.projectActions.setIsCabinetDrawing(true);
         case 8:
-          return _context2.abrupt("continue", 16);
+          return _context2.abrupt("continue", 25);
         case 9:
           _evt$payload = evt.payload, moveType = _evt$payload.moveType, moveValue = _evt$payload.moveValue;
-          value = state.getIn(['KitchenConfigurator', 'viewer2D']).toJS();
+          value = state.getIn(['viewer2D']).toJS();
           _t3 = moveType;
           _context2.next = _t3 === _constants.TOP ? 10 : _t3 === _constants.BOTTOM ? 11 : _t3 === _constants.RIGHT ? 12 : _t3 === _constants.LEFT ? 13 : 14;
           break;
@@ -149,14 +154,79 @@ function _handleExternalEvent() {
           value.e -= moveValue;
           return _context2.abrupt("continue", 14);
         case 14:
-          if (value.e <= 10 && value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth && value.f <= 80 && value.f + value.d * value.SVGHeight + 10 >= value.viewerHeight) props.viewer2DActions.updateCameraView(value);
-          return _context2.abrupt("continue", 16);
+          if (compareSVGRect(value)) props.viewer2DActions.updateCameraView(value);
+          return _context2.abrupt("continue", 25);
         case 15:
           defaulTitle = 'Untitle';
           props.projectActions.newProject();
           props.projectActions.rename(defaulTitle);
-          return _context2.abrupt("continue", 16);
+          return _context2.abrupt("continue", 25);
         case 16:
+          _evt$payload2 = evt.payload, doorStyle = _evt$payload2.doorStyle, isAll = _evt$payload2.isAll;
+          props.itemsActions.setDoorStyle(doorStyle, isAll);
+          return _context2.abrupt("continue", 25);
+        case 17:
+          _doorStyle = evt.payload.doorStyle;
+          props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle, _doorStyle.oStyle);
+          return _context2.abrupt("continue", 25);
+        case 18:
+          props.projectActions.loadProject(evt.payload, props.categoryData);
+          return _context2.abrupt("continue", 25);
+        case 19:
+          _value = state.getIn(['viewer2D']).toJS();
+          _value.a -= 0.1;
+          _value.d -= 0.1;
+          _value.e += _value.SVGWidth * 0.1 / 2;
+          _value.f += _value.SVGHeight * 0.1 / 2;
+          _zoomValue = parseInt((_value.a - 0.5) / _constants.ZOOM_VARIABLE);
+          if (!(_zoomValue > 404)) {
+            _context2.next = 20;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 20:
+          if (!(_zoomValue < 35 || Number.isNaN(_zoomValue))) {
+            _context2.next = 21;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 21:
+          while (!(_value.e <= 10)) {
+            _value.e -= 0.1;
+          }
+          while (!(_value.e + _value.a * _value.SVGWidth + 10 >= _value.viewerWidth)) {
+            _value.e += 0.1;
+          }
+          while (!(_value.f <= 80)) {
+            _value.f -= 0.1;
+          }
+          while (!(_value.f + _value.a * _value.SVGHeight + 10 >= _value.viewerHeight)) {
+            _value.f += 0.1;
+          }
+          if (compareSVGRect(_value)) props.viewer2DActions.updateCameraView(_value);
+          return _context2.abrupt("continue", 25);
+        case 22:
+          _value2 = state.getIn(['viewer2D']).toJS();
+          _value2.a += 0.1;
+          _value2.d += 0.1;
+          _value2.e -= _value2.SVGWidth * 0.1 / 2;
+          _value2.f -= _value2.SVGHeight * 0.1 / 2;
+          _zoomValue2 = parseInt((_value2.a - 0.5) / _constants.ZOOM_VARIABLE);
+          if (!(_zoomValue2 > 404)) {
+            _context2.next = 23;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 23:
+          if (!(_zoomValue2 < 35 || Number.isNaN(_zoomValue2))) {
+            _context2.next = 24;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 24:
+          if (compareSVGRect(_value2)) props.viewer2DActions.updateCameraView(_value2);
+          return _context2.abrupt("continue", 25);
+        case 25:
         case "end":
           return _context2.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "1.0.0-alin.05",
+  "version": "1.0.0-alin.50",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",
@@ -82,13 +82,13 @@
     "react-hotjar": "^1.0.11",
     "react-icons": "3.5.0",
     "react-redux": "5.0.7",
-    "react-svg-pan-zoom": "^3.13.1",
+    "react-svg-pan-zoom": "2.18.0",
     "redux": "4.0.1",
     "three": "0.166.0",
     "moment": "^2.30.1",
     "jwt-decode": "^2.2.0",
     "react-ga4": "^1.4.1",
-    "styled-components": "^6.1.19"
+    "styled-components": "^5.2.0"
   },
   "devDependencies": {
     "localstorage-slim": "^1.3.0",