kitchen-simulator 4.0.1-react-18 → 4.0.1

package/es/components/viewer2d/layer.js

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

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

@@ -139,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

@@ -121,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/viewer2d.js

@@ -4,7 +4,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import { INITIAL_VALUE, POSITION_NONE, ReactSVGPanZoom, TOOL_AUTO, TOOL_NONE, TOOL_PAN, TOOL_ZOOM_IN, TOOL_ZOOM_OUT } from 'react-svg-pan-zoom';
+import { ReactSVGPanZoom, TOOL_AUTO, TOOL_NONE, TOOL_PAN, TOOL_ZOOM_IN, TOOL_ZOOM_OUT } from 'react-svg-pan-zoom';
 import * as constants from "../../constants";
 import { DECIMAL_PLACES_2, LINE_THICKNESS, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_ELEVATION_VIEW, MODE_IDLE, UNIT_ANGLE, INTERNAL_EVENT_SELECT_ELEMENT, INTERNAL_EVENT_DRAG_ELEMENT, INTERNAL_EVENT_DRAW_ELEMENT, INTERNAL_EVENT_ROTATE_ELEMENT } from "../../constants";
 import State from "./state";
@@ -15,10 +15,8 @@ import FormNumberInput from "../style/form-number-input";
 import { convert } from "../../utils/convert-units-lite";
 import { Map } from 'immutable';
 import { formatNumber } from "../../utils/math";
-import { isEmpty } from "../../utils/helper"; // variables
+import { isEmpty, updatePayloadOfInternalEvent } from "../../utils/helper"; // variables
 import { isWarningItem } from "./utils";
-import { MoldingUtils } from "../../utils/export";
-import { useAppContext } from "../../useAppContext";
 // variables
 var pinFlag = false;
 var sFlag = false; //for all object move
@@ -122,22 +120,21 @@ function extractElementData(node) {
     direct: node.attributes.getNamedItem('data-direct') ? node.attributes.getNamedItem('data-direct').value : 0
   };
 }
