kitchen-simulator 11.30.2 → 11.30.3

package/es/components/viewer2d/viewer2d.js

@@ -17,6 +17,7 @@ import { Map } from 'immutable';
 import { formatNumber } from "../../utils/math";
 import { isEmpty, updatePayloadOfInternalEvent } from "../../utils/helper"; // variables
 import { isWarningCabinet } from "../../shared/domain/cabinet-warning";
+import { shouldBypassItemIntersectionValidation } from "../../engine/2d/viewer-utils";
 // variables
 var pinFlag = false;
 var sFlag = false; //for all object move
@@ -569,6 +570,7 @@ export default function Viewer2D(_ref, _ref2) {
     }
   };
   var onMouseMove = function onMouseMove(viewerEvent) {
+    var _allItemRect$cur2;
     //workaround that allow imageful component to work
 
     // let evt = new Event('mousemove-planner-event');
@@ -632,6 +634,7 @@ export default function Viewer2D(_ref, _ref2) {
             endPoint.x = x;
             endPoint.y = y;
           } else {
+            var _allItemRect$cur;
             prepareSnap();
             var _GeometryUtils$calcSn = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
               nx = _GeometryUtils$calcSn.nx,
@@ -675,19 +678,8 @@ export default function Viewer2D(_ref, _ref2) {
               y: ny
             };
             var _isrectSect = GeometryUtils.validInterSect(allItemRect.others, _val);
-            if (_isrectSect && _isSect) {
-              itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-              itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-              endPoint.x = nx;
-              endPoint.y = ny;
-            }
-            if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('cabinet')) {
-              itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-              itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-              endPoint.x = nx;
-              endPoint.y = ny;
-            }
-            if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Hood') || allItemRect.cur.itemInfo.cabinet_category.toLowerCase().includes('hood') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Range') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+            var _isCabinet = (_allItemRect$cur = allItemRect.cur) === null || _allItemRect$cur === void 0 ? void 0 : _allItemRect$cur.itemInfo.name.includes('cabinet');
+            if (_isrectSect && _isSect || _isCabinet || shouldBypassItemIntersectionValidation(allItemRect.cur)) {
               itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
               itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
               endPoint.x = nx;
@@ -751,15 +743,8 @@ export default function Viewer2D(_ref, _ref2) {
             y: ny
           };
           var isrectSect = GeometryUtils.validInterSect(allItemRect.others, val);
-          if (isrectSect && isSect) {
-            itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-            itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-          }
-          if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cabinet')) {
-            itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-            itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-          }
-          if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Hood') || allItemRect.cur.itemInfo.cabinet_category.toLowerCase().includes('hood') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Range') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+          var isCabinet = (_allItemRect$cur2 = allItemRect.cur) === null || _allItemRect$cur2 === void 0 ? void 0 : _allItemRect$cur2.itemInfo.name.includes('Cabinet');
+          if (isrectSect && isSect || isCabinet || shouldBypassItemIntersectionValidation(allItemRect.cur)) {
             itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
             itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
           }

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

