kitchen-simulator 10.0.1 → 10.0.4

package/es/catalog/cabinet/cabinet-assembly-order.js

@@ -0,0 +1,36 @@
+// Sort the keys of a cabinet assembly so nested parts can be attached in the
+// correct order (e.g. drawer-door assets are inserted into placeholder nodes
+// that exist only after the drawer interior is loaded).
+export function orderCabinetAssemblyKeys(cabinetAssembly) {
+  var keys = Object.keys(cabinetAssembly || {});
+  var keyPriority = function keyPriority(key) {
+    if (key === 'base' || key === 'animation' || key === 'placeholders' || key === 'tempPlaceholders' || key === 'model') {
+      return 1000;
+    }
+
+    // Drawer interiors (NOT door)
+    if (key.startsWith('base_drawer_') && !key.includes('_door')) return 10;
+    // Fixed drawer interiors (NOT door)
+    if (key.startsWith('base_fixed_drawer_') && !key.includes('door')) return 10;
+
+    // Drawer doors
+    if (key.startsWith('base_drawer_door_')) return 20;
+    if (key.startsWith('base_fixed_drawer_door_')) return 20;
+
+    // Drawer door handles
+    if (key.startsWith('drawer_door_handle_')) return 30;
+    if (key.startsWith('fixed_drawer_door_handle_')) return 30;
+    return 50;
+  };
+  return keys.map(function (k, idx) {
+    return {
+      k: k,
+      idx: idx
+    };
+  }).sort(function (a, b) {
+    return keyPriority(a.k) - keyPriority(b.k) || a.idx - b.idx;
+  }).map(function (_ref) {
+    var k = _ref.k;
+    return k;
+  });
+}

package/es/catalog/utils/item-loader.js

@@ -14,6 +14,7 @@ import * as GeomUtils from "./geom-utils";
 import { loadGLTF } from "./load-obj";
 import { animateDoor, getSkuAliasFromCatalogElement, isEmpty, translateDrawer } from "../../utils/helper";
 import { isWarningItem } from "../../components/viewer2d/utils";
+import { orderCabinetAssemblyKeys } from "../cabinet/cabinet-assembly-order";
 var INITIAL_NORMAL_MAP = '';
 
 // env Map ///////////////
@@ -754,7 +755,7 @@ export function render3DItem(element, layer, scene, sizeinfo, structure_json, is
     return object1;
   };
   // keys in structure
-  var keys = Object.keys(structure);
+  var keys = orderCabinetAssemblyKeys(structure);
   // if exist in cached Objects
   if (element.type + color + 'doorStyle' + JSON.stringify(doorStyles.toJS()) + element.counterTop.uri in cachedObject) {
     var _objGroup = cachedObject[element.type + color + 'doorStyle' + JSON.stringify(doorStyles.toJS())].clone();

package/es/events/external/handlers.changeDoorStyle.js

@@ -49,7 +49,6 @@ function _handleChangeDoorStyleEvent() {
                     return item.itemID === v.itemID && item.name === v.name && doorStyle.id === v.doorFinishId;
                   })) {
                     ccdf_list.push({
-                      ccdfId: item.ccdf.id,
                       itemID: item.itemID,
                       prototype: item.prototype,
                       category: item.category,

package/lib/catalog/cabinet/cabinet-assembly-order.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.orderCabinetAssemblyKeys = orderCabinetAssemblyKeys;
+// Sort the keys of a cabinet assembly so nested parts can be attached in the
+// correct order (e.g. drawer-door assets are inserted into placeholder nodes
+// that exist only after the drawer interior is loaded).
+function orderCabinetAssemblyKeys(cabinetAssembly) {
+  var keys = Object.keys(cabinetAssembly || {});
+  var keyPriority = function keyPriority(key) {
+    if (key === 'base' || key === 'animation' || key === 'placeholders' || key === 'tempPlaceholders' || key === 'model') {
+      return 1000;
+    }
+
+    // Drawer interiors (NOT door)
+    if (key.startsWith('base_drawer_') && !key.includes('_door')) return 10;
+    // Fixed drawer interiors (NOT door)
+    if (key.startsWith('base_fixed_drawer_') && !key.includes('door')) return 10;
+
+    // Drawer doors
+    if (key.startsWith('base_drawer_door_')) return 20;
+    if (key.startsWith('base_fixed_drawer_door_')) return 20;
+
+    // Drawer door handles
+    if (key.startsWith('drawer_door_handle_')) return 30;
+    if (key.startsWith('fixed_drawer_door_handle_')) return 30;
+    return 50;
+  };
+  return keys.map(function (k, idx) {
+    return {
+      k: k,
+      idx: idx
+    };
+  }).sort(function (a, b) {
+    return keyPriority(a.k) - keyPriority(b.k) || a.idx - b.idx;
+  }).map(function (_ref) {
+    var k = _ref.k;
+    return k;
+  });
+}

package/lib/catalog/utils/item-loader.js

@@ -25,6 +25,7 @@ var GeomUtils = _interopRequireWildcard(require("./geom-utils"));
 var _loadObj = require("./load-obj");
 var _helper = require("../../utils/helper");
 var _utils = require("../../components/viewer2d/utils");
+var _cabinetAssemblyOrder = require("../cabinet/cabinet-assembly-order");
 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" != _typeof3(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 _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); 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; }
@@ -768,7 +769,7 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
     return object1;
   };
   // keys in structure
-  var keys = Object.keys(structure);
+  var keys = (0, _cabinetAssemblyOrder.orderCabinetAssemblyKeys)(structure);
   // if exist in cached Objects
   if (element.type + color + 'doorStyle' + JSON.stringify(doorStyles.toJS()) + element.counterTop.uri in cachedObject) {
     var _objGroup = cachedObject[element.type + color + 'doorStyle' + JSON.stringify(doorStyles.toJS())].clone();

package/lib/events/external/handlers.changeDoorStyle.js

@@ -56,7 +56,6 @@ function _handleChangeDoorStyleEvent() {
                     return item.itemID === v.itemID && item.name === v.name && doorStyle.id === v.doorFinishId;
                   })) {
                     ccdf_list.push({
-                      ccdfId: item.ccdf.id,
                       itemID: item.itemID,
                       prototype: item.prototype,
                       category: item.category,

package/package.json

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