kitchen-simulator 7.0.10-react-18 → 11.0.0-react.18

package/es/LiteKitchenConfigurator.js

@@ -303,19 +303,18 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _extractedState$getIn2, _extractedState$getIn3;
+      var _extractedState$getIn2;
       var _this$props2 = this.props,
         externalEvent = _this$props2.externalEvent,
         extractedState = _this$props2.extractedState,
         projectActions = _this$props2.projectActions,
-        catalog = _this$props2.catalog,
-        onViewer2DChange = _this$props2.onViewer2DChange;
-      onViewer2DChange === null || onViewer2DChange === void 0 || onViewer2DChange(extractedState === null || extractedState === void 0 || (_extractedState$getIn2 = extractedState.getIn) === null || _extractedState$getIn2 === void 0 ? void 0 : _extractedState$getIn2.call(extractedState, ['viewer2D']).toJS());
+        catalog = _this$props2.catalog;
+
       // same behavior: handle external event when it changes
       if (prevProps.externalEvent !== externalEvent) {
         handleExternalEvent(this.props);
       }
-      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn3 = extractedState.getIn) === null || _extractedState$getIn3 === void 0 ? void 0 : _extractedState$getIn3.call(extractedState, ['catalog', 'ready']);
+      var catalogReady = extractedState === null || extractedState === void 0 || (_extractedState$getIn2 = extractedState.getIn) === null || _extractedState$getIn2 === void 0 ? void 0 : _extractedState$getIn2.call(extractedState, ['catalog', 'ready']);
       if (!catalogReady) projectActions.initCatalog(catalog);
     }
   }, {

package/es/LiteRenderer.js

@@ -6,7 +6,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
-var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "onError", "onViewer2DChange"];
+var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "onError"];
 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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -25,6 +25,7 @@ import * as THREE from 'three';
 import * as Models from "./models";
 import { State } from "./models";
 import PlannerReducer from "./reducers/reducer";
+import AppContext from "./AppContext";
 import Catalog from "./catalog/catalog";
 import * as Areas from "./catalog/areas/area/planner-element";
 import * as Lines from "./catalog/lines/wall/planner-element";
@@ -163,7 +164,6 @@ export default function LiteRenderer(props) {
     externalEvent = props.externalEvent,
     onInternalEvent = props.onInternalEvent,
     onError = props.onError,
-    onViewer2DChange = props.onViewer2DChange,
     passThrough = _objectWithoutProperties(props, _excluded);
   useEffect(function () {
     return function () {
@@ -338,8 +338,7 @@ export default function LiteRenderer(props) {
     },
     configData: configData,
     externalEvent: externalEvent,
-    onInternalEvent: onInternalEvent,
-    onViewer2DChange: onViewer2DChange
+    onInternalEvent: onInternalEvent
   }, passThrough))));
 }
 LiteRenderer.propTypes = {

package/es/catalog/factories/wall-factory.js

@@ -16,7 +16,7 @@ var STYLE_LINE = {
   // strokeWidth:1
 };
 var STYLE_INTERIOR_LINE = {
-  strokeWidth: 4,
+  strokeWidth: 2,
   stroke: SharedStyle.INTERIOR_LINE.unselected
 };
 var STYLE_INTERIOR_LINE_SELECTED = {

package/es/class/project.js

@@ -857,8 +857,8 @@ var Project = /*#__PURE__*/function () {
         if (isEmpty(viewer)) return {
           updatedState: state
         };
-        width = convert(width).from(measurementUnit).to('cm');
-        height = convert(height).from(measurementUnit).to('cm');
+        width = convert(width).from(measurementUnit !== null && measurementUnit !== void 0 ? measurementUnit : 'in').to('cm');
+        height = convert(height).from(measurementUnit !== null && measurementUnit !== void 0 ? measurementUnit : 'in').to('cm');
         var halfWidth = width / 2;
         var halfHeight = height / 2;
         var viewerWidth = viewer.SVGWidth;

package/es/components/viewer2d/utils.js

@@ -190,8 +190,4 @@ export var isWarningItem = function isWarningItem(item) {
   if (item.category === 'cabinet') return !(item !== null && item !== void 0 && (_item$toJS$doorStyle = item.toJS().doorStyle) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.doorStyles) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.cds) !== null && _item$toJS$doorStyle !== void 0 && _item$toJS$doorStyle.filter(function (cd) {
     return cd.itemID == (item === null || item === void 0 ? void 0 : item.getIn(['itemID']));
   }).length) > 0;else return false;
-};
-export function shallowEqualViewer(a, b) {
-  if (!a || !b) return a === b;
-  return a.a === b.a && a.d === b.d && a.e === b.e && a.f === b.f && a.viewerWidth === b.viewerWidth && a.viewerHeight === b.viewerHeight && a.SVGWidth === b.SVGWidth && a.SVGHeight === b.SVGHeight;
-}
+};

