kitchen-simulator 11.0.0-react.18 → 11.0.0

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/catalog.js

@@ -1,7 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import { PropertyColor, PropertyEnum, PropertyString, PropertyNumber, PropertyLengthMeasure, PropertyToggle, PropertyCheckbox, PropertyHidden, PropertyReadOnly } from "./properties/export";
 import { UNIT_CENTIMETER, UNIT_INCH } from "../constants";
 import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils";
 var Catalog = /*#__PURE__*/function () {
@@ -19,7 +18,6 @@ var Catalog = /*#__PURE__*/function () {
     };
     this.propertyTypes = {};
     this.unit = unit;
-    this.registerMultiplePropertyType([['color', PropertyColor, PropertyColor], ['enum', PropertyEnum, PropertyEnum], ['string', PropertyString, PropertyString], ['number', PropertyNumber, PropertyNumber], ['length-measure', PropertyLengthMeasure, PropertyLengthMeasure], ['toggle', PropertyToggle, PropertyToggle], ['checkbox', PropertyCheckbox, PropertyCheckbox], ['hidden', PropertyHidden, PropertyHidden], ['read-only', PropertyReadOnly, PropertyReadOnly]]);
   }
 
   /**

package/es/catalog/factories/area-factory-3d.js

@@ -1,7 +1,7 @@
 import * as Three from 'three';
 import { Box3, Mesh, MeshBasicMaterial, MeshPhysicalMaterial, RepeatWrapping, Shape, TextureLoader, Vector2 } from 'three';
 import * as SharedStyle from "../../shared-style";
-import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader.js';
+import { RGBELoader } from 'three/examples/jsm/loaders/RGBELoader';
 var params = {
   envMap: 'HDR',
   roughness: 0.9,
@@ -75,10 +75,6 @@ export function createArea(element, layer, scene, textures) {
   } else {
     color = SharedStyle.AREA_MESH_COLOR.unselected;
   }
-  if (texture.uri === undefined || texture.uri == '') {
-    // @todo THIS IS A TEMPORARY FIX TO HAVE A DEFAULT FLOOR TEXTURE
-    texture.uri = layer.floorStyle.uri || 'https://media.test.diydesignspace.com/uploads/CountTop/202203162950_2/texture/oak-barcelona-s.jpg';
-  }
   var shape = new Shape();
   shape.moveTo(vertices[0].x, vertices[0].y);
   for (var i = 1; i < vertices.length; i++) {

package/es/catalog/factories/wall-factory.js

@@ -16,7 +16,7 @@ var STYLE_LINE = {
   // strokeWidth:1
 };
 var STYLE_INTERIOR_LINE = {
-  strokeWidth: 2,
+  strokeWidth: 1,
   stroke: SharedStyle.INTERIOR_LINE.unselected
 };
 var STYLE_INTERIOR_LINE_SELECTED = {

package/es/catalog/utils/exporter.js

@@ -11,10 +11,12 @@ export default function (_ref) {
     description = _ref.description,
     prototype = _ref.prototype,
     base = _ref.base,
+    gltf = _ref.gltf,
     shape_svg = _ref.shape_svg,
     render2DItem = _ref.render2DItem,
     render3DItem = _ref.render3DItem,
     structure_json = _ref.structure_json,
+    ccdf_list = _ref.ccdf_list,
     layoutpos = _ref.layoutpos,
     is_corner = _ref.is_corner,
     alti = _ref.alti,
@@ -100,6 +102,7 @@ export default function (_ref) {
       is_corner: is_corner,
       shape_svg: shape_svg
     },
+    gltf: gltf,
     properties: _objectSpread(_objectSpread({
       altitude: {
         label: 'Distance from floor',
@@ -147,6 +150,7 @@ export default function (_ref) {
     obj: obj_property,
     cds: cds,
     structure_json: structure_json,
+    ccdf_list: ccdf_list,
     width_unit: widthUnit,
     length_unit: lengthUnit,
     height_unit: heightUnit,

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

@@ -12,8 +12,9 @@ import { ARROW_COLOR, BASE_CABINET_LAYOUTPOS, OBJTYPE_GROUP, OBJTYPE_MESH, SHADE
 import { Item } from "../../models";
 import * as GeomUtils from "./geom-utils";
 import { loadGLTF } from "./load-obj";
-import { animateDoor, isEmpty, translateDrawer } from "../../utils/helper";
-import { isWarningItem } from "../../components/viewer2d/utils";
+import { animateDoor, getCatalogCabinetSku, isEmpty, translateDrawer } from "../../utils/helper";
+import { isWarningCabinet } from "../../shared/domain/cabinet-warning";
+import { orderCabinetAssemblyKeys } from "../cabinet/cabinet-assembly-order";
 var INITIAL_NORMAL_MAP = '';
 
 // env Map ///////////////
@@ -122,23 +123,8 @@ export function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corn
   var lineCount = 0; //parseInt(((newWidth) / 8 - 0.51).toFixed(), 10) - 1;
   var rowCount = 0; //parseInt((element.type.length / lineCount - 0.51).toFixed(), 10);
 
-  // Get type
-  var objSKU = this.obj.sku_number;
-  if (objSKU.length !== 0) {
-    var dcId,
-      doorStyle = element.doorStyle;
-    if (doorStyle instanceof Map) {
-      dcId = doorStyle.get('id');
-    } else {
-      dcId = doorStyle.id;
-    }
-    var skuItem = this.obj.skuArray.find(function (el) {
-      return el.door_color_id === dcId;
-    });
-    if (skuItem !== undefined) {
-      objSKU = skuItem.sku;
-    }
-  }
+  // Get SKU Alias
+  var objSKU = getCatalogCabinetSku(element);
   if (rowCount > 0) {
     for (var _x = 0; _x < rowCount; _x++) {
       splitStr.push(objSKU.slice(lineCount * _x, lineCount * (_x + 1)));
@@ -307,10 +293,15 @@ export function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corn
     }), /*#__PURE__*/React.createElement("g", {
       transform: "translate(".concat(padding_width, ",").concat(padding_depth, ")")
     }, txtContent)), element.category === 'cabinet' && /*#__PURE__*/React.createElement("g", {
-      visibility: isWarningItem(element) ? 'visible' : 'hidden'
+      visibility: isWarningCabinet(element) ? 'visible' : 'hidden'
     }, warning_buttons)));
   } else {
     rendered = /*#__PURE__*/React.createElement("g", {
+      "data-element-root": true,
+      "data-prototype": element.prototype,
+      "data-id": element.id,
+      "data-selected": element.selected,
+      "data-layer": layer.id,
       onMouseOver: function onMouseOver(event) {
         setHover(true);
       },
@@ -769,7 +760,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();
@@ -1003,10 +994,6 @@ export function render3DItem(element, layer, scene, sizeinfo, structure_json, is
       if (isEmpty(counterTop.uri) && !isEmpty(layer === null || layer === void 0 || (_layer$toJS = layer.toJS()) === null || _layer$toJS === void 0 ? void 0 : _layer$toJS.counterTop.uri)) {
         counterTop.uri = layer.toJS().counterTop.uri;
       }
-      if (isEmpty(counterTop.uri)) {
-        //@todo THIS IS A TEMPORARY FIX FOR COUNTERTOP TEXTURE UNDEFINED ISSUE
-        counterTop.uri = 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg';
-      }
       var countTopMap = counterTop.uri;
       var interiorMap = doorStyles.get('interior');
       var countT = loadTexture(countTopMap);

package/es/class/area.js

@@ -14,7 +14,6 @@ var Area = /*#__PURE__*/function () {
     key: "add",
     value: function add(state, layerID, type, verticesCoords, catalog) {
       var area;
-      var layer = state.getIn(['scene', 'layers', layerID]);
       var areaID;
       areaID = IDBroker.acquireID();
       var vertices = verticesCoords.map(function (v) {

package/es/class/export.js

@@ -6,13 +6,11 @@ import Hole from "./hole";
 import Vertex from "./vertex";
 import Area from "./area";
 import Item from "./item";
-import FuseUtils from "./FuseUtils";
 import { HorizontalGuide, VerticalGuide } from "./guide";
-export { Project, Group, FuseUtils, Layer, Line, Hole, Vertex, Area, Item, HorizontalGuide, VerticalGuide };
+export { Project, Group, Layer, Line, Hole, Vertex, Area, Item, HorizontalGuide, VerticalGuide };
 export default {
   Project: Project,
   Group: Group,
-  FuseUtils: FuseUtils,
   Layer: Layer,
   Line: Line,
   Hole: Hole,