-export default function Viewer2D(_ref) {
+export default function Viewer2D(_ref, _ref2) {
   var state = _ref.state,
     width = _ref.width,
     height = _ref.height,
     setToolbar = _ref.setToolbar,
     replaceCabinet = _ref.replaceCabinet,
     onInternalEvent = _ref.onInternalEvent;
-  var _useAppContext = 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 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 _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     rulerEdit = _useState2[0],
@@ -160,26 +157,6 @@ export default function Viewer2D(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     drawStart = _useState8[0],
     setdrawStart = _useState8[1];
-  var _useState9 = useState(function () {
-      return viewer2D && !viewer2D.isEmpty() ? viewer2D.toJS() : INITIAL_VALUE;
-    }),
-    _useState0 = _slicedToArray(_useState9, 2),
-    svgValue = _useState0[0],
-    setSvgValue = _useState0[1];
-  var _useState1 = useState(function () {
-      return mode2Tool(mode);
-    }),
-    _useState10 = _slicedToArray(_useState1, 2),
-    svgTool = _useState10[0],
-    setSvgTool = _useState10[1];
-  useEffect(function () {
-    // keep tool controlled from app mode
-    setSvgTool(mode2Tool(mode));
-  }, [mode]);
-  useEffect(function () {
-    // keep value controlled from store, but never null
-    if (viewer2D && !viewer2D.isEmpty()) setSvgValue(viewer2D.toJS());
-  }, [viewer2D]);
   useEffect(function () {
     // move viewer point to center
     var selectedLayer = state.scene.layers.get(state.scene.selectedLayer);
@@ -204,9 +181,9 @@ export default function Viewer2D(_ref) {
   var layerID = scene.selectedLayer;
   var wall_thickness = LINE_THICKNESS / 2;
   var layer = scene.getIn(['layers', layerID]);
-  var mapCursorPosition = function mapCursorPosition(_ref2) {
-    var x = _ref2.x,
-      y = _ref2.y;
+  var mapCursorPosition = function mapCursorPosition(_ref3) {
+    var x = _ref3.x,
+      y = _ref3.y;
     return {
       x: x,
       y: -y + scene.height
@@ -855,15 +832,17 @@ export default function Viewer2D(_ref) {
   var onMouseUp = function onMouseUp(viewerEvent) {
     //set move all flag false
     sFlag = false;
-    // //////////////////////
-    // setRulerEdit(null);
     var event = viewerEvent.originalEvent;
-    var bbox = event.target.getBoundingClientRect();
+    var parent = document.querySelector('#kitchen-simulator-container');
+    var targetRect = event.target.getBoundingClientRect();
+    var parentRect = parent.getBoundingClientRect();
+    var left = targetRect.left - parentRect.left;
+    var top = targetRect.top - parentRect.top;
+    left = left - (200 - targetRect.width) / 2;
+    top = top - (50 - targetRect.height) / 2;
     if (!mode.includes('ING')) {
       setToolbar('');
     }
-    // bbox.width = event.target.getBBox().width;
-    // bbox.height = event.target.getBBox().height;
     if (event.target.tagName === 'rect') {
       if (event.target.id) {
         setRulerEditID(event.target.id);
@@ -995,8 +974,8 @@ export default function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
-                top: bbox.top - (50 - bbox.height) / 2,
+                left: left,
+                top: top,
                 zIndex: 1000
               }
             }, /*#__PURE__*/React.createElement(FormNumberInput, {
@@ -1027,8 +1006,8 @@ export default function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
-                top: bbox.top - (50 - bbox.height) / 2,
+                left: left,
+                top: top,
                 zIndex: 1000
               }
             }, /*#__PURE__*/React.createElement(FormNumberInput, {
@@ -1060,8 +1039,8 @@ export default function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
-                top: bbox.top - (50 - bbox.height) / 2,
+                left: left,
+                top: top,
                 zIndex: 1000
               }
             }, /*#__PURE__*/React.createElement(FormNumberInput, {
@@ -1093,8 +1072,8 @@ export default function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
-                top: bbox.top - (50 - bbox.height) / 2,
+                left: left,
+                top: top,
                 zIndex: 1000
               }
             }, /*#__PURE__*/React.createElement(FormNumberInput, {
@@ -1126,8 +1105,8 @@ export default function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
-                top: bbox.top - (50 - bbox.height) / 2,
+                left: left,
+                top: top,
                 zIndex: 1000
               }
             }, /*#__PURE__*/React.createElement(FormNumberInput, {
@@ -1159,8 +1138,8 @@ export default function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
-                top: bbox.top - (50 - bbox.height) / 2,
+                left: left,
+                top: top,
                 zIndex: 1000
               }
             }, /*#__PURE__*/React.createElement(FormNumberInput, {
@@ -1191,8 +1170,8 @@ export default function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
-                top: bbox.top - (50 - bbox.height) / 2,
+                left: left,
+                top: top,
                 zIndex: 1000
               }
             }, /*#__PURE__*/React.createElement(FormNumberInput, {
@@ -1273,24 +1252,7 @@ export default function Viewer2D(_ref) {
         _currentObject = state.getIn(['scene', 'layers', layerID, elementPrototype, elementID]);
       }
       if (_currentObject) {
-        var _currentObject3, _currentObject4, _currentObject5;
-        var payload = (_currentObject3 = _currentObject) === null || _currentObject3 === void 0 ? void 0 : _currentObject3.toJS();
-        if (((_currentObject4 = _currentObject) === null || _currentObject4 === void 0 ? void 0 : _currentObject4.prototype) === 'lines') {
-          // caculating length of selected line//
-          var v_a = layer.vertices.get(_currentObject.vertices.get(0));
-          var v_b = layer.vertices.get(_currentObject.vertices.get(1));
-          var distance = GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
-          var _length3 = convert(distance).from('cm').to('in');
-          payload.length = _length3;
-          //////////////////////////////////////
-        } else if (((_currentObject5 = _currentObject) === null || _currentObject5 === void 0 ? void 0 : _currentObject5.prototype) === 'items') {
-          // check this cabinet has warning box
-          payload.isWarning = isWarningItem(_currentObject);
-          // check this item is available molding
-          payload.isMoldingAvailable = MoldingUtils.isEnableItemForMolding(layer, _currentObject);
-          // check this item is snapped to wall
-          payload.isAttachedWall = MoldingUtils.isAttachedWall(layer, _currentObject);
-        }
+        var payload = updatePayloadOfInternalEvent(_currentObject, layer, catalog);
 
         // send selection event befor replace event
         if (internalType === constants.INTERNAL_EVENT_REPLACE_CABINET) {
@@ -1309,7 +1271,6 @@ export default function Viewer2D(_ref) {
   };
   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;
@@ -1322,8 +1283,6 @@ export default function Viewer2D(_ref) {
       var bbox;
       if (_rect && _rulerEdit) {
         bbox = _rect.getBoundingClientRect();
-        // bbox.width = _rect.getBBox().width;
-        // bbox.height = _rect.getBBox().height;
         _rulerEdit.style.left = "".concat(bbox.left - (150 - bbox.width) / 2, "px");
         _rulerEdit.style.top = "".concat(bbox.top - (50 - bbox.height) / 2, "px");
       }
@@ -1341,7 +1300,6 @@ export default function Viewer2D(_ref) {
     }
   };
   var onChangeTool = function onChangeTool(tool) {
-    setSvgTool(tool);
     switch (tool) {
       case TOOL_NONE:
         projectActions.selectToolEdit();
@@ -1440,20 +1398,19 @@ export default function Viewer2D(_ref) {
     },
     width: width - rulerSize,
     height: height - rulerSize,
-    value: svgValue,
-    tool: svgTool,
+    value: viewer2D.isEmpty() ? null : viewer2D.toJS(),
     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,
-    toolbarProps: {
-      position: POSITION_NONE
-    }
+    ref: Viewer
   }, /*#__PURE__*/React.createElement("svg", {
     width: scene.width,
     height: scene.height
@@ -1488,4 +1445,14 @@ Viewer2D.propTypes = {
   state: PropTypes.object.isRequired,
   width: PropTypes.number.isRequired,
   height: PropTypes.number.isRequired
+};
+Viewer2D.contextTypes = {
+  viewer2DActions: PropTypes.object.isRequired,
+  linesActions: PropTypes.object.isRequired,
+  holesActions: PropTypes.object.isRequired,
+  verticesActions: PropTypes.object.isRequired,
+  itemsActions: PropTypes.object.isRequired,
+  areaActions: PropTypes.object.isRequired,
+  projectActions: PropTypes.object.isRequired,
+  catalog: PropTypes.object.isRequired
 };