package/es/components/viewer3d/scene-creator.js

@@ -12,7 +12,7 @@ import { disposeObject } from "./three-memory-cleaner";
 import { ANIMATE_STEP_MAX, ANIMATE_STEP_MIN, ARRAY_3D_MODES, ARROW_TEXT_BACKCOLOR, ARROW_TEXT_FONTFACE, ARROW_TEXT_FORECOLOR, BASE_CABINET_LAYOUTPOS, BOTTOM_MOLDING_LOCATION, DECIMAL_PLACES_2, DIFFERENT_VALUES_PATH_LENGTH, DISTANCE_EPSILON, EPSILON, MIDDLE_MOLDING_LOCATION, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_ITEM_3D, MODE_IDLE, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, OBJTYPE_MESH, SHADE_DARK_PURPLE_COLOR, TOP_MOLDING_LOCATION, UNIT_CENTIMETER, UNIT_FOOT, UNIT_INCH, UNIT_METER, WALL_CABINET_LAYOUTPOS } from "../../constants";
 import { GeometryUtils, IDBroker, MoldingUtils } from "../../utils/export";
 import { convert } from "../../utils/convert-units-lite";
-import { calcDistancesFromItemToWalls, verticesDistance } from "../../utils/geometry";
+import { calcDistancesFromItemToWalls, getSnappedWallLines, verticesDistance } from "../../utils/geometry";
 import * as GeomUtils from "../../catalog/utils/geom-utils";
 import { loadTexture } from "../../catalog/utils/item-loader";
 import { returnReplaceableDeepSearchType } from "../viewer2d/utils";
@@ -3010,6 +3010,10 @@ export function createBacksplash(item, layer, planData, scene) {
     return;
   }
 
+  // Get current wall line that item is snapped
+  var wLines = getSnappedWallLines(item.itemInfo, layer, planData.catalog);
+  var curLine = wLines.length > 0 ? wLines[0] : null;
+
   // Get wall items
 
   var i,
