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

package/es/components/viewer3d/viewer3d.js

@@ -2559,7 +2559,6 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
           }));
         } else {
           document.getElementById('front') && (document.getElementById('front').style.display = 'none');
-          document.getElementById('error').style.display = 'none';
           this.renderer.domElement.style.display = 'none';
           return /*#__PURE__*/React.createElement("div", {
             style: {
@@ -2594,7 +2593,6 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
           alt: "img"
         }));
       } else {
-        !this.props.downloadFlag && (document.getElementById('error').style.display = 'block');
         this.renderer.domElement.style.pointerEvents = 'auto';
         this.renderer.domElement.style.opacity = '1';
         !this.props.downloadFlag && document.getElementById('front') && (document.getElementById('front').style.display = 'block');

package/es/constants.js

@@ -579,6 +579,7 @@ export var ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT = 0.1;
 export var DIFFERENT_VALUES_PATH_LENGTH = 5;
 export var MIN_ANGLE_DISALLOW_DRAW_WALL = 45;
 export var UNIT_ANGLE = 5;
+export var MAX_ANGLE_SCALE = 30;
 export var HDR_URLS = ['px.hdr', 'nx.hdr', 'py.hdr', 'ny.hdr', 'pz.hdr', 'nz.hdr'];
 export var SUBMIT_REQUEST_ASSIST = 'submit';
 export var SUBMIT_ADD_CART = 'addCart';
@@ -650,4 +651,9 @@ export var EXTERNAL_EVENT_TOGGLE_TO_ELEVATION = 'EXTERNAL_EVENT_TOGGLE_TO_ELEVAT
 export var EXTERNAL_EVENT_ADD_WALL = 'EXTERNAL_EVENT_ADD_WALL';
 export var EXTERNAL_EVENT_ADD_ITEM = 'EXTERNAL_EVENT_ADD_ITEM';
 export var EXTERNAL_EVENT_MOVE_PAN = 'EXTERNAL_EVENT_MOVE_PAN';
-export var EXTERNAL_EVENT_NEW_PROJECT = 'EXTERNAL_EVENT_NEW_PROJECT';
+export var EXTERNAL_EVENT_NEW_PROJECT = 'EXTERNAL_EVENT_NEW_PROJECT';
+export var EXTERNAL_EVENT_CHANGE_DOORSTYLE = 'EXTERNAL_EVENT_CHANGE_DOORSTYLE';
+export var EXTERNAL_EVENT_SET_INITIAL_DATA = 'EXTERNAL_EVENT_SET_INITIAL_DATA';
+export var EXTERNAL_EVENT_ADD_ROOM_SHAPE = 'EXTERNAL_EVENT_ADD_ROOM_SHAPE';
+export var EXTERNAL_EVENT_ZOOM_IN = 'EXTERNAL_EVENT_ZOOM_IN';
+export var EXTERNAL_EVENT_ZOOM_OUT = 'EXTERNAL_EVENT_ZOOM_OUT';

package/es/devLiteRenderer.js

@@ -5,10 +5,13 @@ import mockProps from "./mocks/mockProps.json";
 import mockCategoryData from "./mocks/categoryData.json";
 import mockDataBundle from "./mocks/dataBundle.json";
 import cabinetPaylod from "./mocks/cabinetPayload.json";
+import doorStylePaylod from "./mocks/doorStylePayload.json";
+import oStylePaylod from "./mocks/oStylePayload.json";
+import rectangleData from "./mocks/rectangleShape.json";
 import ReactDOM from 'react-dom';
 import LiteRenderer from "./LiteRenderer";
 import { Button } from 'antd';
-import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, EXTERNAL_EVENT_NEW_PROJECT } from "./constants";
+import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_SET_INITIAL_DATA, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT } from "./constants";
 
 // --- renderer props ---
 var options = {
@@ -22,6 +25,18 @@ function WorkSpace(props) {
     externalEvent = _useState2[0],
     setExternalEvent = _useState2[1];
   var offset = 5;
+  useEffect(function () {
+    var evt = {
+      type: EXTERNAL_EVENT_SET_INITIAL_DATA,
+      payload: {
+        doorStyle: {
+          doorStyle: doorStylePaylod,
+          oStyle: oStylePaylod
+        }
+      }
+    };
+    setExternalEvent(evt);
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "flex gap-4"
   }, /*#__PURE__*/React.createElement(Button, {
@@ -107,6 +122,28 @@ function WorkSpace(props) {
     }
   }, /*#__PURE__*/React.createElement("img", {
     src: "/assets/img/svg/bottombar/arrow-right.svg"
+  })), /*#__PURE__*/React.createElement(Button, {
+    actionType: "primary",
+    onClick: function onClick() {
+      var evt = {
+        type: EXTERNAL_EVENT_ZOOM_IN,
+        payload: {}
+      };
+      setExternalEvent(evt);
+    }
+  }, /*#__PURE__*/React.createElement("img", {
+    src: "/assets/img/svg/bottombar/arrow-minus.svg"
+  })), /*#__PURE__*/React.createElement(Button, {
+    actionType: "primary",
+    onClick: function onClick() {
+      var evt = {
+        type: EXTERNAL_EVENT_ZOOM_OUT,
+        payload: {}
+      };
+      setExternalEvent(evt);
+    }
+  }, /*#__PURE__*/React.createElement("img", {
+    src: "/assets/img/svg/bottombar/arrow-plus.svg"
   })), /*#__PURE__*/React.createElement(Button, {
     actionType: "primary",
     onClick: function onClick() {
@@ -134,9 +171,30 @@ function WorkSpace(props) {
       };
       setExternalEvent(evt);
     }
-  }, "Add B12 Cabinet"), /*#__PURE__*/React.createElement(LiteRenderer, {
-    width: 1200,
-    height: 953,
+  }, "Add B12 Cabinet"), /*#__PURE__*/React.createElement(Button, {
+    actionType: "danger",
+    onClick: function onClick() {
+      var evt = {
+        type: EXTERNAL_EVENT_CHANGE_DOORSTYLE,
+        payload: {
+          doorStyle: doorStylePaylod,
+          isAll: true
+        }
+      };
+      setExternalEvent(evt);
+    }
+  }, "DoorStyle (Change into Midtown White Shaker)"), /*#__PURE__*/React.createElement(Button, {
+    actionType: "danger",
+    onClick: function onClick() {
+      var evt = {
+        type: EXTERNAL_EVENT_ADD_ROOM_SHAPE,
+        payload: rectangleData
+      };
+      setExternalEvent(evt);
+    }
+  }, "Add Room shape(rectangle)"), /*#__PURE__*/React.createElement(LiteRenderer, {
+    width: props.width,
+    height: props.height,
     projectElement: mockProps.projectElement,
     categoryData: mockCategoryData,
     dataBundle: mockDataBundle,
@@ -158,4 +216,11 @@ function WorkSpace(props) {
     }
   }));
 }
-ReactDOM.render(/*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(WorkSpace, null)), document.getElementById('app'));
+ReactDOM.render(/*#__PURE__*/React.createElement(ContainerDimensions, null, function (_ref) {
+  var width = _ref.width,
+    height = _ref.height;
+  return /*#__PURE__*/React.createElement(WorkSpace, {
+    width: width,
+    height: height
+  });
+}), document.getElementById('app'));

package/es/index.js

@@ -7,19 +7,20 @@ import LiteRenderer from "./LiteRenderer";
 export function renderKitchenSimulator(container) {
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var currentProps = props;
-  var render = function render(newProps) {
-    ReactDOM.render(/*#__PURE__*/React.createElement(LiteRenderer, newProps), container);
-  };
-  render(props);
+
+  // Initial render
+  var root = ReactDOM.render(/*#__PURE__*/React.createElement(LiteRenderer, props), container);
   return {
-    updateExternalEvent: function updateExternalEvent(externalEvent) {
-      currentProps = _objectSpread(_objectSpread({}, currentProps), {}, {
-        externalEvent: externalEvent
-      });
-      render(currentProps);
-    },
-    unmount: function unmount() {
-      ReactDOM.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.render(/*#__PURE__*/React.createElement(LiteRenderer, currentProps), container);
+      }
     }
   };
 }

