kitchen-simulator 5.0.0-new-api → 5.0.0-new-api.2

package/es/mappings/external-events/mappers/changeDoorStyleMapper.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { DEFAULT_INTERIOR_URL } from "../../../constants";
 import { isEmpty } from "../../../utils/helper";
 export function mapChangeDoorStyleEvent(evt, state) {
-  var _evt$payload, _layer$toJS, _targetDoorStyle$ccdf;
+  var _evt$payload, _layer$toJS;
   if (isEmpty(evt)) return null;
   var targetDoorStyle = evt === null || evt === void 0 || (_evt$payload = evt.payload) === null || _evt$payload === void 0 ? void 0 : _evt$payload.doorStyle;
   if (isEmpty(targetDoorStyle)) return evt;
@@ -33,33 +33,5 @@ export function mapChangeDoorStyleEvent(evt, state) {
   evt.payload.doorStyle = _objectSpread(_objectSpread({}, targetDoorStyle), {}, {
     doorStyles: doorStyles
   });
-  // make itemCDS using assets3d
-  var itemCDS = [];
-  var itemCDSData = {};
-  var cabitnetDoorStyleId;
-  targetDoorStyle === null || targetDoorStyle === void 0 || (_targetDoorStyle$ccdf = targetDoorStyle.ccdf_list) === null || _targetDoorStyle$ccdf === void 0 || _targetDoorStyle$ccdf.forEach(function (asItem) {
-    if (!isEmpty(asItem === null || asItem === void 0 ? void 0 : asItem.id)) {
-      cabitnetDoorStyleId = asItem.id;
-    }
-    asItem === null || asItem === void 0 || asItem.assets3d.forEach(function (as) {
-      if (!isEmpty(as === null || as === void 0 ? void 0 : as.placeholder_name) && !isEmpty(as === null || as === void 0 ? void 0 : as.gltf)) {
-        var updatedName = 'base_' + (as === null || as === void 0 ? void 0 : as.placeholder_name) + '_gltf';
-        itemCDSData[updatedName] = as === null || as === void 0 ? void 0 : as.gltf;
-      }
-      itemCDSData['is_euro_cds'] = !isEmpty(as === null || as === void 0 ? void 0 : as.is_euro_cds) ? as.is_euro_cds : 0;
-      itemCDSData['euro_shape_svg'] = !isEmpty(as === null || as === void 0 ? void 0 : as.euro_shape_svg) ? as.is_euro_cds : null;
-      itemCDSData['euro_width'] = !isEmpty(as === null || as === void 0 ? void 0 : as.euro_width) ? as.is_euro_cds : null;
-      itemCDSData['euro_height'] = !isEmpty(as === null || as === void 0 ? void 0 : as.euro_height) ? as.is_euro_cds : null;
-      itemCDSData['euro_length'] = !isEmpty(as === null || as === void 0 ? void 0 : as.euro_length) ? as.is_euro_cds : null;
-    });
-    var data = [];
-    data.push(itemCDSData);
-    itemCDS.push({
-      itemID: asItem.cabinet_id,
-      data: data,
-      cabinet_door_style_id: cabitnetDoorStyleId
-    });
-  });
-  evt.payload.itemCDS = itemCDS;
   return evt;
 }

package/es/plugins/keyboard.js

@@ -1,4 +1,4 @@
-import { MODE_IDLE, MODE_3D_FIRST_PERSON, MODE_3D_VIEW, MODE_SNAPPING, KEYBOARD_BUTTON_CODE, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_ITEM_3D, MODE_DRAWING_ITEM } from "../constants";
+import { MODE_IDLE, MODE_3D_VIEW, MODE_SNAPPING, KEYBOARD_BUTTON_CODE, MODE_IDLE_3D, MODE_DRAWING_ITEM_3D, MODE_DRAWING_ITEM } from "../constants";
 import { rollback, undo, redo, recreate, uncreate, remove, toggleSnap, copyProperties, pasteProperties, shift2doff, shift2don } from "../actions/project-actions";
 export default function keyboard() {
   return function (store, stateExtractor) {

package/es/reducers/export.js

@@ -8,8 +8,7 @@ import KitchenConfiguratorSceneReducer from "./scene-reducer";
 import KitchenConfiguratorVerticesReducer from "./vertices-reducer";
 import KitchenConfiguratorViewer2dReducer from "./viewer2d-reducer";
 import KitchenConfiguratorViewer3dReducer from "./viewer3d-reducer";
-import KitchenConfiguratorUserReducer from "./user-reducer";
-export { KitchenConfiguratorAreasReducer, KitchenConfiguratorHolesReducer, KitchenConfiguratorItemsReducer, KitchenConfiguratorLinesReducer, KitchenConfiguratorGroupsReducer, KitchenConfiguratorProjectReducer, KitchenConfiguratorSceneReducer, KitchenConfiguratorVerticesReducer, KitchenConfiguratorViewer2dReducer, KitchenConfiguratorViewer3dReducer, KitchenConfiguratorUserReducer };
+export { KitchenConfiguratorAreasReducer, KitchenConfiguratorHolesReducer, KitchenConfiguratorItemsReducer, KitchenConfiguratorLinesReducer, KitchenConfiguratorGroupsReducer, KitchenConfiguratorProjectReducer, KitchenConfiguratorSceneReducer, KitchenConfiguratorVerticesReducer, KitchenConfiguratorViewer2dReducer, KitchenConfiguratorViewer3dReducer };
 export default {
   KitchenConfiguratorAreasReducer: KitchenConfiguratorAreasReducer,
   KitchenConfiguratorHolesReducer: KitchenConfiguratorHolesReducer,
@@ -20,6 +19,5 @@ export default {
   KitchenConfiguratorSceneReducer: KitchenConfiguratorSceneReducer,
   KitchenConfiguratorVerticesReducer: KitchenConfiguratorVerticesReducer,
   KitchenConfiguratorViewer2dReducer: KitchenConfiguratorViewer2dReducer,
-  KitchenConfiguratorViewer3dReducer: KitchenConfiguratorViewer3dReducer,
-  KitchenConfiguratorUserReducer: KitchenConfiguratorUserReducer
+  KitchenConfiguratorViewer3dReducer: KitchenConfiguratorViewer3dReducer
 };

package/es/reducers/items-reducer.js

@@ -1,6 +1,6 @@
 import { Item, Area } from "../class/export";
 import { history } from "../utils/export";
-import { TOGGLE_LOADING_CABINET, SELECT_TOOL_DRAWING_ITEM, UPDATE_DRAWING_ITEM, END_DRAWING_ITEM, BEGIN_DRAGGING_ITEM, BEGIN_DRAGGING_ITEM_3D, UPDATE_DRAGGING_ITEM, UPDATE_DRAGGING_ITEM_CHANGED, UPDATE_DRAGGING_ITEM_3DX, UPDATE_DRAGGING_ITEM_3DY, END_DRAGGING_ITEM, END_DRAGGING_ITEM_3D, BEGIN_ROTATING_ITEM, BEGIN_ROTATING_ITEM_3D, UPDATE_ROTATING, UPDATE_ROTATING_ITEM, UPDATE_ROTATING_ITEM_CHANGED, END_ROTATING_ITEM, END_ROTATING_ITEM_3D, REPLACE_SUBMODULE, SELECT_ITEM, ANIMATE_OBJECT, REMOVE_REPLACE_SUBMODULE, ITEM_MOVE_UP, SELECT_TOOL_DRAWING_ITEM_3D, SET_DOOR_STYLE, SET_HANDLE_MATERIAL, SET_INITIAL_DOOR_STYLE, UPDATE_ITEM_POSITION, SET_DOOR_HANDLE, SET_WALL_COLOR, END_CREATING_CABINET, UPDATE_POPUP_OPEN, SET_MODELLING, SET_COUNTER_TOP, SET_BACKSPLASH, SET_BACKSPLASH_VISIBLE, SET_APPLIANCE_MATERIAL, DUPLICATE_SELECTED, EDIT_WIDTH, END_LOADING, SET_MOLDING, UPDATE_MOLDING, STORE_DIST_ARRAY, VALIDATE_ITEM_POSTIONS, REPLACE_ITEM
+import { TOGGLE_LOADING_CABINET, SELECT_TOOL_DRAWING_ITEM, UPDATE_DRAWING_ITEM, END_DRAWING_ITEM, BEGIN_DRAGGING_ITEM, BEGIN_DRAGGING_ITEM_3D, UPDATE_DRAGGING_ITEM, UPDATE_DRAGGING_ITEM_CHANGED, UPDATE_DRAGGING_ITEM_3DX, UPDATE_DRAGGING_ITEM_3DY, END_DRAGGING_ITEM, END_DRAGGING_ITEM_3D, BEGIN_ROTATING_ITEM, BEGIN_ROTATING_ITEM_3D, UPDATE_ROTATING_ITEM, UPDATE_ROTATING_ITEM_CHANGED, END_ROTATING_ITEM, END_ROTATING_ITEM_3D, REPLACE_SUBMODULE, SELECT_ITEM, ANIMATE_OBJECT, REMOVE_REPLACE_SUBMODULE, ITEM_MOVE_UP, SELECT_TOOL_DRAWING_ITEM_3D, SET_DOOR_STYLE, SET_HANDLE_MATERIAL, SET_INITIAL_DOOR_STYLE, UPDATE_ITEM_POSITION, SET_DOOR_HANDLE, SET_WALL_COLOR, END_CREATING_CABINET, UPDATE_POPUP_OPEN, SET_MODELLING, SET_COUNTER_TOP, SET_BACKSPLASH, SET_BACKSPLASH_VISIBLE, SET_APPLIANCE_MATERIAL, DUPLICATE_SELECTED, EDIT_WIDTH, END_LOADING, SET_MOLDING, UPDATE_MOLDING, STORE_DIST_ARRAY, VALIDATE_ITEM_POSTIONS, REPLACE_ITEM
 // SET_MOVE_STATUS,
 // SET_ROTATE_STATUS
 } from "../constants";

package/es/reducers/project-reducer.js

@@ -1,5 +1,5 @@
 import { history } from "../utils/export";
-import { LOAD_PROJECT, NEW_PROJECT, OPEN_CATALOG, SELECT_TOOL_EDIT, MODE_IDLE, UNSELECT_ALL, SELECT_ALL, SET_PROPERTIES, SET_ITEMS_ATTRIBUTES, SET_LINES_ATTRIBUTES, SET_HOLES_ATTRIBUTES, REMOVE, INVERT, UNDO, REDO, RECREATE, UNCREATE, PROJECT_RE_NAME, ROLLBACK, SET_PROJECT_PROPERTIES, SET_PROJECT_ID, OPEN_PROJECT_CONFIGURATOR, INIT_CATALOG, UPDATE_MOUSE_COORDS, UPDATE_ZOOM_SCALE, TOGGLE_SNAP, CHANGE_CATALOG_PAGE, GO_BACK_TO_CATALOG_PAGE, THROW_ERROR, THROW_WARNING, COPY_PROPERTIES, PASTE_PROPERTIES, PUSH_LAST_SELECTED_CATALOG_ELEMENT_TO_HISTORY, ALTERATE_STATE, SET_MODE, ADD_HORIZONTAL_GUIDE, ADD_VERTICAL_GUIDE, ADD_CIRCULAR_GUIDE, REMOVE_HORIZONTAL_GUIDE, REMOVE_VERTICAL_GUIDE, REMOVE_CIRCULAR_GUIDE, REMOVE_DRAWING_SUPPORT, SET_STATE_PROPERTIES, SHIFT2DON, SHIFT2DOFF, MODE_DRAWING_LINE, SET_IS_HELP, SET_IS_CABINET_DRAWING, ADD_ELEMENT_TO_CATALOG, CREATE_ROOM_WITH_SHAPE } from "../constants";
+import { LOAD_PROJECT, NEW_PROJECT, OPEN_CATALOG, SELECT_TOOL_EDIT, MODE_IDLE, UNSELECT_ALL, SELECT_ALL, SET_PROPERTIES, SET_ITEMS_ATTRIBUTES, SET_LINES_ATTRIBUTES, SET_HOLES_ATTRIBUTES, REMOVE, UNDO, REDO, RECREATE, UNCREATE, PROJECT_RE_NAME, ROLLBACK, SET_PROJECT_PROPERTIES, SET_PROJECT_ID, OPEN_PROJECT_CONFIGURATOR, INIT_CATALOG, UPDATE_MOUSE_COORDS, UPDATE_ZOOM_SCALE, TOGGLE_SNAP, CHANGE_CATALOG_PAGE, GO_BACK_TO_CATALOG_PAGE, THROW_ERROR, THROW_WARNING, COPY_PROPERTIES, PASTE_PROPERTIES, PUSH_LAST_SELECTED_CATALOG_ELEMENT_TO_HISTORY, ALTERATE_STATE, SET_MODE, ADD_HORIZONTAL_GUIDE, ADD_VERTICAL_GUIDE, ADD_CIRCULAR_GUIDE, REMOVE_HORIZONTAL_GUIDE, REMOVE_VERTICAL_GUIDE, REMOVE_CIRCULAR_GUIDE, REMOVE_DRAWING_SUPPORT, SET_STATE_PROPERTIES, SHIFT2DON, SHIFT2DOFF, MODE_DRAWING_LINE, SET_IS_HELP, SET_IS_CABINET_DRAWING, ADD_ELEMENT_TO_CATALOG, CREATE_ROOM_WITH_SHAPE } from "../constants";
 import { Project } from "../class/export";
 export default function (state, action) {
   switch (action.type) {

package/es/reducers/reducer.js

@@ -1,5 +1,5 @@
-import { PROJECT_ACTIONS, VIEWER2D_ACTIONS, VIEWER3D_ACTIONS, GROUP_ACTIONS, ITEMS_ACTIONS, HOLE_ACTIONS, LINE_ACTIONS, AREA_ACTIONS, SCENE_ACTIONS, VERTEX_ACTIONS, USER_ACTIONS } from "../constants";
-import { KitchenConfiguratorAreasReducer, KitchenConfiguratorHolesReducer, KitchenConfiguratorItemsReducer, KitchenConfiguratorLinesReducer, KitchenConfiguratorGroupsReducer, KitchenConfiguratorProjectReducer, KitchenConfiguratorSceneReducer, KitchenConfiguratorVerticesReducer, KitchenConfiguratorViewer2dReducer, KitchenConfiguratorViewer3dReducer, KitchenConfiguratorUserReducer } from "./export";
+import { PROJECT_ACTIONS, VIEWER2D_ACTIONS, VIEWER3D_ACTIONS, GROUP_ACTIONS, ITEMS_ACTIONS, HOLE_ACTIONS, LINE_ACTIONS, AREA_ACTIONS, SCENE_ACTIONS, VERTEX_ACTIONS } from "../constants";
+import { KitchenConfiguratorAreasReducer, KitchenConfiguratorHolesReducer, KitchenConfiguratorItemsReducer, KitchenConfiguratorLinesReducer, KitchenConfiguratorGroupsReducer, KitchenConfiguratorProjectReducer, KitchenConfiguratorSceneReducer, KitchenConfiguratorVerticesReducer, KitchenConfiguratorViewer2dReducer, KitchenConfiguratorViewer3dReducer } from "./export";
 import { State } from "../models";
 export var initialState = new State();
 export default function appReducer(state, action) {
@@ -14,6 +14,5 @@ export default function appReducer(state, action) {
   if (GROUP_ACTIONS[action.type]) return KitchenConfiguratorGroupsReducer.apply(void 0, arguments);
   if (SCENE_ACTIONS[action.type]) return KitchenConfiguratorSceneReducer.apply(void 0, arguments);
   if (VERTEX_ACTIONS[action.type]) return KitchenConfiguratorVerticesReducer.apply(void 0, arguments);
-  if (USER_ACTIONS[action.type]) return KitchenConfiguratorUserReducer.apply(void 0, arguments);
   return state || initialState;
 }

package/es/shared/objects/immutable.js

@@ -0,0 +1,3 @@
+export function toJSIfNeeded(value) {
+  return value && typeof value.toJS === 'function' ? value.toJS() : value;
+}

package/es/utils/geometry.js

@@ -2132,8 +2132,6 @@ export function relationshipOfTwoOverlappedLines2(srcLine, destLine) {
       };
       var line0 = [p1, p2].sort(comparator);
       var line1 = [p3, p4].sort(comparator);
-      var isReversedSrcLineDirection = false;
-      if (line0[0].x === srcLine.x2 && line0[0].y === srcLine.y2) isReversedSrcLineDirection = true;
       var _sort3 = [line0, line1].sort(function (lineA, lineB) {
           return comparator(lineA[0], lineB[0]);
         }),
@@ -2141,101 +2139,305 @@ export function relationshipOfTwoOverlappedLines2(srcLine, destLine) {
         lineSX = _sort4[0],
         lineDX = _sort4[1];
       var isReversedSrcLineIdx = false;
-      if (lineSX[0].x === line0[0].x && lineSX[0].y === line0[0].y) isReversedSrcLineIdx = false;else if (lineSX[0].x === line1[0].x && lineSX[0].y === line1[0].y) isReversedSrcLineIdx = true;
-      var compare0 = comparator(lineSX[0], lineDX[0]);
+      if (lineSX[0].x === line0[0].x && lineSX[0].y === line0[0].y) isReversedSrcLineIdx = false; // SX=srcLine, DX=destLine
+      else if (lineSX[0].x === line1[0].x && lineSX[0].y === line1[0].y) isReversedSrcLineIdx = true; // DX=srcLine, SX=destLine
+
+      var compare0 = comparator(lineSX[0], lineDX[0]); // always <= 0
       var compare1 = comparator(lineSX[1], lineDX[0]);
       var compare2 = comparator(lineSX[1], lineDX[1]);
-      if (MathUtils.fAbs(compare0) < EPSILON && MathUtils.fAbs(compare2) < EPSILON) {
-        return {
-          result: OVERLAP_SAME
-        };
-      } else if (MathUtils.fAbs(compare0) < EPSILON && compare2 < 0) {
-        // lineDX includes lineSX
-        if (!isReversedSrcLineIdx) {
-          // dest === lineDX : dest includes src
-          // return OVERLAP_INCLUDED; // lineSX[1] - lineDX[1]
-          return {
-            result: OVERLAP_INCLUDED
+      var sp = null,
+        ep = null;
+      if (MathUtils.fAbs(compare1) < EPSILON) {
+        //       SX
+        //  |----------|
+        //                   DX
+        //             |------------|
+        // link : lineSX[0] - lineDX[1]
+        if (lineSX[0].x === p1.x && lineSX[0].y === p1.y || lineDX[1].x === p2.x && lineDX[1].y === p2.y) {
+          sp = {
+            x: lineSX[0].x,
+            y: lineSX[0].y
+          };
+          ep = {
+            x: lineDX[1].x,
+            y: lineDX[1].y
+          };
+        } else {
+          // srcLine Direction is reversed
+          sp = {
+            x: lineDX[1].x,
+            y: lineDX[1].y
+          };
+          ep = {
+            x: lineSX[0].x,
+            y: lineSX[0].y
           };
         }
-        //  else {
-        //   // src includes dest
-        //   // return OVERLAP_SOME; // lineSX[1] - lineDX[1]
-        //   return {
-        //     result: OVERLAP_SOME,
-        //     trimmedSegs: {
-        //       x1: lineSX[1].x,
-        //       y1: lineSX[1].y,
-        //       x2: lineDX[1].x,
-        //       y2: lineDX[1].y
-        //     }
-        //   };
-        // }
-      }
-      if (MathUtils.fAbs(compare1) < EPSILON) {
-        // return OVERLAP_LINK; // lineSX[1]
         return {
           result: OVERLAP_LINK,
           linkedLine: {
-            x1: isReversedSrcLineDirection ? lineDX[1].x : lineSX[0].x,
-            y1: isReversedSrcLineDirection ? lineDX[1].y : lineSX[0].y,
-            x2: isReversedSrcLineDirection ? lineSX[0].x : lineDX[1].x,
-            y2: isReversedSrcLineDirection ? lineSX[0].y : lineDX[1].y
+            x1: sp.x,
+            y1: sp.y,
+            x2: ep.x,
+            y2: ep.y
           }
         };
       } else if (compare1 < 0) {
+        //       SX
+        //  |----------|
+        //                     DX
+        //                |----------|
+        // none
         return {
           result: OVERLAP_NONE
         };
-      } else {
-        if (MathUtils.fAbs(compare2) < EPSILON || compare2 > 0) {
-          // lineSX includes lineDX
-          if (isReversedSrcLineIdx) {
-            // dest === lineSX : dest includes src
-            // return OVERLAP_INCLUDED; // lineDX[0] - lineDX[1]
+      } else if (MathUtils.fAbs(compare0) < EPSILON && MathUtils.fAbs(compare2) < EPSILON) {
+        //       SX
+        //  |----------|
+        //       DX
+        //  |----------|
+        return {
+          result: OVERLAP_SAME
+        };
+      } else if (MathUtils.fAbs(compare0) < EPSILON) {
+        if (compare2 < 0 && isReversedSrcLineIdx) {
+          //       SX
+          //  |---------------|
+          //             DX
+          //  |-----------------------|
+          // DX includes SX, DX=srcLine, SX=destLine : sx1 - dx1
+          if (lineDX[1].x === p2.x && lineDX[1].y === p2.y) {
+            sp = {
+              x: lineSX[1].x,
+              y: lineSX[1].y
+            };
+            ep = {
+              x: lineDX[1].x,
+              y: lineDX[1].y
+            };
+          } else {
+            // srcLine Direction is reversed
+            sp = {
+              x: lineDX[1].x,
+              y: lineDX[1].y
+            };
+            ep = {
+              x: lineSX[1].x,
+              y: lineSX[1].y
+            };
+          }
+          return {
+            result: OVERLAP_SOME,
+            trimmedSegs: [{
+              x1: sp.x,
+              y1: sp.y,
+              x2: ep.x,
+              y2: ep.y
+            }]
+          };
+        } else if (compare2 > 0 && !isReversedSrcLineIdx) {
+          //             SX
+          //  |-----------------------|
+          //         DX
+          //  |---------------|
+          // SX includes DX, SX=srcLine, DX=destLine  : dx1 - sx1
+          if (lineSX[1].x === p2.x && lineSX[1].y === p2.y) {
+            sp = {
+              x: lineDX[1].x,
+              y: lineDX[1].y
+            };
+            ep = {
+              x: lineSX[1].x,
+              y: lineSX[1].y
+            };
+          } else {
+            // srcLine Direction is reversed
+            sp = {
+              x: lineSX[1].x,
+              y: lineSX[1].y
+            };
+            ep = {
+              x: lineDX[1].x,
+              y: lineDX[1].y
+            };
+          }
+          return {
+            result: OVERLAP_SOME,
+            trimmedSegs: [{
+              x1: sp.x,
+              y1: sp.y,
+              x2: ep.x,
+              y2: ep.y
+            }]
+          };
+        } else {
+          //       srcLine
+          //  |---------------|
+          //          destLine
+          //  |-----------------------|
+          // destLine includes srcLine
+          return {
+            result: OVERLAP_INCLUDED
+          };
+        }
+      } else if (MathUtils.fAbs(compare2) < EPSILON) {
+        //             SX
+        //  |-----------------------|
+        //                DX
+        //       |------------------|
+        if (isReversedSrcLineIdx) {
+          // SX includes DX, DX=srcLine, SX=destLine
+          // destLine includes srcLine
+          return {
+            result: OVERLAP_INCLUDED
+          };
+        } else {
+          // SX includes DX, SX=srcLine, DX=destLine
+          // srcLine incluedes destLine : sx0 - dx0
+          if (lineSX[1].x === p2.x && lineSX[1].y === p2.y) {
+            sp = {
+              x: lineSX[0].x,
+              y: lineSX[0].y
+            };
+            ep = {
+              x: lineDX[0].x,
+              y: lineDX[0].y
+            };
+          } else {
+            // srcLine direction is reversed
+            sp = {
+              x: lineDX[0].x,
+              y: lineDX[0].y
+            };
+            ep = {
+              x: lineSX[0].x,
+              y: lineSX[0].y
+            };
+          }
+          return {
+            result: OVERLAP_SOME,
+            trimmedSegs: [{
+              x1: sp.x,
+              y1: sp.y,
+              x2: ep.x,
+              y2: ep.y
+            }]
+          };
+        }
+      } else if (compare0 < 0 && compare2 > 0) {
+        //             SX
+        //  |-----------------------|
+        //             DX
+        //     |----------------|
+        if (isReversedSrcLineIdx) {
+          // SX includes DX, DX=srcLine, SX=destLine
+          // destLine includes srcLine
+          return {
+            result: OVERLAP_INCLUDED
+          };
+        } else {
+          // SX includes DX, SX=srcLine, DX=destLine
+          // srcLine incluedes destLine : sx0 - dx0, dx1 - sx1
+          if (lineSX[1].x === p2.x && lineSX[1].y === p2.y) {
             return {
-              result: OVERLAP_INCLUDED
+              result: OVERLAP_SOME,
+              trimmedSegs: [{
+                x1: lineSX[0].x,
+                y1: lineSX[0].y,
+                x2: lineDX[0].x,
+                y2: lineDX[0].y
+              }, {
+                x1: lineDX[1].x,
+                y1: lineDX[1].y,
+                x2: lineSX[1].x,
+                y2: lineSX[1].y
+              }]
             };
           } else {
-            // dest === lineDX : src includes dest
-            var trimmedSegs = [];
-            // return OVERLAP_SOME; // lineSX[0] - lineDX[0], lineDX[1] - lineSX[1]
-            if (compare0 < 0) trimmedSegs.push({
-              x1: isReversedSrcLineDirection ? lineDX[0].x : lineSX[0].x,
-              y1: isReversedSrcLineDirection ? lineDX[0].y : lineSX[0].y,
-              x2: isReversedSrcLineDirection ? lineSX[0].x : lineDX[0].x,
-              y2: isReversedSrcLineDirection ? lineSX[0].y : lineDX[0].y
-            });
-            if (compare2 > 0) trimmedSegs.push({
-              x1: isReversedSrcLineDirection ? lineSX[1].x : lineDX[1].x,
-              y1: isReversedSrcLineDirection ? lineSX[1].y : lineDX[1].y,
-              x2: isReversedSrcLineDirection ? lineDX[1].x : lineSX[1].x,
-              y2: isReversedSrcLineDirection ? lineDX[1].y : lineSX[1].y
-            });
+            // srcLine direction is reversed
             return {
               result: OVERLAP_SOME,
-              trimmedSegs: trimmedSegs
+              trimmedSegs: [{
+                x1: lineDX[0].x,
+                y1: lineDX[0].y,
+                x2: lineSX[0].x,
+                y2: lineSX[0].y
+              }, {
+                x1: lineSX[1].x,
+                y1: lineSX[1].y,
+                x2: lineDX[1].x,
+                y2: lineDX[1].y
+              }]
             };
           }
         }
-        if (compare2 < 0) {
-          // return OVERLAP_SOME; // lineSX[0] - lineDX[0], lineSX[1] - lineDX[1]
-          var _trimmedSegs = [];
-          if (compare0 < 0 && !isReversedSrcLineIdx) _trimmedSegs.push({
-            x1: isReversedSrcLineDirection ? lineDX[0].x : lineSX[0].x,
-            y1: isReversedSrcLineDirection ? lineDX[0].y : lineSX[0].y,
-            x2: isReversedSrcLineDirection ? lineSX[0].x : lineDX[0].x,
-            y2: isReversedSrcLineDirection ? lineSX[0].y : lineDX[0].y
-          });
-          if (compare2 < 0 && isReversedSrcLineIdx) _trimmedSegs.push({
-            x1: isReversedSrcLineDirection ? lineDX[1].x : lineSX[1].x,
-            y1: isReversedSrcLineDirection ? lineDX[1].y : lineSX[1].y,
-            x2: isReversedSrcLineDirection ? lineSX[1].x : lineDX[1].x,
-            y2: isReversedSrcLineDirection ? lineSX[1].y : lineDX[1].y
-          });
+      } else if (compare2 < 0) {
+        //             SX
+        //  |-----------------------|
+        //                   DX
+        //     |----------------------------|
+        // overlap some
+        if (isReversedSrcLineIdx) {
+          // DX=srcLine, SX=destLine
+          if (lineDX[1].x === p2.x && lineDX[1].y === p2.y) {
+            sp = {
+              x: lineSX[1].x,
+              y: lineSX[1].y
+            };
+            ep = {
+              x: lineDX[1].x,
+              y: lineDX[1].y
+            };
+          } else {
+            // srcLine direction is reversed
+            sp = {
+              x: lineDX[1].x,
+              y: lineDX[1].y
+            };
+            ep = {
+              x: lineSX[1].x,
+              y: lineSX[1].y
+            };
+          }
+          return {
+            result: OVERLAP_SOME,
+            trimmedSegs: [{
+              x1: sp.x,
+              y1: sp.y,
+              x2: ep.x,
+              y2: ep.y
+            }]
+          };
+        } else {
+          // SX=srcLine, DX=destLine
+          if (lineSX[1].x === p2.x && lineSX[1].y === p2.y) {
+            sp = {
+              x: lineSX[0].x,
+              y: lineSX[0].y
+            };
+            ep = {
+              x: lineDX[0].x,
+              y: lineDX[0].y
+            };
+          } else {
+            // srcLine direction is reversed
+            sp = {
+              x: lineDX[0].x,
+              y: lineDX[0].y
+            };
+            ep = {
+              x: lineSX[0].x,
+              y: lineSX[0].y
+            };
+          }
           return {
             result: OVERLAP_SOME,
-            trimmedSegs: _trimmedSegs
+            trimmedSegs: [{
+              x1: sp.x,
+              y1: sp.y,
+              x2: ep.x,
+              y2: ep.y
+            }]
           };
         }
       }

package/es/utils/history.js

@@ -1,4 +1,4 @@
-import { List, Map } from 'immutable';
+import { Map, List } from 'immutable';
 import diff from 'immutablediff';
 import patch from 'immutablepatch';
 export var historyPush = function historyPush(historyStructure, item) {
@@ -11,7 +11,7 @@ export var historyPush = function historyPush(historyStructure, 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) {
+      if (List.isList(toPush.get('diff')) && ((_toPush$get = toPush.get('diff')) === null || _toPush$get === void 0 ? void 0 : _toPush$get.size) > 0) {
         for (var i = 0; i < toPush.get('diff').size; i++) {
           var mapValue = toPush.get('diff').get(i).get('value');
           if (Map.isMap(mapValue)) {

package/es/utils/molding.js

@@ -248,8 +248,9 @@ export function getLinesOfItem(item, allLineRects, catalog) {
   var hUnit = item.properties.get('depth').get('_unit') || 'cm';
   newDepth = convert(newDepth).from(hUnit).to('cm');
   if (item) {
+    var _element;
     // Get Outline Data of Selected Item
-    outline = element.info.outline;
+    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;
@@ -319,9 +320,9 @@ export function getLinesOfItem2(item, allLineRects, catalog) {
   var hUnit = item.properties.get('depth').get('_unit') || 'cm';
   newDepth = convert(newDepth).from(hUnit).to('cm');
   if (item) {
-    var _element;
+    var _element2;
     // Get Outline Data of Selected Item
-    outline = (_element = element) === null || _element === void 0 ? void 0 : _element.info.outline;
+    outline = (_element2 = element) === null || _element2 === void 0 ? void 0 : _element2.info.outline;
     if (outline) {
       // Extract Points from `outline`
       var outlinePaths = outline.paths;
@@ -429,6 +430,7 @@ export function getLinesFromItems2(moldingGroup, layer, catalog) {
   var MGlines = [];
   var MGlinesOtherSnapped = [];
   var items = _toConsumableArray(moldingGroup.items);
+  items = sortItemsByDistance(items, items[0]);
   // The other item's lines (these items are snapped to the moldingGroup items)
   var itemsOtherSnapped = layer.items.toArray().filter(function (item) {
     if (items.some(function (it) {
@@ -563,23 +565,7 @@ export function getLinesFromItems2(moldingGroup, layer, catalog) {
       })) return 1; // continue
       var mergedResult = getMergedLine(MGlines[_i3], filteredMGlines, 0);
       if (mergedResult) {
-        // keep origin line direction
-        var rstLine = mergedResult.mergedLine;
-        // if (
-        //   (Math.abs(MGlines[i][0].x - rstLine[1].x) < EPSILON &&
-        //     Math.abs(MGlines[i][0].y - rstLine[1].y) < EPSILON) ||
-        //   (Math.abs(MGlines[i][1].x - rstLine[0].x) < EPSILON &&
-        //     Math.abs(MGlines[i][1].y - rstLine[0].y) < EPSILON)
-        // ) {
-        //   // swap two end points
-        //   const tx = rstLine[0].x;
-        //   const ty = rstLine[0].y;
-        //   rstLine[0].x = rstLine[1].x;
-        //   rstLine[0].y = rstLine[1].y;
-        //   rstLine[1].x = tx;
-        //   rstLine[1].y = ty;
-        // }
-        newMGlines.push(rstLine);
+        newMGlines.push(mergedResult.mergedLine);
         filteredMGlines = mergedResult.filteredMGlines;
       }
     },

package/lib/LiteKitchenConfigurator.js

@@ -30,7 +30,7 @@ var _export2 = require("./components/export");
 var _translator = _interopRequireDefault(require("./translator/translator"));
 var _objectsUtils = require("./utils/objects-utils");
 var _version = require("./version");
-var _isolateEventHandler = require("./utils/isolate-event-handler");
+var _handleExternalEvent = require("./events/external/handleExternalEvent");
 var _excluded = ["width", "height", "extractedState"];
 var _templateObject, _templateObject2; // LiteKitchenConfigurator.jsx
 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); }
@@ -360,7 +360,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
 
       // same behavior: handle external event when it changes
       if (prevProps.externalEvent !== externalEvent) {
-        (0, _isolateEventHandler.handleExternalEvent)(this.props);
+        (0, _handleExternalEvent.handleExternalEvent)(this.props);
       }
 
       // same behavior: init catalog until ready