kitchen-simulator 2.0.30 → 2.0.40

package/lib/utils/helper.js

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.animateDoor = void 0;
 exports.applyEdges = applyEdges;
 exports.base64Decode = void 0;
+exports.centering2D = centering2D;
+exports.compareSVGRect = void 0;
 exports.debugUtil = debugUtil;
 exports.getSignedUrl = exports.getPathInfo = exports.getPath = void 0;
 exports.handleCamRect = handleCamRect;
@@ -20,7 +22,7 @@ exports.refineProductForSummaryPdf = exports.refineMoldingForSummaryPdf = void 0
 exports.replaceMeshesWithLineSegments = replaceMeshesWithLineSegments;
 exports.textureCube = void 0;
 exports.toPlainObject = toPlainObject;
-exports.translateDrawer = void 0;
+exports.updateViwer2D = exports.translateDrawer = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _HDRCubeTextureLoader = require("three/examples/jsm/loaders/HDRCubeTextureLoader.js");
@@ -355,4 +357,69 @@ function isImmutable(maybeImmutable) {
 }
 function debugUtil() {
   return new Date();
+}
+var compareSVGRect = exports.compareSVGRect = function compareSVGRect(value) {
+  return value.e <= 10 && value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth && value.f <= 80 && value.f + value.d * value.SVGHeight + 10 >= value.viewerHeight ? true : false;
+};
+var updateViwer2D = exports.updateViwer2D = function updateViwer2D(value) {
+  var viewer2DActions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  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;
+
+  // modify e, f to fit to SVG
+  while (!(value.e <= 10)) {
+    value.e -= 0.1;
+  }
+  while (!(value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth)) {
+    value.e += 0.1;
+  }
+  while (!(value.f <= 80)) {
+    value.f -= 0.1;
+  }
+  while (!(value.f + value.a * value.SVGHeight + 10 >= value.viewerHeight)) {
+    value.f += 0.1;
+  }
+  if (viewer2DActions && compareSVGRect(value)) viewer2DActions.updateCameraView(value);
+};
+function centering2D(state) {
+  var viewer2DActions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  // calculate the bounding box of all elements in plan
+  var layer = state.scene.getIn(['layers', state.scene.selectedLayer]);
+  var bb = {
+    minX: Infinity,
+    maxX: -Infinity,
+    minY: Infinity,
+    maxY: -Infinity
+  };
+  bb = layer.vertices.reduce(function (pre, cur) {
+    pre.minX = Math.min(pre.minX, cur.x);
+    pre.maxX = Math.max(pre.maxX, cur.x);
+    pre.minY = Math.min(pre.minY, cur.y);
+    pre.maxY = Math.max(pre.maxY, cur.y);
+    return pre;
+  }, bb);
+  var w = bb.maxX - bb.minX;
+  var h = bb.maxY - bb.minY;
+
+  // calc scale and offset to fit view
+  var viewer = state.getIn(['viewer2D']).toJS();
+  if (w != 0 && Math.abs(w) != Infinity && h != 0 && Math.abs(h) != Infinity) {
+    // elements are exist && bounding box size > 0
+    viewer.a = viewer.viewerHeight < h ? viewer.viewerHeight / h : viewer.viewerHeight / h * 3 / 5 / _constants.ZOOM_VARIABLE > _constants.MAX_ZOOM_IN_SCALE ? viewer.viewerHeight / h * _constants.MAX_ZOOM_IN_SCALE / (viewer.viewerHeight / h / _constants.ZOOM_VARIABLE) : viewer.viewerHeight / h * 3 / 5;
+    viewer.d = viewer.a;
+    viewer.e = (viewer.viewerWidth - (bb.maxX + bb.minX) * viewer.a) / 2;
+    viewer.f = (viewer.viewerHeight - (bb.maxY + bb.minY) * viewer.a) / 2;
+  } else {
+    // there is no any element && bounding box size == 0
+    viewer.e = viewer.viewerWidth / 2 - viewer.SVGWidth / 2;
+    viewer.f = viewer.viewerHeight / 2 - viewer.SVGHeight / 2;
+    viewer.a = 0.99;
+    viewer.d = 0.99;
+  }
+  state = state.merge({
+    viewer2D: viewer
+  });
+  if (viewer2DActions) updateViwer2D(viewer, viewer2DActions);
+  return state;
 }