@@ -18,6 +18,7 @@ import { animateDoor, isElevationView, isEmpty, isImmutable, replaceMeshesWithLi
 import { formatNumber } from "../../utils/math";
 import { toJSIfNeeded } from "../../shared/objects/immutable";
 import { isCornerCabinet } from "../../shared/domain/cabinet-corner";
+import { APPLIANCE_CATEGORY_DISHWASHER } from "../../constants/applianceCategories";
 export var fVLine = [];
 var scene_mode = null;
 export function parseData(sceneData, actions, catalog, camera, renderer, mode) {
@@ -2474,13 +2475,13 @@ export function createMDFromItem(item, lines, molding) {
   };
 }
 function tryAdjacent(ct1, ct2) {
-  if (ct1.catid.includes('Dishwasher') && ct1.catid.includes('BF')) {
+  if (ct1.catid.includes(APPLIANCE_CATEGORY_DISHWASHER) && ct1.catid.includes('BF')) {
     var temp = ct1;
     ct1 = ct2;
     ct2 = temp;
   }
   log('----tryAdjacent', ct1.id, ct2.id);
-  if (!ct2.catid.includes('Dishwasher') && !ct2.catid.includes('BF') && ct1.catid != ct2.catid) return false;
+  if (!ct2.catid.includes(APPLIANCE_CATEGORY_DISHWASHER) && !ct2.catid.includes('BF') && ct1.catid != ct2.catid) return false;
   if (ct1.items[0].layoutpos === 'Vanity' || ct2.items[0].layoutpos === 'Vanity') return false;
   if (ct1.rotRad != ct2.rotRad) return false;
   log('ct1', ct1.pos.x, ct1.pos.y, ct1.size.width);
@@ -2625,7 +2626,7 @@ function showItemCT(item, CT, visible, planData, layer) {
   });
 }
 function getCountertopMesh(item, visible, planData, layer) {
-  if (item.type.includes('Dishwasher')) return undefined;
+  if (item.type.includes(APPLIANCE_CATEGORY_DISHWASHER)) return undefined;
   if (item.type.includes('BF')) return undefined;
   var item3D = planData.sceneGraph.layers[layer.id].items[item.id];
   var countertop = null;
@@ -2695,10 +2696,10 @@ function addCTMesh(countertop, planData, layer) {
       var pivotMat = ctMesh.parent.parent.matrix;
       pivotMat.setPosition(new Three.Vector3(countertop.pos.x, 0, -countertop.pos.y));
       var width = countertop.items.find(function (ct) {
-        return !ct.type.includes('Dishwasher') && !ct.type.includes('BF');
+        return !ct.type.includes(APPLIANCE_CATEGORY_DISHWASHER) && !ct.type.includes('BF');
       }).properties.get('width').get('_length');
       var unit_width = countertop.items.find(function (ct) {
-        return !ct.type.includes('Dishwasher') && !ct.type.includes('BF');
+        return !ct.type.includes(APPLIANCE_CATEGORY_DISHWASHER) && !ct.type.includes('BF');
       }).properties.get('width').get('_unit') || 'cm';
       width = convert(width).from(unit_width).to('cm');
       pivotMat.scale(new Three.Vector3(countertop.size.width / width, 1, 1));

package/es/constants/applianceCategories.js

@@ -0,0 +1,19 @@
+// Appliance category/name constants
+//
+// NOTE: Keep these in a small dedicated module instead of adding more
+// hardcoded strings into src/constants.js (which is already very large).
+
+// wall-like appliances
+export var APPLIANCE_CATEGORY_COOK_TOP = 'Cook Top';
+export var APPLIANCE_CATEGORY_MICROWAVE = 'Microwave';
+export var APPLIANCE_CATEGORY_HOOD = 'Hood';
+
+// base-like appliances
+export var APPLIANCE_CATEGORY_DISHWASHER = 'Dishwasher';
+export var APPLIANCE_CATEGORY_REFRIGERATOR = 'Refrigerator';
+export var APPLIANCE_CATEGORY_RANGE = 'Range';
+
+// Categories that we exclude from some snapping/overlap logic.
+// (exported as an array so call-sites can create their own Set and avoid
+// accidental shared mutation)
+export var EXCLUDED_APPLIANCE_CATEGORIES = Object.freeze([APPLIANCE_CATEGORY_COOK_TOP, APPLIANCE_CATEGORY_MICROWAVE, APPLIANCE_CATEGORY_HOOD]);

package/es/engine/2d/viewer-utils.js

@@ -0,0 +1,20 @@
+import { APPLIANCE_CATEGORY_COOK_TOP, APPLIANCE_CATEGORY_HOOD, APPLIANCE_CATEGORY_RANGE } from "../../constants/applianceCategories";
+
+/**
+ * Returns `true` for items that are intentionally allowed to overlap other
+ * elements while being placed/dragged in the 2D viewer.
+ *
+ * Why this exists:
+ * - `GeometryUtils.validInterSect(...)` is used as a collision/intersection gate.
+ * - Some appliances (e.g. cooktops/ranges/hoods) are expected to be placed "on"
+ *   or "inside" cabinetry/countertops, so they must not be blocked by that gate.
+ *
+ * NOTE: This currently identifies items by the appliance category strings found
+ * in `itemInfo.name` / `itemInfo.cabinet_category`.
+ */
+export var shouldBypassItemIntersectionValidation = function shouldBypassItemIntersectionValidation(itemRect) {
+  var itemInfo = itemRect === null || itemRect === void 0 ? void 0 : itemRect.itemInfo;
+  var name = typeof (itemInfo === null || itemInfo === void 0 ? void 0 : itemInfo.name) === 'string' ? itemInfo.name : '';
+  var cabinetCategory = typeof (itemInfo === null || itemInfo === void 0 ? void 0 : itemInfo.cabinet_category) === 'string' ? itemInfo.cabinet_category : '';
+  return name.includes(APPLIANCE_CATEGORY_HOOD) || cabinetCategory.toLowerCase().includes(APPLIANCE_CATEGORY_HOOD.toLowerCase()) || name.includes(APPLIANCE_CATEGORY_RANGE) || name.includes(APPLIANCE_CATEGORY_COOK_TOP);
+};

package/es/utils/geometry.js

@@ -15,6 +15,8 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
  */
 import { fAbs, toFixedFloat } from "./math.js";
 import { BASE_CABINET_LAYOUTPOS, EPSILON, LINE_THICKNESS, MEPSILON, OVERLAP_INCLUDED, OVERLAP_LINK, OVERLAP_NONE, OVERLAP_SAME, OVERLAP_SOME, UNIT_ANGLE, WALL_CABINET_LAYOUTPOS } from "../constants";
+import { APPLIANCE_CATEGORY_COOK_TOP, APPLIANCE_CATEGORY_HOOD, EXCLUDED_APPLIANCE_CATEGORIES } from "../constants/applianceCategories";
+import { shouldBypassItemIntersectionValidation } from "../engine/2d/viewer-utils.js";
 import { convert } from "./convert-units-lite";
 import * as Three from 'three';
 import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils.js";
@@ -729,8 +731,9 @@ export function getAllItemSpecified(scene, catalog, filter) {
   };
   var curiteminfo;
   var iteminfo = [];
+  var excludedApplianceCategories = new Set(EXCLUDED_APPLIANCE_CATEGORIES);
   layer.items.forEach(function (item) {
-    var _cat$obj;
+    var _cat$obj, _cat$obj2;
     if (!item) return;
     var val = {
       pos: {
@@ -756,11 +759,9 @@ export function getAllItemSpecified(scene, catalog, filter) {
     val.item = item;
 
     // Filter check
-    if (Array.isArray(filter)) {
-      if (!val.layoutpos || !filter.includes(val.layoutpos)) return;
-    } else if (val.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;
-    }
+    var isExcludedItem = isEmpty(cat) || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && excludedApplianceCategories.has(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category) || excludedApplianceCategories.has(cat === null || cat === void 0 || (_cat$obj2 = cat.obj) === null || _cat$obj2 === void 0 ? void 0 : _cat$obj2.cabinet_category);
+    var layoutMatches = Array.isArray(filter) ? !!val.layoutpos && filter.includes(val.layoutpos) : val.layoutpos === filter;
+    if (!layoutMatches || isExcludedItem) return;
 
     // Current vs others
     var rect = getCalcRectFromItem3D(val);
@@ -1633,7 +1634,7 @@ export function calcSnap2(allItemRect, allItemSnap, allLineRects, allLineSnap, a
             rotRad = snap.rotRad;
           }
         });
-        if (allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+        if (allItemRect.cur.itemInfo.name.includes(APPLIANCE_CATEGORY_COOK_TOP)) {
           var intersects = allItemRect.others.filter(function (others) {
             return intersectRect(others.rect, curitem.rect);
           });
@@ -1645,12 +1646,12 @@ export function calcSnap2(allItemRect, allItemSnap, allLineRects, allLineSnap, a
             }
           });
         }
-        if (allItemRect.cur.itemInfo.name.includes('Hood') || allItemRect.cur.itemInfo.cabinet_category.toLowerCase().includes('hood') || allItemRect.cur.itemInfo.name.includes('Range') || allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+        if (shouldBypassItemIntersectionValidation(allItemRect.cur)) {
           var _intersects = allItemRect.others.filter(function (others) {
             return intersectRect(others.rect, curitem.rect);
           });
           _intersects.forEach(function (rect) {
-            if (isPointInArea(allArea, rect.itemInfo) || !allArea.length) if (rect.itemInfo.name.includes('Hood') || rect.itemInfo.cabinet_category.toLowerCase().includes('hood') || rect.itemInfo.name.includes('Range') || rect.itemInfo.name.includes('Cook Top')) {
+            if ((isPointInArea(allArea, rect.itemInfo) || !allArea.length) && shouldBypassItemIntersectionValidation(rect)) {
               nx = rect.itemInfo.x;
               ny = rect.itemInfo.y;
               rotRad = rect.itemInfo.rotation * Math.PI / 180;
@@ -2039,9 +2040,9 @@ export function needSnap(curItem, othItem) {
   var isBlsnapOth = othItem.item.category === 'cabinet' && othItem.item.layoutpos === BASE_CABINET_LAYOUTPOS && Math.abs(curFloor - otherFloor) >= delta;
   var isBlsnapCur = curItem.selectedItem.category === 'cabinet' && curItem.selectedItem.layoutpos === BASE_CABINET_LAYOUTPOS && Math.abs(curFloor - otherFloor) >= delta;
   if (curItem.cat.hasOwnProperty('long_name') || othItem.cat && othItem.cat.hasOwnProperty('long_name')) {
-    if (curItem.cat.long_name.includes('Hood') || othItem.cat && othItem.cat.long_name.includes('Hood')) blSnap = true;
-    if (curItem.cat.long_name.includes('Hood') && othItem.cat && isBlsnapOth || isBlsnapCur && othItem.cat.long_name.includes('Hood')) blSnap = false;
-    if (curItem.cat.long_name.includes('Cook Top') && othItem.cat && othItem.cat.long_name.includes('Cabinet') || curItem.cat.long_name.includes('Cabinet') && othItem.cat && othItem.cat.long_name.includes('Cook Top')) blSnap = true;
+    if (curItem.cat.long_name.includes(APPLIANCE_CATEGORY_HOOD) || othItem.cat && othItem.cat.long_name.includes(APPLIANCE_CATEGORY_HOOD)) blSnap = true;
+    if (curItem.cat.long_name.includes(APPLIANCE_CATEGORY_HOOD) && othItem.cat && isBlsnapOth || isBlsnapCur && othItem.cat.long_name.includes(APPLIANCE_CATEGORY_HOOD)) blSnap = false;
+    if (curItem.cat.long_name.includes(APPLIANCE_CATEGORY_COOK_TOP) && othItem.cat && othItem.cat.long_name.includes('Cabinet') || curItem.cat.long_name.includes('Cabinet') && othItem.cat && othItem.cat.long_name.includes(APPLIANCE_CATEGORY_COOK_TOP)) blSnap = true;
   }
   return blSnap;
 }

package/lib/components/viewer2d/viewer2d.js

@@ -23,6 +23,7 @@ var _immutable = require("immutable");
 var _math = require("../../utils/math");
 var _helper = require("../../utils/helper");
 var _cabinetWarning = require("../../shared/domain/cabinet-warning");
+var _viewerUtils = require("../../engine/2d/viewer-utils");
 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); }
 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; } // variables
@@ -578,6 +579,7 @@ function Viewer2D(_ref, _ref2) {
     }
   };
   var onMouseMove = function onMouseMove(viewerEvent) {
+    var _allItemRect$cur2;
     //workaround that allow imageful component to work
 
     // let evt = new Event('mousemove-planner-event');
@@ -641,6 +643,7 @@ function Viewer2D(_ref, _ref2) {
             endPoint.x = x;
             endPoint.y = y;
           } else {
+            var _allItemRect$cur;
             prepareSnap();
             var _GeometryUtils$calcSn = _export2.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
               nx = _GeometryUtils$calcSn.nx,
@@ -684,19 +687,8 @@ function Viewer2D(_ref, _ref2) {
               y: ny
             };
             var _isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, _val);
-            if (_isrectSect && _isSect) {
-              itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-              itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-              endPoint.x = nx;
-              endPoint.y = ny;
-            }
-            if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('cabinet')) {
-              itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-              itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-              endPoint.x = nx;
-              endPoint.y = ny;
-            }
-            if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Hood') || allItemRect.cur.itemInfo.cabinet_category.toLowerCase().includes('hood') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Range') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+            var _isCabinet = (_allItemRect$cur = allItemRect.cur) === null || _allItemRect$cur === void 0 ? void 0 : _allItemRect$cur.itemInfo.name.includes('cabinet');
+            if (_isrectSect && _isSect || _isCabinet || (0, _viewerUtils.shouldBypassItemIntersectionValidation)(allItemRect.cur)) {
               itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
               itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
               endPoint.x = nx;
@@ -760,15 +752,8 @@ function Viewer2D(_ref, _ref2) {
             y: ny
           };
           var isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, val);
-          if (isrectSect && isSect) {
-            itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-            itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-          }
-          if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cabinet')) {
-            itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
-            itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
-          }
-          if (allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Hood') || allItemRect.cur.itemInfo.cabinet_category.toLowerCase().includes('hood') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Range') || allItemRect.cur && allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+          var isCabinet = (_allItemRect$cur2 = allItemRect.cur) === null || _allItemRect$cur2 === void 0 ? void 0 : _allItemRect$cur2.itemInfo.name.includes('Cabinet');
+          if (isrectSect && isSect || isCabinet || (0, _viewerUtils.shouldBypassItemIntersectionValidation)(allItemRect.cur)) {
             itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
             itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
           }

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

@@ -49,6 +49,7 @@ var _helper = require("../../utils/helper");
 var _math = require("../../utils/math");
 var _immutable = require("../../shared/objects/immutable");
 var _cabinetCorner = require("../../shared/domain/cabinet-corner");
+var _applianceCategories = require("../../constants/applianceCategories");
 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); }
 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; }
@@ -2508,13 +2509,13 @@ function createMDFromItem(item, lines, molding) {
   };
 }
 function tryAdjacent(ct1, ct2) {
-  if (ct1.catid.includes('Dishwasher') && ct1.catid.includes('BF')) {
+  if (ct1.catid.includes(_applianceCategories.APPLIANCE_CATEGORY_DISHWASHER) && ct1.catid.includes('BF')) {
     var temp = ct1;
     ct1 = ct2;
     ct2 = temp;
   }
   log('----tryAdjacent', ct1.id, ct2.id);
-  if (!ct2.catid.includes('Dishwasher') && !ct2.catid.includes('BF') && ct1.catid != ct2.catid) return false;
+  if (!ct2.catid.includes(_applianceCategories.APPLIANCE_CATEGORY_DISHWASHER) && !ct2.catid.includes('BF') && ct1.catid != ct2.catid) return false;
   if (ct1.items[0].layoutpos === 'Vanity' || ct2.items[0].layoutpos === 'Vanity') return false;
   if (ct1.rotRad != ct2.rotRad) return false;
   log('ct1', ct1.pos.x, ct1.pos.y, ct1.size.width);
@@ -2659,7 +2660,7 @@ function showItemCT(item, CT, visible, planData, layer) {
   });
 }
 function getCountertopMesh(item, visible, planData, layer) {
-  if (item.type.includes('Dishwasher')) return undefined;
+  if (item.type.includes(_applianceCategories.APPLIANCE_CATEGORY_DISHWASHER)) return undefined;
   if (item.type.includes('BF')) return undefined;
   var item3D = planData.sceneGraph.layers[layer.id].items[item.id];
   var countertop = null;
@@ -2729,10 +2730,10 @@ function addCTMesh(countertop, planData, layer) {
       var pivotMat = ctMesh.parent.parent.matrix;
       pivotMat.setPosition(new Three.Vector3(countertop.pos.x, 0, -countertop.pos.y));
       var width = countertop.items.find(function (ct) {
-        return !ct.type.includes('Dishwasher') && !ct.type.includes('BF');
+        return !ct.type.includes(_applianceCategories.APPLIANCE_CATEGORY_DISHWASHER) && !ct.type.includes('BF');
       }).properties.get('width').get('_length');
       var unit_width = countertop.items.find(function (ct) {
-        return !ct.type.includes('Dishwasher') && !ct.type.includes('BF');
+        return !ct.type.includes(_applianceCategories.APPLIANCE_CATEGORY_DISHWASHER) && !ct.type.includes('BF');
       }).properties.get('width').get('_unit') || 'cm';
       width = (0, _convertUnitsLite.convert)(width).from(unit_width).to('cm');
       pivotMat.scale(new Three.Vector3(countertop.size.width / width, 1, 1));

package/lib/constants/applianceCategories.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EXCLUDED_APPLIANCE_CATEGORIES = exports.APPLIANCE_CATEGORY_REFRIGERATOR = exports.APPLIANCE_CATEGORY_RANGE = exports.APPLIANCE_CATEGORY_MICROWAVE = exports.APPLIANCE_CATEGORY_HOOD = exports.APPLIANCE_CATEGORY_DISHWASHER = exports.APPLIANCE_CATEGORY_COOK_TOP = void 0;
+// Appliance category/name constants
+//
+// NOTE: Keep these in a small dedicated module instead of adding more
+// hardcoded strings into src/constants.js (which is already very large).
+
+// wall-like appliances
+var APPLIANCE_CATEGORY_COOK_TOP = exports.APPLIANCE_CATEGORY_COOK_TOP = 'Cook Top';
+var APPLIANCE_CATEGORY_MICROWAVE = exports.APPLIANCE_CATEGORY_MICROWAVE = 'Microwave';
+var APPLIANCE_CATEGORY_HOOD = exports.APPLIANCE_CATEGORY_HOOD = 'Hood';
+
+// base-like appliances
+var APPLIANCE_CATEGORY_DISHWASHER = exports.APPLIANCE_CATEGORY_DISHWASHER = 'Dishwasher';
+var APPLIANCE_CATEGORY_REFRIGERATOR = exports.APPLIANCE_CATEGORY_REFRIGERATOR = 'Refrigerator';
+var APPLIANCE_CATEGORY_RANGE = exports.APPLIANCE_CATEGORY_RANGE = 'Range';
+
+// Categories that we exclude from some snapping/overlap logic.
+// (exported as an array so call-sites can create their own Set and avoid
+// accidental shared mutation)
+var EXCLUDED_APPLIANCE_CATEGORIES = exports.EXCLUDED_APPLIANCE_CATEGORIES = Object.freeze([APPLIANCE_CATEGORY_COOK_TOP, APPLIANCE_CATEGORY_MICROWAVE, APPLIANCE_CATEGORY_HOOD]);

package/lib/engine/2d/viewer-utils.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldBypassItemIntersectionValidation = void 0;
+var _applianceCategories = require("../../constants/applianceCategories");
+/**
+ * Returns `true` for items that are intentionally allowed to overlap other
+ * elements while being placed/dragged in the 2D viewer.
+ *
+ * Why this exists:
+ * - `GeometryUtils.validInterSect(...)` is used as a collision/intersection gate.
+ * - Some appliances (e.g. cooktops/ranges/hoods) are expected to be placed "on"
+ *   or "inside" cabinetry/countertops, so they must not be blocked by that gate.
+ *
+ * NOTE: This currently identifies items by the appliance category strings found
+ * in `itemInfo.name` / `itemInfo.cabinet_category`.
+ */
+var shouldBypassItemIntersectionValidation = exports.shouldBypassItemIntersectionValidation = function shouldBypassItemIntersectionValidation(itemRect) {
+  var itemInfo = itemRect === null || itemRect === void 0 ? void 0 : itemRect.itemInfo;
+  var name = typeof (itemInfo === null || itemInfo === void 0 ? void 0 : itemInfo.name) === 'string' ? itemInfo.name : '';
+  var cabinetCategory = typeof (itemInfo === null || itemInfo === void 0 ? void 0 : itemInfo.cabinet_category) === 'string' ? itemInfo.cabinet_category : '';
+  return name.includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD) || cabinetCategory.toLowerCase().includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD.toLowerCase()) || name.includes(_applianceCategories.APPLIANCE_CATEGORY_RANGE) || name.includes(_applianceCategories.APPLIANCE_CATEGORY_COOK_TOP);
+};

package/lib/utils/geometry.js

@@ -107,6 +107,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _math = require("./math.js");
 var _constants = require("../constants");
+var _applianceCategories = require("../constants/applianceCategories");
+var _viewerUtils = require("../engine/2d/viewer-utils.js");
 var _convertUnitsLite = require("./convert-units-lite");
 var Three = _interopRequireWildcard(require("three"));
 var _utils = require("../components/viewer2d/utils.js");
@@ -833,8 +835,9 @@ function getAllItemSpecified(scene, catalog, filter) {
   };
   var curiteminfo;
   var iteminfo = [];
+  var excludedApplianceCategories = new Set(_applianceCategories.EXCLUDED_APPLIANCE_CATEGORIES);
   layer.items.forEach(function (item) {
-    var _cat$obj;
+    var _cat$obj, _cat$obj2;
     if (!item) return;
     var val = {
       pos: {
@@ -860,11 +863,9 @@ function getAllItemSpecified(scene, catalog, filter) {
     val.item = item;
 
     // Filter check
-    if (Array.isArray(filter)) {
-      if (!val.layoutpos || !filter.includes(val.layoutpos)) return;
-    } else if (val.layoutpos !== filter || (0, _helper.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;
-    }
+    var isExcludedItem = (0, _helper.isEmpty)(cat) || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && excludedApplianceCategories.has(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category) || excludedApplianceCategories.has(cat === null || cat === void 0 || (_cat$obj2 = cat.obj) === null || _cat$obj2 === void 0 ? void 0 : _cat$obj2.cabinet_category);
+    var layoutMatches = Array.isArray(filter) ? !!val.layoutpos && filter.includes(val.layoutpos) : val.layoutpos === filter;
+    if (!layoutMatches || isExcludedItem) return;
 
     // Current vs others
     var rect = getCalcRectFromItem3D(val);
@@ -1737,7 +1738,7 @@ function calcSnap2(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect,
             rotRad = snap.rotRad;
           }
         });
-        if (allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+        if (allItemRect.cur.itemInfo.name.includes(_applianceCategories.APPLIANCE_CATEGORY_COOK_TOP)) {
           var intersects = allItemRect.others.filter(function (others) {
             return intersectRect(others.rect, curitem.rect);
           });
@@ -1749,12 +1750,12 @@ function calcSnap2(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect,
             }
           });
         }
-        if (allItemRect.cur.itemInfo.name.includes('Hood') || allItemRect.cur.itemInfo.cabinet_category.toLowerCase().includes('hood') || allItemRect.cur.itemInfo.name.includes('Range') || allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+        if ((0, _viewerUtils.shouldBypassItemIntersectionValidation)(allItemRect.cur)) {
           var _intersects = allItemRect.others.filter(function (others) {
             return intersectRect(others.rect, curitem.rect);
           });
           _intersects.forEach(function (rect) {
-            if (isPointInArea(allArea, rect.itemInfo) || !allArea.length) if (rect.itemInfo.name.includes('Hood') || rect.itemInfo.cabinet_category.toLowerCase().includes('hood') || rect.itemInfo.name.includes('Range') || rect.itemInfo.name.includes('Cook Top')) {
+            if ((isPointInArea(allArea, rect.itemInfo) || !allArea.length) && (0, _viewerUtils.shouldBypassItemIntersectionValidation)(rect)) {
               nx = rect.itemInfo.x;
               ny = rect.itemInfo.y;
               rotRad = rect.itemInfo.rotation * Math.PI / 180;
@@ -2143,9 +2144,9 @@ function needSnap(curItem, othItem) {
   var isBlsnapOth = othItem.item.category === 'cabinet' && othItem.item.layoutpos === _constants.BASE_CABINET_LAYOUTPOS && Math.abs(curFloor - otherFloor) >= delta;
   var isBlsnapCur = curItem.selectedItem.category === 'cabinet' && curItem.selectedItem.layoutpos === _constants.BASE_CABINET_LAYOUTPOS && Math.abs(curFloor - otherFloor) >= delta;
   if (curItem.cat.hasOwnProperty('long_name') || othItem.cat && othItem.cat.hasOwnProperty('long_name')) {
-    if (curItem.cat.long_name.includes('Hood') || othItem.cat && othItem.cat.long_name.includes('Hood')) blSnap = true;
-    if (curItem.cat.long_name.includes('Hood') && othItem.cat && isBlsnapOth || isBlsnapCur && othItem.cat.long_name.includes('Hood')) blSnap = false;
-    if (curItem.cat.long_name.includes('Cook Top') && othItem.cat && othItem.cat.long_name.includes('Cabinet') || curItem.cat.long_name.includes('Cabinet') && othItem.cat && othItem.cat.long_name.includes('Cook Top')) blSnap = true;
+    if (curItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD) || othItem.cat && othItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD)) blSnap = true;
+    if (curItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD) && othItem.cat && isBlsnapOth || isBlsnapCur && othItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD)) blSnap = false;
+    if (curItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_COOK_TOP) && othItem.cat && othItem.cat.long_name.includes('Cabinet') || curItem.cat.long_name.includes('Cabinet') && othItem.cat && othItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_COOK_TOP)) blSnap = true;
   }
   return blSnap;
 }

package/package.json

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