kitchen-simulator 1.1.1-test.9 → 2.0.1

package/es/class/line.js

@@ -1,15 +1,6 @@
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { fromJS, List, Map } from 'immutable';
 import { Group, Hole, Layer, Vertex } from "./export";
 import { GeometryUtils, history, IDBroker, NameGenerator, SnapSceneUtils, SnapUtils } from "../utils/export";
@@ -88,7 +79,7 @@ var Line = /*#__PURE__*/function () {
   }, {
     key: "select",
     value: function select(state, layerID, lineID) {
-      var _line$vertices, _line$vertices$get, _line$vertices2, _line$vertices2$get;
+      var _line$toJS, _line$vertices, _line$vertices$get, _line$vertices2, _line$vertices2$get;
       // Try selecting the layer first
       var layerResult = Layer.select(state, layerID);
       if (!layerResult || !layerResult.updatedState) {
@@ -100,7 +91,7 @@ var Line = /*#__PURE__*/function () {
 
       // Try getting the line
       var line = state.getIn(['scene', 'layers', layerID, 'lines', lineID]);
-      if (!line) {
+      if (!line || isEmpty((_line$toJS = line.toJS) === null || _line$toJS === void 0 ? void 0 : _line$toJS.call(line))) {
         return {
           updatedState: state
         }; // no update if line not found
@@ -136,8 +127,9 @@ var Line = /*#__PURE__*/function () {
   }, {
     key: "remove",
     value: function remove(state, layerID, lineID) {
+      var _line$toJS2;
       var line = state.getIn(['scene', 'layers', layerID, 'lines', lineID]);
-      if (line) {
+      if (line && !isEmpty((_line$toJS2 = line.toJS) === null || _line$toJS2 === void 0 ? void 0 : _line$toJS2.call(line))) {
         state = this.unselect(state, layerID, lineID).updatedState;
         line.holes.forEach(function (holeID) {
           return state = Hole.remove(state, layerID, holeID).updatedState;
@@ -509,7 +501,7 @@ var Line = /*#__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 (!isEmpty(relatedLines)) {
@@ -517,41 +509,63 @@ var Line = /*#__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]) {
-        relatedLines.forEach(function (line) {
-          // get the points of two lines(drawing line and related line)
-          if (!isEmpty(line)) {
-            // the angle between two lines(line, drawingLine)
-            lineAngle = GeometryUtils.angleBetweenTwoLines(line, drawingLine, vertices);
-            // check whether the angle is less than or bigger than specific value.
-            absAngle = Math.abs(lineAngle);
-            if (absAngle < MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
-              moveFlag = false;
-            } else moveFlag = true;
-          }
-        });
+        if (!isEmpty(relatedLines)) {
+          relatedLines.forEach(function (line) {
+            // get the points of two lines(drawing line and related line)
+            if (!isEmpty(line)) {
+              // the angle between two lines(line, drawingLine)
+              lineAngle = 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 < MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
+                moveFlag.push(false);
+              } else moveFlag.push(true);
+            }
+          });
+        } else {
+          var px = vertices[drawingLine.vertices[0]].x;
+          var py = vertices[drawingLine.vertices[0]].y;
+          lineAngle = GeometryUtils.angleBetweenTwoPointsAndOrigin(px, py, x, y);
+          absAngle = Math.abs(lineAngle);
+        }
       }
 
       // 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 = 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 = 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 = MIN_ANGLE_DISALLOW_DRAW_WALL - absVal;
+            if (absVal > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
+              absVal = 360 - absVal;
+              rest = -(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 = GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
+            tx = res.x;
+            ty = res.y;
+          }
+        });
       }
       // angle snapping as a value of UNIT_ANGLE
-      if (moveFlag && !isEmpty(absAngle) && absAngle % UNIT_ANGLE !== 0) {
+      if (!moveFlag.some(function (flag) {
+        return flag === false;
+      }) && !isEmpty(absAngle) && absAngle % UNIT_ANGLE !== 0) {
         var result = GeometryUtils.snapAngleByUnit(lineAngle, vertices, drawingLine, tx, ty, drawingLine.vertices[1]);
         tx = result.x;
         ty = result.y;
@@ -617,9 +631,10 @@ var Line = /*#__PURE__*/function () {
       var _this3 = this;
       var layer = state.getIn(['scene', 'layers', layerID]);
       var allVertices = state.getIn(['scene', 'layers', layerID, 'vertices']);
-      selectedLineInfo.points.forEach(function (vertex, index) {
-        vertex = vertex.toJS();
-        if (vertex.lines.length === 2) {
+      selectedLineInfo.points.forEach(function (tvertex, index) {
+        var _tvertex$toJS, _vertex$lines;
+        var vertex = tvertex === null || tvertex === void 0 || (_tvertex$toJS = tvertex.toJS) === null || _tvertex$toJS === void 0 ? void 0 : _tvertex$toJS.call(tvertex);
+        if (vertex && !isEmpty(vertex) && ((_vertex$lines = vertex.lines) === null || _vertex$lines === void 0 ? void 0 : _vertex$lines.length) === 2) {
           var relatedLineID = vertex.lines.filter(function (lineID) {
             return !selectedLineInfo.mergelines.some(function (mgline) {
               return mgline.id === lineID;
@@ -627,27 +642,33 @@ var Line = /*#__PURE__*/function () {
           });
           if (!isEmpty(relatedLineID)) {
             var relatedLine = layer.lines.get(relatedLineID[0]);
-            var intersectionPoint = vertex;
-            var startPoint, endPoint;
-            if (relatedLine.vertices.get(0) === intersectionPoint.id) {
-              endPoint = allVertices.get(relatedLine.vertices.get(1));
-              startPoint = selectedLineInfo.points[1 - index];
-            } else {
-              startPoint = allVertices.get(relatedLine.vertices.get(0));
-              endPoint = selectedLineInfo.points[1 - index];
-            }
-            var tline1 = {
-              vertices: [startPoint.id, intersectionPoint.id]
-            };
-            var tline2 = {
-              vertices: [intersectionPoint.id, endPoint.id]
-            };
-            var angle = Math.abs(GeometryUtils.angleBetweenTwoLines(tline1, tline2, allVertices.toJS()));
-            if (Math.abs(angle - 180) <= EPSILON) {
-              selectedLineInfo.mergelines.push(relatedLine);
-              selectedLineInfo.points[0] = startPoint;
-              selectedLineInfo.points[1] = endPoint;
-              return _this3.mergeAllLines(state, selectedLineInfo, layerID);
+            if (!isEmpty(relatedLine)) {
+              var intersectionPoint = vertex;
+              var startPoint, endPoint;
+              var tstPoint = allVertices.get(relatedLine.vertices.get(0)).toJS();
+              var tedPoint = allVertices.get(relatedLine.vertices.get(1)).toJS();
+              if (!isEmpty(tstPoint) && !isEmpty(tedPoint)) {
+                if (relatedLine.vertices.get(0) === intersectionPoint.id) {
+                  endPoint = allVertices.get(relatedLine.vertices.get(1));
+                  startPoint = selectedLineInfo.points[1 - index];
+                } else {
+                  startPoint = allVertices.get(relatedLine.vertices.get(0));
+                  endPoint = selectedLineInfo.points[1 - index];
+                }
+                var tline1 = {
+                  vertices: [startPoint.id, intersectionPoint.id]
+                };
+                var tline2 = {
+                  vertices: [intersectionPoint.id, endPoint.id]
+                };
+                var angle = Math.abs(GeometryUtils.angleBetweenTwoLines(tline1, tline2, allVertices.toJS()));
+                if (Math.abs(angle - 180) <= EPSILON) {
+                  selectedLineInfo.mergelines.push(relatedLine);
+                  selectedLineInfo.points[0] = startPoint;
+                  selectedLineInfo.points[1] = endPoint;
+                  return _this3.mergeAllLines(state, selectedLineInfo, layerID);
+                }
+              }
             }
           }
         }
@@ -662,9 +683,7 @@ var Line = /*#__PURE__*/function () {
       var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
       var line = state.getIn(['scene', 'layers', layerID, 'lines', lineID]);
       if (isEmpty(line)) {
-        return {
-          updatedState: state
-        };
+        return null;
       }
       var tmpStPoint = allVertices.get(line.vertices.get(0));
       var tmpEdPoint = allVertices.get(line.vertices.get(1));
@@ -686,7 +705,12 @@ var Line = /*#__PURE__*/function () {
     key: "createLines",
     value: function createLines(state, actionType, mergeInfo) {
       var _this4 = this,
-        _ret;
+        _ret2;
+      if (isEmpty(mergeInfo)) {
+        return {
+          updatedState: state
+        };
+      }
       var layerID = state.getIn(['scene', 'selectedLayer']);
       var layer = state.getIn(['scene', 'layers', layerID]);
       var lineGroups = [];
@@ -699,6 +723,7 @@ var Line = /*#__PURE__*/function () {
         };
       }
       mergeInfo.mergelines.forEach(function (line) {
+        var _nv0$toJS, _nv1$toJS;
         if ([END_DRAGGING_LINE, END_DRAGGING_VERTEX].includes(actionType)) {
           var tmpGroups = state //get groups membership if present
           .getIn(['scene', 'groups']).filter(function (group) {
@@ -711,10 +736,12 @@ var Line = /*#__PURE__*/function () {
         }
         var nv0 = layer.getIn(['vertices', line.vertices.get(0)]);
         var nv1 = layer.getIn(['vertices', line.vertices.get(1)]);
-        var tmpholeposition = _this4.getHolePosition(layer, line.id, nv0, nv1);
-        tmpholeposition.forEach(function (holeInfo) {
-          return holesWithOffsetPosition.push(holeInfo);
-        });
+        if (!isEmpty(nv0 === null || nv0 === void 0 || (_nv0$toJS = nv0.toJS) === null || _nv0$toJS === void 0 ? void 0 : _nv0$toJS.call(nv0)) && !isEmpty(nv1 === null || nv1 === void 0 || (_nv1$toJS = nv1.toJS) === null || _nv1$toJS === void 0 ? void 0 : _nv1$toJS.call(nv1))) {
+          var tmpholeposition = _this4.getHolePosition(layer, line.id, nv0, nv1);
+          tmpholeposition.forEach(function (holeInfo) {
+            return holesWithOffsetPosition.push(holeInfo);
+          });
+        }
         state = Line.remove(state, layerID, line.id).updatedState;
       });
       var ret;
@@ -723,16 +750,18 @@ var Line = /*#__PURE__*/function () {
         state = ret.updatedState;
       }
       if ([END_DRAGGING_LINE, END_DRAGGING_VERTEX].includes(actionType)) {
+        var _ret;
         //re-add to old line's groups if present
-        ret.lines.forEach(function (addedLine) {
+        (_ret = ret) === null || _ret === void 0 || _ret.lines.forEach(function (addedLine) {
           lineGroups.forEach(function (oldLineGroup) {
             state = Group.addElement(state, oldLineGroup.id, layerID, 'lines', addedLine.id).updatedState;
           });
         });
       }
       state = Layer.removeZeroLengthLines(state, layerID).updatedState;
-      if (!isEmpty((_ret = ret) === null || _ret === void 0 ? void 0 : _ret.newline)) {
-        state = this.select(state, layerID, ret.newline.get('id')).updatedState;
+      if (!isEmpty((_ret2 = ret) === null || _ret2 === void 0 ? void 0 : _ret2.newline)) {
+        var _ret3;
+        state = this.select(state, layerID, (_ret3 = ret) === null || _ret3 === void 0 ? void 0 : _ret3.newline.get('id')).updatedState;
       }
       return {
         updatedState: state
@@ -776,11 +805,13 @@ var Line = /*#__PURE__*/function () {
           updatedState: state
         };
       }
-      if (!isEmpty(v0)) {
+      var tv0 = state.getIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(0)]).toJS();
+      var tv1 = state.getIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(1)]).toJS();
+      if (!isEmpty(v0) && !isEmpty(tv0)) {
         state = state.setIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(0), 'x'], v0.x);
         state = state.setIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(0), 'y'], v0.y);
       }
-      if (!isEmpty(v1)) {
+      if (!isEmpty(v1) && !isEmpty(tv1)) {
         state = state.setIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(1), 'x'], v1.x);
         state = state.setIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(1), 'y'], v1.y);
       }
@@ -804,6 +835,11 @@ var Line = /*#__PURE__*/function () {
       var layerID = state.getIn(['drawingSupport', 'layerID']);
       var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
       var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', lineID]).toJS();
+      if (isEmpty(drawingLine)) {
+        return {
+          updatedState: state
+        };
+      }
       if (drawingLine.vertices[0] === drawingLine.vertices[1]) {
         state = Line.remove(state, layerID, lineID).updatedState;
         state = state.merge({
@@ -996,6 +1032,11 @@ var Line = /*#__PURE__*/function () {
       var line = layer.lines.get(lineID);
       var drawedLine = line.toJS();
       var allVertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
+      if (isEmpty(drawedLine)) {
+        return {
+          updatedState: state
+        };
+      }
       var diffX = x - draggingSupport.get('startPointX');
       var diffY = y - draggingSupport.get('startPointY');
       var newVertex0X = draggingSupport.get('startVertex0X') + diffX;

package/es/class/project.js

@@ -1,16 +1,12 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
 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) { _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; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Map, List } from 'immutable';
 import { MODE_VIEWING_CATALOG, MODE_CONFIGURING_PROJECT, MODE_IDLE, MODE_DRAWING_ITEM_3D, MODE_3D_VIEW, MODE_DRAGGING_ITEM_3D, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, MODE_DRAWING_ITEM, MODE_DRAWING_LINE, MODE_WAITING_DRAWING_LINE, MODE_DRAWING_HOLE, ARRAY_3D_MODES, END_DRAWING_LINE } from "../constants";
 import * as constants from "../constants";
-import { State, Catalog, Scene } from "../models";
+import { State, Catalog, Scene, safeLoadMapList, CatalogElement } from "../models";
 import { GeometryUtils, history } from "../utils/export";
 import { Layer, Group, Line, Hole, Item, Area, HorizontalGuide, VerticalGuide } from "../class/export";
 import * as viewer2DActions from "../actions/viewer2d-actions";
@@ -38,7 +34,6 @@ var Project = /*#__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;
@@ -52,7 +47,6 @@ var Project = /*#__PURE__*/function () {
       state = new State({});
       state = state.merge({
         doorStyle: doorStyle,
-        oStyle: oStyle,
         viewer2D: _viewer2D
       });
       // state = Item.setCounterTop(state, counterTop).updatedState;
@@ -63,9 +57,8 @@ var Project = /*#__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();
@@ -165,28 +158,10 @@ var Project = /*#__PURE__*/function () {
       }
       state = state.merge({
         doorStyle: doorStyle,
-        oStyle: oStyle,
         viewer2D: _viewer2D
       });
       state = Item.setCounterTop(state, counterTop).updatedState;
       state = 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 {
@@ -331,7 +306,7 @@ var Project = /*#__PURE__*/function () {
       var delLine = !isEmpty(lineID) && state.getIn(['scene', 'layers', selectedLayer, 'lines', lineID]).toJS();
       var allLines = state.getIn(['scene', 'layers', selectedLayer, 'lines']).toJS();
       var relatedLines = [];
-      delLine && GeometryUtils.getRelatedLines(relatedLines, delLine, allVertices, allLines);
+      !isEmpty(delLine) && GeometryUtils.getRelatedLines(relatedLines, delLine, allVertices, allLines);
       selectedLines.forEach(function (lineID) {
         state = Line.remove(state, selectedLayer, lineID).updatedState;
       });
@@ -341,12 +316,14 @@ var Project = /*#__PURE__*/function () {
       selectedItems.forEach(function (itemID) {
         state = Item.remove(state, selectedLayer, itemID).updatedState;
       });
-      if (!isEmpty(relatedLines)) {
+      if (!isEmpty(selectedLines) && !isEmpty(relatedLines)) {
         state = state.setIn(['mode'], MODE_DRAWING_LINE);
         relatedLines.forEach(function (relLine, index) {
           state = Line.select(state, selectedLayer, relLine.id).updatedState;
           state = Line.applyWallChanges(state, END_DRAWING_LINE).updatedState;
         });
+      } else {
+        state = Line.applyWallChanges(state, END_DRAWING_LINE).updatedState;
       }
       state = Layer.unselectAll(state, selectedLayer).updatedState;
       var mode = state.getIn(['mode']);
@@ -480,6 +457,10 @@ var Project = /*#__PURE__*/function () {
         };
       }
       var mode;
+      var isLineAction = false;
+      if (state.mode.includes('LINE')) {
+        isLineAction = true;
+      }
       if (state.mode == MODE_DRAWING_ITEM_3D) {
         mode = MODE_IDLE_3D;
         if (state.drawingSupport.has('currentID')) state = Layer.removeElement(state, state.scene.selectedLayer, 'items', state.drawingSupport.get('currentID')).updatedState;
@@ -522,6 +503,9 @@ var Project = /*#__PURE__*/function () {
         draggingSupport: new Map(),
         rotatingSupport: new Map()
       });
+      if (isLineAction) {
+        state = Line.applyWallChanges(state, END_DRAWING_LINE).updatedState;
+      }
       return {
         updatedState: state
       };
@@ -594,6 +578,24 @@ var Project = /*#__PURE__*/function () {
         };
       }
     }
+  }, {
+    key: "addElementToCatalog",
+    value: function addElementToCatalog(state, element) {
+      try {
+        var elements = state.getIn(['catalog', 'elements']).toJS();
+        elements[element.name] = element;
+        var newElements = safeLoadMapList(elements, CatalogElement);
+        state = state.setIn(['catalog', 'elements'], newElements);
+        return {
+          updatedState: state
+        };
+      } catch (error) {
+        console.log('addElementToCatalogError', error);
+        return {
+          updatedState: state
+        };
+      }
+    }
   }, {
     key: "updateMouseCoord",
     value: function updateMouseCoord(state, coords) {

package/es/class/vertex.js

@@ -1,10 +1,6 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { List, Map } from 'immutable';
 import { Vertex as VertexModel } from "../models";
 import { GeometryUtils, IDBroker, SnapSceneUtils, SnapUtils } from "../utils/export";
@@ -175,7 +171,7 @@ var Vertex = /*#__PURE__*/function () {
       var layerID = draggingSupport.get('layerID');
       var vertexID = draggingSupport.get('vertexID');
       var lines = state.getIn(['scene', 'layers', layerID, 'vertices', vertexID, 'lines']);
-      if (lines) {
+      if (!isEmpty(lines)) {
         state = lines.reduce(function (reducedState, lineID) {
           var eachLine = reducedState.getIn(['scene', 'layers', layerID, 'lines', lineID]);
           if (isEmpty(eachLine)) return reducedState;

package/es/components/content.js

@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
 import Viewer2D from "./viewer2d/viewer2d";
 import Viewer3D from "./viewer3d/viewer3d";
 import Viewer3DFirstPerson from "./viewer3d/viewer3d-first-person";
+// import CatalogList from './catalog-view/catalog-list';
+// import ProjectConfigurator from './configurator/project-configurator';
 import * as constants from "../constants";
 import Front3D from "./viewer3d/front3D";
 export default function Content(_ref, _ref2) {
@@ -14,7 +16,8 @@ export default 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) {
@@ -38,7 +41,8 @@ export default 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.createElement(Viewer3DFirstPerson, {
@@ -46,6 +50,18 @@ export default function Content(_ref, _ref2) {
         width: width,
         height: height
       });
+
+    // case constants.MODE_VIEWING_CATALOG:
+    //   return (
+    //     <CatalogList
+    //       state={state}
+    //       param={match}
+    //       width={width}
+    //       height={height}
+    //       categoryData={this.props.categoryData}
+    //     />
+    //   );
+
     case constants.MODE_IDLE:
     case constants.MODE_2D_ZOOM_IN:
     case constants.MODE_2D_ZOOM_OUT:
@@ -64,7 +80,8 @@ export default 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:
@@ -80,8 +97,15 @@ export default function Content(_ref, _ref2) {
         setToolbar: setToolbar,
         replaceCabinet: replaceCabinet,
         keyDownEnable: keyDownEnable,
-        downloadFlag: false
+        downloadFlag: false,
+        onInternalEvent: onInternalEvent
       });
+
+    // case constants.MODE_CONFIGURING_PROJECT:
+    //   return (
+    //     <ProjectConfigurator width={width} height={height} state={state} />
+    //   );
+
     default:
       if (customContents.hasOwnProperty(mode)) {
         var CustomContent = customContents[mode];
@@ -99,7 +123,8 @@ Content.propTypes = {
   state: PropTypes.object.isRequired,
   width: PropTypes.number.isRequired,
   height: PropTypes.number.isRequired,
-  replaceCabinet: PropTypes.func.isRequired
+  replaceCabinet: PropTypes.func.isRequired,
+  onInternalEvent: PropTypes.func.isRequired
 };
 Content.contextTypes = {
   projectActions: PropTypes.object.isRequired

package/es/components/export.js

@@ -1,9 +1,7 @@
 import Content from "./content";
 import Viewer2DComponents from "./viewer2d/export";
 import StyleComponents from "./style/export";
+
 export { Content, Viewer2DComponents, StyleComponents };
-export default {
-  Content: Content,
-  Viewer2DComponents: Viewer2DComponents,
-  StyleComponents: StyleComponents
-};
+
+export default { Content, Viewer2DComponents, StyleComponents };

package/es/components/style/button.js

@@ -1,20 +1,13 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
 var _excluded = ["type", "style", "styleHover", "children", "size"];
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
-function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
-function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
-function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
-function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import * as SharedStyle from "../../shared-style";

package/es/components/style/cancel-button.js

@@ -1,7 +1,6 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 import React from 'react';
 import Button from "./button";
 var STYLE = {