kitchen-simulator 1.0.0-alin.9 → 1.0.0-clark.101

package/lib/class/item.js

@@ -55,65 +55,19 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         isDuplication: isDuplication
       }, null, state);
       if (item.category === 'cabinet') {
+        var _state$doorStyle;
         var layer = state.getIn(['scene', 'layers', layerID]);
-        if (state.doorStyle !== null && state.doorStyle !== undefined) {
-          var _state$doorStyle, _temp$doorStyles;
-          var temp = layer.doorStyle || ((_state$doorStyle = state.doorStyle) === null || _state$doorStyle === void 0 ? void 0 : _state$doorStyle.toJS());
-          var cds = temp === null || temp === void 0 || (_temp$doorStyles = temp.doorStyles) === null || _temp$doorStyles === void 0 || (_temp$doorStyles = _temp$doorStyles.cds) === null || _temp$doorStyles === void 0 ? void 0 : _temp$doorStyles.find(function (elem) {
-            return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
+        var temp = layer.doorStyle || ((_state$doorStyle = state.doorStyle) === null || _state$doorStyle === void 0 ? void 0 : _state$doorStyle.toJS());
+        var cds = state.catalog.getIn(['elements', type, 'cds']);
+        if (cds) {
+          var updatedDoorStyles = _objectSpread(_objectSpread({}, temp.doorStyles), {}, {
+            cds: [cds]
+          });
+          item = item.merge({
+            doorStyle: (0, _immutable.fromJS)(_objectSpread(_objectSpread({}, temp), {}, {
+              doorStyles: updatedDoorStyles
+            }))
           });
-          if (cds) {
-            var updatedDoorStyles = _objectSpread(_objectSpread(_objectSpread({}, temp.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
-              cabinet_door_style_id: cds.cabinet_door_style_id
-            });
-            item = item.merge({
-              doorStyle: (0, _immutable.fromJS)(_objectSpread(_objectSpread({}, temp), {}, {
-                doorStyles: updatedDoorStyles
-              }))
-            });
-          } else {
-            var _state$oStyle;
-            var styleObj = (_state$oStyle = state.oStyle) === null || _state$oStyle === void 0 || (_state$oStyle = _state$oStyle.toJS()) === null || _state$oStyle === void 0 ? void 0 : _state$oStyle.oStyle;
-            if (styleObj) {
-              for (var _x in styleObj) {
-                cds = styleObj[_x].data.doorStyles.cds.find(function (elem) {
-                  return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
-                });
-                if (cds) {
-                  var tmpDS = styleObj[_x].data;
-                  tmpDS.doorStyles = _objectSpread(_objectSpread(_objectSpread({}, tmpDS.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
-                    cabinet_door_style_id: cds.cabinet_door_style_id
-                  });
-                  item = item.merge({
-                    doorStyle: (0, _immutable.fromJS)(tmpDS)
-                  });
-                  break;
-                }
-              }
-            }
-          }
-        } else {
-          var _state$oStyle2;
-          var _styleObj = (_state$oStyle2 = state.oStyle) === null || _state$oStyle2 === void 0 || (_state$oStyle2 = _state$oStyle2.toJS()) === null || _state$oStyle2 === void 0 ? void 0 : _state$oStyle2.oStyle;
-          if (_styleObj) {
-            for (var _x2 in _styleObj) {
-              var _styleObj$_x;
-              var _cds = (_styleObj$_x = _styleObj[_x2]) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.data) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.doorStyles) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.cds) === null || _styleObj$_x === void 0 ? void 0 : _styleObj$_x.find(function (elem) {
-                return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
-              });
-              if (_cds) {
-                var _styleObj$_x2;
-                var _tmpDS = (_styleObj$_x2 = _styleObj[_x2]) === null || _styleObj$_x2 === void 0 ? void 0 : _styleObj$_x2.data;
-                _tmpDS.doorStyles = _objectSpread(_objectSpread(_objectSpread({}, _tmpDS.doorStyles), _cds.data && _cds.data[0] ? _cds.data[0] : {}), {}, {
-                  cabinet_door_style_id: _cds.cabinet_door_style_id
-                });
-                item = item.merge({
-                  doorStyle: (0, _immutable.fromJS)(_tmpDS)
-                });
-                break;
-              }
-            }
-          }
         }
       }
       if (item.get('type') === 'cabinet' && item.get('doorStyle').size === 0) {
@@ -123,15 +77,9 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         };
       }
       var setSizeOfItemByDoorStyle = function setSizeOfItemByDoorStyle() {
-        var _doorStyle$doorStyles, _cds$data;
         var doorStyle = item.get('doorStyle').toJS();
-        var cds = doorStyle === null || doorStyle === void 0 || (_doorStyle$doorStyles = doorStyle.doorStyles) === null || _doorStyle$doorStyles === void 0 || (_doorStyle$doorStyles = _doorStyle$doorStyles.cds) === null || _doorStyle$doorStyles === void 0 ? void 0 : _doorStyle$doorStyles.find(function (elem) {
-          return elem.itemID === item.itemID;
-        });
-        var euro_cds = (cds === null || cds === void 0 || (_cds$data = cds.data) === null || _cds$data === void 0 ? void 0 : _cds$data.filter(function (element) {
-          return element && element.is_euro_cds;
-        })) || [];
-        if (doorStyle.door_style_name === 'Euro & Frameless' && euro_cds.length > 0) {
+        var euroCDS = state.catalog.getIn(['elements', type, 'customer_property']).is_euro_cds;
+        if (doorStyle.door_style_name === 'Euro & Frameless' && euroCDS.length > 0) {
           var newProperties = item.get('properties').toJS();
           if (newProperties.hasOwnProperty('depth')) {
             if (!newProperties.hasOwnProperty('oldDepth')) {
@@ -142,8 +90,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
               });
             }
             newProperties['depth'] = new _immutable.Map({
-              length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_length).from('in').to('cm'),
-              _length: euro_cds[0].euro_length,
+              length: (0, _convertUnitsLite.convert)(euroCDS[0].euro_length).from('in').to('cm'),
+              _length: euroCDS[0].euro_length,
               _unit: 'in'
             });
           }
@@ -156,8 +104,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
               });
             }
             newProperties['height'] = new _immutable.Map({
-              length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_height).from('in').to('cm'),
-              _length: euro_cds[0].euro_height,
+              length: (0, _convertUnitsLite.convert)(euroCDS[0].euro_height).from('in').to('cm'),
+              _length: euroCDS[0].euro_height,
               _unit: 'in'
             });
           }
