kitchen-simulator 3.1.13 → 3.1.15

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

@@ -1007,53 +1007,87 @@ function setFinishing(props, state, payload) {
       break;
   }
 }
-function movePan2D3D(props, payload, state) {
-  var moveType = payload.moveType,
-    moveValue = payload.moveValue;
-  var value = state.getIn(['viewer2D']).toJS();
-  if (state.mode === _constants.MODE_IDLE) {
-    switch (moveType) {
-      case _constants.TOP:
-        value.f -= moveValue;
-        break;
-      case _constants.BOTTOM:
-        value.f += moveValue;
-        break;
-      case _constants.RIGHT:
-        value.e += moveValue;
-        break;
-      case _constants.LEFT:
-        value.e -= moveValue;
-        break;
+function moveAndRotatePan2D3D(eventType, props, payload, state) {
+  if (eventType === _constants.EXTERNAL_EVENT_MOVE_PAN) {
+    var moveType = payload.moveType,
+      moveValue = payload.moveValue;
+    var value = state.getIn(['viewer2D']).toJS();
+    if (state.mode === _constants.MODE_IDLE) {
+      switch (moveType) {
+        case _constants.TOP:
+          value.f -= moveValue;
+          break;
+        case _constants.BOTTOM:
+          value.f += moveValue;
+          break;
+        case _constants.RIGHT:
+          value.e += moveValue;
+          break;
+        case _constants.LEFT:
+          value.e -= moveValue;
+          break;
+      }
+      (0, _helper.updateViwer2D)(value, props.viewer2DActions);
+    } else if (state.mode === _constants.MODE_IDLE_3D) {
+      switch (moveType) {
+        case _constants.TOP:
+          window.interval = setTimeout(function () {
+            window.tDKeyDown({
+              keyCode: 38
+            });
+          }, 50);
+          break;
+        case _constants.BOTTOM:
+          window.interval = setTimeout(function () {
+            window.tDKeyDown({
+              keyCode: 40
+            });
+          }, 50);
+          break;
+        case _constants.RIGHT:
+          window.interval = setTimeout(function () {
+            window.tDKeyDown({
+              keyCode: 37
+            });
+          }, 50);
+          break;
+        case _constants.LEFT:
+          window.interval = setTimeout(function () {
+            window.tDKeyDown({
+              keyCode: 39
+            });
+          }, 50);
+          break;
+      }
     }
-    (0, _helper.updateViwer2D)(value, props.viewer2DActions);
-  } else if (state.mode === _constants.MODE_IDLE_3D) {
-    switch (moveType) {
+  } else if (eventType === _constants.EXTERNAL_EVENT_ROTATE_PAN) {
+    var rotateType = payload.rotateType;
+    switch (rotateType) {
       case _constants.TOP:
         window.interval = setTimeout(function () {
-          window.tDKeyDown({
-            keyCode: 38
+          window.SPKeyDown({
+            keyCode: 87
           });
         }, 50);
         break;
       case _constants.BOTTOM:
         window.interval = setTimeout(function () {
-          window.tDKeyDown({
-            keyCode: 40
+          window.SPKeyDown({
+            keyCode: 83
           });
         }, 50);
         break;
       case _constants.RIGHT:
         window.interval = setTimeout(function () {
-          window.tDKeyDown({
-            keyCode: 37
+          window.SPKeyDown({
+            keyCode: 68
           });
         }, 50);
         break;
       case _constants.LEFT:
         window.interval = setTimeout(function () {
-          window.tDKeyDown({
-            keyCode: 39
+          window.SPKeyDown({
+            keyCode: 65
           });
         }, 50);
         break;
@@ -1066,7 +1100,7 @@ function handleExternalEvent(_x10) {
 function _handleExternalEvent() {
   _handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(props) {
     var _evt$payload3, _evt$payload4;
-    var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, _state$getIn, element, cds, _cds$find, currentCdsId, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5;
+    var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, _state$getIn, element, cds, _cds$find, currentCdsId, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5, _t6;
     return _regenerator["default"].wrap(function (_context1) {
       while (1) switch (_context1.prev = _context1.next) {
         case 0:
@@ -1076,7 +1110,7 @@ function _handleExternalEvent() {
           layerId = state.getIn(['scene', 'selectedLayer']);
           layer = state.getIn(['scene', 'layers', layerId]);
           _t5 = evt === null || evt === void 0 ? void 0 : evt.type;
-          _context1.next = _t5 === _constants.EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === _constants.EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === _constants.EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 14 : _t5 === _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 15 : _t5 === _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_OUT ? 21 : _t5 === _constants.EXTERNAL_EVENT_CENTERING_2D ? 22 : _t5 === _constants.EXTERNAL_EVENT_UNDO ? 23 : _t5 === _constants.EXTERNAL_EVENT_REDO ? 24 : _t5 === _constants.EXTERNAL_EVENT_SET_MOLDING ? 25 : _t5 === _constants.EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 27 : _t5 === _constants.EXTERNAL_EVENT_DELETE_ELEMENT ? 28 : _t5 === _constants.EXTERNAL_EVENT_PROJECT_SETTING ? 29 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? 30 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_PROPERTY ? 30 : _t5 === _constants.EXTERNAL_EVENT_REPLACE_CABINET ? 31 : _t5 === _constants.EXTERNAL_EVENT_SET_FINISHING ? 33 : _t5 === _constants.EXTERNAL_EVENT_SYNC_SCENE ? 34 : 35;
+          _context1.next = _t5 === _constants.EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === _constants.EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === _constants.EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === _constants.EXTERNAL_EVENT_ROTATE_PAN ? 13 : _t5 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 14 : _t5 === _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 15 : _t5 === _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_OUT ? 21 : _t5 === _constants.EXTERNAL_EVENT_CENTERING_2D ? 22 : _t5 === _constants.EXTERNAL_EVENT_UNDO ? 23 : _t5 === _constants.EXTERNAL_EVENT_REDO ? 24 : _t5 === _constants.EXTERNAL_EVENT_SET_MOLDING ? 25 : _t5 === _constants.EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 27 : _t5 === _constants.EXTERNAL_EVENT_DELETE_ELEMENT ? 28 : _t5 === _constants.EXTERNAL_EVENT_PROJECT_SETTING ? 29 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? 38 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_PROPERTY ? 38 : _t5 === _constants.EXTERNAL_EVENT_REPLACE_CABINET ? 39 : _t5 === _constants.EXTERNAL_EVENT_SET_FINISHING ? 41 : _t5 === _constants.EXTERNAL_EVENT_SYNC_SCENE ? 42 : 43;
           break;
         case 1:
           // prepare item data request
@@ -1161,23 +1195,23 @@ function _handleExternalEvent() {
               };
             }());
           }
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 5:
           props.projectActions.setMode(_constants.MODE_IDLE_3D);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 6:
           props.projectActions.setMode(_constants.MODE_IDLE);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 7:
           sLineCnt = layer.selected.lines.size;
           if (sLineCnt > 0) props.projectActions.setMode(_constants.MODE_ELEVATION_VIEW);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 8:
           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 _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 9:
           if ((0, _helper.isEmpty)(evt === null || evt === void 0 ? void 0 : evt.payload)) {
             _context1.next = 11;
@@ -1220,18 +1254,18 @@ function _handleExternalEvent() {
           props.projectActions.pushLastSelectedCatalogElementToHistory(element);
           props.projectActions.setIsCabinetDrawing(true);
         case 11:
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 12:
           _constants.ARRAY_3D_MODES.includes(state.mode) ? props.holesActions.selectToolDrawingHole3D(evt === null || evt === void 0 || (_evt$payload3 = evt.payload) === null || _evt$payload3 === void 0 ? void 0 : _evt$payload3.holeName) : props.holesActions.selectToolDrawingHole(evt === null || evt === void 0 || (_evt$payload4 = evt.payload) === null || _evt$payload4 === void 0 ? void 0 : _evt$payload4.holeName);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 13:
-          movePan2D3D(props, evt.payload, state);
-          return _context1.abrupt("continue", 35);
+          moveAndRotatePan2D3D(evt.type, props, evt.payload, state);
+          return _context1.abrupt("continue", 43);
         case 14:
           defaulTitle = 'Untitle';
           props.projectActions.newProject();
           props.projectActions.rename(defaulTitle);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 15:
           _evt$payload5 = evt.payload, doorStyle = _evt$payload5.doorStyle, itemCDS = _evt$payload5.itemCDS, isAll = _evt$payload5.isAll; // prepare item data request
           _layerId = state.getIn(['scene', 'selectedLayer']);
@@ -1316,11 +1350,11 @@ function _handleExternalEvent() {
               };
             }());
           } else props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 19:
           _evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle;
           props.projectActions.createRoomWithShape(roomShapeType, width, height, _doorStyle);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 20:
           value = state.getIn(['viewer2D']).toJS();
           value.a += 0.1;
@@ -1328,7 +1362,7 @@ function _handleExternalEvent() {
           value.e -= value.SVGWidth * 0.1 / 2;
           value.f -= value.SVGHeight * 0.1 / 2;
           (0, _helper.updateViwer2D)(value, props.viewer2DActions);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 21:
           _value = state.getIn(['viewer2D']).toJS();
           _value.a -= 0.1;
@@ -1336,62 +1370,74 @@ function _handleExternalEvent() {
           _value.e += _value.SVGWidth * 0.1 / 2;
           _value.f += _value.SVGHeight * 0.1 / 2;
           (0, _helper.updateViwer2D)(_value, props.viewer2DActions);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 22:
           (0, _helper.centering2D)(state, props.viewer2DActions);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 23:
           props.projectActions.undo();
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 24:
           props.projectActions.redo();
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 25:
           _evt$payload7 = evt.payload, moldingInfo = _evt$payload7.moldingInfo, isGlobal = _evt$payload7.isGlobal;
           _context1.next = 26;
           return loadMoldingSvg(moldingInfo);
         case 26:
           props.itemsActions.setMolding(moldingInfo, isGlobal);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 27:
           distElement = getElement(evt.payload, state);
           if (distElement) props.itemsActions.duplicateSelected(distElement, props.onInternalEvent);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 28:
           _distElement = getElement(evt.payload, state);
           if (_distElement) props.projectActions.remove(_distElement);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 29:
           _evt$payload8 = evt.payload, option = _evt$payload8.option, _value2 = _evt$payload8.value;
-          if (option === _constants.PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT) {
-            props.viewer2DActions.updateCeilHeight(_value2);
-            props.viewer3DActions.update3DCeilHeight(_value2);
-          } else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE) {
-            props.viewer2DActions.changeWallLengthMeasure(_value2);
-          } else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_BASE_CABINET_MEASURE) {
-            props.viewer2DActions.changeBaseCabinetMeasure(_value2);
-          } else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_WALL_CABINET_MEASURE) {
-            props.viewer2DActions.changeWallCabinetMeasure(_value2);
-          } else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE) {
-            props.viewer2DActions.changeWindowDoorMeasure(_value2);
-          }
-          return _context1.abrupt("continue", 35);
+          _t6 = option;
+          _context1.next = _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_MEASUREMENT_UNIT ? 30 : _t6 === _constants.PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT ? 31 : _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE ? 32 : _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_BASE_CABINET_MEASURE ? 33 : _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_WALL_CABINET_MEASURE ? 34 : _t6 === _constants.PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE ? 35 : 36;
+          break;
         case 30:
+          props.viewer2DActions.updateCeilHeightUnit(_value2);
+        case 31:
+          props.viewer2DActions.updateCeilHeight(_value2);
+          props.viewer3DActions.update3DCeilHeight(_value2);
+          return _context1.abrupt("continue", 37);
+        case 32:
+          props.viewer2DActions.changeWallLengthMeasure(_value2);
+          return _context1.abrupt("continue", 37);
+        case 33:
+          props.viewer2DActions.changeBaseCabinetMeasure(_value2);
+          return _context1.abrupt("continue", 37);
+        case 34:
+          props.viewer2DActions.changeWallCabinetMeasure(_value2);
+          return _context1.abrupt("continue", 37);
+        case 35:
+          props.viewer2DActions.changeWindowDoorMeasure(_value2);
+          return _context1.abrupt("continue", 37);
+        case 36:
+          return _context1.abrupt("continue", 37);
+        case 37:
+          return _context1.abrupt("continue", 43);
+        case 38:
           _layerId2 = state.getIn(['scene', 'selectedLayer']);
           _layer = state.getIn(['scene', 'layers', _layerId2]);
           _layer$getIn = _layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
           for (_i4 = 0; _i4 < selectedLines.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, state, _layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
           for (_i5 = 0; _i5 < selectedHoles.size; _i5++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, state, _layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, props.catalog, props.projectActions, evt.callback);
           for (_i6 = 0; _i6 < selectedItems.size; _i6++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, state, _layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, props.catalog, props.projectActions, evt.callback);
-          return _context1.abrupt("continue", 35);
-        case 31:
+          return _context1.abrupt("continue", 43);
+        case 39:
           _layerID = state.scene.selectedLayer;
           _layer2 = state.scene.getIn(['layers', _layerID]).toJS();
           orginalItemInfo = evt === null || evt === void 0 || (_evt$payload9 = evt.payload) === null || _evt$payload9 === void 0 ? void 0 : _evt$payload9.orginalItemInfo;
           originalItem = _layer2 === null || _layer2 === void 0 ? void 0 : _layer2.items[orginalItemInfo.id];
-          _context1.next = 32;
+          _context1.next = 40;
           return addItemToCatalog(evt.payload.replaceItemInfo, state, props.catalog, props.projectActions);
-        case 32:
+        case 40:
           originalItemPos = {
             rotation: originalItem.rotation,
             selectedItemId: originalItem.id,
@@ -1406,10 +1452,11 @@ function _handleExternalEvent() {
             }
           };
           props.itemsActions.replaceItem(originalItemPos, originalItem, replaceItem);
-          return _context1.abrupt("continue", 35);
-        case 33:
+          return _context1.abrupt("continue", 43);
+        case 41:
           setFinishing(props, state, evt.payload);
-        case 34:
+          return _context1.abrupt("continue", 43);
+        case 42:
           sceneData = state.scene.toJS(); // get molding data for "ReviewForQuote"
           currentTexture = layer.doorStyle !== null || layer.doorStyle !== undefined ? layer.doorStyle : props.state.doorStyle.toJS();
           sceneData.layers[layerId].moldingData = (0, _molding.getMoldingDataOfScene)(layer, props.catalog, currentTexture);
@@ -1420,8 +1467,8 @@ function _handleExternalEvent() {
               scene: sceneData
             }
           });
-          return _context1.abrupt("continue", 35);
-        case 35:
+          return _context1.abrupt("continue", 43);
+        case 43:
         case "end":
           return _context1.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "3.1.13",
+  "version": "3.1.15",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",