kitchen-simulator 4.3.5 → 4.3.7

package/es/actions/items-actions.js

@@ -227,12 +227,13 @@ export function updateItemsAltitude(layerID, itemID, value) {
     value: value
   };
 }
-export function setDoorStyle(doorStyle, itemCDS, isAll) {
+export function setDoorStyle(doorStyle, itemCDS, applyScope, itemIds) {
   return {
     type: SET_DOOR_STYLE,
     doorStyle: doorStyle,
     itemCDS: itemCDS,
-    isAll: isAll
+    applyScope: applyScope,
+    itemIds: itemIds
   };
 }
 export function setCounterTop(counterTop) {

package/es/class/item.js

@@ -8,7 +8,7 @@ import { convert } from "../utils/convert-units-lite";
 import { Group, Hole, Layer } from "./export";
 import { GeometryUtils, IDBroker, MoldingUtils, NameGenerator } from "../utils/export";
 import { fromJS, Map } from 'immutable';
-import { INSTALLATION_SUFFIX_TYPE, INTERNAL_EVENT_DRAW_ELEMENT, MODE_DRAGGING_ITEM, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_ITEM, MODE_DRAWING_ITEM_3D, MODE_IDLE, MODE_IDLE_3D, MODE_ROTATING_ITEM, MODE_ROTATING_ITEM_3D, MOLDING_LOCATIONS } from "../constants";
+import { DOORSTYLE_SCOPE_ALL, DOORSTYLE_SCOPE_MULTIPLE, DOORSTYLE_SCOPE_SINGLE, INSTALLATION_SUFFIX_TYPE, INTERNAL_EVENT_DRAW_ELEMENT, MODE_DRAGGING_ITEM, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_ITEM, MODE_DRAWING_ITEM_3D, MODE_IDLE, MODE_IDLE_3D, MODE_ROTATING_ITEM, MODE_ROTATING_ITEM_3D, MOLDING_LOCATIONS } from "../constants";
 import { debugUtil, updatePayloadOfInternalEvent } from "../utils/helper";
 import { isUndefined } from 'util';
 import { hasMoldingLayout } from "../utils/molding";
@@ -1161,8 +1161,9 @@ var Item = /*#__PURE__*/function () {
     }
   }, {
     key: "setDoorStyle",
-    value: function setDoorStyle(state, doorStyle, itemCDS, isAll) {
+    value: function setDoorStyle(state, doorStyle, itemCDS, applyScope) {
       var _this2 = this;
+      var targetItemIDs = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
       if (isEmpty(doorStyle)) return {
         updatedState: state
       };
@@ -1187,10 +1188,33 @@ var Item = /*#__PURE__*/function () {
         });
       });
       state = state.setIn(['scene', 'layers', layerID, 'molding'], temp_layer_molding);
-      var itemIDs = state.scene.layers.getIn([layerID, 'selected', 'items']).toJS();
+
+      // 🔥 Determine which items to update
+      var items = state.scene.layers.get(layerID).items;
+      var itemsToProcess = [];
+      var idSet = null;
+      if (applyScope === DOORSTYLE_SCOPE_SINGLE) {
+        var selectedItemIds = state.scene.layers.getIn([layerID, 'selected', 'items']).toJS();
+        idSet = new Set(selectedItemIds);
+      }
+      if (applyScope === DOORSTYLE_SCOPE_MULTIPLE) {
+        // targetItemIds contains item.id (instance IDs)
+        idSet = new Set(targetItemIDs);
+      }
+      if (applyScope === DOORSTYLE_SCOPE_ALL) {
+        items.forEach(function (item) {
+          itemsToProcess.push(item);
+        });
+      } else if (idSet) {
+        items.forEach(function (item) {
+          if (idSet.has(item.id)) {
+            itemsToProcess.push(item);
+          }
+        });
+      }
       var setDoorStyleOfItem = function setDoorStyleOfItem(data) {
         var _cds$data;
-        if (data.category !== 'cabinet') return; //CDS should effect to cabinets
+        if (data.category !== 'cabinet') return;
         var itemID = data.id;
         var curItem = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
         var layer = state.getIn(['scene', 'layers', layerID]);
@@ -1214,9 +1238,7 @@ var Item = /*#__PURE__*/function () {
           return element && element.is_euro_cds;
         })) || [];
         var cds_data = cds ? [cds] : [];
