kitchen-simulator 11.30.1 → 11.30.3

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/mappings/external-events/mapExternalEventPayload.js

@@ -9,10 +9,10 @@ var _helper = require("../../utils/helper");
 var _addItemMapper = require("./mappers/addItemMapper");
 var _changeDoorStyleMapper = require("./mappers/changeDoorStyleMapper");
 var _loadProjectMapper = require("./mappers/loadProjectMapper");
-/**
- * Main dispatcher for external event payload mapping.
- * Converts new API formats into legacy internal formats (e.g. assets3d -> structure_json)
- * without changing the behavior of the existing 3D tool.
+/**
+ * Main dispatcher for external event payload mapping.
+ * Converts new API formats into legacy internal formats (e.g. assets3d -> structure_json)
+ * without changing the behavior of the existing 3D tool.
  */
 function mapExternalEventPayload(evt, state, defaultTextures) {
   if ((0, _helper.isEmpty)(evt)) return null;

package/lib/mappings/external-events/mappers/addItemMapper.js

@@ -11,15 +11,15 @@ var _constants = require("../../../constants");
 var _helper = require("../../../utils/helper");
 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; }
-/**
- * Mapping logic for EXTERNAL_EVENT_ADD_ITEM.
- *
- * Converts the new assets3d payload shape into the legacy structure_json format
- * expected by the existing 3D tool.
- *
- * @param {Object} evt.payload   External event payload
- * @param {Immutable.Map} state Planner state
- * @returns {Object|null} Updated event (or null when payload is empty)
+/**
+ * Mapping logic for EXTERNAL_EVENT_ADD_ITEM.
+ *
+ * Converts the new assets3d payload shape into the legacy structure_json format
+ * expected by the existing 3D tool.
+ *
+ * @param {Object} evt.payload   External event payload
+ * @param {Immutable.Map} state Planner state
+ * @returns {Object|null} Updated event (or null when payload is empty)
  */
 function mapAddItemEvent(orgEvtPayload, state) {
   var _evtPayload, _evtPayload3;

package/lib/shared/domain/asset/sanitize-asset-url.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sanitizeAssetUrl = void 0;
-/**
- * Strip stray dots from the **path portion** of a GLTF/BIN URL.
- * e.g. `…/B36_36x34.5x24.gltf` → `…/B36_36x345x24.gltf`
- *
- * Leaves the protocol/domain and the final file extension untouched.
+/**
+ * Strip stray dots from the **path portion** of a GLTF/BIN URL.
+ * e.g. `…/B36_36x34.5x24.gltf` → `…/B36_36x345x24.gltf`
+ *
+ * Leaves the protocol/domain and the final file extension untouched.
  */
 var sanitizeAssetUrl = exports.sanitizeAssetUrl = function sanitizeAssetUrl(url) {
   if (!url) return url;

package/lib/shared/math/line-metrics.js

@@ -14,17 +14,17 @@ function getVertex(vertices, vertexId) {
   return typeof vertices.get === 'function' ? vertices.get(vertexId) : vertices[vertexId];
 }
 
-/**
- * Computes a line length using its 2 vertices.
- *
- * Assumptions (matches existing DRAG logic):
- * - vertex coordinates are stored in centimeters
- * - result is converted to the provided unit
- *
- * @param {object} line - line object/record with `vertices` (array or immutable List)
- * @param {object} vertices - vertices collection (plain object map or immutable Map)
- * @param {string} unit - target unit (e.g. 'in', 'cm')
- * @returns {number|null}
+/**
+ * Computes a line length using its 2 vertices.
+ *
+ * Assumptions (matches existing DRAG logic):
+ * - vertex coordinates are stored in centimeters
+ * - result is converted to the provided unit
+ *
+ * @param {object} line - line object/record with `vertices` (array or immutable List)
+ * @param {object} vertices - vertices collection (plain object map or immutable Map)
+ * @param {string} unit - target unit (e.g. 'in', 'cm')
+ * @returns {number|null}
  */
 function getLineLength(line, vertices) {
   var _v0$x, _v1$x, _v0$y, _v1$y;

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/lib/utils/skinPanelEngine.js

@@ -145,10 +145,10 @@ function isSnappedWithCornerCabient(srcItem, desItem) {
   } else return false;
 }
 
-/**
- * @param {*} faceSegs
- * @param {*} otherFaces
- * @returns
+/**
+ * @param {*} faceSegs
+ * @param {*} otherFaces
+ * @returns
  */
 function getTrimmedFaceSegs(faceSegs, otherFaces, cnt) {
   try {
@@ -309,8 +309,8 @@ function applyGroupingRules(faces) {
   };
 }
 
-/**
- * Horizontal Grouping (for base cabinets back-to-back : BSV48 48" x 34.5")
+/**
+ * Horizontal Grouping (for base cabinets back-to-back : BSV48 48" x 34.5")
  */
 function applyHorizontalGrouping(faces) {
   var removeIdxs = [];
@@ -352,8 +352,8 @@ function applyHorizontalGrouping(faces) {
   };
 }
 
-/**
- * Vertical Grouping (For CT3DR or CT2DR SKUs + stacked wall cabinets)
+/**
+ * Vertical Grouping (For CT3DR or CT2DR SKUs + stacked wall cabinets)
  */
 function applyVerticalGrouping(faces) {
   var removeIdxs = [];
@@ -444,8 +444,8 @@ function buildMP3SkinPanelArray(bottomHeight, topHeight, mp3SkinPanelArray) {
   return skinPanelTypeArray;
 }
 
-/**
- * Decide which skin panel pieces are needed for a tall cabinet.
+/**
+ * Decide which skin panel pieces are needed for a tall cabinet.
  */
 function resolveTallCabinetBundle(face) {
   var item = face.itemInfo;
@@ -465,8 +465,8 @@ function resolveTallCabinetBundle(face) {
   return face !== null && face !== void 0 && face.skinPanelSKU ? [face.skinPanelSKU] : [];
 }
 
-/**
- * Converts a face → list of SKUs
+/**
+ * Converts a face → list of SKUs
  */
 function resolveSkinPanelSKU(face) {
   var layout = face.itemInfo.layoutpos;
@@ -476,8 +476,8 @@ function resolveSkinPanelSKU(face) {
   return [face.skinPanelSKU];
 }
 
-/**
- * Make skin panel data with grouping skinPanelSKU & doorStyle
+/**
+ * Make skin panel data with grouping skinPanelSKU & doorStyle
  */
 function buildSkinPanelData(faces) {
   var tempResult = [];

package/package.json

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