kitchen-simulator 4.1.6-react-18 → 5.0.0-react.18

package/es/components/viewer2d/viewer2d.js

@@ -2,9 +2,9 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 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) { _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 React, { useContext, 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,9 @@ 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";
+import AppContext from "../../AppContext";
 // variables
 var pinFlag = false;
 var sFlag = false; //for all object move
@@ -123,22 +122,21 @@ function extractElementData(node) {
   };
 }
 export default function Viewer2D(_ref) {
-  var _state$get;
   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 _useContext = useContext(AppContext),
+    viewer2DActions = _useContext.viewer2DActions,
+    linesActions = _useContext.linesActions,
+    holesActions = _useContext.holesActions,
+    verticesActions = _useContext.verticesActions,
+    itemsActions = _useContext.itemsActions,
+    areaActions = _useContext.areaActions,
+    projectActions = _useContext.projectActions,
+    catalog = _useContext.catalog;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     rulerEdit = _useState2[0],
@@ -161,27 +159,10 @@ 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 () {
+    if (!Viewer.current) return;
+    var zoom = viewer2D && !viewer2D.isEmpty() ? viewer2D.get('a') : 1;
+
     // move viewer point to center
     var selectedLayer = state.scene.layers.get(state.scene.selectedLayer);
     var vertices = selectedLayer.vertices;
@@ -200,7 +181,7 @@ export default function Viewer2D(_ref) {
     });
     var moveX = topX + (bottomX - topX) / 2;
     var moveY = 2000 - (bottomY + (topY - bottomY) / 2);
-    Viewer.current.setPointOnViewerCenter(moveX, moveY, viewer2D.get('a'));
+    Viewer.current.setPointOnViewerCenter(moveX, moveY, zoom);
   }, []);
   var layerID = scene.selectedLayer;
   var wall_thickness = LINE_THICKNESS / 2;
