kitchen-simulator 4.1.7-react-18 → 4.2.1

package/lib/components/viewer2d/viewer2d.js

@@ -23,7 +23,6 @@ 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
@@ -130,22 +129,21 @@ function extractElementData(node) {
     direct: node.attributes.getNamedItem('data-direct') ? node.attributes.getNamedItem('data-direct').value : 0
   };
 }
-function Viewer2D(_ref) {
-  var _state$get;
+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 = (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 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 = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     rulerEdit = _useState2[0],
@@ -168,26 +166,6 @@ function Viewer2D(_ref) {
     _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);
@@ -212,9 +190,9 @@ function Viewer2D(_ref) {
   var layerID = scene.selectedLayer;
   var wall_thickness = _constants.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
@@ -238,11 +216,10 @@ function Viewer2D(_ref) {
     allArea = _export2.GeometryUtils.getAllArea(layer);
   };
   var updateRulerDistAttribute = function updateRulerDistAttribute(elementData, value) {
-    var _scene$getIn;
     var newVal = value.get('length');
     var oldVal = elementData.length;
     var direct = elementData.direct;
-    var thisItem = (_scene$getIn = scene.getIn(['layers', elementData.layer, 'items', elementData.id])) === null || _scene$getIn === void 0 ? void 0 : _scene$getIn.toJS();
+    var thisItem = scene.getIn(['layers', elementData.layer, 'items', elementData.id]).toJS();
     var oldX = thisItem.x;
     var oldY = thisItem.y;
     var oldRotRad = thisItem.rotation / 180 * Math.PI;
@@ -276,8 +253,7 @@ function Viewer2D(_ref) {
     verticesActions.endDraggingVertex(x, y, state.snapMask);
   };
   var updateRulerAttribute = function updateRulerAttribute(elementData, value) {
-    var _scene$getIn2;
-    var selectedLine = (_scene$getIn2 = scene.getIn(['layers', elementData.layer, 'lines', elementData.id])) === null || _scene$getIn2 === void 0 ? void 0 : _scene$getIn2.toJS();
+    var selectedLine = scene.getIn(['layers', elementData.layer, 'lines', elementData.id]).toJS();
     var v_0 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[0]]);
     var v_1 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[1]]);
     var _GeometryUtils$orderV = _export2.GeometryUtils.orderVertices([v_0, v_1]),
@@ -337,10 +313,9 @@ function Viewer2D(_ref) {
     updateRightHoleRulerAttribute(elementData, value);
   };
   var updateLeftHoleRulerAttribute = function updateLeftHoleRulerAttribute(elementData, value) {
-    var _scene$getIn3;
     var newVal = value.get('length');
     var oldVal = elementData.length;
-    var thisItem = (_scene$getIn3 = scene.getIn(['layers', elementData.layer, 'holes', elementData.id])) === null || _scene$getIn3 === void 0 ? void 0 : _scene$getIn3.toJS();
+    var thisItem = scene.getIn(['layers', elementData.layer, 'holes', elementData.id]).toJS();
     var oldX = thisItem.x;
     var oldY = thisItem.y;
     var oldRotRad = thisItem.rotation;
@@ -353,9 +328,8 @@ function Viewer2D(_ref) {
     setRulerEdit(null);
   };
   var updateHoleRulerAttribute = function updateHoleRulerAttribute(elementData, value) {
-    var _scene$getIn4;
     var newVal = value.get('length');
-    var thisItem = (_scene$getIn4 = scene.getIn(['layers', elementData.layer, 'holes', elementData.id])) === null || _scene$getIn4 === void 0 ? void 0 : _scene$getIn4.toJS();
+    var thisItem = scene.getIn(['layers', elementData.layer, 'holes', elementData.id]).toJS();
     var oldX = thisItem.x;
     var oldY = thisItem.y;
     holesActions.beginDraggingHole(elementData.layer, elementData.id, oldX, oldY);
@@ -364,10 +338,9 @@ function Viewer2D(_ref) {
     setRulerEdit(null);
   };
   var updateRightHoleRulerAttribute = function updateRightHoleRulerAttribute(elementData, value) {
-    var _scene$getIn5;
     var newVal = value.get('length');
     var oldVal = elementData.length;
-    var thisItem = (_scene$getIn5 = scene.getIn(['layers', elementData.layer, 'holes', elementData.id])) === null || _scene$getIn5 === void 0 ? void 0 : _scene$getIn5.toJS();
+    var thisItem = scene.getIn(['layers', elementData.layer, 'holes', elementData.id]).toJS();
     var oldX = thisItem.x;
     var oldY = thisItem.y;
     var oldRotRad = thisItem.rotation;
@@ -402,7 +375,6 @@ function Viewer2D(_ref) {
     // }
   };
   var getEndPoint = function getEndPoint(vertices, x, y, mode) {
-    var _state$getIn, _state$getIn2;
     var selLineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
     if ((0, _helper.isEmpty)(selLineID)) {
       return {
@@ -411,8 +383,8 @@ function Viewer2D(_ref) {
         y: y
       };
     }
-    var draggingLine = (_state$getIn = state.getIn(['scene', 'layers', layerID, 'lines', selLineID])) === null || _state$getIn === void 0 ? void 0 : _state$getIn.toJS();
-    var allLines = (_state$getIn2 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn2 === void 0 ? void 0 : _state$getIn2.toJS();
+    var draggingLine = state.getIn(['scene', 'layers', layerID, 'lines', selLineID]).toJS();
+    var allLines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
     var dragVertexId = state.getIn(['draggingSupport', 'vertexID']);
     dragVertexId = !(0, _helper.isEmpty)(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
     var vtx, vty;
@@ -587,11 +559,11 @@ function Viewer2D(_ref) {
     };
   };
   var getConnectedLines = function getConnectedLines() {
-    var _state$getIn3, _state$getIn4, _state$getIn5;
-    var vertices = (_state$getIn3 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn3 === void 0 ? void 0 : _state$getIn3.toJS();
-    var lines = (_state$getIn4 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn4 === void 0 ? void 0 : _state$getIn4.toJS();
+    var _state$getIn;
+    var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
+    var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
     var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
-    var drawingLine = (_state$getIn5 = state.getIn(['scene', 'layers', layerID, 'lines', lineID])) === null || _state$getIn5 === void 0 ? void 0 : _state$getIn5.toJS();
+    var drawingLine = (_state$getIn = state.getIn(['scene', 'layers', layerID, 'lines', lineID])) === null || _state$getIn === void 0 ? void 0 : _state$getIn.toJS();
     // get the lines that have same points with drawing line.
     if (!(0, _helper.isEmpty)(drawingLine)) {
       var tlines = [];
@@ -600,7 +572,6 @@ function Viewer2D(_ref) {
     }
   };
   var onMouseMove = function onMouseMove(viewerEvent) {
-    var _state$getIn6, _state$getIn7, _state$getIn9;
     //workaround that allow imageful component to work
 
     // let evt = new Event('mousemove-planner-event');
@@ -624,12 +595,11 @@ function Viewer2D(_ref) {
         case constants.MODE_DRAWING_LINE:
           // check whether the drawing line is started.
           var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
-          var lines = (_state$getIn6 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn6 === void 0 ? void 0 : _state$getIn6.toJS();
-          var drawingLine = (_state$getIn7 = state.getIn(['scene', 'layers', layerID, 'lines', lineID])) === null || _state$getIn7 === void 0 ? void 0 : _state$getIn7.toJS();
+          var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
+          var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', lineID]).toJS();
           var tlines = [];
           if (drawStart || state.getIn(['scene', 'setLineAttributes'])) {
-            var _state$getIn8;
-            var _vertices = (_state$getIn8 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn8 === void 0 ? void 0 : _state$getIn8.toJS();
+            var _vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
             setdrawStart(false);
             // get the lines that have same points with drawing line.
             getRelatedLines(tlines, drawingLine, _vertices, lines);
@@ -735,7 +705,7 @@ function Viewer2D(_ref) {
           linesActions.updateDraggingLine(x, y, relatedLines, state.snapMask);
           break;
         case constants.MODE_DRAGGING_VERTEX:
-          var vertices = (_state$getIn9 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn9 === void 0 ? void 0 : _state$getIn9.toJS();
+          var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
           getConnectedLines();
           var result = getEndPoint(vertices, x, y, 'DRAGGING_VERTEX');
           verticesActions.updateDraggingVertex(result.x, result.y, state.snapMask);
@@ -841,6 +811,7 @@ function Viewer2D(_ref) {
             verticesActions.beginDraggingVertex(elementData.layer, elementData.id, x, y, state.snapMask);
             break;
           case 'items':
+            setToolbar('');
             current_sel_obj_id = elementData.id;
             if (elementData.part === 'rotation-anchor') itemsActions.beginRotatingItem(elementData.layer, elementData.id, x, y);else if (elementData.part === 'remove') break;else if (elementData.part === 'duplicate') break;else if (elementData.part === 'warning_edit') break;else {
               // closes the setting dialog
@@ -868,15 +839,23 @@ function Viewer2D(_ref) {
     event.stopPropagation();
   };
   var onMouseUp = function onMouseUp(viewerEvent) {
-    var _state$getIn0, _state$getIn1;
     //set move all flag false
     sFlag = false;
-    // //////////////////////
-    // setRulerEdit(null);
     var event = viewerEvent.originalEvent;
-    var bbox = event.target.getBoundingClientRect();
-    // bbox.width = event.target.getBBox().width;
-    // bbox.height = event.target.getBBox().height;
+    var parent = document.querySelector('#kitchen-simulator-container');
+    var targetRect = event.target.getBoundingClientRect();
+    var left = targetRect.left;
+    var top = targetRect.top;
+    if (!(0, _helper.isEmpty)(parent)) {
+      var parentRect = parent.getBoundingClientRect();
+      left = targetRect.left - parentRect.left;
+      top = targetRect.top - parentRect.top;
+      left = left - (200 - targetRect.width) / 2;
+      top = top - (50 - targetRect.height) / 2;
+    }
+    if (!mode.includes('ING')) {
+      setToolbar('');
+    }
     if (event.target.tagName === 'rect') {
       if (event.target.id) {
         setRulerEditID(event.target.id);
@@ -891,8 +870,8 @@ function Viewer2D(_ref) {
       x = _mapCursorPosition3.x,
       y = _mapCursorPosition3.y;
     var draggingDistance = Math.sqrt((x - mouseDownPoint.x) * (x - mouseDownPoint.x) + (y - mouseDownPoint.y) * (y - mouseDownPoint.y));
-    var vertices = (_state$getIn0 = state.getIn(['scene', 'layers', layerID, 'vertices'])) === null || _state$getIn0 === void 0 ? void 0 : _state$getIn0.toJS();
-    var lines = (_state$getIn1 = state.getIn(['scene', 'layers', layerID, 'lines'])) === null || _state$getIn1 === void 0 ? void 0 : _state$getIn1.toJS();
+    var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
+    var lines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
     var elementData = extractElementData(event.target);
     var selectedLayer = scene.getIn(['layers', layerID]);
     var elementPrototype = null;
@@ -965,11 +944,11 @@ function Viewer2D(_ref) {
               // handle action when click elevation about selected line
               var _mode = _constants.MODE_ELEVATION_VIEW;
               projectActions.setMode(_mode);
+              internalType = constants.INTERNAL_EVENT_TOGGLE_TO_ELEVATION;
               break;
             } else {
-              var _state$getIn10;
               var tlines = [];
-              var drawingLine = (_state$getIn10 = state.getIn(['scene', 'layers', layerID, 'lines', elementData.id])) === null || _state$getIn10 === void 0 ? void 0 : _state$getIn10.toJS();
+              var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', elementData.id]).toJS();
               getRelatedLines(tlines, drawingLine, vertices, lines);
               setRelatedLines(tlines);
               linesActions.selectLine(elementData.layer, elementData.id);
@@ -1009,8 +988,8 @@ 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["default"].createElement(_formNumberInput["default"], {
@@ -1041,8 +1020,8 @@ 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["default"].createElement(_formNumberInput["default"], {
@@ -1074,8 +1053,8 @@ 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["default"].createElement(_formNumberInput["default"], {
@@ -1107,8 +1086,8 @@ 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["default"].createElement(_formNumberInput["default"], {
@@ -1140,8 +1119,8 @@ 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["default"].createElement(_formNumberInput["default"], {
@@ -1173,8 +1152,8 @@ 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["default"].createElement(_formNumberInput["default"], {
@@ -1205,8 +1184,8 @@ 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["default"].createElement(_formNumberInput["default"], {
@@ -1287,24 +1266,7 @@ 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 = _export2.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
-          var _length3 = (0, _convertUnitsLite.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 = (0, _utils.isWarningItem)(_currentObject);
-          // check this item is available molding
-          payload.isMoldingAvailable = _export2.MoldingUtils.isEnableItemForMolding(layer, _currentObject);
-          // check this item is snapped to wall
-          payload.isAttachedWall = _export2.MoldingUtils.isAttachedWall(layer, _currentObject);
-        }
+        var payload = (0, _helper.updatePayloadOfInternalEvent)(_currentObject, layer, catalog);
 
         // send selection event befor replace event
         if (internalType === constants.INTERNAL_EVENT_REPLACE_CABINET) {
@@ -1323,7 +1285,6 @@ 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;
@@ -1336,8 +1297,6 @@ 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");
       }
@@ -1355,7 +1314,6 @@ function Viewer2D(_ref) {
     }
   };
   var onChangeTool = function onChangeTool(tool) {
-    setSvgTool(tool);
     switch (tool) {
       case _reactSvgPanZoom.TOOL_NONE:
         projectActions.selectToolEdit();
@@ -1372,12 +1330,12 @@ function Viewer2D(_ref) {
     }
   };
   var onZoom = function onZoom(value) {
-    // var nextValue = viewer2D?.toJS();
+    // var nextValue = viewer2D.toJS();
     // nextValue = zoom(nextValue, 0, 0, value.a / nextValue.a)
     // projectActions.updateZoomScale(nextValue.a);
     // return viewer2DActions.updateCameraView(nextValue)
   };
-  var _state$get$toJS = (_state$get = state.get('viewer2D')) === null || _state$get === void 0 ? void 0 : _state$get.toJS(),
+  var _state$get$toJS = state.get('viewer2D').toJS(),
     e = _state$get$toJS.e,
     f = _state$get$toJS.f,
     SVGWidth = _state$get$toJS.SVGWidth,
@@ -1454,23 +1412,19 @@ 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,
-    miniatureProps: {
-      position: _reactSvgPanZoom.POSITION_NONE
-    },
-    toolbarProps: {
-      position: _reactSvgPanZoom.POSITION_NONE
-    }
+    ref: Viewer
   }, /*#__PURE__*/_react["default"].createElement("svg", {
     width: scene.width,
     height: scene.height
@@ -1506,4 +1460,14 @@ 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/front3D.js

@@ -13,13 +13,15 @@ var _state3D = _interopRequireDefault(require("./ruler-utils/state3D"));
 var _utils = require("../viewer2d/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); }
 var k = 0;
-function Front3D(_ref) {
+function Front3D(_ref, _ref2) {
   var width = _ref.width,
     height = _ref.height,
     state = _ref.state,
+    setToolbar = _ref.setToolbar,
     replaceCabinet = _ref.replaceCabinet,
     keyDownEnable = _ref.keyDownEnable,
     catalog = _ref.catalog;
+  var viewer2DActions = _ref2.viewer2DActions;
   var _useState = (0, _react.useState)(''),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     mode = _useState2[0],
@@ -30,6 +32,15 @@ function Front3D(_ref) {
     k++;
     setMode(state.get('mode'));
   }
+  var mouseUpEvent = function mouseUpEvent(event) {
+    setToolbar('');
+  };
+  (0, _react.useEffect)(function () {
+    if (!(0, _utils.isEmpty)(document.getElementById('front'))) document.getElementById('front').addEventListener('mouseup', mouseUpEvent);
+    return function () {
+      if (!(0, _utils.isEmpty)(document.getElementById('front'))) document.getElementById('front').removeEventListener('mouseup', mouseUpEvent);
+    };
+  }, []);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("svg", {
     width: sceneWidth,
     height: sceneHeight,
@@ -52,6 +63,7 @@ function Front3D(_ref) {
     state: state,
     width: width,
     height: height,
+    setToolbar: setToolbar,
     replaceCabinet: replaceCabinet,
     keyDownEnable: keyDownEnable,
     downloadFlag: false

package/lib/components/viewer3d/ruler-utils/scene3D.js

@@ -22,7 +22,7 @@ function Scene3D(_ref) {
     downloadFlag = _ref.downloadFlag;
   var layers = scene.layers;
   var selectedLayer = layers.get(scene.selectedLayer);
-  var ceilHeight = selectedLayer.ceilHeight;
+  var ceilHeight = Number(selectedLayer.ceilHeight);
   var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
   var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
   var vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));