package/es/reducers/items-reducer.js

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

package/es/utils/geometry.js

@@ -873,18 +873,18 @@ export 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/es/utils/isolate-event-handler.js

@@ -4,7 +4,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { fromJS, List, Map, Record } from 'immutable';
-import { EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, MODE_IDLE, MODE_2D_PAN, EXTERNAL_EVENT_ADD_ITEM, ARRAY_3D_MODES, MODE_IDLE_3D, MODE_ELEVATION_VIEW, TOP, BOTTOM, LEFT, RIGHT, EXTERNAL_EVENT_NEW_PROJECT } from "../constants";
+import { EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, MODE_IDLE, MODE_2D_PAN, EXTERNAL_EVENT_ADD_ITEM, ARRAY_3D_MODES, MODE_IDLE_3D, MODE_ELEVATION_VIEW, TOP, BOTTOM, LEFT, RIGHT, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_SET_INITIAL_DATA, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, ZOOM_VARIABLE } from "../constants";
 import { isEmpty } from "./helper";
 import exporter from "../catalog/utils/exporter";
 import { render2DItem, render3DItem } from "../catalog/utils/item-loader";
@@ -62,42 +62,46 @@ var loadSVGsByItem = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-export 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;
+};
+export function handleExternalEvent(_x2) {
   return _handleExternalEvent.apply(this, arguments);
 }
 function _handleExternalEvent() {
-  _handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(evt, props) {
-    var state, sLineCnt, element, catalog, outlineSVGData, catalogInstance, elementJs, _evt$payload, moveType, moveValue, value, defaulTitle, _t2, _t3;
+  _handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.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 _regeneratorRuntime.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 === EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t2 === EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t2 === EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t2 === EXTERNAL_EVENT_ADD_WALL ? 4 : _t2 === EXTERNAL_EVENT_ADD_ITEM ? 5 : _t2 === EXTERNAL_EVENT_MOVE_PAN ? 9 : _t2 === EXTERNAL_EVENT_NEW_PROJECT ? 15 : 16;
+          _context2.next = _t2 === EXTERNAL_EVENT_TOGGLE_TO_3D ? 1 : _t2 === EXTERNAL_EVENT_TOGGLE_TO_2D ? 2 : _t2 === EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 3 : _t2 === EXTERNAL_EVENT_ADD_WALL ? 4 : _t2 === EXTERNAL_EVENT_ADD_ITEM ? 5 : _t2 === EXTERNAL_EVENT_MOVE_PAN ? 9 : _t2 === EXTERNAL_EVENT_NEW_PROJECT ? 15 : _t2 === EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 16 : _t2 === EXTERNAL_EVENT_SET_INITIAL_DATA ? 17 : _t2 === EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 18 : _t2 === EXTERNAL_EVENT_ZOOM_IN ? 19 : _t2 === EXTERNAL_EVENT_ZOOM_OUT ? 22 : 25;
           break;
         case 1:
           props.projectActions.setMode(MODE_IDLE_3D);
-          return _context2.abrupt("continue", 16);
+          return _context2.abrupt("continue", 25);
         case 2:
           props.projectActions.setMode(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(MODE_ELEVATION_VIEW);
-          return _context2.abrupt("continue", 16);
+          return _context2.abrupt("continue", 25);
         case 4:
           if (state.mode === MODE_IDLE || state.mode === MODE_2D_PAN) props.linesActions.selectToolDrawingLine('wall');else {
             props.projectActions.setMode(MODE_IDLE);
             props.linesActions.selectToolDrawingLine('wall');
           }
-          return _context2.abrupt("continue", 16);
+          return _context2.abrupt("continue", 25);
         case 5:
           if (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 (!isEmpty(catalog === null || catalog === void 0 ? void 0 : catalog.elements[element.name])) {
             _context2.next = 7;
             break;
@@ -114,6 +118,7 @@ function _handleExternalEvent() {
             render3DItem: render3DItem
           }));
           if (catalogInstance !== null && catalogInstance !== void 0 && catalogInstance.validateElement(elementJs)) {
+            catalogInstance.registerElement(elementJs);
             props.projectActions.addElementToCatalog(elementJs);
           }
         case 7:
@@ -122,10 +127,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 === TOP ? 10 : _t3 === BOTTOM ? 11 : _t3 === RIGHT ? 12 : _t3 === LEFT ? 13 : 14;
           break;
@@ -142,14 +147,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) / 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) / 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/lib/LiteKitchenConfigurator.js

@@ -8,15 +8,13 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _axios = _interopRequireDefault(require("axios"));
 var _convertUnitsLite = require("./utils/convert-units-lite");
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -33,7 +31,7 @@ var _objectsUtils = require("./utils/objects-utils");
 var _version = require("./version");
 var _isolateEventHandler = require("./utils/isolate-event-handler");
 var _excluded = ["width", "height", "state", "stateExtractor"];
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
@@ -51,23 +49,6 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
     _this = _callSuper(this, LiteKitchenConfigurator, [props]);
 
     // utm tracking
-    (0, _defineProperty2["default"])(_this, "handleBeforeUnload", function (e) {
-      var areas = _this.props.stateExtractor(_this.props.state).getIn(['scene', 'layers', _this.props.stateExtractor(_this.props.state).scene.selectedLayer, 'areas']);
-      if (!_this.state.isSaved && areas.size > 0) {
-        setTimeout(function () {
-          _this.setState({
-            savePromptVisible: true,
-            isLeaving: true
-          });
-        }, 500);
-        _this.saveProjectToStorage();
-
-        // This line is required to trigger the browser confirmation dialog
-        e.preventDefault();
-        e.returnValue = '';
-        return '';
-      }
-    });
     var utmDetailParams = new URLSearchParams(_this.props.location && _this.props.location.search);
     var utmStrEncoded = utmDetailParams.get('details');
     var utmRequestData = null;
@@ -112,7 +93,8 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       redirectURL: '',
       snackBarMessage: '',
       isSaved: false,
-      isLeaving: false
+      isLeaving: false,
+      stateCatalog: _this.props.catalog
     };
 
     // For UTM tracking
