kitchen-simulator 4.0.4-react-18 → 4.0.4

package/es/components/viewer2d/line.js

@@ -247,13 +247,11 @@ export default 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 || GeometryUtils.almostEqual(y1, y2)) {
         if (x1 - x2 > 0) {
-          return /*#__PURE__*/React.createElement("g", {
-            key: "wallRuler-".concat(idx)
-          }, /*#__PURE__*/React.createElement("line", {
+          return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -275,9 +273,7 @@ export default function Line(_ref) {
             style: STYLE_DASH
           }));
         } else {
-          return /*#__PURE__*/React.createElement("g", {
-            key: "wallRuler-".concat(idx)
-          }, /*#__PURE__*/React.createElement("line", {
+          return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -302,9 +298,7 @@ export default function Line(_ref) {
       } else {
         if (y1 - y2 > 0) {
           if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/React.createElement("g", {
-              key: "wallRuler-".concat(idx)
-            }, /*#__PURE__*/React.createElement("line", {
+            return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.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),
@@ -326,9 +320,7 @@ export default function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/React.createElement("g", {
-              key: "wallRuler-".concat(idx)
-            }, /*#__PURE__*/React.createElement("line", {
+            return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
               x1: pAw.pos.x,
               y1: pAw.pos.y,
               x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -352,9 +344,7 @@ export default function Line(_ref) {
           }
         } else {
           if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/React.createElement("g", {
-              key: "wallRuler-".concat(idx)
-            }, /*#__PURE__*/React.createElement("line", {
+            return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
               x1: pAw.pos.x,
               y1: pAw.pos.y,
               x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
@@ -376,9 +366,7 @@ export default function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/React.createElement("g", {
-              key: "wallRuler-".concat(idx)
-            }, /*#__PURE__*/React.createElement("line", {
+            return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.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),
@@ -471,13 +459,11 @@ export default 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 || GeometryUtils.almostEqual(y1, y2)) {
         if (x1 - x2 > 0) {
-          return /*#__PURE__*/React.createElement("g", {
-            key: "baseRuler-".concat(idx)
-          }, /*#__PURE__*/React.createElement("line", {
+          return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -499,9 +485,7 @@ export default function Line(_ref) {
             style: STYLE_DASH
           }));
         } else {
-          return /*#__PURE__*/React.createElement("g", {
-            key: "baseRuler-".concat(idx)
-          }, /*#__PURE__*/React.createElement("line", {
+          return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -526,9 +510,7 @@ export default function Line(_ref) {
       } else {
         if (y1 - y2 > 0) {
           if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/React.createElement("g", {
-              key: "baseRuler-".concat(idx)
-            }, /*#__PURE__*/React.createElement("line", {
+            return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.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),
@@ -550,9 +532,7 @@ export default function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/React.createElement("g", {
-              key: "baseRuler-".concat(idx)
-            }, /*#__PURE__*/React.createElement("line", {
+            return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
               x1: pAw.pos.x,
               y1: pAw.pos.y,
               x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -576,9 +556,7 @@ export default function Line(_ref) {
           }
         } else {
           if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/React.createElement("g", {
-              key: "baseRuler-".concat(idx)
-            }, /*#__PURE__*/React.createElement("line", {
+            return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
               x1: pAw.pos.x,
               y1: pAw.pos.y,
               x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
@@ -600,9 +578,7 @@ export default function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/React.createElement("g", {
-              key: "baseRuler-".concat(idx)
-            }, /*#__PURE__*/React.createElement("line", {
+            return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.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),
@@ -676,9 +652,7 @@ export default 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.createElement("g", {
-      key: 'ruler_' + line.id
-    }, /*#__PURE__*/React.createElement("line", {
+    renderedRuler.push(/*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
       x1: length,
       y1: lineSpace + lineSpacedimension1,
       x2: length,
@@ -700,9 +674,7 @@ export default function Line(_ref) {
       style: STYLE_ROOM_SHAPE
     })));
   } else {
-    renderedRuler.push(/*#__PURE__*/React.createElement("g", {
-      key: 'ruler_' + line.id
-    }, /*#__PURE__*/React.createElement("line", {
+    renderedRuler.push(/*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
       x1: 0,
       y1: lineSpace + lineSpacedimension1,
       x2: 0,
@@ -801,9 +773,7 @@ export default function Line(_ref) {
       }
     });
   }
-  return /*#__PURE__*/React.createElement("g", {
-    key: line.id
-  }, /*#__PURE__*/React.createElement("g", {
+  return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("g", {
     transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)"),
     "data-element-root": true,
     "data-prototype": 'ruler',

package/es/components/viewer2d/ruler.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { convert } from "../../utils/convert-units-lite";
 import IDBroker from "../../utils/id-broker";
-import { LINE_THICKNESS, TEXT_COLOR_NEUTRAL_7 } from "../../constants";
+import { LINE_THICKNESS, TEXT_COLOR_NEUTRAL_7, UNIT_FOOT, UNIT_METER } from "../../constants";
 import { STYLE_ROOM_SHAPE } from "./line";
 var STYLE = {
   stroke: TEXT_COLOR_NEUTRAL_7,
@@ -31,7 +31,9 @@ export default function Ruler(_ref) {
     rulerUnit = _ref.rulerUnit,
     transform = _ref.transform,
     style = _ref.style;
-  var distanceText = convert(length).from(unit).to(rulerUnit).toFixed(0);
+  var ruLength = convert(length).from(unit).to(rulerUnit);
+  var fixedLength = layer.unit === UNIT_METER || layer.unit === UNIT_FOOT ? 2 : 0;
+  var distanceText = (Math.round(convert(ruLength).from(rulerUnit).to(layer.unit) * 100) / 100).toFixed(fixedLength);
   var textLength = (distanceText.length + layer.unit.length) * 9;
   return /*#__PURE__*/React.createElement("g", {
     transform: transform
@@ -52,7 +54,7 @@ export default function Ruler(_ref) {
     transform: "scale(1, -1)",
     style: STYLE_TEXT,
     fill: TEXT_COLOR_NEUTRAL_7
-  }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
+  }, distanceText, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
     x1: style === STYLE_ROOM_SHAPE ? 0 : 4,
     y1: "0",
     x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,

package/es/components/viewer2d/rulerDist.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { convert } from "../../utils/convert-units-lite";
+import { UNIT_FOOT, UNIT_METER } from "../../constants";
 var ARROW_STYLE = {
   stroke: '#1183B7',
   strokeWidth: '2px',
@@ -31,9 +32,9 @@ export default 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(convert(length).from('cm').to(rulerUnit).toFixed(0));
+  var ruLength = convert(length).from(unit).to(rulerUnit);
+  var fixedLength = layer.unit === UNIT_METER || layer.unit === UNIT_FOOT ? 2 : 0;
+  var distanceText = (Math.round(convert(ruLength).from(rulerUnit).to(layer.unit) * 100) / 100).toFixed(fixedLength);
   var textLength = (distanceText.length + layer.unit.length) * 8;
   var textangle = angle + 90;
   var textRotation = 1;
@@ -66,8 +67,8 @@ export default function RulerDist(_ref) {
     textRotation = 180;
     ay = 5;
   }
-  if (distanceText > 0) {
-    if (distanceText < 28) {
+  if (ruLength > 0) {
+    if (ruLength < 28) {
       return /*#__PURE__*/React.createElement("g", {
         transform: transform
       }, /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("text", {
@@ -75,7 +76,7 @@ export default function RulerDist(_ref) {
         y: "0",
         transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
         style: STYLE_TEXT
-      }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)));
+      }, distanceText, layer.unit === 'in' ? '"' : layer.unit)));
     } else {
       return /*#__PURE__*/React.createElement("g", {
         transform: transform
@@ -84,7 +85,7 @@ export default function RulerDist(_ref) {
         y: "0",
         transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
         style: STYLE_TEXT
-      }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
+      }, distanceText, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
         x1: "2",
         y1: "0",
         x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,

package/es/components/viewer2d/rulerX.js

@@ -43,10 +43,9 @@ var RulerX = /*#__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,
@@ -140,4 +139,7 @@ RulerX.defaultProps = {
   backgroundColor: SharedStyle.PRIMARY_COLOR.main,
   fontColor: SharedStyle.COLORS.white,
   markerColor: SharedStyle.SECONDARY_COLOR.main
+};
+RulerX.contextTypes = {
+  translator: PropTypes.object.isRequired
 };

package/es/components/viewer2d/rulerY.js

@@ -141,4 +141,7 @@ RulerY.defaultProps = {
   backgroundColor: SharedStyle.PRIMARY_COLOR.main,
   fontColor: SharedStyle.COLORS.white,
   markerColor: SharedStyle.SECONDARY_COLOR.main
+};
+RulerY.contextTypes = {
+  translator: PropTypes.object.isRequired
 };

package/es/components/viewer2d/scene.js

@@ -19,15 +19,16 @@ var Scene = /*#__PURE__*/function (_Component) {
   }
   _inherits(Scene, _Component);
   return _createClass(Scene, [{
-    key: "componentDidUpdate",
+    key: "componentWillReceiveProps",
     value: function () {
-      var _componentDidUpdate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(prevProps) {
-        var _this$props, scene, catalog, height, layers, selectedLayer, msg, isNotFoundInElements, itemType;
+      var _componentWillReceiveProps = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(nextProps) {
+        var scene, catalog, height, layers, selectedLayer, msg, isNotFoundInElements, itemType;
         return _regeneratorRuntime.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 = '';
@@ -59,10 +60,10 @@ var Scene = /*#__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",
@@ -73,9 +74,10 @@ var Scene = /*#__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);
@@ -119,5 +121,8 @@ export { Scene as default };
 Scene.propTypes = {
   scene: PropTypes.object.isRequired,
   catalog: PropTypes.object.isRequired,
-  relatedLines: PropTypes.array.isRequired
+  relatedLines: PropTypes.object.isRequired
+};
+Scene.contextTypes = {
+  projectActions: PropTypes.object.isRequired
 };

package/es/components/viewer2d/state.js

@@ -69,5 +69,5 @@ export default function State(_ref) {
 State.propTypes = {
   state: PropTypes.object.isRequired,
   catalog: PropTypes.object.isRequired,
-  relatedLines: PropTypes.array.isRequired
+  relatedLines: PropTypes.object.isRequired
 };

package/es/components/viewer2d/utils.js

@@ -187,7 +187,7 @@ export var areaPolygon = function areaPolygon(points) {
 };
 export var 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/es/components/viewer2d/vertex.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import * as SharedStyle from "../../shared-style";
+import { isEmpty } from "./utils";
 //Space from the center of the point(Use cases:x - vertexthickness,y + vertexthickness )
 var vertexthickness = 4;
 var STYLE = {
@@ -31,9 +32,9 @@ export default function Vertex(_ref) {
       });
       if (index > -1) {
         var vertice = line.relatedVertices.filter(function (a) {
-          if (a['index'] === undefined) {
+          if (isEmpty(a['index'])) {
             return a.get('index') === index;
-          } else if (a['index'] !== undefined) {
+          } else {
             return a.index === index;
           }
         }).get(0);