@@ -3051,7 +3055,7 @@ export function createBacksplash(item, layer, planData, scene) {
     var _hole$properties, _hole$properties2;
     var width = (_hole$properties = hole.properties) === null || _hole$properties === void 0 ? void 0 : _hole$properties.getIn(['width', 'length']);
     var altitude = (_hole$properties2 = hole.properties) === null || _hole$properties2 === void 0 ? void 0 : _hole$properties2.getIn(['altitude', 'length']);
-    if (!isEmpty(width) && !isEmpty(altitude)) altItems.push({
+    if (!isEmpty(width) && !isEmpty(altitude) && hole.line === (curLine === null || curLine === void 0 ? void 0 : curLine.id)) altItems.push({
       x: hole.x,
       width: width,
       altitude: altitude
@@ -3068,7 +3072,8 @@ export function createBacksplash(item, layer, planData, scene) {
       }
     });
   }
-  if (!flag) depth = 52 * 2.54;
+  var DEFAULT_BACKSPLASH_HEIGHT = 52 * 2.54;
+  if (!flag || depth > DEFAULT_BACKSPLASH_HEIGHT) depth = DEFAULT_BACKSPLASH_HEIGHT;
 
   // Get backsplash info
 

package/es/constants.js

@@ -447,6 +447,7 @@ export var UNIT_MILLIMETER = 'mm';
 export var UNIT_CENTIMETER = 'cm';
 export var UNIT_METER = 'm';
 export var UNIT_INCH = 'in';
+export var UNIT_INCH_LONG = 'inch';
 export var UNIT_FOOT = 'ft';
 export var UNIT_MILE = 'mi';
 export var UNITS_LENGTH = [UNIT_MILLIMETER, UNIT_CENTIMETER, UNIT_METER, UNIT_INCH, UNIT_FOOT, UNIT_MILE];

package/es/index.js

@@ -15,7 +15,6 @@ import React from 'react';
 import * as Three from 'three';
 import LiteRenderer from "./LiteRenderer";
 import { createRoot } from 'react-dom/client';
-import { shallowEqualViewer } from "./components/viewer2d/utils";
 var ROOT_KEY = '__kitchenSimulatorRoot__';
 var API_KEY = '__kitchenSimulatorApi__';
 function nextFrame() {
@@ -369,7 +368,6 @@ export function renderKitchenSimulator(container) {
 
   // ✅ Reuse root
   var root = container[ROOT_KEY];
-  var latestViewer2D = null;
   if (!root) {
     root = createRoot(container);
     container[ROOT_KEY] = root;
@@ -550,12 +548,7 @@ export function renderKitchenSimulator(container) {
       key: "render",
       value: function render() {
         return /*#__PURE__*/React.createElement(LiteRenderer, _extends({}, this.props, {
-          externalEvent: this.state.externalEvent,
-          onViewer2DChange: function onViewer2DChange(v) {
-            if (!shallowEqualViewer(v, latestViewer2D)) {
-              latestViewer2D = v;
-            }
-          }
+          externalEvent: this.state.externalEvent
         }));
       }
     }]);
@@ -564,9 +557,6 @@ export function renderKitchenSimulator(container) {
     __render: function __render(nextProps) {
       root.render(/*#__PURE__*/React.createElement(Wrapper, nextProps));
     },
-    getViewer2D: function getViewer2D() {
-      return latestViewer2D;
-    },
     // ✅ host can query current inFlight
     getGltfInFlight: function getGltfInFlight() {
       return gltfTracker.getInFlight();

package/es/utils/convert-units-lite.js

@@ -1,3 +1,4 @@
+import { UNIT_INCH, UNIT_INCH_LONG } from "../constants";
 var lengthFactors = {
   m: 1,
   cm: 100,
@@ -13,11 +14,19 @@ var lengthFactors = {
   // (39.3701^2)
   ft2: 10.7639 // (3.28084^2)
 };
+function normalizeUnit(unit) {
+  if (!unit) return unit;
+  var u = unit.toLowerCase();
+  if (u === UNIT_INCH_LONG) return UNIT_INCH;
+  return u;
+}
 export function convert(value) {
   return {
     from: function from(fromUnit) {
       return {
         to: function to(toUnit) {
+          fromUnit = normalizeUnit(fromUnit);
+          toUnit = normalizeUnit(toUnit);
           if (!(fromUnit in lengthFactors) || !(toUnit in lengthFactors)) {
             throw new Error("Unsupported unit conversion: ".concat(fromUnit, " \u2192 ").concat(toUnit));
           }

package/es/utils/geometry.js

@@ -759,7 +759,7 @@ export function getAllItemSpecified(scene, catalog, filter) {
     // Filter check
     if (Array.isArray(filter)) {
       if (info && !filter.includes(info.layoutpos)) return;
-    } else if (info && (info.layoutpos !== filter || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && ['Cook Top', 'Microwave'].includes(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category))) {
+    } else if ((info === null || info === void 0 ? void 0 : info.layoutpos) !== filter || isEmpty(cat) || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && ['Cook Top', 'Microwave'].includes(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category)) {
       return;
     }
 
@@ -995,9 +995,9 @@ export function getAllLines(layer) {
           }
         }
       });
-      allLines.splice(addIdx, 0, [vertices, thick]);
+      allLines.splice(addIdx, 0, [vertices, thick, line.id]);
     } else {
-      allLines.push([allAreaLines[i], thick]);
+      allLines.push([allAreaLines[i], thick, line.id]);
     }
   });
   return allLines;
@@ -1039,7 +1039,9 @@ export function buildRectFromLines(layer, lines) {
     var y0 = vxys[1];
     var x1 = vxys[2];
     var y1 = vxys[3];
-    rect.push(getCalcRectFromLine(x0, y0, x1, y1, thick, layer));
+    var rectLine = getCalcRectFromLine(x0, y0, x1, y1, thick, layer);
+    rectLine.lineId = line.length > 2 ? line[2] : null;
+    rect.push(rectLine);
   });
   return rect;
 }
@@ -2606,4 +2608,196 @@ export function calcDistancesFromItemToWalls(curItem, layer) {
   return {
     PointArray: PointArray
   };
+}
+export function calcDistancesFromHoleToNearestOneOrWall(curHole, layer) {
+  var _layer$lines, _layer$vertices2, _line$vertices, _layer$vertices3, _line$vertices2, _curHole$properties$g, _curHole$properties, _line$get;
+  var distArray = {
+    distLeft: 0,
+    distRight: 0
+  };
+  if (isEmpty(curHole)) return distArray;
+  /***** calculate Left & Right distance from nearest hole ******/
+  // parent line of curHole
+  var line = (_layer$lines = layer.lines) === null || _layer$lines === void 0 ? void 0 : _layer$lines.get(curHole.line);
+  var v0 = (_layer$vertices2 = layer.vertices) === null || _layer$vertices2 === void 0 ? void 0 : _layer$vertices2.get(line === null || line === void 0 || (_line$vertices = line.vertices) === null || _line$vertices === void 0 ? void 0 : _line$vertices.get(0));
+  var v1 = (_layer$vertices3 = layer.vertices) === null || _layer$vertices3 === void 0 ? void 0 : _layer$vertices3.get(line === null || line === void 0 || (_line$vertices2 = line.vertices) === null || _line$vertices2 === void 0 ? void 0 : _line$vertices2.get(1));
+  if (isEmpty(line) || isEmpty(v0) || isEmpty(v1)) return distArray;
+  var angle = angleBetweenTwoPoints(v0.x, v0.y, v1.x, v1.y);
+
+  // start point and end point of current hole
+  var chw = (_curHole$properties$g = (_curHole$properties = curHole.properties) === null || _curHole$properties === void 0 || (_curHole$properties = _curHole$properties.get('width')) === null || _curHole$properties === void 0 ? void 0 : _curHole$properties.get('length')) !== null && _curHole$properties$g !== void 0 ? _curHole$properties$g : 0;
+  var chsp = {
+    x: curHole.x - chw / 2 * Math.cos(angle),
+    y: curHole.y - chw / 2 * Math.sin(angle)
+  };
+  var chep = {
+    x: curHole.x + chw / 2 * Math.cos(angle),
+    y: curHole.y + chw / 2 * Math.sin(angle)
+  };
+  distArray.distLeft = pointsDistance(v0.x, v0.y, chsp.x, chsp.y);
+  distArray.distRight = pointsDistance(v1.x, v1.y, chep.x, chep.y);
+  (_line$get = line.get('holes')) === null || _line$get === void 0 || _line$get.forEach(function (hId) {
+    if (hId !== curHole.id) {
+      var _layer$holes, _hole$properties$get$, _hole$properties;
+      var hole = (_layer$holes = layer.holes) === null || _layer$holes === void 0 ? void 0 : _layer$holes.get(hId);
+      // start point and end point of other hole
+      var hw = (_hole$properties$get$ = (_hole$properties = hole.properties) === null || _hole$properties === void 0 || (_hole$properties = _hole$properties.get('width')) === null || _hole$properties === void 0 ? void 0 : _hole$properties.get('length')) !== null && _hole$properties$get$ !== void 0 ? _hole$properties$get$ : 0;
+      var hsp = {
+        x: hole.x - hw / 2 * Math.cos(angle),
+        y: hole.y - hw / 2 * Math.sin(angle)
+      };
+      var hep = {
+        x: hole.x + hw / 2 * Math.cos(angle),
+        y: hole.y + hw / 2 * Math.sin(angle)
+      };
+      var relation = relationshipOfTwoOverlappedLines({
+        x1: chsp.x,
+        y1: chsp.y,
+        x2: chep.x,
+        y2: chep.y
+      }, {
+        x1: hsp.x,
+        y1: hsp.y,
+        x2: hep.x,
+        y2: hep.y
+      });
+      // two holes(current hole and other hole) are not overlaped, then get distance
+      if (relation.result === OVERLAP_NONE || relation.result === OVERLAP_LINK) {
+        if (hole.offset < curHole.offset)
+          // other hole is on the left side
+          distArray.distLeft = Math.min(distArray.distLeft, pointsDistance(chsp.x, chsp.y, hep.x, hep.y));
+          // other hole is on the right side
+        else distArray.distRight = Math.min(distArray.distRight, pointsDistance(chep.x, chep.y, hsp.x, hsp.y));
+      }
+    }
+  });
+  return distArray;
+}
+export function getSnappedWallLines(item, layer, catalog) {
+  var _element;
+  var snappedWallLines = [];
+  if (isEmpty(item)) return snappedWallLines;
+  var vertexLines = getAllLines(layer);
+  var rectLines = buildRectFromLines(layer, vertexLines);
+  var outline = null;
+  var element = catalog.elements[item.get('type')];
+  if (!element) element = catalog.elements[returnReplaceableDeepSearchType(item.get('type'))];
+  var newWidth = item.properties.get('width').get('_length');
+  var wUnit = item.properties.get('width').get('_unit') || 'cm';
+  newWidth = convert(newWidth).from(wUnit).to('cm');
+  var newDepth = item.properties.get('depth').get('_length');
+  var hUnit = item.properties.get('depth').get('_unit') || 'cm';
+  newDepth = convert(newDepth).from(hUnit).to('cm');
+  var overlapList = [OVERLAP_INCLUDED, OVERLAP_SAME, OVERLAP_SOME];
+
+  // Get Outline Data of Selected Item
+  outline = (_element = element) === null || _element === void 0 || (_element = _element.info) === null || _element === void 0 ? void 0 : _element.outline;
+  if (outline) {
+    // Extract Points from `outline`
+    var outlinePaths = outline.paths;
+    var outlineWidth = outline.svgWidth;
+    var outlineHeight = outline.svgHeight;
+    var outlinePoints = []; // Hold Points Of SVG
+    var _iterator7 = _createForOfIteratorHelper(outlinePaths),
+      _step7;
+    try {
+      for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+        var path = _step7.value;
+        var _iterator8 = _createForOfIteratorHelper(path.subPaths),
+          _step8;
+        try {
+          for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+            var subPath = _step8.value;
+            outlinePoints = outlinePoints.concat(subPath.getPoints());
+          }
+        } catch (err) {
+          _iterator8.e(err);
+        } finally {
+          _iterator8.f();
+        }
+      }
+    } catch (err) {
+      _iterator7.e(err);
+    } finally {
+      _iterator7.f();
+    }
+    outline.reverse && outlinePoints.reverse();
+    for (var i = 0; i < outlinePoints.length - 1; i++) {
+      var v0 = rotatePointAroundPoint((outlinePoints[i].x / outlineWidth - 0.5) * newWidth + item.x, (outlinePoints[i].y / outlineHeight - 0.5) * newDepth + item.y, item.x, item.y, item.rotation + 90);
+      var v1 = rotatePointAroundPoint((outlinePoints[i + 1].x / outlineWidth - 0.5) * newWidth + item.x, (outlinePoints[i + 1].y / outlineHeight - 0.5) * newDepth + item.y, item.x, item.y, item.rotation + 90);
+      var srcLine = {
+        x1: v0.x,
+        y1: v0.y,
+        x2: v1.x,
+        y2: v1.y
+      };
+      var _loop2 = function _loop2(j) {
+        var destLine1 = {
+          x1: rectLines[j].rect[2].x,
+          y1: rectLines[j].rect[3].y,
+          x2: v1.x,
+          y2: v1.y
+        };
+        var destLine2 = {
+          x1: rectLines[j].rect[0].x,
+          y1: rectLines[j].rect[1].y,
+          x2: v1.x,
+          y2: v1.y
+        };
+        if (overlapList.includes(relationshipOfTwoOverlappedLines(srcLine, destLine1).result) || overlapList.includes(relationshipOfTwoOverlappedLines(srcLine, destLine2).result)) {
+          var idx = snappedWallLines.findIndex(function (v) {
+            return v.id === rectLines[j].lineId;
+          });
+          var snapSide = 'unknown';
+          if (idx < 0) snappedWallLines.push({
+            id: rectLines[j].lineId,
+            snapSide: snapSide
+          });else snappedWallLines[idx].snapSide = snapSide;
+        }
+      };
+      for (var j = 0; j < (rectLines === null || rectLines === void 0 ? void 0 : rectLines.length); j++) {
+        _loop2(j);
+      }
+    }
+  } else {
+    var pos = [[-1, -1], [1, -1], [1, 1], [-1, 1]];
+    for (var _i = 0; _i < 4; _i++) {
+      var _v = rotatePointAroundPoint(pos[_i][0] * newWidth / 2 + item.x, pos[_i][1] * newDepth / 2 + item.y, item.x, item.y, item.rotation);
+      var _v2 = rotatePointAroundPoint(pos[(_i + 1) % 4][0] * newWidth / 2 + item.x, pos[(_i + 1) % 4][1] * newDepth / 2 + item.y, item.x, item.y, item.rotation);
+      var _srcLine = {
+        x1: _v.x,
+        y1: _v.y,
+        x2: _v2.x,
+        y2: _v2.y
+      };
+      var _loop3 = function _loop3(_j) {
+        var destLine1 = {
+          x1: rectLines[_j].rect[2].x,
+          y1: rectLines[_j].rect[2].y,
+          x2: rectLines[_j].rect[3].x,
+          y2: rectLines[_j].rect[3].y
+        };
+        var destLine2 = {
+          x1: rectLines[_j].rect[0].x,
+          y1: rectLines[_j].rect[0].y,
+          x2: rectLines[_j].rect[1].x,
+          y2: rectLines[_j].rect[1].y
+        };
+        if (overlapList.includes(relationshipOfTwoOverlappedLines(_srcLine, destLine1).result) || overlapList.includes(relationshipOfTwoOverlappedLines(_srcLine, destLine2).result)) {
+          var idx = snappedWallLines.findIndex(function (v) {
+            return v.id === rectLines[_j].lineId;
+          });
+          var snapSide = _i === 0 || _i === 2 ? 'front' : 'side';
+          if (idx < 0) snappedWallLines.push({
+            id: rectLines[_j].lineId,
+            snapSide: snapSide
+          });else snappedWallLines[idx].snapSide = snapSide;
+        }
+      };
+      for (var _j = 0; _j < (rectLines === null || rectLines === void 0 ? void 0 : rectLines.length); _j++) {
+        _loop3(_j);
+      }
+    }
+  }
+  return snappedWallLines;
 }

package/es/utils/history.js

@@ -1,13 +1,25 @@
-import { Map } from 'immutable';
+import { List, Map } from 'immutable';
 import diff from 'immutablediff';
 import patch from 'immutablepatch';
 export var historyPush = function historyPush(historyStructure, item) {
   if (historyStructure.last) {
     if (historyStructure.last.hashCode() !== item.hashCode()) {
+      var _toPush$get;
       var toPush = new Map({
         time: Date.now(),
         diff: diff(historyStructure.last, item)
       });
+
+      // convert map to object of the [value] field
+      if (List.isList(toPush.get('diff')) && ((_toPush$get = toPush.get('diff')) === null || _toPush$get === void 0 ? void 0 : _toPush$get.size) > 1) {
+        for (var i = 0; i < toPush.get('diff').size; i++) {
+          var mapValue = toPush.get('diff').get(i).get('value');
+          if (Map.isMap(mapValue)) {
+            var jsValue = mapValue.toJS();
+            toPush = toPush.setIn(['diff', i, 'value'], jsValue);
+          }
+        }
+      }
       historyStructure = historyStructure.set('last', item).set('list', historyStructure.list.push(toPush));
     }
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "7.0.10-react-18",
+  "version": "11.0.0-react.18",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "module": "es/index.js",