kitchen-simulator 4.0.7-react-18 → 4.0.7

package/lib/components/viewer3d/ruler-utils/scene3D.js

@@ -22,7 +22,7 @@ function Scene3D(_ref) {
     downloadFlag = _ref.downloadFlag;
   var layers = scene.layers;
   var selectedLayer = layers.get(scene.selectedLayer);
-  var ceilHeight = selectedLayer.ceilHeight;
+  var ceilHeight = Number(selectedLayer.ceilHeight);
   var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
   var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
   var vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));

package/lib/components/viewer3d/scene-creator.js

@@ -222,6 +222,31 @@ function createWarningObject() {
   warningObj.name = 'warningObj';
   return warningObj;
 }
+function swapLengthProperty(diffs) {
+  var idx1 = diffs.findIndex(function (v) {
+    return v.path[v.path.length - 1] === 'length';
+  });
+  var idx2 = diffs.findIndex(function (v) {
+    return v.path[v.path.length - 1] === '_length';
+  });
+  if (idx1 < 0 || idx2 < 0) return diffs;
+  if (idx1 > idx2) return diffs;
+  if (diffs[idx1].op === diffs[idx2].op) {
+    var isSwap = true;
+    for (var i = 0; i < diffs[idx1].path.length - 2; i++) {
+      if (diffs[idx1].path[i] !== diffs[idx2].path[i]) {
+        isSwap = false;
+        break;
+      }
+    }
+    if (isSwap) {
+      var temp = diffs[idx1];
+      diffs[idx1] = diffs[idx2];
+      diffs[idx2] = temp;
+    }
+  }
+  return diffs;
+}
 function updateScene(planData, sceneData, oldSceneData, diffArray, actions, catalog) {
   var _draggingItem$toJS, _filteredDiffs, _filteredDiffs2;
   var mode = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
@@ -239,6 +264,9 @@ function updateScene(planData, sceneData, oldSceneData, diffArray, actions, cata
       value: el.value
     };
   });
