kitchen-simulator 4.0.6-react-18 → 4.0.7-measurement-unit-payload

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) {
+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
@@ -863,15 +841,21 @@ 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 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('');
     }
-    // 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);
@@ -960,6 +944,7 @@ 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 tlines = [];
@@ -1003,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"], {
@@ -1035,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"], {
@@ -1068,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"], {
@@ -1101,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"], {
@@ -1134,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"], {
@@ -1167,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"], {
@@ -1199,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"], {
@@ -1281,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) {
@@ -1317,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;
@@ -1330,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");
       }
@@ -1349,7 +1314,6 @@ function Viewer2D(_ref) {
     }
   };
   var onChangeTool = function onChangeTool(tool) {
-    setSvgTool(tool);
     switch (tool) {
       case _reactSvgPanZoom.TOOL_NONE:
         projectActions.selectToolEdit();
@@ -1448,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
@@ -1500,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/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));