kitchen-simulator 4.0.11-react-18 → 4.1.0-react-18

package/lib/class/item.js

@@ -18,6 +18,7 @@ var _helper = require("../utils/helper");
 var _util = require("util");
 var _molding = require("../utils/molding");
 var _utils = require("../components/viewer2d/utils");
+var _history = require("../utils/history");
 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; }
 var allItemRect;
@@ -1548,6 +1549,9 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           });
         }
       }
+      state = state.merge({
+        sceneHistory: (0, _history.historyPush)(state.sceneHistory, state.scene)
+      });
       return {
         updatedState: state
       };
@@ -1670,6 +1674,9 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           updateSelectItemMolding();
         }
       }
+      state = state.merge({
+        sceneHistory: (0, _history.historyPush)(state.sceneHistory, state.scene)
+      });
       return {
         updatedState: state
       };

package/lib/components/viewer2d/viewer2d.js

@@ -1003,7 +1003,7 @@ function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
+                left: bbox.left - (200 - bbox.width) / 2,
                 top: bbox.top - (50 - bbox.height) / 2,
                 zIndex: 1000
               }
@@ -1035,7 +1035,7 @@ function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
+                left: bbox.left - (200 - bbox.width) / 2,
                 top: bbox.top - (50 - bbox.height) / 2,
                 zIndex: 1000
               }
@@ -1068,7 +1068,7 @@ function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
+                left: bbox.left - (200 - bbox.width) / 2,
                 top: bbox.top - (50 - bbox.height) / 2,
                 zIndex: 1000
               }
@@ -1101,7 +1101,7 @@ function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
+                left: bbox.left - (200 - bbox.width) / 2,
                 top: bbox.top - (50 - bbox.height) / 2,
                 zIndex: 1000
               }
@@ -1134,7 +1134,7 @@ function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
+                left: bbox.left - (200 - bbox.width) / 2,
                 top: bbox.top - (50 - bbox.height) / 2,
                 zIndex: 1000
               }
@@ -1167,7 +1167,7 @@ function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
+                left: bbox.left - (200 - bbox.width) / 2,
                 top: bbox.top - (50 - bbox.height) / 2,
                 zIndex: 1000
               }
@@ -1199,7 +1199,7 @@ function Viewer2D(_ref) {
               id: "ruler_numberInput",
               style: {
                 position: 'absolute',
-                left: bbox.left - (150 - bbox.width) / 2,
+                left: bbox.left - (200 - bbox.width) / 2,
                 top: bbox.top - (50 - bbox.height) / 2,
                 zIndex: 1000
               }

package/lib/components/viewer3d/viewer3d.js

@@ -1192,10 +1192,18 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
       };
       var sendInternalEvent = function sendInternalEvent(evtType, evtElement) {
         var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-        if (!(0, _helper.isEmpty)(evtType)) {
-          var _this2$props$onIntern, _this2$props;
+        if (!(0, _helper.isEmpty)(evtType) && !(0, _helper.isEmpty)(evtElement)) {
+          var _currentObject, _this2$props$onIntern, _this2$props;
           var payload = evtElement === null || evtElement === void 0 ? void 0 : evtElement.toJS();
-          if ((evtElement === null || evtElement === void 0 ? void 0 : evtElement.prototype) === 'items') {
+          if (((_currentObject = currentObject) === null || _currentObject === void 0 ? void 0 : _currentObject.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 = _export.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
+            var _length = (0, _convertUnitsLite.convert)(distance).from('cm').to('in');
+            payload.length = _length;
+            //////////////////////////////////////
+          } else if ((evtElement === null || evtElement === void 0 ? void 0 : evtElement.prototype) === 'items') {
             // check this cabinet has warning box
             payload.isWarning = (0, _utils.isWarningItem)(evtElement);
             // check this item is available molding
@@ -1294,7 +1302,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             if (intersects[_i1] === undefined) {
               if (transflag !== 0 && transflag !== 2) {
                 isSelected = false;
-                _this2.context.projectActions.unselectAll();
+                // this.context.projectActions.unselectAll();
                 scene3D.remove(toolObj);
                 _this2.context.itemsActions.removeReplacingSupport();
                 return;
@@ -1363,14 +1371,14 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                 selectedFlag = false;
               } else {
                 isSelected = false;
-                _this2.context.projectActions.unselectAll();
+                // this.context.projectActions.unselectAll();
                 scene3D.remove(toolObj);
                 _this2.context.itemsActions.removeReplacingSupport();
               }
             }
           } else {
             isSelected = false;
-            _this2.context.projectActions.unselectAll();
+            // this.context.projectActions.unselectAll();
             scene3D.remove(toolObj);
             _this2.context.itemsActions.removeReplacingSupport();
             return;
@@ -1418,11 +1426,18 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         }
         switch (_this2.props.state.mode) {
           case _constants.MODE_DRAGGING_ITEM_3D:
+          case _constants.MODE_DRAGGING_HOLE_3D:
             internalType = _constants.INTERNAL_EVENT_DRAG_ELEMENT;
             break;
           case _constants.MODE_ROTATING_ITEM_3D:
             internalType = _constants.INTERNAL_EVENT_ROTATE_ELEMENT;
             break;
+          case _constants.MODE_DRAWING_HOLE_3D:
+            internalType = _constants.INTERNAL_EVENT_DRAW_ELEMENT;
+            break;
+          case _constants.MODE_IDLE_3D:
+            internalType = _constants.INTERNAL_EVENT_SELECT_ELEMENT;
+            break;
         }
         if (_this2.props.state.mode == _constants.MODE_DRAGGING_ITEM_3D) {
           _this2.context.itemsActions.endDraggingItem3D();
@@ -1547,16 +1562,17 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                   var elementPrototype = null;
                   switch (true) {
                     case 'holeID' in selectedObject:
-                    case 'lineID' in selectedObject:
+                      elementID = selectedObject.holeID;
+                      elementPrototype = 'holes';
                       if (_this2.props.state.mode === _constants.MODE_DRAGGING_HOLE_3D) {
                         actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
-                        internalType = _constants.INTERNAL_EVENT_SELECT_ELEMENT;
-                        elementID = selectedObject.holeID;
-                        elementPrototype = 'holes';
                       }
                       break;
+                    case 'lineID' in selectedObject:
+                      elementID = selectedObject.lineID;
+                      elementPrototype = 'lines';
+                      break;
                     case 'areaID' in selectedObject:
-                      internalType = _constants.INTERNAL_EVENT_SELECT_ELEMENT;
                       elementID = selectedObject.areaID;
                       elementPrototype = 'areas';
                       break;
@@ -2092,7 +2108,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         if (minDis < snapDelta && !snapFlag) {
           _this2.snap(snapObj, layer);
           snapFlag = true;
-          (0, _sceneCreator.getDistances)(layer, true);
+          (0, _sceneCreator.getDistances)(layer);
           var _i13 = 0;
           for (_i13 = 0; _i13 < _sceneCreator.fVLine.length; _i13++) {
             if (_sceneCreator.fVLine[_i13].userData.distance < snapDelta) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "4.0.11-react-18",
+  "version": "4.1.0-react-18",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",