@@ -231,11 +212,10 @@ export default function Viewer2D(_ref) {
     allArea = 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;
@@ -269,8 +249,7 @@ export default 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 = GeometryUtils.orderVertices([v_0, v_1]),
@@ -330,10 +309,9 @@ export default 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;
@@ -346,9 +324,8 @@ export default 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);
@@ -357,10 +334,9 @@ export default 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;
@@ -395,7 +371,6 @@ export default 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 (isEmpty(selLineID)) {
       return {
@@ -404,8 +379,8 @@ export default 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 = !isEmpty(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
     var vtx, vty;
@@ -580,11 +555,11 @@ export default 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 (!isEmpty(drawingLine)) {
       var tlines = [];
@@ -593,7 +568,6 @@ export default 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');
@@ -617,12 +591,11 @@ export default 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);
@@ -728,7 +701,7 @@ export default 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);
@@ -862,18 +835,19 @@ export default 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();
+    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);
@@ -888,8 +862,8 @@ export default 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;
@@ -962,11 +936,11 @@ export default function Viewer2D(_ref) {
               // handle action when click elevation about selected line
               var _mode = 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);
@@ -1006,8 +980,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, {
@@ -1038,8 +1012,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, {
@@ -1071,8 +1045,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, {
@@ -1104,8 +1078,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, {
@@ -1137,8 +1111,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, {
@@ -1170,8 +1144,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, {
@@ -1202,8 +1176,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, {
@@ -1284,24 +1258,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) {
@@ -1318,13 +1275,22 @@ export default function Viewer2D(_ref) {
     }
     event.stopPropagation();
   };
+  var normalizeValue = function normalizeValue(v) {
+    var _v$viewerWidth, _v$viewerHeight, _v$SVGWidth, _v$SVGHeight;
+    return _objectSpread(_objectSpread({}, v), {}, {
+      viewerWidth: (_v$viewerWidth = v.viewerWidth) !== null && _v$viewerWidth !== void 0 ? _v$viewerWidth : width - rulerSize,
+      viewerHeight: (_v$viewerHeight = v.viewerHeight) !== null && _v$viewerHeight !== void 0 ? _v$viewerHeight : height - rulerSize,
+      SVGWidth: (_v$SVGWidth = v.SVGWidth) !== null && _v$SVGWidth !== void 0 ? _v$SVGWidth : scene.width,
+      SVGHeight: (_v$SVGHeight = v.SVGHeight) !== null && _v$SVGHeight !== void 0 ? _v$SVGHeight : scene.height
+    });
+  };
   var onChangeValue = function onChangeValue(value) {
     if (sFlag) return;
-    setSvgValue(value);
-    var _zoomValue = parseInt((value.a - 0.5) / constants.ZOOM_VARIABLE);
+    var normalized = normalizeValue(value);
+    var _zoomValue = parseInt((normalized.a - 0.5) / constants.ZOOM_VARIABLE);
     if (_zoomValue > constants.MAX_ZOOM_IN_SCALE) return;
     if (_zoomValue < 0 || Number.isNaN(_zoomValue)) return;
-    if (rulerEdit !== null && value.startX && value.startY || value.lastAction === 'zoom') {
+    if (rulerEdit !== null && normalized.startX && normalized.startY || normalized.lastAction === 'zoom') {
       var _rulerEdit = document.getElementById('ruler_numberInput') && document.getElementById('ruler_numberInput'),
         _rect;
       if (rulerEditID !== null) {
@@ -1333,30 +1299,17 @@ 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");
       }
     }
-    if (value.e <= 10 && value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth && value.f <= 80 && value.f + value.d * value.SVGHeight + 10 >= value.viewerHeight) {
-      /*let val = Object.assign({}, value);
-      if (refresh === 2) {
-        val.a += 0.4; val.d += 0.4;
-        val.e -= (val.SVGWidth * val.a - val.SVGWidth * (val.a - 0.4)) / 2;
-        val.f -= (val.SVGHeight * val.d - val.SVGHeight * (val.d - 0.4)) / 2;
-        console.log('----', val)
-      }*/
-      projectActions.updateZoomScale(value.a);
-      return viewer2DActions.updateCameraView(value);
+    if (normalized.e <= 10 && normalized.e + normalized.a * normalized.SVGWidth + 10 >= normalized.viewerWidth && normalized.f <= 80 && normalized.f + normalized.d * normalized.SVGHeight + 10 >= normalized.viewerHeight) {
+      projectActions.updateZoomScale(normalized.a);
+      return viewer2DActions.updateCameraView(normalized);
     }
   };
   var onChangeTool = function onChangeTool(tool) {
-    setSvgTool(tool);
     switch (tool) {
-      case TOOL_NONE:
-        projectActions.selectToolEdit();
-        break;
       case TOOL_PAN:
         viewer2DActions.selectToolPan();
         break;
@@ -1366,15 +1319,19 @@ export default function Viewer2D(_ref) {
       case TOOL_ZOOM_OUT:
         viewer2DActions.selectToolZoomOut();
         break;
+      case TOOL_NONE:
+      case TOOL_AUTO:
+      default:
+        break;
     }
   };
   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,
@@ -1389,6 +1346,18 @@ export default function Viewer2D(_ref) {
   var sceneZoom = state.zoom || 1;
   var rulerXElements = Math.ceil(sceneWidth / rulerUnitPixelSize) + 1;
   var rulerYElements = Math.ceil(sceneHeight / rulerUnitPixelSize) + 1;
+  var defaultViewerValue = {
+    a: 1,
+    b: 0,
+    c: 0,
+    d: 1,
+    e: 0,
+    f: 0,
+    viewerWidth: width - rulerSize,
+    viewerHeight: height - rulerSize,
+    SVGWidth: scene.width,
+    SVGHeight: scene.height
+  };
   return /*#__PURE__*/React.createElement("div", null, rulerEdit, /*#__PURE__*/React.createElement("div", {
     style: {
       margin: 0,
@@ -1451,23 +1420,23 @@ export default function Viewer2D(_ref) {
     },
     width: width - rulerSize,
     height: height - rulerSize,
-    value: svgValue,
-    tool: svgTool,
+    value: viewer2D && !viewer2D.isEmpty() ? viewer2D.toJS() : defaultViewerValue,
     onChangeValue: onChangeValue,
+    tool: mode2Tool(mode),
     onChangeTool: onChangeTool,
     detectAutoPan: mode2DetectAutopan(mode),
     onMouseDown: onMouseDown,
     onMouseMove: onMouseMove,
     onMouseUp: onMouseUp,
     detectPinchGesture: false,
-    disableDoubleClickZoomWithToolAuto: true,
-    ref: Viewer,
-    miniatureProps: {
-      position: POSITION_NONE
-    },
     toolbarProps: {
-      position: POSITION_NONE
-    }
+      position: 'none',
+      style: {
+        display: 'none'
+      }
+    },
+    disableDoubleClickZoomWithToolAuto: true,
+    ref: Viewer
   }, /*#__PURE__*/React.createElement("svg", {
     width: scene.width,
     height: scene.height

package/es/components/viewer3d/front3D.js

@@ -4,7 +4,7 @@ import Viewer3D from "./viewer3d";
 import State3D from "./ruler-utils/state3D";
 import { isEmpty } from "../viewer2d/utils";
 var k = 0;
-export default function Front3D(_ref) {
+export default function Front3D(_ref, _ref2) {
   var width = _ref.width,
     height = _ref.height,
     state = _ref.state,
@@ -12,6 +12,7 @@ export default function Front3D(_ref) {
     replaceCabinet = _ref.replaceCabinet,
     keyDownEnable = _ref.keyDownEnable,
     catalog = _ref.catalog;
+  var viewer2DActions = _ref2.viewer2DActions;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     mode = _useState2[0],

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

@@ -14,7 +14,7 @@ export default 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));