-        if (
-        // doorStyle.door_style_name === 'Euro & Frameless' &&
-        euro_cds.length > 0) {
+        if (euro_cds.length > 0) {
           var newProperties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
           if (newProperties.hasOwnProperty('depth')) {
             if (!newProperties.hasOwnProperty('oldDepth')) {
@@ -1298,7 +1320,6 @@ var Item = /*#__PURE__*/function () {
           type: doorStyle.type,
           sku: doorStyle.sku,
           color_sku_alias: doorStyle.color_sku_alias,
-          // alias name of color_sku for the current dealer
           install: getInstallationSuffix(INSTALLATION_SUFFIX_TYPE.NAME, doorStyle),
           doorStyles: _objectSpread(_objectSpread({}, tmp), {}, {
             cds: cds_data
@@ -1306,25 +1327,9 @@ var Item = /*#__PURE__*/function () {
         };
         state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'doorStyle'], fromJS(tmpDS));
       };
-      if (isAll) {
-        var items = state.scene.layers.get(layerID).items;
-        items.forEach(setDoorStyleOfItem);
-      } else {
-        if (itemIDs.length > 0) {
-          var _loop = function _loop() {
-            var itemID = itemIDs[i];
-            var items = state.scene.layers.get(layerID).items;
-            items.forEach(function (data) {
-              if (itemID === data.id) {
-                setDoorStyleOfItem(data);
-              }
-            });
-          };
-          for (var i = 0; i < itemIDs.length; i++) {
-            _loop();
-          }
-        }
-      }
+
+      // 🔥 Apply to resolved items
+      itemsToProcess.forEach(setDoorStyleOfItem);
       return {
         updatedState: state
       };
@@ -1606,7 +1611,7 @@ var Item = /*#__PURE__*/function () {
           }
         });
         var updateSelectItemMolding = function updateSelectItemMolding() {
-          var _loop2 = function _loop2() {
+          var _loop = function _loop() {
             // check whether snapped item is same as selected item in layoutpos(Wall, Tall, Base)
             if (MoldingUtils.isSameMoldingLayoutpos(selectedItem, snappedItemGroup[i])) {
               // check whether snapped item is same in location(same location type and height).
@@ -1628,7 +1633,7 @@ var Item = /*#__PURE__*/function () {
             }
           };
           for (var i = 0; i < snappedItemGroup.length; i++) {
-            _loop2();
+            _loop();
           }
         };
         var emptyMoldingArray = function emptyMoldingArray() {

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

@@ -1,8 +1,5 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-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; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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; }
 import * as Three from 'three';
@@ -3014,11 +3011,11 @@ export function createBacksplash(item, layer, planData, scene) {
   var wLines = getSnappedWallLines(item.itemInfo, layer, planData.catalog);
   var curLine = wLines.length > 0 ? wLines[0] : null;
 
-  // Get wall items
+  // Get wall items which snapped to the curLine
 
   var i,
     wallItems = [];
-  var allWallItems = GeometryUtils.getAllItemSpecified(scene, planData.catalog, WALL_CABINET_LAYOUTPOS);
+  var allWallItems = GeometryUtils.getAllItemSpecified(scene, planData.catalog, WALL_CABINET_LAYOUTPOS, curLine === null || curLine === void 0 ? void 0 : curLine.lineRect);
   for (i = 0; i < allWallItems.others.length; i++) wallItems.push(allWallItems.others[i]);
   if (allWallItems.cur) wallItems.push(allWallItems.cur);
 
@@ -3095,37 +3092,37 @@ export function createBacksplash(item, layer, planData, scene) {
 
   // Find mergeable other backsplashes
 
-  var info, wholeWidth, /** Width factor */factor, distance, halfWidth, /** To get new center */centerFactor;
-  var _iterator = _createForOfIteratorHelper(backsplashes),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var back = _step.value;
-      info = back.info;
-      if (info.height === splashHeight && info.rotY === rotY) {
-        factor = Math.cos(rotY) || 1;
-        distance = Math.hypot(posX - info.posX, posZ - info.posZ) / factor;
-        halfWidth = (info.width + splashWidth) / 2;
-        if (Math.abs(distance - halfWidth) < 1e-2) {
-          // dispose `back`
-          if (info.id) {
-            deleteSpecifiedMeshObjects('backsplash' + info.id);
-          }
+  // let info,
+  //   wholeWidth,
+  //   /** Width factor */ factor,
+  //   distance,
+  //   halfWidth,
+  //   /** To get new center */ centerFactor;
+
+  // for (let back of backsplashes) {
+  //   info = back.info;
+  //   if (info.height === splashHeight && info.rotY === rotY) {
+  //     factor = Math.cos(rotY) || 1;
+  //     distance = Math.hypot(posX - info.posX, posZ - info.posZ) / factor;
+  //     halfWidth = (info.width + splashWidth) / 2;
+
+  //     if (Math.abs(distance - halfWidth) < 1e-2) {
+  //       // dispose `back`
+  //       if (info.id) {
+  //         deleteSpecifiedMeshObjects('backsplash' + info.id);
+  //       }
+
+  //       // Get center position
+  //       wholeWidth = info.width + splashWidth;
+  //       centerFactor = info.width / wholeWidth;
+  //       posX = posX + centerFactor * (info.posX - posX);
+  //       posZ = posZ + centerFactor * (info.posZ - posZ);
+
+  //       splashWidth = wholeWidth;
+  //     }
+  //   }
+  // }
 
-          // Get center position
-          wholeWidth = info.width + splashWidth;
-          centerFactor = info.width / wholeWidth;
-          posX = posX + centerFactor * (info.posX - posX);
-          posZ = posZ + centerFactor * (info.posZ - posZ);
-          splashWidth = wholeWidth;
-        }
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
   itemToSave.info.posX = posX;
   itemToSave.info.posY = posY;
   itemToSave.info.posZ = posZ;
@@ -3174,9 +3171,9 @@ export function createBacksplash(item, layer, planData, scene) {
   }
   itemToSave.info.id = item.itemInfo.id;
   deleteSpecifiedMeshObjects('backsplash' + item.itemInfo.id);
-  if (item.rotRad % (Math.PI / 2) === 0) planData.plan.add(backsplash);
+  if (Math.abs(item.rotRad % (Math.PI / 2)) < EPSILON) planData.plan.add(backsplash);
   backsplash.name = name;
-  backsplash.visible = item.itemInfo.get('backsplashVisible') && backsplashApplied && item.rotRad % (Math.PI / 2) === 0;
+  backsplash.visible = item.itemInfo.get('backsplashVisible') && backsplashApplied && Math.abs(item.rotRad % (Math.PI / 2)) < EPSILON;
 
   // Save to scene graph
 

package/es/constants.js

@@ -767,4 +767,7 @@ export var ROOM_SHAPE_TYPE = {
   THREE_WALLS_TOP_RIGHT_BOTTOM: '3wTopRightBottom',
   THREE_WALLS_RIGHT_BOTTOM_LEFT: '3wRightBottomLeft',
   THREE_WALLS_BOTTOM_LEFT_TOP: '3wBottomLeftTop'
-};
+};
+export var DOORSTYLE_SCOPE_ALL = 'all';
+export var DOORSTYLE_SCOPE_SINGLE = 'single';
+export var DOORSTYLE_SCOPE_MULTIPLE = 'multiple';

package/es/devLiteRenderer.js

@@ -20,7 +20,7 @@ import replaceCabinetPayload from "./mocks/replaceCabinetPayload.json";
 import ReactDOM from 'react-dom';
 import LiteRenderer from "./LiteRenderer";
 import { Button } from 'antd';
-import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, BACK_DIST_ANG, ATT_ITEM_POS, ATT_ITEM_ROTATION, ATT_LINE_LENGTH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, HOLE_NAMES, EXTERNAL_EVENT_CENTERING_2D, PROP_ALTITUDE, EXTERNAL_EVENT_DUPLICATE_ELEMENT, ELEMENT_ITEM, EXTERNAL_EVENT_DELETE_ELEMENT, PROP_RESIZE_WIDTH, EXTERNAL_EVENT_REPLACE_CABINET, EXTERNAL_EVENT_SET_FINISHING, FINISHING_TYPE, EXTERNAL_EVENT_ROTATE_PAN } from "./constants";
+import { LEFT, RIGHT, TOP, BOTTOM, EXTERNAL_EVENT_ADD_ITEM, EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TOGGLE_TO_2D, EXTERNAL_EVENT_TOGGLE_TO_ELEVATION, EXTERNAL_EVENT_MOVE_PAN, EXTERNAL_EVENT_NEW_PROJECT, EXTERNAL_EVENT_CHANGE_DOORSTYLE, EXTERNAL_EVENT_ADD_ROOM_SHAPE, EXTERNAL_EVENT_ZOOM_IN, EXTERNAL_EVENT_ZOOM_OUT, EXTERNAL_EVENT_UNDO, EXTERNAL_EVENT_REDO, EXTERNAL_EVENT_SET_MOLDING, EXTERNAL_EVENT_PROJECT_SETTING, PROJECT_SETTING_OPTION, EXTERNAL_EVENT_SYNC_SCENE, EXTERNAL_EVENT_UPDATE_ATTRIBUTE, BACK_DIST_ANG, ATT_ITEM_POS, ATT_ITEM_ROTATION, ATT_LINE_LENGTH, EXTERNAL_EVENT_UPDATE_PROPERTY, PROP_FLIP_DOOR_HANDLE, PROP_OPEN_DOORS, EXTERNAL_EVENT_LOAD_PROJECT, INTERNAL_EVENT_ITEMS_CATALOG, EXTERNAL_EVENT_ADD_HOLE, HOLE_NAMES, EXTERNAL_EVENT_CENTERING_2D, PROP_ALTITUDE, EXTERNAL_EVENT_DUPLICATE_ELEMENT, ELEMENT_ITEM, EXTERNAL_EVENT_DELETE_ELEMENT, PROP_RESIZE_WIDTH, EXTERNAL_EVENT_REPLACE_CABINET, EXTERNAL_EVENT_SET_FINISHING, FINISHING_TYPE, EXTERNAL_EVENT_ROTATE_PAN, DOORSTYLE_SCOPE_ALL } from "./constants";
 import { convert } from "./utils/convert-units-lite";
 
 // --- renderer props ---
@@ -231,7 +231,7 @@ function WorkSpace(props) {
         payload: {
           doorStyle: doorStylePaylod2,
           itemCDS: itemCDSPayload,
-          isAll: true
+          applyScope: DOORSTYLE_SCOPE_ALL
         }
       };
       setExternalEvent(evt);

package/es/reducers/items-reducer.js

@@ -108,7 +108,7 @@ export default function (state, action) {
     case SELECT_TOOL_DRAWING_ITEM_3D:
       return Item.selectToolDrawingItem3D(state, action.sceneComponentType).updatedState;
     case SET_DOOR_STYLE:
-      return Item.setDoorStyle(state, action.doorStyle, action.itemCDS, action.isAll).updatedState;
+      return Item.setDoorStyle(state, action.doorStyle, action.itemCDS, action.applyScope, action.itemIds).updatedState;
     case SET_HANDLE_MATERIAL:
       return Item.setHandleMaterial(state, action.material).updatedState;
     case SET_DOOR_HANDLE:

package/es/utils/geometry.js

@@ -719,6 +719,7 @@ export function getAllItems(scene, catalog, allLineRects) {
 }
 export function getAllItemSpecified(scene, catalog, filter) {
   var _scene$layers, _scene$layers$get;
+  var snappedLineRect = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
   var layerID = scene === null || scene === void 0 ? void 0 : scene.selectedLayer;
   var layer = scene === null || scene === void 0 || (_scene$layers = scene.layers) === null || _scene$layers === void 0 || (_scene$layers$get = _scene$layers.get) === null || _scene$layers$get === void 0 ? void 0 : _scene$layers$get.call(_scene$layers, layerID);
   if (!layer || !layer.items) return {
@@ -765,6 +766,39 @@ export function getAllItemSpecified(scene, catalog, filter) {
 
     // Current vs others
     var rect = getCalcRectFromItem3D(val);
+
+    // check current item is snapped to the [snappedLineRect]
+    if (!isEmpty(snappedLineRect)) {
+      var isSnapped = false;
+      var overlapList = [OVERLAP_INCLUDED, OVERLAP_SAME, OVERLAP_SOME];
+      for (var i = 0; i < (rect === null || rect === void 0 || (_rect$rect = rect.rect) === null || _rect$rect === void 0 ? void 0 : _rect$rect.length); i++) {
+        var _rect$rect;
+        if (isSnapped) break;
+        var curItemPt = rect.rect[i];
+        var nextItemPt = i === rect.rect.length - 1 ? rect.rect[0] : rect.rect[i + 1];
+        var srcLine = {
+          x1: curItemPt.x,
+          y1: curItemPt.y,
+          x2: nextItemPt.x,
+          y2: nextItemPt.y
+        };
+        for (var j = 0; j < (snappedLineRect === null || snappedLineRect === void 0 ? void 0 : snappedLineRect.length); j++) {
+          var curLineRectPt = snappedLineRect[j];
+          var nextLineRectPt = j === snappedLineRect.length - 1 ? snappedLineRect[0] : snappedLineRect[j + 1];
+          var destLine = {
+            x1: curLineRectPt.x,
+            y1: curLineRectPt.y,
+            x2: nextLineRectPt.x,
+            y2: nextLineRectPt.y
+          };
+          if (overlapList.includes(relationshipOfTwoOverlappedLines(srcLine, destLine).result)) {
+            isSnapped = true;
+            break;
+          }
+        }
+      }
+      if (!isSnapped) return;
+    }
     if (item.selected) {
       curiteminfo = rect;
     } else {
@@ -2743,15 +2777,15 @@ export function getSnappedWallLines(item, layer, catalog) {
       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
+          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[1].y,
-          x2: v1.x,
-          y2: v1.y
+          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) {
@@ -2760,6 +2794,7 @@ export function getSnappedWallLines(item, layer, catalog) {
           var snapSide = 'unknown';
           if (idx < 0) snappedWallLines.push({
             id: rectLines[j].lineId,
+            lineRect: rectLines[j].rect,
             snapSide: snapSide
           });else snappedWallLines[idx].snapSide = snapSide;
         }
@@ -2799,6 +2834,7 @@ export function getSnappedWallLines(item, layer, catalog) {
           var snapSide = _i === 0 || _i === 2 ? 'front' : 'side';
           if (idx < 0) snappedWallLines.push({
             id: rectLines[_j].lineId,
+            lineRect: rectLines[_j].rect,
             snapSide: snapSide
           });else snappedWallLines[idx].snapSide = snapSide;
         }