kitchen-simulator 3.1.12 → 3.1.14

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

@@ -5,7 +5,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 { Map } 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, MODE_DRAWING_LINE, TOP, BOTTOM, LEFT, RIGHT, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, INTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, ATT_ITEM_POS, ATT_LINE_LENGTH, ATT_VERTEXT_ONE, ATT_VERTEXT_TWO, ATT_HOLE_OFFSET_A, ATT_HOLE_OFFSET_B, UNIT_CENTIMETER, UNIT_INCH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, EXTERNAL_EVENT_CENTERING_2D, EXTERNAL_EVENT_DUPLICATE_ELEMENT, EXTERNAL_EVENT_DELETE_ELEMENT, ELEMENT_HOLE, ELEMENT_ITEM, ELEMENT_LINE, EXTERNAL_EVENT_REPLACE_CABINET, FINISHING_TYPE, EXTERNAL_EVENT_SET_FINISHING } 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, MODE_DRAWING_LINE, TOP, BOTTOM, LEFT, RIGHT, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, INTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, ATT_ITEM_POS, ATT_LINE_LENGTH, ATT_VERTEXT_ONE, ATT_VERTEXT_TWO, ATT_HOLE_OFFSET_A, ATT_HOLE_OFFSET_B, UNIT_CENTIMETER, UNIT_INCH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, EXTERNAL_EVENT_CENTERING_2D, EXTERNAL_EVENT_DUPLICATE_ELEMENT, EXTERNAL_EVENT_DELETE_ELEMENT, ELEMENT_HOLE, ELEMENT_ITEM, ELEMENT_LINE, EXTERNAL_EVENT_REPLACE_CABINET, FINISHING_TYPE, EXTERNAL_EVENT_SET_FINISHING, EXTERNAL_EVENT_ROTATE_PAN } from "../constants";
 import { isEmpty, updateViwer2D, centering2D } from "./helper";
 import exporter from "../catalog/utils/exporter";
 import { render2DItem, render3DItem, render3DApplianceItem, render3DLightingItem } from "../catalog/utils/item-loader";
