kitchen-simulator 3.1.2 → 4.0.1-react-18

package/lib/components/viewer2d/layer.js

@@ -123,7 +123,7 @@ function Layer(_ref) {
   var lineData = [];
   lines.sort(function compare(a, b) {
     return a.createdDateTime - b.createdDateTime;
-  }).valueSeq().forEach(function (line) {
+  }).valueSeq().forEach(function (line, index) {
     lineData.push(/*#__PURE__*/_react["default"].createElement(_export.Line, {
       key: line.id,
       layer: layer,

package/lib/components/viewer2d/line.js

@@ -258,11 +258,13 @@ function Line(_ref) {
   if (!showWallCabinetMeasure || wall_posArray.length <= 2) {
     wallSpace = 0;
   }
-  wallRuler = wall_posAndwidth.map(function (pAw) {
+  wallRuler = wall_posAndwidth.map(function (pAw, idx) {
     if (pAw.length > 1) {
       if (Math.sin(angle) === 0 || _export.GeometryUtils.almostEqual(y1, y2)) {
         if (x1 - x2 > 0) {
-          return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+          return /*#__PURE__*/_react["default"].createElement("g", {
+            key: "wallRuler-".concat(idx)
+          }, /*#__PURE__*/_react["default"].createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -284,7 +286,9 @@ function Line(_ref) {
             style: STYLE_DASH
           }));
         } else {
-          return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+          return /*#__PURE__*/_react["default"].createElement("g", {
+            key: "wallRuler-".concat(idx)
+          }, /*#__PURE__*/_react["default"].createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -309,7 +313,9 @@ function Line(_ref) {
       } else {
         if (y1 - y2 > 0) {
           if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", {
+              key: "wallRuler-".concat(idx)
+            }, /*#__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),
@@ -331,7 +337,9 @@ function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", {
+              key: "wallRuler-".concat(idx)
+            }, /*#__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),
@@ -355,7 +363,9 @@ function Line(_ref) {
           }
         } else {
           if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", {
+              key: "wallRuler-".concat(idx)
+            }, /*#__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),
@@ -377,7 +387,9 @@ function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", {
+              key: "wallRuler-".concat(idx)
+            }, /*#__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),
@@ -470,11 +482,13 @@ function Line(_ref) {
   if (!showBaseCabinetMeasure || base_posArray.length <= 2) {
     baseSpace -= STEP;
   }
-  baseRuler = base_posAndwidth.map(function (pAw) {
+  baseRuler = base_posAndwidth.map(function (pAw, idx) {
     if (pAw.length > 1) {
       if (Math.sin(angle) === 0 || _export.GeometryUtils.almostEqual(y1, y2)) {
         if (x1 - x2 > 0) {
-          return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+          return /*#__PURE__*/_react["default"].createElement("g", {
+            key: "baseRuler-".concat(idx)
+          }, /*#__PURE__*/_react["default"].createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -496,7 +510,9 @@ function Line(_ref) {
             style: STYLE_DASH
           }));
         } else {
-          return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+          return /*#__PURE__*/_react["default"].createElement("g", {
+            key: "baseRuler-".concat(idx)
+          }, /*#__PURE__*/_react["default"].createElement("line", {
             x1: pAw.pos.x + pAw.length,
             y1: pAw.pos.y,
             x2: pAw.pos.x + pAw.length,
@@ -521,7 +537,9 @@ function Line(_ref) {
       } else {
         if (y1 - y2 > 0) {
           if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", {
+              key: "baseRuler-".concat(idx)
+            }, /*#__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),
@@ -543,7 +561,9 @@ function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", {
+              key: "baseRuler-".concat(idx)
+            }, /*#__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),
@@ -567,7 +587,9 @@ function Line(_ref) {
           }
         } else {
           if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
-            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", {
+              key: "baseRuler-".concat(idx)
+            }, /*#__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),
@@ -589,7 +611,9 @@ function Line(_ref) {
               style: STYLE_DASH
             }));
           } else {
-            return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+            return /*#__PURE__*/_react["default"].createElement("g", {
+              key: "baseRuler-".concat(idx)
+            }, /*#__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),
@@ -663,7 +687,9 @@ 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", null, /*#__PURE__*/_react["default"].createElement("line", {
+    renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
+      key: 'ruler_' + line.id
+    }, /*#__PURE__*/_react["default"].createElement("line", {
       x1: length,
       y1: lineSpace + lineSpacedimension1,
       x2: length,
@@ -685,7 +711,9 @@ function Line(_ref) {
       style: STYLE_ROOM_SHAPE
     })));
   } else {
-    renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
+    renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
+      key: 'ruler_' + line.id
+    }, /*#__PURE__*/_react["default"].createElement("line", {
       x1: 0,
       y1: lineSpace + lineSpacedimension1,
       x2: 0,
@@ -784,7 +812,9 @@ function Line(_ref) {
       }
     });
   }
-  return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("g", {
+  return /*#__PURE__*/_react["default"].createElement("g", {
+    key: line.id
+  }, /*#__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/rulerX.js

@@ -148,7 +148,4 @@ 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,7 +150,4 @@ 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

@@ -129,9 +129,6 @@ var Scene = exports["default"] = /*#__PURE__*/function (_Component) {
 Scene.propTypes = {
   scene: _propTypes["default"].object.isRequired,
   catalog: _propTypes["default"].object.isRequired,
-  relatedLines: _propTypes["default"].object.isRequired
-};
-Scene.contextTypes = {
-  projectActions: _propTypes["default"].object.isRequired
+  relatedLines: _propTypes["default"].array.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"].object.isRequired
+  relatedLines: _propTypes["default"].array.isRequired
 };
 module.exports = exports.default;

package/lib/components/viewer2d/viewer2d.js

@@ -23,6 +23,7 @@ var _immutable = require("immutable");
 var _math = require("../../utils/math");
 var _helper = require("../../utils/helper");
 var _utils = require("./utils");
+var _useAppContext2 = require("../../useAppContext");
 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); }
 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) { (0, _defineProperty2["default"])(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; } // variables
@@ -129,21 +130,22 @@ function extractElementData(node) {
     direct: node.attributes.getNamedItem('data-direct') ? node.attributes.getNamedItem('data-direct').value : 0
   };
 }
-function Viewer2D(_ref, _ref2) {
+function Viewer2D(_ref) {
   var state = _ref.state,
     width = _ref.width,
     height = _ref.height,
     setToolbar = _ref.setToolbar,
     replaceCabinet = _ref.replaceCabinet,
     onInternalEvent = _ref.onInternalEvent;
-  var viewer2DActions = _ref2.viewer2DActions,
-    linesActions = _ref2.linesActions,
-    holesActions = _ref2.holesActions,
-    verticesActions = _ref2.verticesActions,
-    itemsActions = _ref2.itemsActions,
-    areaActions = _ref2.areaActions,
-    projectActions = _ref2.projectActions,
-    catalog = _ref2.catalog;
+  var _useAppContext = (0, _useAppContext2.useAppContext)(),
+    viewer2DActions = _useAppContext.viewer2DActions,
+    linesActions = _useAppContext.linesActions,
+    holesActions = _useAppContext.holesActions,
+    verticesActions = _useAppContext.verticesActions,
+    itemsActions = _useAppContext.itemsActions,
+    areaActions = _useAppContext.areaActions,
+    projectActions = _useAppContext.projectActions,
+    catalog = _useAppContext.catalog;
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     rulerEdit = _useState2[0],
@@ -166,6 +168,26 @@ function Viewer2D(_ref, _ref2) {
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
     drawStart = _useState8[0],
     setdrawStart = _useState8[1];
+  var _useState9 = (0, _react.useState)(function () {
+      return viewer2D && !viewer2D.isEmpty() ? viewer2D.toJS() : _reactSvgPanZoom.INITIAL_VALUE;
+    }),
+    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
+    svgValue = _useState0[0],
+    setSvgValue = _useState0[1];
+  var _useState1 = (0, _react.useState)(function () {
+      return mode2Tool(mode);
+    }),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    svgTool = _useState10[0],
+    setSvgTool = _useState10[1];
+  (0, _react.useEffect)(function () {
+    // keep tool controlled from app mode
+    setSvgTool(mode2Tool(mode));
+  }, [mode]);
+  (0, _react.useEffect)(function () {
+    // keep value controlled from store, but never null
+    if (viewer2D && !viewer2D.isEmpty()) setSvgValue(viewer2D.toJS());
+  }, [viewer2D]);
   (0, _react.useEffect)(function () {
     // move viewer point to center
     var selectedLayer = state.scene.layers.get(state.scene.selectedLayer);
@@ -190,9 +212,9 @@ function Viewer2D(_ref, _ref2) {
   var layerID = scene.selectedLayer;
   var wall_thickness = _constants.LINE_THICKNESS / 2;
   var layer = scene.getIn(['layers', layerID]);
-  var mapCursorPosition = function mapCursorPosition(_ref3) {
-    var x = _ref3.x,
-      y = _ref3.y;
+  var mapCursorPosition = function mapCursorPosition(_ref2) {
+    var x = _ref2.x,
+      y = _ref2.y;
     return {
       x: x,
       y: -y + scene.height
@@ -1295,6 +1317,7 @@ function Viewer2D(_ref, _ref2) {
   };
   var onChangeValue = function onChangeValue(value) {
     if (sFlag) return;
+    setSvgValue(value);
     var _zoomValue = parseInt((value.a - 0.5) / constants.ZOOM_VARIABLE);
     if (_zoomValue > constants.MAX_ZOOM_IN_SCALE) return;
     if (_zoomValue < 0 || Number.isNaN(_zoomValue)) return;
@@ -1326,6 +1349,7 @@ function Viewer2D(_ref, _ref2) {
     }
   };
   var onChangeTool = function onChangeTool(tool) {
+    setSvgTool(tool);
     switch (tool) {
       case _reactSvgPanZoom.TOOL_NONE:
         projectActions.selectToolEdit();
@@ -1424,19 +1448,20 @@ function Viewer2D(_ref, _ref2) {
     },
     width: width - rulerSize,
     height: height - rulerSize,
-    value: viewer2D.isEmpty() ? null : viewer2D.toJS(),
+    value: svgValue,
+    tool: svgTool,
     onChangeValue: onChangeValue,
-    tool: mode2Tool(mode),
     onChangeTool: onChangeTool,
     detectAutoPan: mode2DetectAutopan(mode),
     onMouseDown: onMouseDown,
     onMouseMove: onMouseMove,
     onMouseUp: onMouseUp,
-    miniaturePosition: "none",
-    toolbarPosition: "none",
     detectPinchGesture: false,
     disableDoubleClickZoomWithToolAuto: true,
-    ref: Viewer
+    ref: Viewer,
+    toolbarProps: {
+      position: _reactSvgPanZoom.POSITION_NONE
+    }
   }, /*#__PURE__*/_react["default"].createElement("svg", {
     width: scene.width,
     height: scene.height
@@ -1472,14 +1497,4 @@ Viewer2D.propTypes = {
   width: _propTypes["default"].number.isRequired,
   height: _propTypes["default"].number.isRequired
 };
-Viewer2D.contextTypes = {
-  viewer2DActions: _propTypes["default"].object.isRequired,
-  linesActions: _propTypes["default"].object.isRequired,
-  holesActions: _propTypes["default"].object.isRequired,
-  verticesActions: _propTypes["default"].object.isRequired,
-  itemsActions: _propTypes["default"].object.isRequired,
-  areaActions: _propTypes["default"].object.isRequired,
-  projectActions: _propTypes["default"].object.isRequired,
-  catalog: _propTypes["default"].object.isRequired
-};
 module.exports = exports.default;

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

@@ -305,12 +305,4 @@ Viewer3DFirstPerson.propTypes = {
   width: _propTypes["default"].number.isRequired,
   height: _propTypes["default"].number.isRequired
 };
-Viewer3DFirstPerson.contextTypes = {
-  areaActions: _propTypes["default"].object.isRequired,
-  holesActions: _propTypes["default"].object.isRequired,
-  itemsActions: _propTypes["default"].object.isRequired,
-  linesActions: _propTypes["default"].object.isRequired,
-  projectActions: _propTypes["default"].object.isRequired,
-  catalog: _propTypes["default"].object
-};
 module.exports = exports.default;

package/lib/components/viewer3d/viewer3d.js

@@ -2671,13 +2671,4 @@ Scene3DViewer.propTypes = {
   height: _propTypes["default"].number.isRequired,
   replaceCabinet: _propTypes["default"].func.isRequired
 };
-Scene3DViewer.contextTypes = {
-  areaActions: _propTypes["default"].object.isRequired,
-  holesActions: _propTypes["default"].object.isRequired,
-  itemsActions: _propTypes["default"].object.isRequired,
-  linesActions: _propTypes["default"].object.isRequired,
-  sceneActions: _propTypes["default"].object.isRequired,
-  projectActions: _propTypes["default"].object.isRequired,
-  catalog: _propTypes["default"].object
-};
 module.exports = exports.default;