package/lib/utils/isolate-event-handler.js

@@ -21,29 +21,6 @@ var _SVGLoader = require("three/addons/loaders/SVGLoader");
 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 PRECISION = 2;
-var compareSVGRect = function compareSVGRect(value) {
-  return value.e <= 10 && value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth && value.f <= 80 && value.f + value.d * value.SVGHeight + 10 >= value.viewerHeight ? true : false;
-};
-var updateViwer2D = function updateViwer2D(value, viewer2DActions) {
-  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;
-
-  // modify e, f to fit to SVG
-  while (!(value.e <= 10)) {
-    value.e -= 0.1;
-  }
-  while (!(value.e + value.a * value.SVGWidth + 10 >= value.viewerWidth)) {
-    value.e += 0.1;
-  }
-  while (!(value.f <= 80)) {
-    value.f -= 0.1;
-  }
-  while (!(value.f + value.a * value.SVGHeight + 10 >= value.viewerHeight)) {
-    value.f += 0.1;
-  }
-  if (compareSVGRect(value)) viewer2DActions.updateCameraView(value);
-};
 function loadJSON(_x) {
   return _loadJSON.apply(this, arguments);
 }
@@ -1003,7 +980,7 @@ function handleExternalEvent(_x10) {
 function _handleExternalEvent() {
   _handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(props) {
     var _evt$payload3, _evt$payload4;
-    var evt, state, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, _evt$payload5, moveType, moveValue, value, defaulTitle, _evt$payload6, doorStyle, itemCDS, isAll, _doorStyle, _value, _value2, layer, bb, w, h, viewer, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value3, layerId, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i2, _i3, _i4, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven2, _t5, _t6;
+    var evt, state, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, _evt$payload5, moveType, moveValue, value, defaulTitle, _evt$payload6, doorStyle, itemCDS, isAll, _doorStyle, _value, _value2, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value3, layerId, layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i2, _i3, _i4, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven2, _t5, _t6;
     return _regenerator["default"].wrap(function (_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
@@ -1133,7 +1110,7 @@ function _handleExternalEvent() {
               vPosX = (mouseX - v2d.e) / v2d.a;
               vPosY = (mouseY - v2d.f) / v2d.d;
               layerID = state.scene.selectedLayer; // move cabinet to initial position
-              props.itemsActions.updateDrawingItem(layerID, vPosX, -vPosY + state.scene.height);
+              props.itemsActions.updateDrawingItem(layerID, vPosX, -vPosY + state.scene.height, true);
             }
           }
           props.projectActions.pushLastSelectedCatalogElementToHistory(element);
@@ -1162,7 +1139,7 @@ function _handleExternalEvent() {
           value.e -= moveValue;
           return _context9.abrupt("continue", 18);
         case 18:
-          updateViwer2D(value, props.viewer2DActions);
+          (0, _helper.updateViwer2D)(value, props.viewer2DActions);
           return _context9.abrupt("continue", 37);
         case 19:
           defaulTitle = 'Untitle';
@@ -1178,7 +1155,7 @@ function _handleExternalEvent() {
           props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
           return _context9.abrupt("continue", 37);
         case 22:
-          props.projectActions.loadProject(evt.payload);
+          props.projectActions.createRoomWithShape(evt.payload.roomShapeType, evt.payload.width, evt.payload.height);
           return _context9.abrupt("continue", 37);
         case 23:
           _value = state.getIn(['viewer2D']).toJS();
@@ -1186,7 +1163,7 @@ function _handleExternalEvent() {
           _value.d += 0.1;
           _value.e -= _value.SVGWidth * 0.1 / 2;
           _value.f -= _value.SVGHeight * 0.1 / 2;
-          updateViwer2D(_value, props.viewer2DActions);
+          (0, _helper.updateViwer2D)(_value, props.viewer2DActions);
           return _context9.abrupt("continue", 37);
         case 24:
           _value2 = state.getIn(['viewer2D']).toJS();
@@ -1194,41 +1171,10 @@ function _handleExternalEvent() {
           _value2.d -= 0.1;
           _value2.e += _value2.SVGWidth * 0.1 / 2;
           _value2.f += _value2.SVGHeight * 0.1 / 2;
-          updateViwer2D(_value2, props.viewer2DActions);
+          (0, _helper.updateViwer2D)(_value2, props.viewer2DActions);
           return _context9.abrupt("continue", 37);
         case 25:
-          // calculate the bounding box of all elements in plan
-          layer = state.scene.getIn(['layers', state.scene.selectedLayer]);
-          bb = {
-            minX: Infinity,
-            maxX: -Infinity,
-            minY: Infinity,
-            maxY: -Infinity
-          };
-          bb = layer.vertices.reduce(function (pre, cur) {
-            pre.minX = Math.min(pre.minX, cur.x);
-            pre.maxX = Math.max(pre.maxX, cur.x);
-            pre.minY = Math.min(pre.minY, cur.y);
-            pre.maxY = Math.max(pre.maxY, cur.y);
-            return pre;
-          }, bb);
-          w = bb.maxX - bb.minX;
-          h = bb.maxY - bb.minY; // calc scale and offset to fit view
-          viewer = state.getIn(['viewer2D']).toJS();
-          if (w != 0 && Math.abs(w) != Infinity && h != 0 && Math.abs(h) != Infinity) {
-            // elements are exist && bounding box size > 0
-            viewer.a = viewer.viewerHeight < h ? viewer.viewerHeight / h : viewer.viewerHeight / h * 3 / 5 / _constants.ZOOM_VARIABLE > _constants.MAX_ZOOM_IN_SCALE ? viewer.viewerHeight / h * _constants.MAX_ZOOM_IN_SCALE / (viewer.viewerHeight / h / _constants.ZOOM_VARIABLE) : viewer.viewerHeight / h * 3 / 5;
-            viewer.d = viewer.a;
-            viewer.e = (viewer.viewerWidth - (bb.maxX + bb.minX) * viewer.a) / 2;
-            viewer.f = (viewer.viewerHeight - (bb.maxY + bb.minY) * viewer.a) / 2;
-          } else {
-            // there is no any element && bounding box size == 0
-            viewer.e = viewer.viewerWidth / 2 - viewer.SVGWidth / 2;
-            viewer.f = viewer.viewerHeight / 2 - viewer.SVGHeight / 2;
-            viewer.a = 0.99;
-            viewer.d = 0.99;
-          }
-          updateViwer2D(viewer, props.viewer2DActions);
+          (0, _helper.centering2D)(state, props.viewer2DActions);
           return _context9.abrupt("continue", 37);
         case 26:
           props.projectActions.undo();
@@ -1268,17 +1214,17 @@ function _handleExternalEvent() {
           return _context9.abrupt("continue", 37);
         case 33:
           layerId = state.getIn(['scene', 'selectedLayer']);
-          _layer = state.getIn(['scene', 'layers', layerId]);
-          _layer$getIn = _layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
-          for (_i2 = 0; _i2 < selectedLines.size; _i2++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, props.catalog, props.projectActions, evt.callback);
-          for (_i3 = 0; _i3 < selectedHoles.size; _i3++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, props.catalog, props.projectActions, evt.callback);
-          for (_i4 = 0; _i4 < selectedItems.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
+          layer = state.getIn(['scene', 'layers', layerId]);
+          _layer$getIn = layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
+          for (_i2 = 0; _i2 < selectedLines.size; _i2++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, state, layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, props.catalog, props.projectActions, evt.callback);
+          for (_i3 = 0; _i3 < selectedHoles.size; _i3++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, state, layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, props.catalog, props.projectActions, evt.callback);
+          for (_i4 = 0; _i4 < selectedItems.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, state, layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
           return _context9.abrupt("continue", 37);
         case 34:
           _layerID = state.scene.selectedLayer;
-          _layer2 = state.scene.getIn(['layers', _layerID]).toJS();
+          _layer = state.scene.getIn(['layers', _layerID]).toJS();
           orginalItemInfo = evt === null || evt === void 0 || (_evt$payload9 = evt.payload) === null || _evt$payload9 === void 0 ? void 0 : _evt$payload9.orginalItemInfo;
-          originalItem = _layer2 === null || _layer2 === void 0 ? void 0 : _layer2.items[orginalItemInfo.id];
+          originalItem = _layer === null || _layer === void 0 ? void 0 : _layer.items[orginalItemInfo.id];
           _context9.next = 35;
           return addItemToCatalog(evt.payload.replaceItemInfo, state, props.catalog, props.projectActions);
         case 35:

package/package.json

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