@@ -170,8 +118,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
               });
             }
             newProperties['width'] = new _immutable.Map({
-              length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_width).from('in').to('cm') - 10,
-              _length: euro_cds[0].euro_width,
+              length: (0, _convertUnitsLite.convert)(euroCDS[0].euro_width).from('in').to('cm') - 10,
+              _length: euroCDS[0].euro_width,
               _unit: 'in'
             });
           }
@@ -1130,48 +1078,37 @@ var Item = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "setInitialDoorStyle",
-    value: function setInitialDoorStyle(state, doorStyle, oStyle) {
-      if (doorStyle === undefined) {
-        state = state.merge({
-          oStyle: new _immutable.Map({
-            oStyle: oStyle
-          })
-        });
-      } else {
-        state = state.merge({
-          doorStyle: doorStyle,
-          oStyle: new _immutable.Map({
-            oStyle: oStyle
-          })
-        });
-        var _state8 = state,
-          scene = _state8.scene;
-        var layerID = scene.get('selectedLayer');
-        var layers = scene.layers.get(layerID);
-        var items = layers.items;
-        items.forEach(function (data) {
-          {
-            var itemID = data.id;
-            var tmpDS = _objectSpread(_objectSpread({}, data.doorStyle), {}, {
-              doorStyles: _objectSpread(_objectSpread({}, data.doorStyle.doorStyles), {}, {
-                counttop: doorStyle.doorStyles.counttop
-              })
-            });
-            data = data.mergeIn(['doorStyle'], (0, _immutable.fromJS)(tmpDS));
-            layers = layers.mergeIn(['items', itemID], data);
-            state = state.merge({
-              scene: scene.mergeIn(['layers', layerID], layers)
-            });
-          }
-        });
-      }
+    value: function setInitialDoorStyle(state, doorStyle) {
+      state = state.merge({
+        doorStyle: doorStyle
+      });
+      var _state8 = state,
+        scene = _state8.scene;
+      var layerID = scene.get('selectedLayer');
+      var layers = scene.layers.get(layerID);
+      var items = layers.items;
+      items.forEach(function (data) {
+        {
+          var itemID = data.id;
+          var tmpDS = _objectSpread(_objectSpread({}, data.doorStyle), {}, {
+            doorStyles: _objectSpread(_objectSpread({}, data.doorStyle.doorStyles), {}, {
+              counttop: doorStyle.doorStyles.counttop
+            })
+          });
+          data = data.mergeIn(['doorStyle'], (0, _immutable.fromJS)(tmpDS));
+          layers = layers.mergeIn(['items', itemID], data);
+          state = state.merge({
+            scene: scene.mergeIn(['layers', layerID], layers)
+          });
+        }
+      });
       return {
         updatedState: state
       };
     }
   }, {
     key: "setDoorStyle",
-    value: function setDoorStyle(state, doorStyle, pathes, isAll) {
+    value: function setDoorStyle(state, doorStyle, itemCDS, isAll) {
       var _this2 = this;
       var keys = Object.keys(doorStyle.doorStyles);
       keys = keys.filter(function (elem) {
@@ -1188,14 +1125,14 @@ var Item = exports["default"] = /*#__PURE__*/function () {
       var layerID = state.scene.get('selectedLayer');
       var temp_layer_molding = state.scene.getIn(['layers', layerID, 'molding']);
       temp_layer_molding = temp_layer_molding.filter(function (md) {
-        return doorStyle.doorStyles.cds.some(function (ds) {
+        return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
           return md.itemID === ds.itemID;
         });
       });
       state = state.setIn(['scene', 'layers', layerID, 'molding'], temp_layer_molding);
       var itemIDs = state.scene.layers.getIn([layerID, 'selected', 'items']).toJS();
       var setDoorStyleOfItem = function setDoorStyleOfItem(data) {
-        var _cds$data2;
+        var _cds$data;
         if (data.category !== 'cabinet') return; //CDS should effect to cabinets
         var itemID = data.id;
         var curItem = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
@@ -1203,7 +1140,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         var tmpMolding = (0, _toConsumableArray2["default"])(curItem.molding);
         var temp_item_molding = (0, _toConsumableArray2["default"])(curItem.molding);
         temp_item_molding = temp_item_molding.filter(function (md) {
-          return doorStyle.doorStyles.cds.some(function (ds) {
+          return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
             return ds.itemID === md.itemID;
           });
         });
@@ -1213,17 +1150,16 @@ var Item = exports["default"] = /*#__PURE__*/function () {
             state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], temp_item_molding);
           });
         });
-        var cds = doorStyle.doorStyles.cds.find(function (elem) {
+        var cds = itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.find(function (elem) {
           return elem.itemID === data.itemID;
         });
-        var euro_cds = (cds === null || cds === void 0 || (_cds$data2 = cds.data) === null || _cds$data2 === void 0 ? void 0 : _cds$data2.filter(function (element) {
+        var euro_cds = (cds === null || cds === void 0 || (_cds$data = cds.data) === null || _cds$data === void 0 ? void 0 : _cds$data.filter(function (element) {
           return element && element.is_euro_cds;
         })) || [];
-        var cds_data;
-        if (doorStyle.door_style_name === 'Euro & Frameless' && euro_cds.length > 0) {
-          cds_data = cds ? _objectSpread(_objectSpread({}, euro_cds[0]), {}, {
-            cabinet_door_style_id: cds.cabinet_door_style_id
-          }) : {};
+        var cds_data = cds ? [cds] : [];
+        if (
+        // doorStyle.door_style_name === 'Euro & Frameless' &&
+        euro_cds.length > 0) {
           var newProperties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
           if (newProperties.hasOwnProperty('depth')) {
             if (!newProperties.hasOwnProperty('oldDepth')) {
@@ -1269,9 +1205,6 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           }
           state = _this2.setJsProperties(state, layerID, itemID, newProperties).updatedState;
         } else {
-          cds_data = cds ? _objectSpread(_objectSpread({}, cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
-            cabinet_door_style_id: cds.cabinet_door_style_id
-          }) : {};
           var properties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
           if (properties.hasOwnProperty('oldDepth')) {
             properties['depth'] = new _immutable.Map({
@@ -1310,7 +1243,9 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           color_sku_alias: doorStyle.color_sku_alias,
           // alias name of color_sku for the current dealer
           install: (0, _utils.getInstallationSuffix)(_constants.INSTALLATION_SUFFIX_TYPE.NAME, doorStyle),
-          doorStyles: _objectSpread(_objectSpread({}, tmp), cds_data)
+          doorStyles: _objectSpread(_objectSpread({}, tmp), {}, {
+            cds: cds_data
+          })
         };
         state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'doorStyle'], (0, _immutable.fromJS)(tmpDS));
       };
@@ -1338,10 +1273,41 @@ var Item = exports["default"] = /*#__PURE__*/function () {
       };
     }
   }, {
-    key: "setCounterTop",
-    value: function setCounterTop(state, counterTop) {
+    key: "changeDistance",
+    value: function changeDistance(state, distancePayload) {
       var _state9 = state,
         scene = _state9.scene;
+      var Left = distancePayload.distanceLeft;
+      var Right = distancePayload.distanceRight;
+      var Back = distancePayload.distanceBack;
+      var Front = distancePayload.distanceFront;
+      var LeftRotRad = Left ? 180 : null;
+      var RightRotRad = Right ? 0 : null;
+      var BackRotRad = Back ? -90 : null;
+      var FrontRotRad = Front ? 90 : null;
+      var directR = LeftRotRad || RightRotRad || BackRotRad || FrontRotRad;
+      var dist = Left || Right || Back || Front;
+      var layerID = scene.get('selectedLayer');
+      var layer = scene.layers.get(layerID).toJS();
+      var selectedItemId = layer.selected.items[0];
+      var selectedItem = layer.items[selectedItemId];
+      if (selectedItem) {
+        var renderedR = selectedItem.rotation || 0;
+        var rotRad = (directR + renderedR) / 180 * Math.PI;
+        var newX = selectedItem.x + (0, _convertUnitsLite.convert)(dist * Math.cos(rotRad)).from('in').to('cm');
+        var newY = selectedItem.y + (0, _convertUnitsLite.convert)(dist * Math.sin(rotRad)).from('in').to('cm');
+        state = state.setIn(['scene', 'layers', layerID, 'items', layer.selected.items[0], 'x'], newX);
+        state = state.setIn(['scene', 'layers', layerID, 'items', layer.selected.items[0], 'y'], newY);
+      }
+      return {
+        updatedState: state
+      };
+    }
+  }, {
+    key: "setCounterTop",
+    value: function setCounterTop(state, counterTop) {
+      var _state0 = state,
+        scene = _state0.scene;
       var layerID = scene.get('selectedLayer');
       var layers = scene.layers.get(layerID);
       layers = layers.mergeIn(['counterTop'], counterTop);
@@ -1385,8 +1351,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setDoorHandle",
     value: function setDoorHandle(state, doorHandle) {
-      var _state0 = state,
-        scene = _state0.scene;
+      var _state1 = state,
+        scene = _state1.scene;
       var layerID = scene.get('selectedLayer');
       var layer = scene.layers.get(layerID);
       layer = layer.mergeIn(['doorHandle'], doorHandle);
@@ -1410,8 +1376,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setHandleMaterial",
     value: function setHandleMaterial(state, material) {
-      var _state1 = state,
-        scene = _state1.scene;
+      var _state10 = state,
+        scene = _state10.scene;
       var layerID = scene.get('selectedLayer');
       var layers = scene.layers.get(layerID);
       var items = layers.items;
@@ -1436,8 +1402,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setWallColor",
     value: function setWallColor(state, wallColor) {
-      var _state10 = state,
-        scene = _state10.scene;
+      var _state11 = state,
+        scene = _state11.scene;
       var layerID = scene.get('selectedLayer');
       var layer = scene.layers.get(layerID);
       layer = layer.merge({
@@ -1463,8 +1429,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setBacksplash",
     value: function setBacksplash(state, backsplash) {
-      var _state11 = state,
-        scene = _state11.scene;
+      var _state12 = state,
+        scene = _state12.scene;
       var layerID = scene.get('selectedLayer');
       var layer = scene.layers.get(layerID);
       var dataJSON = layer.toJS();
@@ -1492,8 +1458,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setMolding",
     value: function setMolding(state, molding, isAll) {
-      var _state12 = state,
-        scene = _state12.scene;
+      var _state13 = state,
+        scene = _state13.scene;
       var layerID = scene.get('selectedLayer');
       var layer = scene.layers.get(layerID);
       if (isAll) {
@@ -1582,8 +1548,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "updateMolding",
     value: function updateMolding(state) {
-      var _state13 = state,
-        scene = _state13.scene;
+      var _state14 = state,
+        scene = _state14.scene;
       var layerID = scene.get('selectedLayer');
       var layer = scene.layers.get(layerID);
       var selectedItem = layer.getIn(['items', layer.selected.toJS().items[0]]);
@@ -1704,8 +1670,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setBacksplashVisible",
     value: function setBacksplashVisible(state, itemID, backsplashVisible) {
-      var _state14 = state,
-        scene = _state14.scene;
+      var _state15 = state,
+        scene = _state15.scene;
       var layerID = scene.get('selectedLayer');
       var layer = scene.layers.get(layerID);
       layer = layer.mergeIn(['items', itemID, 'backsplashVisible'], backsplashVisible);
@@ -1725,8 +1691,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setApplianceMaterial",
     value: function setApplianceMaterial(state, material) {
-      var _state15 = state,
-        scene = _state15.scene;
+      var _state16 = state,
+        scene = _state16.scene;
       var layerID = scene.get('selectedLayer');
       var layers = scene.layers.get(layerID);
       var items = layers.items;
@@ -1750,8 +1716,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "setModelling",
     value: function setModelling(state, molding) {
-      var _state16 = state,
-        scene = _state16.scene;
+      var _state17 = state,
+        scene = _state17.scene;
       var layerID = scene.get('selectedLayer');
       var layers = scene.layers.get(layerID);
       var items = layers.items;
@@ -1861,8 +1827,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "toggleLoadingCabinet",
     value: function toggleLoadingCabinet(state) {
-      var _state17 = state,
-        scene = _state17.scene;
+      var _state18 = state,
+        scene = _state18.scene;
       console.log('scene.isLoadingCabinet: ', !scene.isLoadingCabinet);
       // scene = scene.set('isLoadingCabinet', !scene.isLoadingCabinet);
       // state = state.set('scene', scene);
@@ -1874,8 +1840,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "endLoading",
     value: function endLoading(state) {
-      var _state18 = state,
-        scene = _state18.scene;
+      var _state19 = state,
+        scene = _state19.scene;
       state = state.setIn(['scene', 'loadFlag'], true);
       return {
         updatedState: state

package/lib/class/line.js

@@ -510,7 +510,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       // let relatedLines = [];
       var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
       var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', lineID]).toJS();
-      var moveFlag = true;
+      var moveFlag = [];
       var tx = vertices[drawingLine.vertices[1]].x;
       var ty = vertices[drawingLine.vertices[1]].y;
       if (!(0, _helper.isEmpty)(relatedLines)) {
@@ -518,6 +518,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
         vertices[drawingLine.vertices[1]].y = y;
       }
       var absAngle, lineAngle;
+      var angles = [];
 
       // get the angle of two lines and check the angle
       if (drawingLine.vertices[0] !== drawingLine.vertices[1]) {
@@ -529,9 +530,10 @@ var Line = exports["default"] = /*#__PURE__*/function () {
               lineAngle = _export2.GeometryUtils.angleBetweenTwoLines(line, drawingLine, vertices);
               // check whether the angle is less than or bigger than specific value.
               absAngle = Math.abs(lineAngle);
+              angles.push(lineAngle);
               if (absAngle < _constants.MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
-                moveFlag = false;
-              } else moveFlag = true;
+                moveFlag.push(false);
+              } else moveFlag.push(true);
             }
           });
         } else {
@@ -543,23 +545,36 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       }
 
       // if the angle is bigger or less than specific value, the wall mustn't be drawn at new position
-      if (moveFlag) {
+      if (!moveFlag.some(function (flag) {
+        return flag === false;
+      })) {
         tx = x;
         ty = y;
       } else {
-        var rest = _constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
         // the origin point of rotation(snapping)
         var ox = vertices[drawingLine.vertices[0]].x;
         var oy = vertices[drawingLine.vertices[0]].y;
-        // determine the direction of rotation.
-        rest = lineAngle > 0 ? -rest : rest;
-        // rotate the current point to last point around the first point of drawing line.
-        var res = _export2.GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
-        tx = res.x;
-        ty = res.y;
+        angles.forEach(function (angle, index) {
+          if (!moveFlag[index]) {
+            var absVal = Math.abs(angle);
+            var rest = _constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absVal;
+            if (absVal > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
+              absVal = 360 - absVal;
+              rest = -(_constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absVal);
+            }
+            // determine the direction of rotation.
+            rest = angle > 0 ? -rest : rest;
+            // rotate the current point to last point around the first point of drawing line.
+            var res = _export2.GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
+            tx = res.x;
+            ty = res.y;
+          }
+        });
       }
       // angle snapping as a value of UNIT_ANGLE
-      if (moveFlag && !(0, _helper.isEmpty)(absAngle) && absAngle % _constants.UNIT_ANGLE !== 0) {
+      if (!moveFlag.some(function (flag) {
+        return flag === false;
+      }) && !(0, _helper.isEmpty)(absAngle) && absAngle % _constants.UNIT_ANGLE !== 0) {
         var result = _export2.GeometryUtils.snapAngleByUnit(lineAngle, vertices, drawingLine, tx, ty, drawingLine.vertices[1]);
         tx = result.x;
         ty = result.y;

package/lib/class/project.js

@@ -43,7 +43,6 @@ var Project = exports["default"] = /*#__PURE__*/function () {
     key: "newProject",
     value: function newProject(state) {
       var doorStyle = state.toJS().doorStyle === null ? null : state.toJS().doorStyle;
-      var oStyle = state.oStyle;
       // let counterTop = state.getIn(['scene', 'layers', layerID, 'counterTop']);
       // let floorStyle = state.getIn(['scene', 'layers', layerID, 'floorStyle']);
       var _viewer2D = state.viewer2D;
@@ -57,7 +56,6 @@ var Project = exports["default"] = /*#__PURE__*/function () {
       state = new _models.State({});
       state = state.merge({
         doorStyle: doorStyle,
-        oStyle: oStyle,
         viewer2D: _viewer2D
       });
       // state = Item.setCounterTop(state, counterTop).updatedState;
@@ -68,9 +66,8 @@ var Project = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "loadProject",
-    value: function loadProject(state, sceneJSON, categoryData) {
+    value: function loadProject(state, sceneJSON) {
       var doorStyle = state.doorStyle;
-      var oStyle = state.oStyle;
       var layerID = state.scene.selectedLayer;
       var _viewer2D = state.viewer2D;
       var viewer = state.viewer2D.toJS();
@@ -170,28 +167,10 @@ var Project = exports["default"] = /*#__PURE__*/function () {
       }
       state = state.merge({
         doorStyle: doorStyle,
-        oStyle: oStyle,
         viewer2D: _viewer2D
       });
       state = _export2.Item.setCounterTop(state, counterTop).updatedState;
       state = _export2.Area.setFloorStyles(state, floorStyle).updatedState;
-      if (state.getIn(['scene', 'layers', layerID, 'doorStyle']) && !state.getIn(['scene', 'layers', layerID, 'doorStyle', 'install'])) {
-        var layerDoorStyle = state.getIn(['scene', 'layers', layerID, 'doorStyle']);
-        var install = '';
-        categoryData.data.doorStyles.items.forEach(function (category) {
-          category.items.forEach(function (element) {
-            if (element.items.filter(function (it) {
-              return it.id === layerDoorStyle.id && (layerDoorStyle.install ? category.name === layerDoorStyle.install : true);
-            }).length) {
-              install = category.name;
-            }
-          });
-        });
-        layerDoorStyle = _objectSpread(_objectSpread({}, layerDoorStyle), {}, {
-          install: install
-        });
-        state = state.mergeIn(['scene', 'layers', layerID, 'doorStyle'], layerDoorStyle);
-      }
       this.updateZoomScale(state, a);
       viewer2DActions.updateCameraView(_viewer2D);
       return {
@@ -487,6 +466,10 @@ var Project = exports["default"] = /*#__PURE__*/function () {
         };
       }
       var mode;
+      var isLineAction = false;
+      if (state.mode.includes('LINE')) {
+        isLineAction = true;
+      }
       if (state.mode == _constants.MODE_DRAWING_ITEM_3D) {
         mode = _constants.MODE_IDLE_3D;
         if (state.drawingSupport.has('currentID')) state = _export2.Layer.removeElement(state, state.scene.selectedLayer, 'items', state.drawingSupport.get('currentID')).updatedState;
@@ -529,6 +512,9 @@ var Project = exports["default"] = /*#__PURE__*/function () {
         draggingSupport: new _immutable.Map(),
         rotatingSupport: new _immutable.Map()
       });
+      if (isLineAction) {
+        state = _export2.Line.applyWallChanges(state, _constants.END_DRAWING_LINE).updatedState;
+      }
       return {
         updatedState: state
       };
@@ -613,7 +599,7 @@ var Project = exports["default"] = /*#__PURE__*/function () {
           updatedState: state
         };
       } catch (error) {
-        console.log('initCatalogError', error);
+        console.log('addElementToCatalogError', error);
         return {
           updatedState: state
         };

package/lib/components/content.js

@@ -26,7 +26,8 @@ function Content(_ref, _ref2) {
     setToolbar = _ref.setToolbar,
     replaceCabinet = _ref.replaceCabinet,
     keyDownEnable = _ref.keyDownEnable,
-    catalog = _ref.catalog;
+    catalog = _ref.catalog,
+    onInternalEvent = _ref.onInternalEvent;
   var projectActions = _ref2.projectActions;
   var mode = state.get('mode');
   switch (mode) {
@@ -50,7 +51,8 @@ function Content(_ref, _ref2) {
         setToolbar: setToolbar,
         replaceCabinet: replaceCabinet,
         keyDownEnable: keyDownEnable,
-        downloadFlag: false
+        downloadFlag: false,
+        onInternalEvent: onInternalEvent
       });
     case constants.MODE_3D_FIRST_PERSON:
       return /*#__PURE__*/_react["default"].createElement(_viewer3dFirstPerson["default"], {
@@ -88,7 +90,8 @@ function Content(_ref, _ref2) {
         width: width,
         height: height,
         setToolbar: setToolbar,
-        replaceCabinet: replaceCabinet
+        replaceCabinet: replaceCabinet,
+        onInternalEvent: onInternalEvent
       });
     case constants.MODE_ROTATING_ITEM_3D:
     case constants.MODE_DRAGGING_ITEM_3D:
@@ -104,7 +107,8 @@ function Content(_ref, _ref2) {
         setToolbar: setToolbar,
         replaceCabinet: replaceCabinet,
         keyDownEnable: keyDownEnable,
-        downloadFlag: false
+        downloadFlag: false,
+        onInternalEvent: onInternalEvent
       });
 
     // case constants.MODE_CONFIGURING_PROJECT:
@@ -129,7 +133,8 @@ Content.propTypes = {
   state: _propTypes["default"].object.isRequired,
   width: _propTypes["default"].number.isRequired,
   height: _propTypes["default"].number.isRequired,
-  replaceCabinet: _propTypes["default"].func.isRequired
+  replaceCabinet: _propTypes["default"].func.isRequired,
+  onInternalEvent: _propTypes["default"].func.isRequired
 };
 Content.contextTypes = {
   projectActions: _propTypes["default"].object.isRequired

package/lib/components/viewer2d/grids/grid-streak.js

@@ -29,7 +29,7 @@ function GridStreak(_ref) {
         key: i,
         cx: x,
         cy: y,
-        r: 1.5,
+        r: 2,
         fill: color
       }));
     }