@@ -353,129 +335,20 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this3 = this;
-      window.addEventListener('beforeunload', this.handleBeforeUnload);
-      console.log('context =>', this.context);
       window.forRedo = [];
       var store = this.context.store;
       var _this$props2 = this.props,
-        projectActions = _this$props2.projectActions,
-        catalog = _this$props2.catalog,
         stateExtractor = _this$props2.stateExtractor,
-        state = _this$props2.state,
         plugins = _this$props2.plugins;
-      projectActions.initCatalog(catalog);
-      var match = this.props.match;
-      if (sessionStorage.getItem(window.location.href)) {
-        var jsonData = sessionStorage.getItem(window.location.href);
-        projectActions.loadProject(JSON.parse(jsonData), this.props.categoryData);
-        sessionStorage.removeItem(window.location.href);
-        return;
-      }
       var newplugins = (0, _toConsumableArray2["default"])(plugins);
       newplugins.forEach(function (newplugin) {
         return newplugin(store, stateExtractor);
       });
-      if (match && match.params.pid === undefined) {
-        projectActions.newProject();
-        sessionStorage.setItem('projectTitle', 'Untitled');
-        projectActions.rename('Untitled');
-        sessionStorage.removeItem('projectId');
-        sessionStorage.removeItem('email');
-        sessionStorage.removeItem('firstName');
-        sessionStorage.removeItem('lastName');
-        sessionStorage.removeItem('usedObjects');
-        return;
-      }
-      if (match && match.params.pid !== undefined) {
-        if (match.params.pid === 'new') {
-          projectActions.newProject();
-          sessionStorage.setItem('projectTitle', 'Untitled');
-          projectActions.rename('Untitled');
-          sessionStorage.removeItem('projectId');
-          sessionStorage.removeItem('email');
-          sessionStorage.removeItem('firstName');
-          sessionStorage.removeItem('lastName');
-          sessionStorage.removeItem('usedObjects');
-        } else {
-          _axios["default"].post("".concat(constants.API_SERVER_URL, "/api/project/loadPidProject"), {
-            pid: match.params.pid,
-            visualizerName: sessionStorage.getItem('visualizerName')
-          }).then(/*#__PURE__*/function () {
-            var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(response) {
-              var projectElement, jsonData, _t;
-              return _regenerator["default"].wrap(function (_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    projectElement = response.data.projectElement;
-                    if (!(projectElement.length === 0)) {
-                      _context.next = 1;
-                      break;
-                    }
-                    return _context.abrupt("return");
-                  case 1:
-                    sessionStorage.setItem('projectTitle', projectElement[0].title);
-                    projectActions.rename(projectElement[0].title);
-                    sessionStorage.setItem('projectId', projectElement[0].id);
-                    sessionStorage.setItem('email', projectElement[0].email);
-                    sessionStorage.setItem('firstName', projectElement[0].firstName);
-                    sessionStorage.setItem('lastName', projectElement[0].lastName);
-                    sessionStorage.setItem('phone', projectElement[0].phone);
-                    if (!projectElement[0].project_data) {
-                      _context.next = 2;
-                      break;
-                    }
-                    jsonData = JSON.parse(projectElement[0].project_data);
-                    _context.next = 5;
-                    break;
-                  case 2:
-                    _context.prev = 2;
-                    _context.next = 3;
-                    return _axios["default"].post("".concat(constants.API_SERVER_URL, "/api/project/loadPidData"), {
-                      pid: match.params.pid
-                    }).data.data;
-                  case 3:
-                    jsonData = _context.sent;
-                    _context.next = 5;
-                    break;
-                  case 4:
-                    _context.prev = 4;
-                    _t = _context["catch"](2);
-                    _this3.setState({
-                      isSnackBarOpen: true,
-                      snackBarMessage: _t
-                    });
-                  case 5:
-                    jsonData.isLoadingCabinet = false;
-                    projectActions.loadProject(jsonData, _this3.props.categoryData);
-                  case 6:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee, null, [[2, 4]]);
-            }));
-            return function (_x) {
-              return _ref.apply(this, arguments);
-            };
-          }());
-        }
-        sessionStorage.removeItem('user_type');
-        sessionStorage.removeItem('project_type');
-        sessionStorage.removeItem('project_timeline');
-      }
-    }
-  }, {
-    key: "componentWillUnmount",
-    value: function componentWillUnmount() {
-      window.addEventListener('beforeunload', this.handleBeforeUnload);
-      window.onbeforeunload = null;
     }
-  }, {
-    key: "componentWillMount",
-    value: function componentWillMount() {}
   }, {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
+      var _oldState$catalog, _plannerState$catalog;
       var stateExtractor = nextProps.stateExtractor,
         state = nextProps.state,
         projectActions = nextProps.projectActions,
@@ -484,9 +357,18 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
 
       // handle external events
       if (this.props.externalEvent !== externalEvent) {
-        (0, _isolateEventHandler.handleExternalEvent)(externalEvent, this.props);
+        (0, _isolateEventHandler.handleExternalEvent)(nextProps);
       }
       var plannerState = stateExtractor(state);
+      var oldState = stateExtractor(this.props.state);
+      if ((oldState === null || oldState === void 0 || (_oldState$catalog = oldState.catalog) === null || _oldState$catalog === void 0 ? void 0 : _oldState$catalog.elements) !== (plannerState === null || plannerState === void 0 || (_plannerState$catalog = plannerState.catalog) === null || _plannerState$catalog === void 0 ? void 0 : _plannerState$catalog.elements)) {
+        // copy state.catalog to the props.catalog
+        // let catalog = this.state.stateCatalog;
+        // console.log('111111', plannerState?.catalog?.elements.toJS());
+        // catalog.elements = plannerState?.catalog?.elements.toJS();
+        // console.log('222222', catalog);
+        // this.setState({ stateCatalog: catalog });
+      }
       var catalogReady = plannerState.getIn(['catalog', 'ready']);
       if (!catalogReady) {
         projectActions.initCatalog(catalog);
@@ -582,7 +464,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement(_export2.Content, (0, _extends2["default"])({
         width: contentW,
         height: contentH,
-        catalog: this.props.catalog,
+        catalog: this.state.stateCatalog,
         state: extractedState,
         toolBar: this.state.toolbar,
         setToolbar: this.setToolbar,