@@ -1000,53 +1000,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 === MODE_IDLE) {
-    switch (moveType) {
-      case TOP:
-        value.f -= moveValue;
-        break;
-      case BOTTOM:
-        value.f += moveValue;
-        break;
-      case RIGHT:
-        value.e += moveValue;
-        break;
-      case LEFT:
-        value.e -= moveValue;
-        break;
+function moveAndRotatePan2D3D(eventType, props, payload, state) {
+  if (eventType === EXTERNAL_EVENT_MOVE_PAN) {
+    var moveType = payload.moveType,
+      moveValue = payload.moveValue;
+    var value = state.getIn(['viewer2D']).toJS();
+    if (state.mode === MODE_IDLE) {
+      switch (moveType) {
+        case TOP:
+          value.f -= moveValue;
+          break;
+        case BOTTOM:
+          value.f += moveValue;
+          break;
+        case RIGHT:
+          value.e += moveValue;
+          break;
+        case LEFT:
+          value.e -= moveValue;
+          break;
+      }
+      updateViwer2D(value, props.viewer2DActions);
+    } else if (state.mode === MODE_IDLE_3D) {
+      switch (moveType) {
+        case TOP:
+          window.interval = setTimeout(function () {
+            window.tDKeyDown({
+              keyCode: 38
+            });
+          }, 50);
+          break;
+        case BOTTOM:
+          window.interval = setTimeout(function () {
+            window.tDKeyDown({
+              keyCode: 40
+            });
+          }, 50);
+          break;
+        case RIGHT:
+          window.interval = setTimeout(function () {
+            window.tDKeyDown({
+              keyCode: 37
+            });
+          }, 50);
+          break;
+        case LEFT:
+          window.interval = setTimeout(function () {
+            window.tDKeyDown({
+              keyCode: 39
+            });
+          }, 50);
+          break;
+      }
     }
-    updateViwer2D(value, props.viewer2DActions);
-  } else if (state.mode === MODE_IDLE_3D) {
-    switch (moveType) {
+  } else if (eventType === EXTERNAL_EVENT_ROTATE_PAN) {
+    var rotateType = payload.rotateType;
+    switch (rotateType) {
       case TOP:
         window.interval = setTimeout(function () {
-          window.tDKeyDown({
-            keyCode: 38
+          window.SPKeyDown({
+            keyCode: 87
           });
         }, 50);
         break;
       case BOTTOM:
         window.interval = setTimeout(function () {
-          window.tDKeyDown({
-            keyCode: 40
+          window.SPKeyDown({
+            keyCode: 83
           });
         }, 50);
         break;
       case RIGHT:
         window.interval = setTimeout(function () {
-          window.tDKeyDown({
-            keyCode: 39
+          window.SPKeyDown({
+            keyCode: 68
           });
         }, 50);
         break;
       case LEFT:
         window.interval = setTimeout(function () {
-          window.tDKeyDown({
-            keyCode: 37
+          window.SPKeyDown({
+            keyCode: 65
           });
         }, 50);
         break;
@@ -1059,7 +1093,7 @@ export function handleExternalEvent(_x10) {
 function _handleExternalEvent() {
   _handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(props) {
     var _evt$payload3, _evt$payload4;
-    var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _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 _regeneratorRuntime.wrap(function (_context1) {
       while (1) switch (_context1.prev = _context1.next) {
         case 0:
@@ -1069,7 +1103,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 === EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === EXTERNAL_EVENT_NEW_PROJECT ? 14 : _t5 === EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 15 : _t5 === EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === EXTERNAL_EVENT_ZOOM_OUT ? 21 : _t5 === EXTERNAL_EVENT_CENTERING_2D ? 22 : _t5 === EXTERNAL_EVENT_UNDO ? 23 : _t5 === EXTERNAL_EVENT_REDO ? 24 : _t5 === EXTERNAL_EVENT_SET_MOLDING ? 25 : _t5 === EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 27 : _t5 === EXTERNAL_EVENT_DELETE_ELEMENT ? 28 : _t5 === EXTERNAL_EVENT_PROJECT_SETTING ? 29 : _t5 === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? 30 : _t5 === EXTERNAL_EVENT_UPDATE_PROPERTY ? 30 : _t5 === EXTERNAL_EVENT_REPLACE_CABINET ? 31 : _t5 === EXTERNAL_EVENT_SET_FINISHING ? 33 : _t5 === EXTERNAL_EVENT_SYNC_SCENE ? 34 : 35;
+          _context1.next = _t5 === EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === EXTERNAL_EVENT_ROTATE_PAN ? 13 : _t5 === EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === EXTERNAL_EVENT_NEW_PROJECT ? 14 : _t5 === EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 15 : _t5 === EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === EXTERNAL_EVENT_ZOOM_OUT ? 21 : _t5 === EXTERNAL_EVENT_CENTERING_2D ? 22 : _t5 === EXTERNAL_EVENT_UNDO ? 23 : _t5 === EXTERNAL_EVENT_REDO ? 24 : _t5 === EXTERNAL_EVENT_SET_MOLDING ? 25 : _t5 === EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 27 : _t5 === EXTERNAL_EVENT_DELETE_ELEMENT ? 28 : _t5 === EXTERNAL_EVENT_PROJECT_SETTING ? 29 : _t5 === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? 38 : _t5 === EXTERNAL_EVENT_UPDATE_PROPERTY ? 38 : _t5 === EXTERNAL_EVENT_REPLACE_CABINET ? 39 : _t5 === EXTERNAL_EVENT_SET_FINISHING ? 41 : _t5 === EXTERNAL_EVENT_SYNC_SCENE ? 42 : 43;
           break;
         case 1:
           // prepare item data request
@@ -1154,29 +1188,41 @@ function _handleExternalEvent() {
               };
             }());
           }
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 5:
           props.projectActions.setMode(MODE_IDLE_3D);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 6:
           props.projectActions.setMode(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(MODE_ELEVATION_VIEW);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 8:
           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 _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 9:
           if (isEmpty(evt === null || evt === void 0 ? void 0 : evt.payload)) {
             _context1.next = 11;
             break;
           }
-          element = evt.payload;
+          element = evt.payload; ///// filter the tempPlaceholders using layer-doorstyle-cds
+          cds = (_state$getIn = state.getIn(['scene', 'layers', 'layer-1', 'doorStyle'])) === null || _state$getIn === void 0 ? void 0 : _state$getIn.cds;
+          if (cds) {
+            currentCdsId = (_cds$find = cds.find(function (c) {
+              return c.itemID === element.itemID;
+            })) === null || _cds$find === void 0 ? void 0 : _cds$find.cabinet_door_style_id;
+            if (currentCdsId && element.structure_json.tempPlaceholders.length > 0) {
+              element.structure_json.tempPlaceholders[0] = element.structure_json.tempPlaceholders.find(function (tPlaceholder) {
+                return tPlaceholder.id === currentCdsId;
+              });
+            }
+          }
+          /////
           _context1.next = 10;
           return addItemToCatalog(element, state, props.catalog, props.projectActions);
         case 10:
@@ -1201,18 +1247,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:
           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']);
@@ -1297,11 +1343,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;
@@ -1309,7 +1355,7 @@ function _handleExternalEvent() {
           value.e -= value.SVGWidth * 0.1 / 2;
           value.f -= value.SVGHeight * 0.1 / 2;
           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;
@@ -1317,62 +1363,74 @@ function _handleExternalEvent() {
           _value.e += _value.SVGWidth * 0.1 / 2;
           _value.f += _value.SVGHeight * 0.1 / 2;
           updateViwer2D(_value, props.viewer2DActions);
-          return _context1.abrupt("continue", 35);
+          return _context1.abrupt("continue", 43);
         case 22:
           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 === PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT) {
-            props.viewer2DActions.updateCeilHeight(_value2);
-            props.viewer3DActions.update3DCeilHeight(_value2);
-          } else if (option === PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE) {
-            props.viewer2DActions.changeWallLengthMeasure(_value2);
-          } else if (option === PROJECT_SETTING_OPTION.CHANGE_BASE_CABINET_MEASURE) {
-            props.viewer2DActions.changeBaseCabinetMeasure(_value2);
-          } else if (option === PROJECT_SETTING_OPTION.CHANGE_WALL_CABINET_MEASURE) {
-            props.viewer2DActions.changeWallCabinetMeasure(_value2);
-          } else if (option === PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE) {
-            props.viewer2DActions.changeWindowDoorMeasure(_value2);
-          }
-          return _context1.abrupt("continue", 35);
+          _t6 = option;
+          _context1.next = _t6 === PROJECT_SETTING_OPTION.CHANGE_MEASUREMENT_UNIT ? 30 : _t6 === PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT ? 31 : _t6 === PROJECT_SETTING_OPTION.CHANGE_WALL_LENGTH_MEASURE ? 32 : _t6 === PROJECT_SETTING_OPTION.CHANGE_BASE_CABINET_MEASURE ? 33 : _t6 === PROJECT_SETTING_OPTION.CHANGE_WALL_CABINET_MEASURE ? 34 : _t6 === 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) === 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) === 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) === 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,
@@ -1387,10 +1445,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 = getMoldingDataOfScene(layer, props.catalog, currentTexture);
@@ -1401,8 +1460,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/lib/LiteKitchenConfigurator.js

@@ -30,7 +30,7 @@ var _translator = _interopRequireDefault(require("./translator/translator"));
 var _objectsUtils = require("./utils/objects-utils");
 var _version = require("./version");
 var _isolateEventHandler = require("./utils/isolate-event-handler");
-var _excluded = ["width", "height", "state", "stateExtractor"];
+var _excluded = ["width", "height", "state", "stateExtractor", "measurementUnit"];
 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; }
@@ -371,6 +371,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         height = _this$props2.height,
         state = _this$props2.state,
         stateExtractor = _this$props2.stateExtractor,
+        measurementUnit = _this$props2.measurementUnit,
         props = (0, _objectWithoutProperties2["default"])(_this$props2, _excluded);
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
@@ -413,6 +414,9 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       extractedState = extractedState.merge({
         viewer2D: _viewer2D
       });
+
+      // set the measurement unit after project setup
+      if (measurementUnit) this.props.viewer2DActions.updateCeilHeightUnit(measurementUnit);
       return /*#__PURE__*/_react["default"].createElement("section", null, /*#__PURE__*/_react["default"].createElement("div", {
         style: _objectSpread(_objectSpread({}, wrapperStyle), {}, {
           height: height,

package/lib/catalog/holes/window-clear/planner-element.js

@@ -13,12 +13,12 @@ var _constants = require("../../../constants");
 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); }
 var cached3DWindow = null;
 var _default = exports["default"] = {
-  name: 'Clear Window',
+  name: 'Window',
   prototype: 'holes',
   info: {
     title: 'Clear',
     tag: ['window'],
-    description: 'Clear Window',
+    description: 'Window',
     image: '/assets/img/svg/window/Clear.svg',
     url: '/assets/gltf/window_clear.gltf'
   },

package/lib/class/line.js

@@ -494,7 +494,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       var v_a = layer.vertices.get(line.vertices.get(0));
       var v_b = layer.vertices.get(line.vertices.get(1));
       var distance = _export2.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
-      var _length = (0, _convertUnitsLite.convert)(distance).from('cm').to('in');
+      var _length = (0, _convertUnitsLite.convert)(distance).from('cm').to(layer.unit);
       payload.length = _length;
       if (onInternalEvent) onInternalEvent({
         type: _constants.INTERNAL_EVENT_START_DRAW_WALL,

package/lib/components/viewer2d/item.js

@@ -247,25 +247,38 @@ function Item(_ref, _ref2) {
    */
   var getDistant = function getDistant(x, y, rotRad) {
     var center_h = 3 * height / 8;
-    var center_x = x;
+    var center_x = x; // middle of front line of cabinet rect
     var center_y = y;
-    var center_x1 = x - center_h * Math.sin(rotRad);
+    var center_x1 = x - center_h * Math.sin(rotRad); // center point of cabinet rect
     var center_y1 = y + center_h * Math.cos(rotRad);
     var PointArray = [];
-    curiteminfo.rectCenterPoint.forEach(function (centerpoint) {
-      var comparelength = [];
+    var _loop = function _loop(i) {
+      var centerpoint = curiteminfo.rectCenterPoint[i];
+      // [rectCenterPoint] has four middle points of cabinet rect edges
+      var comparelength = []; // distance array from rectCenterPoint[i] to other lines(walls, other cabinet rect edges)
       var a;
-      var RectLineFuction;
+      var RectLineFuction; // normal line of cabinet rect edge
       if (centerpoint[1] === 180 || centerpoint[1] === 0) RectLineFuction = _export.GeometryUtils.linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x1, center_y1);else RectLineFuction = _export.GeometryUtils.linePassingThroughTwoPoints(centerpoint[0].x, centerpoint[0].y, center_x, center_y);
       allRect.forEach(function (linerect) {
+        // calc distance to all other lines
         var p0 = _export.GeometryUtils.clone_point(linerect.rect[2]);
         var p1 = _export.GeometryUtils.clone_point(linerect.rect[3]);
-        var lineFunction = {};
+        var lineFunction = {}; // other line function
         if (p0.x !== p1.x || p0.y !== p1.y) lineFunction = _export.GeometryUtils.linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
+        // intersection between normal line and other line
         var coordinatePoint = _export.GeometryUtils.twoLinesIntersection(lineFunction.a, lineFunction.b, lineFunction.c, RectLineFuction.a, RectLineFuction.b, RectLineFuction.c);
         if (coordinatePoint !== undefined) {
-          if (_export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && _export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
-            if (_export.GeometryUtils.pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > _export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
+          if (
+          // intersection point is on the other line
+          _export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && _export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
+            // check the intersection point is outside direction of edge
+            var isOutside = true;
+            for (var j = 0; j < curiteminfo.rectCenterPoint.length; j++) {
+              if (j === i) continue;
+              var otherCenterPoint = curiteminfo.rectCenterPoint[j];
+              if (_export.GeometryUtils.isPointOnLineSegment(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y, otherCenterPoint[0].x, otherCenterPoint[0].y)) isOutside = false;
+            }
+            if (isOutside && _export.GeometryUtils.pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > _export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
               comparelength.push(_export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
               a = Math.min.apply(null, comparelength);
             }
@@ -273,7 +286,10 @@ function Item(_ref, _ref2) {
         }
       });
       PointArray.push([a, centerpoint[1]]);
-    });
+    };
+    for (var i = 0; i < curiteminfo.rectCenterPoint.length; i++) {
+      _loop(i);
+    }
     return {
       PointArray: PointArray
     };

package/lib/components/viewer2d/utils.js

@@ -201,7 +201,7 @@ var areaPolygon = exports.areaPolygon = function areaPolygon(points) {
 };
 var isWarningItem = exports.isWarningItem = function isWarningItem(item) {
   var _item$toJS$doorStyle;
-  return !(item !== null && item !== void 0 && (_item$toJS$doorStyle = item.toJS().doorStyle) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.doorStyles) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.cds) !== null && _item$toJS$doorStyle !== void 0 && _item$toJS$doorStyle.filter(function (cd) {
+  if (item.category === 'cabinet') return !(item !== null && item !== void 0 && (_item$toJS$doorStyle = item.toJS().doorStyle) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.doorStyles) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.cds) !== null && _item$toJS$doorStyle !== void 0 && _item$toJS$doorStyle.filter(function (cd) {
     return cd.itemID == (item === null || item === void 0 ? void 0 : item.getIn(['itemID']));
-  }).length) > 0;
+  }).length) > 0;else return false;
 };

package/lib/components/viewer2d/viewer2d.js

@@ -1266,7 +1266,7 @@ function Viewer2D(_ref, _ref2) {
           var v_a = layer.vertices.get(_currentObject.vertices.get(0));
           var v_b = layer.vertices.get(_currentObject.vertices.get(1));
           var distance = _export2.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
-          var _length3 = (0, _convertUnitsLite.convert)(distance).from('cm').to('in');
+          var _length3 = (0, _convertUnitsLite.convert)(distance).from('cm').to(layer.unit);
           payload.length = _length3;
           //////////////////////////////////////
         } else if (((_currentObject5 = _currentObject) === null || _currentObject5 === void 0 ? void 0 : _currentObject5.prototype) === 'items') {