+
+  // move "length" to after "_length"
+  splitted = swapLengthProperty(splitted);
   var filteredDiffs = filterDiffs(splitted, sceneData, oldSceneData);
   //***testing additional filter***
   filteredDiffs = filteredDiffs.filter(function (_ref) {
@@ -273,7 +301,7 @@ function updateScene(planData, sceneData, oldSceneData, diffArray, actions, cata
      * Every 'doorStyle' change has a 'door_style_id' change.
      * So, if door_style_id changes, it indicates 'doorStyle' change.
      */
-    if (['id'].includes(path[path.length - 1])) isSettingDoorStyle = true;
+    if (path[1] === 'layers' && path[3] === 'molding' || path[path.length - 2] === 'doorStyle' && path[path.length - 1] === 'id' || ['id'].includes(path[path.length - 1])) isSettingDoorStyle = true;
 
     // If there are any molding change of layer
     if (path[1] === 'layers' && path[3] === 'molding') isUpdateMolding = true;
@@ -649,10 +677,10 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             vLine3.material.depthTest = false;
             var uVec = new Three.Vector3(-posVec.x / scalevec.x, -posVec.y / scalevec.y, -posVec.z / scalevec.z);
             var blLighting = item.type.includes('Light');
-            vLine.translateY(blLighting ? 1.6 : 0.1);
-            vLine1.translateY(blLighting ? 1.6 : 0.1);
-            vLine2.translateY(blLighting ? 1.6 : 0.1);
-            vLine3.translateY(blLighting ? 1.6 : 0.1);
+            vLine.translateY(blLighting ? 1.6 : boundingBox.min.y + 0.1);
+            vLine1.translateY(blLighting ? 1.6 : boundingBox.min.y + 0.1);
+            vLine2.translateY(blLighting ? 1.6 : boundingBox.min.y + 0.1);
+            vLine3.translateY(blLighting ? 1.6 : boundingBox.min.y + 0.1);
             upObj.translateOnAxis(uVec, 1);
             upObj.translateY(max.y - min.y);
             _mBox.name = 'TransformBox';
@@ -958,9 +986,9 @@ function getLineDistance(obj, layer, isCalcWall, index) {
         obj.geometry.attributes.position.needsUpdate = true;
         obj.geometry.computeBoundingSphere();
         obj.geometry.computeBoundingBox();
-        var dist = (0, _math.formatNumber)((0, _convertUnitsLite.convert)(intersects[i].distance).from('cm').to('in'), _constants.DECIMAL_PLACES_2);
+        var dist = (0, _convertUnitsLite.convert)(intersects[i].distance).from('cm').to('in');
         if (dist > 3) {
-          var _canvas = getTextCanvas(dist);
+          var _canvas = getDistanceCanvas(dist, layer);
           var wid = _canvas.width / window.innerWidth * 30;
           var hei = _canvas.height / window.innerHeight * 30;
           var texture = new Three.Texture(_canvas);
@@ -1082,7 +1110,7 @@ function getLineDistance(obj, layer, isCalcWall, index) {
       obj.geometry.attributes.position.needsUpdate = true;
       var _dist = (0, _math.formatNumber)(distance, _constants.DECIMAL_PLACES_2);
       if (_dist > 3) {
-        var _canvas2 = getTextCanvas(_dist);
+        var _canvas2 = getDistanceCanvas(_dist, layer);
         var _wid = _canvas2.width / window.innerWidth * 30;
         var _hei = _canvas2.height / window.innerHeight * 30;
         var _texture = new Three.Texture(_canvas2);
@@ -1210,12 +1238,18 @@ function getIntersectPoint(opX, opY, pX, pY) {
 function gcd(a, b) {
   return a % b ? gcd(b, a % b) : b;
 }
-function getTextCanvas(text) {
-  var parameters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+function getDistanceCanvas(distance, layer) {
+  var _layer$unit;
+  var parameters = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var canvas = document.createElement('canvas');
   var ctx = canvas.getContext('2d');
+  var curUnit = (_layer$unit = layer === null || layer === void 0 ? void 0 : layer.unit) !== null && _layer$unit !== void 0 ? _layer$unit : _constants.UNIT_INCH;
+  var fixedLength = (layer === null || layer === void 0 ? void 0 : layer.unit) === _constants.UNIT_METER || (layer === null || layer === void 0 ? void 0 : layer.unit) === _constants.UNIT_FOOT ? 2 : 0;
+  var distText = String((Math.round((0, _convertUnitsLite.convert)(distance).from('in').to(curUnit) * 100) / 100).toFixed(fixedLength));
   var fontSize = 16;
-  var integral = String(text) + "''";
+  var integral = distText + curUnit;
+  // let integral = String(distance) + "''";
+
   parameters.fontName = parameters.fontName || _constants.ARROW_TEXT_FONTFACE;
 
   // Prepare the font to be able to measure
@@ -3452,14 +3486,21 @@ function updateMoldingGroupArray(MGArray, selItem, planData, layer) {
     if (changeMoldings.length === 0 && isEnableMolding) {
       // refresh mesh of the updating molding groups
       new_MGArray.forEach(function (mg, index) {
-        if (mg.items[0].molding.some(function (mol) {
-          return mol.location_type === mg.location_type;
+        var _mg$items$;
+        if ((_mg$items$ = mg.items[0]) !== null && _mg$items$ !== void 0 && (_mg$items$ = _mg$items$.molding) !== null && _mg$items$ !== void 0 && _mg$items$.some(function (mol) {
+          var _mol$toJS;
+          return (0, _helper.isImmutable)(mol) ? (mol === null || mol === void 0 || (_mol$toJS = mol.toJS()) === null || _mol$toJS === void 0 ? void 0 : _mol$toJS.location_type) === mg.location_type : (mol === null || mol === void 0 ? void 0 : mol.location_type) === mg.location_type;
         })) {
-          var molding = mg.items[0].molding.filter(function (mol) {
-            return mol.location_type === mg.location_type;
+          var _mg$items$2, _mg$items$3, _mg$items$4;
+          var molding = (0, _helper.isImmutable)((_mg$items$2 = mg.items[0]) === null || _mg$items$2 === void 0 ? void 0 : _mg$items$2.molding) ? (_mg$items$3 = mg.items[0]) === null || _mg$items$3 === void 0 || (_mg$items$3 = _mg$items$3.molding) === null || _mg$items$3 === void 0 ? void 0 : _mg$items$3.filter(function (mol) {
+            var _mol$toJS2;
+            return (mol === null || mol === void 0 || (_mol$toJS2 = mol.toJS()) === null || _mol$toJS2 === void 0 ? void 0 : _mol$toJS2.location_type) === mg.location_type;
+          }).toJS()[0] : (_mg$items$4 = mg.items[0]) === null || _mg$items$4 === void 0 || (_mg$items$4 = _mg$items$4.molding) === null || _mg$items$4 === void 0 ? void 0 : _mg$items$4.filter(function (mol) {
+            return (mol === null || mol === void 0 ? void 0 : mol.location_type) === mg.location_type;
           })[0];
           if (mg.molding === null || mg.molding.itemID !== mol.itemID || mg.lines === null || mg.points === null) {
-            if (mg.molding !== null && mg.molding.itemID !== molding.itemID) {
+            var _mg$molding;
+            if (mg.molding !== null && ((_mg$molding = mg.molding) === null || _mg$molding === void 0 ? void 0 : _mg$molding.itemID) !== molding.itemID) {
               deleteMGMesh(mg, planData, mode);
             }
             mg = _export.MoldingUtils.createMonldingGroup(mg, layer, molding, planData.catalog);

package/lib/components/viewer3d/viewer3d-first-person.js

@@ -261,12 +261,10 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
       this.renderer.renderLists.dispose();
     }
   }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      var _this$props = this.props,
-        width = _this$props.width,
-        height = _this$props.height,
-        state = _this$props.state;
+    key: "componentWillReceiveProps",
+    value: function componentWillReceiveProps(nextProps) {
+      var width = nextProps.width,
+        height = nextProps.height;
       var camera = this.camera,
         renderer = this.renderer,
         scene3D = this.scene3D,
@@ -279,27 +277,19 @@ var Viewer3DFirstPerson = exports["default"] = /*#__PURE__*/function (_React$Com
         linesActions: this.context.linesActions,
         projectActions: this.context.projectActions
       };
-
-      // Handle width/height changes
-      if (width !== prevProps.width || height !== prevProps.height) {
-        this.width = width;
-        this.height = height;
-        camera.aspect = width / height;
-        camera.updateProjectionMatrix();
-        renderer.setSize(width, height);
-      }
-
-      // Handle scene changes
-      if (state.scene !== prevProps.state.scene) {
-        var changedValues = (0, _immutablediff["default"])(prevProps.state.scene, state.scene);
-        (0, _sceneCreator.updateScene)(planData, state.scene, prevProps.state.scene, changedValues.toJS(), actions, this.context.catalog);
+      this.width = width;
+      this.height = height;
+      camera.aspect = width / height;
+      camera.updateProjectionMatrix();
+      if (nextProps.scene !== this.props.state.scene) {
+        var changedValues = (0, _immutablediff["default"])(this.props.state.scene, nextProps.state.scene);
+        (0, _sceneCreator.updateScene)(planData, nextProps.state.scene, this.props.state.scene, changedValues.toJS(), actions, this.context.catalog);
       }
-
-      // Always re-render after updates
-      renderer.clear();
-      renderer.render(scene3D, camera);
-      renderer.clearDepth();
-      renderer.render(sceneOnTop, camera);
+      renderer.setSize(width, height);
+      renderer.clear(); // clear buffers
+      renderer.render(scene3D, camera); // render scene 1
+      renderer.clearDepth(); // clear depth buffer
+      renderer.render(sceneOnTop, camera); // render scene 2
     }
   }, {
     key: "render",
@@ -315,4 +305,12 @@ Viewer3DFirstPerson.propTypes = {
   width: _propTypes["default"].number.isRequired,
   height: _propTypes["default"].number.isRequired
 };
+Viewer3DFirstPerson.contextTypes = {
+  areaActions: _propTypes["default"].object.isRequired,
+  holesActions: _propTypes["default"].object.isRequired,
+  itemsActions: _propTypes["default"].object.isRequired,
+  linesActions: _propTypes["default"].object.isRequired,
+  projectActions: _propTypes["default"].object.isRequired,
+  catalog: _propTypes["default"].object
+};
 module.exports = exports.default;

package/lib/components/viewer3d/viewer3d.js

@@ -238,6 +238,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           });
           self.renderer.domElement.style.display = 'block';
         }, 1500);
+        self.planData = planData;
       });
       var area = scene.getIn(['layers', scene.selectedLayer, 'areas']);
       var layer = scene.getIn(['layers', scene.selectedLayer]);
@@ -676,7 +677,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         layer.lines.forEach(function (line) {
           line.holes.forEach(function (holeID) {
             var hole = layer.holes.get(holeID);
-            holes.push(hole);
+            if (hole) holes.push(hole);
           });
         });
         var i = 0;
@@ -1192,18 +1193,10 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
       };
       var sendInternalEvent = function sendInternalEvent(evtType, evtElement) {
         var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-        if (!(0, _helper.isEmpty)(evtType)) {
-          var _this2$props$onIntern, _this2$props;
-          var payload = evtElement === null || evtElement === void 0 ? void 0 : evtElement.toJS();
-          if ((evtElement === null || evtElement === void 0 ? void 0 : evtElement.prototype) === 'items') {
-            // check this cabinet has warning box
-            payload.isWarning = (0, _utils.isWarningItem)(evtElement);
-            // check this item is available molding
-            payload.isMoldingAvailable = _export.MoldingUtils.isEnableItemForMolding(layer, evtElement); // check this item is snapped to wall
-            payload.isAttachedWall = _export.MoldingUtils.isAttachedWall(layer, evtElement);
-            // update distArray
-            if (pointArray) payload.distArray = pointArray;
-          }
+        if (!(0, _helper.isEmpty)(evtType) && !(0, _helper.isEmpty)(evtElement)) {
+          var _state$get, _this2$props$onIntern, _this2$props;
+          var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
+          var payload = (0, _helper.updatePayloadOfInternalEvent)(evtElement, layer, catalog, pointArray);
           (_this2$props$onIntern = (_this2$props = _this2.props).onInternalEvent) === null || _this2$props$onIntern === void 0 || _this2$props$onIntern.call(_this2$props, {
             type: evtType,
             value: payload
@@ -1361,11 +1354,6 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
               if (selectedFlag || toolIntersects.length > 0 && !(0, _helper.isElevationView)(mode)) {
                 cameraControls.mouseButtons.left = _cameraControls["default"].ACTION.NONE;
                 selectedFlag = false;
-              } else {
-                isSelected = false;
-                _this2.context.projectActions.unselectAll();
-                scene3D.remove(toolObj);
-                _this2.context.itemsActions.removeReplacingSupport();
               }
             }
           } else {
@@ -1418,11 +1406,18 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         }
         switch (_this2.props.state.mode) {
           case _constants.MODE_DRAGGING_ITEM_3D:
+          case _constants.MODE_DRAGGING_HOLE_3D:
             internalType = _constants.INTERNAL_EVENT_DRAG_ELEMENT;
             break;
           case _constants.MODE_ROTATING_ITEM_3D:
             internalType = _constants.INTERNAL_EVENT_ROTATE_ELEMENT;
             break;
+          case _constants.MODE_DRAWING_HOLE_3D:
+            internalType = _constants.INTERNAL_EVENT_DRAW_ELEMENT;
+            break;
+          case _constants.MODE_IDLE_3D:
+            internalType = _constants.INTERNAL_EVENT_SELECT_ELEMENT;
+            break;
         }
         if (_this2.props.state.mode == _constants.MODE_DRAGGING_ITEM_3D) {
           _this2.context.itemsActions.endDraggingItem3D();
@@ -1456,7 +1451,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             });
           });
           var intersects = raycaster.intersectObjects(meshes, true);
-          var _i10;
+          var _i10; // index of warning object in intersects
+
           if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
             for (_i10 = 0; _i10 < intersects.length; _i10++) {
               if (intersects[_i10].object.name === 'warningObj') break;
@@ -1472,6 +1468,9 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                   var replaceInfo = intersects[_i10].object.parent.parent.userData;
                   _this2.context.itemsActions.selectItem(replaceInfo.layerId, replaceInfo.itemId);
                   !_this2.props.downloadFlag && _this2.props.replaceCabinet(true);
+                  internalType = _constants.INTERNAL_EVENT_REPLACE_CABINET;
+                  var replaceElement = _this2.props.state.scene.layers.get(replaceInfo.layerId).items.get(replaceInfo.itemId);
+                  sendInternalEvent(internalType, replaceElement);
                   return;
                 }
               }
@@ -1484,6 +1483,19 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             }
           }
           gridMatrix.copy(gridPlane.matrixWorld).invert();
+          var addItemToolObj = function addItemToolObj() {
+            var _planData$sceneGraph, _selectedObject, _intersects$_i;
+            var selectedItem = (_planData$sceneGraph = planData.sceneGraph) === null || _planData$sceneGraph === void 0 || (_planData$sceneGraph = _planData$sceneGraph.layers[selectedObject.layerID]) === null || _planData$sceneGraph === void 0 ? void 0 : _planData$sceneGraph.items[(_selectedObject = selectedObject) === null || _selectedObject === void 0 ? void 0 : _selectedObject.itemID];
+            if ((0, _util.isUndefined)(selectedItem)) return;
+            selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
+            var itemPos = selectedItem.position.clone();
+            if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
+              toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
+            } else {
+              toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
+            }
+            scene3D.add(toolObj);
+          };
           if (Math.abs(mouse.x - _this2.lastMousePosition.x) <= 0.02 && Math.abs(mouse.y - _this2.lastMousePosition.y) <= 0.02 || bMove) {
             if (intersects.length > 0 && !isNaN(intersects[0].distance)) {
               if (intersects[_i10] === undefined) {
@@ -1507,36 +1519,17 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                 isSelected = true;
                 setTimeout(function () {
                   (0, _sceneCreator.getDistances)(layer);
-                  var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-                  if ((0, _util.isUndefined)(selectedItem)) return;
-                  selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
-                  var itemPos = selectedItem.position.clone();
-                  if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
-                    toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
-                  } else {
-                    toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
-                  }
-                  scene3D.add(toolObj);
+                  addItemToolObj();
                   _this2.setState({
                     toolObj: toolObj
                   });
                   // showItemButtons(layer.getIn(['items', selectedObject.itemID]), currentObject, event, camera, this.renderer);
-                  var pointArray = [],
-                    cnt = 0;
-                  pointArray.push([_sceneCreator.fVLine[0].userData.distance, 90]);
-                  pointArray.push([_sceneCreator.fVLine[1].userData.distance, -90]);
-                  pointArray.push([_sceneCreator.fVLine[2].userData.distance, 180]);
-                  pointArray.push([_sceneCreator.fVLine[3].userData.distance, 0]);
-                  pointArray.forEach(function (pointElement, index) {
-                    if (pointElement[0] == undefined) pointArray[index][0] = 0;
-                  });
-                  pointArray.forEach(function (pointElement) {
-                    if (pointElement[0] == 0) cnt++;
-                  });
-                  if (cnt == 4 || cnt == 3) {
-                    pointArray[0][0] = 100;
-                    pointArray[1][0] = 100;
-                  }
+                  var pointArray = [];
+                  // pointArray.push([fVLine[0].userData.distance, 90]);
+                  // pointArray.push([fVLine[1].userData.distance, -90]);
+                  // pointArray.push([fVLine[2].userData.distance, 180]);
+                  // pointArray.push([fVLine[3].userData.distance, 0]);
+                  pointArray = _export.GeometryUtils.calcDistancesFromItemToWalls(selectedElement, layer).PointArray;
                   actions.itemsActions.storeDistArray(layer.id, selectedObject.itemID, pointArray);
                   internalType = internalType ? internalType : _constants.INTERNAL_EVENT_SELECT_ELEMENT;
                   sendInternalEvent(internalType, selectedElement, pointArray);
@@ -1547,16 +1540,17 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                   var elementPrototype = null;
                   switch (true) {
                     case 'holeID' in selectedObject:
-                    case 'lineID' in selectedObject:
+                      elementID = selectedObject.holeID;
+                      elementPrototype = 'holes';
                       if (_this2.props.state.mode === _constants.MODE_DRAGGING_HOLE_3D) {
                         actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
-                        internalType = _constants.INTERNAL_EVENT_SELECT_ELEMENT;
-                        elementID = selectedObject.holeID;
-                        elementPrototype = 'holes';
                       }
                       break;
+                    case 'lineID' in selectedObject:
+                      elementID = selectedObject.lineID;
+                      elementPrototype = 'lines';
+                      break;
                     case 'areaID' in selectedObject:
-                      internalType = _constants.INTERNAL_EVENT_SELECT_ELEMENT;
                       elementID = selectedObject.areaID;
                       elementPrototype = 'areas';
                       break;
@@ -1568,15 +1562,20 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                 isSelected = false;
               }
             } else {
-              isSelected = false;
-              _this2.context.projectActions.unselectAll();
-              switch (true) {
-                case 'holeID' in selectedObject:
-                  actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
-                  break;
-                default:
-                  _this2.context.itemsActions.removeReplacingSupport();
-                  break;
+              var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+              if (bMove && !(0, _helper.isEmpty)(selectedItem)) {
+                addItemToolObj();
+              } else {
+                isSelected = false;
+                _this2.context.projectActions.unselectAll();
+                switch (true) {
+                  case 'holeID' in selectedObject:
+                    actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
+                    break;
+                  default:
+                    _this2.context.itemsActions.removeReplacingSupport();
+                    break;
+                }
               }
             }
             bMove = false;
@@ -1587,6 +1586,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
               selectedObj = allItemRect.cur;
             }
           } else {
+            var _planData$sceneGraph2, _selectedObject2, _selectedObject3;
             (0, _sceneCreator.visibleTransformBox)(false);
             var alti = 0;
             if (allItemRect && allItemRect.cur && allItemRect.cur.itemInfo !== undefined) {
@@ -1596,18 +1596,9 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
               alti = (0, _convertUnitsLite.convert)(alti).from(_unit2).to(_this2.props.state.scene.unit);
             }
             getPoint(event, alti);
+            var _selectedItem = planData === null || planData === void 0 || (_planData$sceneGraph2 = planData.sceneGraph) === null || _planData$sceneGraph2 === void 0 || (_planData$sceneGraph2 = _planData$sceneGraph2.layers[(_selectedObject2 = selectedObject) === null || _selectedObject2 === void 0 ? void 0 : _selectedObject2.layerID]) === null || _planData$sceneGraph2 === void 0 ? void 0 : _planData$sceneGraph2.items[(_selectedObject3 = selectedObject) === null || _selectedObject3 === void 0 ? void 0 : _selectedObject3.itemID];
+            if (isSelected && !(0, _helper.isEmpty)(_selectedItem)) addItemToolObj();
             if (bRotate) {
-              var _intersects$_i;
-              var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if ((0, _util.isUndefined)(selectedItem)) return;
-              selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
-              var itemPos = selectedItem.position.clone();
-              if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
-                toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
-              } else {
-                toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
-              }
-              scene3D.add(toolObj);
               _this2.setState({
                 toolObj: toolObj
               });
@@ -1616,16 +1607,6 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             }
             if (bMove) {
               bMove = false;
-              var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if ((0, _util.isUndefined)(_selectedItem)) return;
-              selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
-              var _itemPos = _selectedItem.position.clone();
-              if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem.userData.itemId) {
-                toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
-              } else {
-                toolObj.position.set(planData.plan.position.x + _itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + _selectedItem.children[0].position.y, planData.plan.position.z + _itemPos.z);
-              }
-              scene3D.add(toolObj);
               _this2.setState({
                 toolObj: toolObj
               });
@@ -2092,7 +2073,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         if (minDis < snapDelta && !snapFlag) {
           _this2.snap(snapObj, layer);
           snapFlag = true;
-          (0, _sceneCreator.getDistances)(layer, true);
+          (0, _sceneCreator.getDistances)(layer);
           var _i13 = 0;
           for (_i13 = 0; _i13 < _sceneCreator.fVLine.length; _i13++) {
             if (_sceneCreator.fVLine[_i13].userData.distance < snapDelta) {
@@ -2451,18 +2432,14 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
       this.renderer.renderLists.dispose();
     }
   }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
+    key: "componentWillReceiveProps",
+    value: function componentWillReceiveProps(nextProps) {
       var _this4 = this;
-      // Early return if downloadFlag and state are unchanged or scene is empty
-      if (this.props.downloadFlag && (0, _immutablediff["default"])(prevProps.state, this.props.state).toJS().length == 0 || (0, _helper.isEmpty)(this.props.state.scene)) {
-        return;
-      }
-      var _this$props = this.props,
-        width = _this$props.width,
-        height = _this$props.height;
-      var selectedLayer = this.props.state.getIn(['scene', 'layers', this.props.state.scene.selectedLayer]);
-      var ceilHeight = (0, _convertUnitsLite.convert)(selectedLayer.ceilHeight).from(selectedLayer.unit).to(this.props.state.scene.unit);
+      if (this.props.downloadFlag && (0, _immutablediff["default"])(this.props.state, nextProps.state).toJS().length == 0 || (0, _helper.isEmpty)(nextProps.state.scene)) return;
+      var width = nextProps.width,
+        height = nextProps.height;
+      var selectedLayer = nextProps.state.getIn(['scene', 'layers', nextProps.state.scene.selectedLayer]);
+      var ceilHeight = (0, _convertUnitsLite.convert)(selectedLayer.ceilHeight).from(selectedLayer.unit).to(nextProps.state.scene.unit);
       var actions = {
         areaActions: this.context.areaActions,
         holesActions: this.context.holesActions,
@@ -2472,7 +2449,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         projectActions: this.context.projectActions,
         catalog: this.context.catalog
       };
-      var isLoadingCabinet = this.props.state.scene.isLoadingCabinet;
+      var isLoadingCabinet = nextProps.state.scene.isLoadingCabinet;
       if (this.state.isLoadingCabinet !== isLoadingCabinet) this.setState({
         isLoadingCabinet: isLoadingCabinet
       });
@@ -2483,7 +2460,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
       var allItemRect;
 
       // handle camera setting
-      switch (prevProps.state.mode) {
+      switch (this.props.state.mode) {
         case _constants.MODE_ELEVATION_VIEW:
           // when Elevation mode (camera: Orthographic)
           var cameraRect = (0, _helper.handleCamRect)(width, height, ceilHeight, this.state.lineLength);
@@ -2501,12 +2478,12 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           break;
       }
       this.camera.updateProjectionMatrix();
-      var data = this.props.state.scene;
+      var data = nextProps.state.scene;
       var layer = data.getIn(['layers', data.selectedLayer]);
       var self = this;
       function implementBacksplash() {
-        if ((0, _helper.isElevationView)(self.props.state.mode)) return;
-        var allItems = _export.GeometryUtils.getAllItemSpecified(self.props.state.scene, actions.catalog, _constants.BASE_CABINET_LAYOUTPOS);
+        if ((0, _helper.isElevationView)(self.props.state.mode)) return; // apply backsplash when just 3D_mode, not elevation_mode
+        var allItems = _export.GeometryUtils.getAllItemSpecified(nextProps.state.scene, actions.catalog, _constants.BASE_CABINET_LAYOUTPOS);
         var i,
           items = [];
         for (i = 0; i < allItems.others.length; i++) items.push(allItems.others[i]);
@@ -2515,7 +2492,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           var calcRect = _export.GeometryUtils.getCalcRectFromItem3D(items[i]);
           var visible = _export.GeometryUtils.isSnappedLine(calcRect, allLineRects);
           actions.itemsActions.setBacksplashVisible(items[i].itemInfo.id, visible);
-          (0, _sceneCreator.createBacksplash)(items[i], self.props.state.scene.getIn(['layers', self.props.state.scene.selectedLayer]), planData, self.props.state.scene);
+          (0, _sceneCreator.createBacksplash)(items[i], nextProps.state.scene.getIn(['layers', nextProps.state.scene.selectedLayer]), planData, nextProps.state.scene);
         }
       }
       function implementWarningBox() {
@@ -2543,13 +2520,16 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           showflag: false
         });
       }
-      if (this.props.state.scene !== prevProps.state.scene || this.props.state.doorStyle && this.props.state.doorStyle.get('name') !== prevProps.state.doorStyle.get('name')) {
-        var changedValues = (0, _immutablediff["default"])(prevProps.state.scene, this.props.state.scene);
+      if (nextProps.state.scene !== this.props.state.scene || nextProps.state.doorStyle && nextProps.state.doorStyle.get('name') !== this.props.state.doorStyle.get('name')) {
+        var changedValues = (0, _immutablediff["default"])(this.props.state.scene, nextProps.state.scene);
         prepareSnapSpec(layer);
-        if (this.props.state.doorStyle && this.props.state.doorStyle.get('name') === prevProps.state.doorStyle.get('name')) {
-          self.setState({
-            isLoading: true
-          });
+        var isInteractiveMove = nextProps.state.mode === _constants.MODE_DRAGGING_ITEM_3D || nextProps.state.mode === _constants.MODE_ROTATING_ITEM_3D || nextProps.state.mode === _constants.MODE_DRAWING_ITEM_3D || nextProps.state.mode === _constants.MODE_DRAGGING_HOLE_3D || nextProps.state.mode === _constants.MODE_IDLE_3D;
+        if (nextProps.state.doorStyle && nextProps.state.doorStyle.get('name') === this.props.state.doorStyle.get('name')) {
+          if (!isInteractiveMove) {
+            self.setState({
+              isLoading: true
+            });
+          }
           if (self.props.downloadFlag) {
             self.setState({
               waitForRender: 0
@@ -2565,7 +2545,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           }
           self.renderer.domElement.style.display = 'none';
         }
-        if (this.props.state.scene.showfg == true) {
+        if (nextProps.state.scene.showfg == true) {
           implementBacksplash();
           implementWarningBox();
         } else {
@@ -2574,7 +2554,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         var _this$state = this.state,
           toolObj = _this$state.toolObj,
           angleObj = _this$state.angleObj;
-        var _updateScene = (0, _sceneCreator.updateScene)(this.planData, this.props.state.scene, prevProps.state.scene, changedValues.toJS(), actions, this.context.catalog, this.props.state.mode, toolObj, angleObj, this.props.state.draggingSupport),
+        var _updateScene = (0, _sceneCreator.updateScene)(this.planData, nextProps.state.scene, this.props.state.scene, changedValues.toJS(), actions, this.context.catalog, nextProps.state.mode, toolObj, angleObj, nextProps.state.draggingSupport),
           promise = _updateScene.promise;
         self.setState();
         promise.then(function (p1Value) {
@@ -2586,8 +2566,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           });
           self.renderer.domElement.style.display = 'block';
         });
-        if (this.props.state.getIn(['scene', 'isEndDragging'])) {
-          this.props.state.setIn(['scene', 'isEndDragging'], false);
+        if (nextProps.state.getIn(['scene', 'isEndDragging'])) {
+          nextProps.state.setIn(['scene', 'isEndDragging'], false);
         }
       }
       this.renderer.setSize(width, height);
@@ -2675,4 +2655,13 @@ Scene3DViewer.propTypes = {
   height: _propTypes["default"].number.isRequired,
   replaceCabinet: _propTypes["default"].func.isRequired
 };
+Scene3DViewer.contextTypes = {
+  areaActions: _propTypes["default"].object.isRequired,
+  holesActions: _propTypes["default"].object.isRequired,
+  itemsActions: _propTypes["default"].object.isRequired,
+  linesActions: _propTypes["default"].object.isRequired,
+  sceneActions: _propTypes["default"].object.isRequired,
+  projectActions: _propTypes["default"].object.isRequired,
+  catalog: _propTypes["default"].object
+};
 module.exports = exports.default;