kitchen-simulator 4.1.1-react-18 → 4.1.1

package/lib/components/viewer2d/line.js

@@ -45,28 +45,28 @@ var STYLE_ROOM_SHAPE = exports.STYLE_ROOM_SHAPE = {
 var STYLE_DASH = {
   stroke: _constants.DASH_LINE_COLOR,
   strokeDasharray: '4 4',
-  strokeWidth: '2px',
+  strokeWidth: '1px',
   strokeLinecap: 'round'
 };
 var STYLE_ROOM_ELEMENT = {
   fill: _constants.ROOM_ELEMENT_MEASUREMENT_LINE_COLOR,
   stroke: _constants.ROOM_ELEMENT_MEASUREMENT_LINE_COLOR,
-  strokeWidth: '2px'
+  strokeWidth: '1.5px'
 };
 var STYLE_BASE_ITEM = {
   fill: _constants.BASE_ITEM_MEASUREMENT_LINE_COLOR,
   stroke: _constants.BASE_ITEM_MEASUREMENT_LINE_COLOR,
-  strokeWidth: '2px'
+  strokeWidth: '1.5px'
 };
 var STYLE_WALL_ITEM = {
   fill: _constants.WALL_ITEM_MEASUREMENT_LINE_COLOR,
   stroke: _constants.WALL_ITEM_MEASUREMENT_LINE_COLOR,
-  strokeWidth: '2px'
+  strokeWidth: '1.5px'
 };
 var STYLE_DISTANCE = {
   fill: _constants.DISTANCE_MEASUREMENT_LINE_COLOR,
   stroke: _constants.DISTANCE_MEASUREMENT_LINE_COLOR,
-  strokeWidth: '2px'
+  strokeWidth: '1.5px'
 };
 var selectStyle = function selectStyle(element, style) {
   return element.iFlag ? style : STYLE_DISTANCE;
@@ -258,13 +258,11 @@ function Line(_ref) {
   if (!showWallCabinetMeasure || wall_posArray.length <= 2) {
     wallSpace = 0;
   }
-  wallRuler = wall_posAndwidth.map(function (pAw, idx) {
+  wallRuler = wall_posAndwidth.map(function (pAw) {
     if (pAw.length > 1) {
       if (Math.sin(angle) === 0 || _export.GeometryUtils.almostEqual(y1, y2)) {
         if (x1 - x2 > 0) {
-          return /*#__PURE__*/_react["default"].createElement("g", {
-            key: "wallRuler-".concat(idx)
-          }, /*#__PURE__*/_react["default"].createElement("line", {
+          return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -286,9 +284,7 @@ function Line(_ref) {
             style: STYLE_DASH
           }));
         } else {
-          return /*#__PURE__*/_react["default"].createElement("g", {
-            key: "wallRuler-".concat(idx)
-          }, /*#__PURE__*/_react["default"].createElement("line", {
+          return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -313,9 +309,7 @@ function Line(_ref) {
       } else {
         if (y1 - y2 > 0) {
           if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/_react["default"].createElement("g", {
-              key: "wallRuler-".concat(idx)
-            }, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
               x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
               y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
               x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -337,9 +331,7 @@ function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/_react["default"].createElement("g", {
-              key: "wallRuler-".concat(idx)
-            }, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
               x1: pAw.pos.x,
               y1: pAw.pos.y,
               x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -363,9 +355,7 @@ function Line(_ref) {
           }
         } else {
           if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/_react["default"].createElement("g", {
-              key: "wallRuler-".concat(idx)
-            }, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
               x1: pAw.pos.x,
               y1: pAw.pos.y,
               x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -387,9 +377,7 @@ function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/_react["default"].createElement("g", {
-              key: "wallRuler-".concat(idx)
-            }, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
               x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
               y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
               x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -482,13 +470,11 @@ function Line(_ref) {
   if (!showBaseCabinetMeasure || base_posArray.length <= 2) {
     baseSpace -= STEP;
   }
-  baseRuler = base_posAndwidth.map(function (pAw, idx) {
+  baseRuler = base_posAndwidth.map(function (pAw) {
     if (pAw.length > 1) {
       if (Math.sin(angle) === 0 || _export.GeometryUtils.almostEqual(y1, y2)) {
         if (x1 - x2 > 0) {
-          return /*#__PURE__*/_react["default"].createElement("g", {
-            key: "baseRuler-".concat(idx)
-          }, /*#__PURE__*/_react["default"].createElement("line", {
+          return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -510,9 +496,7 @@ function Line(_ref) {
             style: STYLE_DASH
           }));
         } else {
-          return /*#__PURE__*/_react["default"].createElement("g", {
-            key: "baseRuler-".concat(idx)
-          }, /*#__PURE__*/_react["default"].createElement("line", {
+          return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -537,9 +521,7 @@ function Line(_ref) {
       } else {
         if (y1 - y2 > 0) {
           if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/_react["default"].createElement("g", {
-              key: "baseRuler-".concat(idx)
-            }, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
               x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
               y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
               x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -561,9 +543,7 @@ function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/_react["default"].createElement("g", {
-              key: "baseRuler-".concat(idx)
-            }, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
               x1: pAw.pos.x,
               y1: pAw.pos.y,
               x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -587,9 +567,7 @@ function Line(_ref) {
           }
         } else {
           if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/_react["default"].createElement("g", {
-              key: "baseRuler-".concat(idx)
-            }, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
               x1: pAw.pos.x,
               y1: pAw.pos.y,
               x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -611,9 +589,7 @@ function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/_react["default"].createElement("g", {
-              key: "baseRuler-".concat(idx)
-            }, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
               x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
               y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
               x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -687,9 +663,7 @@ function Line(_ref) {
   //the space from the dimensioning line to the bottom
   var lineSpacedimension2 = 14;
   if (compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
-    renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
-      key: 'ruler_' + line.id
-    }, /*#__PURE__*/_react["default"].createElement("line", {
+    renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
       x1: length,
       y1: lineSpace + lineSpacedimension1,
       x2: length,
@@ -711,9 +685,7 @@ function Line(_ref) {
       style: STYLE_ROOM_SHAPE
     })));
   } else {
-    renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
-      key: 'ruler_' + line.id
-    }, /*#__PURE__*/_react["default"].createElement("line", {
+    renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
       x1: 0,
       y1: lineSpace + lineSpacedimension1,
       x2: 0,
@@ -812,9 +784,7 @@ function Line(_ref) {
       }
     });
   }
-  return /*#__PURE__*/_react["default"].createElement("g", {
-    key: line.id
-  }, /*#__PURE__*/_react["default"].createElement("g", {
+  return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("g", {
     transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)"),
     "data-element-root": true,
     "data-prototype": 'ruler',

package/lib/components/viewer2d/ruler.js

@@ -7,14 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = Ruler;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _idBroker = _interopRequireDefault(require("../../utils/id-broker"));
 var _constants = require("../../constants");
 var _line = require("./line");
-var STYLE = {
-  stroke: _constants.TEXT_COLOR_NEUTRAL_7,
-  strokeWidth: '1px'
-};
+var _ruler = require("../../utils/ruler");
 var BACKGROUNDSTYLE = {
   fill: 'transparent',
   fillOpacity: 0.8
@@ -38,11 +34,20 @@ function Ruler(_ref) {
     rulerUnit = _ref.rulerUnit,
     transform = _ref.transform,
     style = _ref.style;
-  var distanceText = (0, _convertUnitsLite.convert)(length).from(unit).to(rulerUnit).toFixed(0);
-  var textLength = (distanceText.length + layer.unit.length) * 9;
+  var _getRulerDisplayData = (0, _ruler.getRulerDisplayData)({
+      length: length,
+      unit: unit,
+      rulerUnit: rulerUnit,
+      layerUnit: layer.unit
+    }),
+    distanceText = _getRulerDisplayData.distanceText,
+    unitStr = _getRulerDisplayData.unitStr,
+    textLength = _getRulerDisplayData.textLength,
+    bShowText = _getRulerDisplayData.bShowText,
+    bShowLine = _getRulerDisplayData.bShowLine;
   return /*#__PURE__*/_react["default"].createElement("g", {
     transform: transform
-  }, /*#__PURE__*/_react["default"].createElement("g", {
+  }, bShowText && /*#__PURE__*/_react["default"].createElement("g", {
     id: "ruler"
   }, /*#__PURE__*/_react["default"].createElement("rect", {
     id: "ruler_rect_".concat(_idBroker["default"].acquireID()),
@@ -59,7 +64,7 @@ function Ruler(_ref) {
     transform: "scale(1, -1)",
     style: STYLE_TEXT,
     fill: _constants.TEXT_COLOR_NEUTRAL_7
-  }, Math.round((0, _convertUnitsLite.convert)(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/_react["default"].createElement("line", {
+  }, distanceText, unitStr)), bShowLine && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("line", {
     x1: style === _line.STYLE_ROOM_SHAPE ? 0 : 4,
     y1: "0",
     x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
@@ -77,7 +82,7 @@ function Ruler(_ref) {
   }), /*#__PURE__*/_react["default"].createElement("polygon", {
     points: "".concat(length - 3, ", 0, ").concat(length - 6.5, ", 2, ").concat(length - 6.5, ", -2"),
     style: style
-  })));
+  }))));
 }
 Ruler.propTypes = {
   length: _propTypes["default"].number.isRequired,

package/lib/components/viewer2d/rulerDist.js

@@ -7,12 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = RulerDist;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _convertUnitsLite = require("../../utils/convert-units-lite");
-var ARROW_STYLE = {
-  stroke: '#1183B7',
-  strokeWidth: '2px',
-  strokeLinecap: 'round'
-};
+var _ruler = require("../../utils/ruler");
 var STYLE = {
   stroke: '#455A64',
   fill: '#455A64',
@@ -38,10 +33,17 @@ function RulerDist(_ref) {
     transform = _ref.transform,
     angle = _ref.angle,
     rotation = _ref.rotation;
-  var _unit = 'in';
-  // let _length = convert(length).from(unit).to(rulerUnit);
-  var distanceText = "".concat((0, _convertUnitsLite.convert)(length).from('cm').to(rulerUnit).toFixed(0));
-  var textLength = (distanceText.length + layer.unit.length) * 8;
+  var _getRulerDisplayData = (0, _ruler.getRulerDisplayData)({
+      length: length,
+      unit: unit,
+      rulerUnit: rulerUnit,
+      layerUnit: layer.unit
+    }),
+    distanceText = _getRulerDisplayData.distanceText,
+    unitStr = _getRulerDisplayData.unitStr,
+    textLength = _getRulerDisplayData.textLength,
+    bShowText = _getRulerDisplayData.bShowText,
+    bShowLine = _getRulerDisplayData.bShowLine;
   var textangle = angle + 90;
   var textRotation = 1;
   var ay = 2;
@@ -73,47 +75,32 @@ function RulerDist(_ref) {
     textRotation = 180;
     ay = 5;
   }
-  if (distanceText > 0) {
-    if (distanceText < 28) {
-      return /*#__PURE__*/_react["default"].createElement("g", {
-        transform: transform
-      }, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("text", {
-        x: "0",
-        y: "0",
-        transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
-        style: STYLE_TEXT
-      }, Math.round((0, _convertUnitsLite.convert)(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)));
-    } else {
-      return /*#__PURE__*/_react["default"].createElement("g", {
-        transform: transform
-      }, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("text", {
-        x: "0",
-        y: "0",
-        transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
-        style: STYLE_TEXT
-      }, Math.round((0, _convertUnitsLite.convert)(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/_react["default"].createElement("line", {
-        x1: "2",
-        y1: "0",
-        x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
-        y2: "0",
-        style: STYLE
-      }), /*#__PURE__*/_react["default"].createElement("polygon", {
-        points: "1, 0, 4.5, -2, 4.5, 2 ",
-        style: STYLE
-      }), /*#__PURE__*/_react["default"].createElement("line", {
-        x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
-        y1: "0",
-        x2: length,
-        y2: "0",
-        style: STYLE
-      }), /*#__PURE__*/_react["default"].createElement("polygon", {
-        points: "".concat(length - 1, ", 0, ").concat(length - 4.5, ", 2, ").concat(length - 4.5, ", -2"),
-        style: STYLE
-      }));
-    }
-  } else {
-    return null;
-  }
+  return /*#__PURE__*/_react["default"].createElement("g", {
+    transform: transform
+  }, bShowText && /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("text", {
+    x: "0",
+    y: "0",
+    transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
+    style: STYLE_TEXT
+  }, distanceText, unitStr)), bShowLine && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("line", {
+    x1: "2",
+    y1: "0",
+    x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
+    y2: "0",
+    style: STYLE
+  }), /*#__PURE__*/_react["default"].createElement("polygon", {
+    points: "1, 0, 4.5, -2, 4.5, 2 ",
+    style: STYLE
+  }), /*#__PURE__*/_react["default"].createElement("line", {
+    x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
+    y1: "0",
+    x2: length,
+    y2: "0",
+    style: STYLE
+  }), /*#__PURE__*/_react["default"].createElement("polygon", {
+    points: "".concat(length - 1, ", 0, ").concat(length - 4.5, ", 2, ").concat(length - 4.5, ", -2"),
+    style: STYLE
+  })));
 }
 RulerDist.propTypes = {
   length: _propTypes["default"].number.isRequired,

package/lib/components/viewer2d/rulerX.js

@@ -52,10 +52,9 @@ var RulerX = exports["default"] = /*#__PURE__*/function (_Component) {
         height: '100%',
         color: this.props.fontColor
       };
-      var left = Number.isFinite(this.props.zeroLeftPosition) && Number.isFinite(this.props.mouseX) && Number.isFinite(this.props.zoom) ? this.props.zeroLeftPosition + this.props.mouseX * this.props.zoom - 6.5 : 0;
       var markerStyle = {
         position: 'absolute',
-        left: left,
+        left: this.props.zeroLeftPosition + this.props.mouseX * this.props.zoom - 6.5,
         top: 8,
         width: 0,
         height: 0,
@@ -149,4 +148,7 @@ RulerX.defaultProps = {
   fontColor: SharedStyle.COLORS.white,
   markerColor: SharedStyle.SECONDARY_COLOR.main
 };
+RulerX.contextTypes = {
+  translator: _propTypes["default"].object.isRequired
+};
 module.exports = exports.default;

package/lib/components/viewer2d/rulerY.js

@@ -150,4 +150,7 @@ RulerY.defaultProps = {
   fontColor: SharedStyle.COLORS.white,
   markerColor: SharedStyle.SECONDARY_COLOR.main
 };
+RulerY.contextTypes = {
+  translator: _propTypes["default"].object.isRequired
+};
 module.exports = exports.default;

package/lib/components/viewer2d/scene.js

@@ -28,15 +28,16 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
   }
   (0, _inherits2["default"])(Scene, _Component);
   return (0, _createClass2["default"])(Scene, [{
-    key: "componentDidUpdate",
+    key: "componentWillReceiveProps",
     value: function () {
-      var _componentDidUpdate = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(prevProps) {
-        var _this$props, scene, catalog, height, layers, selectedLayer, msg, isNotFoundInElements, itemType;
+      var _componentWillReceiveProps = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(nextProps) {
+        var scene, catalog, height, layers, selectedLayer, msg, isNotFoundInElements, itemType;
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (this.props.scene.hashCode() !== prevProps.scene.hashCode()) {
-                _this$props = this.props, scene = _this$props.scene, catalog = _this$props.catalog;
+              // console.log("componentDidMount", this.props.scene.hashCode(), nextProps.scene.hashCode());
+              if (this.props.scene.hashCode() !== nextProps.scene.hashCode()) {
+                scene = nextProps.scene, catalog = nextProps.catalog;
                 height = scene.height, layers = scene.layers;
                 selectedLayer = layers.get(scene.selectedLayer);
                 msg = '';
@@ -68,10 +69,10 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
           }
         }, _callee, this);
       }));
-      function componentDidUpdate(_x) {
-        return _componentDidUpdate.apply(this, arguments);
+      function componentWillReceiveProps(_x) {
+        return _componentWillReceiveProps.apply(this, arguments);
       }
-      return componentDidUpdate;
+      return componentWillReceiveProps;
     }()
   }, {
     key: "shouldComponentUpdate",
@@ -82,9 +83,10 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _this = this;
-      var _this$props2 = this.props,
-        scene = _this$props2.scene,
-        catalog = _this$props2.catalog;
+      // console.log("scene", this);
+      var _this$props = this.props,
+        scene = _this$props.scene,
+        catalog = _this$props.catalog;
       var height = scene.height,
         layers = scene.layers;
       var selectedLayer = layers.get(scene.selectedLayer);
@@ -127,6 +129,9 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
 Scene.propTypes = {
   scene: _propTypes["default"].object.isRequired,
   catalog: _propTypes["default"].object.isRequired,
-  relatedLines: _propTypes["default"].array.isRequired
+  relatedLines: _propTypes["default"].object.isRequired
+};
+Scene.contextTypes = {
+  projectActions: _propTypes["default"].object.isRequired
 };
 module.exports = exports.default;

package/lib/components/viewer2d/state.js

@@ -78,6 +78,6 @@ function State(_ref) {
 State.propTypes = {
   state: _propTypes["default"].object.isRequired,
   catalog: _propTypes["default"].object.isRequired,
-  relatedLines: _propTypes["default"].array.isRequired
+  relatedLines: _propTypes["default"].object.isRequired
 };
 module.exports = exports.default;

package/lib/components/viewer2d/utils.js

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

package/lib/components/viewer2d/vertex.js

@@ -9,6 +9,7 @@ exports["default"] = Vertex;
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
+var _utils = require("./utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 //Space from the center of the point(Use cases:x - vertexthickness,y + vertexthickness )
 var vertexthickness = 4;
@@ -40,9 +41,9 @@ function Vertex(_ref) {
       });
       if (index > -1) {
         var vertice = line.relatedVertices.filter(function (a) {
-          if (a['index'] === undefined) {
+          if ((0, _utils.isEmpty)(a['index'])) {
             return a.get('index') === index;
-          } else if (a['index'] !== undefined) {
+          } else {
             return a.index === index;
           }
         }).get(0);