kitchen-simulator 4.4.2-dynamic-holes → 4.4.2-new-json

package/es/LiteRenderer.js

@@ -1,13 +1,12 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "onError", "holes"];
+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; }
 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; }
 // LiteRenderer.jsx
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import PropTypes from 'prop-types';
@@ -23,7 +22,7 @@ import AppContext from "./AppContext";
 import Catalog from "./catalog/catalog";
 import * as Areas from "./catalog/areas/area/planner-element";
 import * as Lines from "./catalog/lines/wall/planner-element";
-import * as Holes from "./catalog/holes/export";
+import { buildHoleElements, registerDynamicHoles } from "./mappings/holesToCatalog";
 import { ConsoleDebugger, Keyboard } from "./plugins/export";
 import LiteKitchenConfigurator from "./LiteKitchenConfigurator";
 var isBrowser = typeof window !== 'undefined';
@@ -73,150 +72,16 @@ function serializeError(err) {
     };
   }
 }
-var INCH_TO_CM = 2.54;
-var normalizeKey = function normalizeKey(value) {
-  return (value !== null && value !== void 0 ? value : '').toString().toLowerCase().replace(/[^a-z0-9]+/g, '');
-};
-var safeParseJson = function safeParseJson(value) {
-  if (!value) return null;
-  try {
-    return JSON.parse(value);
-  } catch (_unused3) {
-    return null;
-  }
-};
-var toCatalogLength = function toCatalogLength(value, prop) {
-  var _prop$defaultValue;
-  if (value == null) return null;
-  var unit = prop === null || prop === void 0 || (_prop$defaultValue = prop.defaultValue) === null || _prop$defaultValue === void 0 ? void 0 : _prop$defaultValue.unit;
-  if (unit && unit.toLowerCase() === 'in') return value;
-  return value * INCH_TO_CM;
-};
-var overrideLengthProperty = function overrideLengthProperty(prop, value) {
-  if (!prop || value == null) return prop;
-  var length = toCatalogLength(value, prop);
-  if (length == null) return prop;
-  return _objectSpread(_objectSpread({}, prop), {}, {
-    defaultValue: _objectSpread(_objectSpread({}, prop.defaultValue), {}, {
-      length: length
-    })
-  });
-};
-var findBaseHoleTemplate = function findBaseHoleTemplate(hole, templates) {
-  var target = normalizeKey(hole === null || hole === void 0 ? void 0 : hole.name);
-  if (!target) return null;
-  return templates.find(function (template) {
-    var _template$info, _template$info2;
-    var candidates = [template === null || template === void 0 ? void 0 : template.name, template === null || template === void 0 || (_template$info = template.info) === null || _template$info === void 0 ? void 0 : _template$info.title, template === null || template === void 0 || (_template$info2 = template.info) === null || _template$info2 === void 0 ? void 0 : _template$info2.description].map(normalizeKey);
-    return candidates.includes(target);
-  }) || null;
-};
-var buildHoleElementFromTemplate = function buildHoleElementFromTemplate(hole, base) {
-  var _base$info, _base$info2, _base$info3, _base$info4, _base$info5, _base$structure_json;
-  if (!hole || !base) return null;
-  var nextInfo = _objectSpread(_objectSpread({}, base.info), {}, {
-    title: hole.name || ((_base$info = base.info) === null || _base$info === void 0 ? void 0 : _base$info.title),
-    description: ((_base$info2 = base.info) === null || _base$info2 === void 0 ? void 0 : _base$info2.description) || hole.name || ((_base$info3 = base.info) === null || _base$info3 === void 0 ? void 0 : _base$info3.title),
-    image: hole.menu_thumbnail || ((_base$info4 = base.info) === null || _base$info4 === void 0 ? void 0 : _base$info4.image),
-    url: hole.gltf || ((_base$info5 = base.info) === null || _base$info5 === void 0 ? void 0 : _base$info5.url)
-  });
-  var nextProperties = _objectSpread({}, base.properties);
-  if (nextProperties.width) {
-    nextProperties.width = overrideLengthProperty(nextProperties.width, hole.width);
-  }
-  if (nextProperties.height) {
-    nextProperties.height = overrideLengthProperty(nextProperties.height, hole.height);
-  }
-  if (nextProperties.length) {
-    nextProperties.length = overrideLengthProperty(nextProperties.length, hole.length);
-  }
-  var customConfig = safeParseJson(hole.custom_config);
-  var customProps = (customConfig === null || customConfig === void 0 ? void 0 : customConfig.properties) || {};
-  Object.keys(customProps).forEach(function (key) {
-    if (!nextProperties[key]) return;
-    nextProperties[key] = overrideLengthProperty(nextProperties[key], customProps[key]);
-  });
-  return _objectSpread(_objectSpread({}, base), {}, {
-    name: hole.name || base.name,
-    info: nextInfo,
-    properties: nextProperties,
-    structure_json: _objectSpread(_objectSpread({}, base.structure_json || {}), {}, {
-      hole_id: hole.id || ((_base$structure_json = base.structure_json) === null || _base$structure_json === void 0 ? void 0 : _base$structure_json.hole_id)
-    })
-  });
-};
-var buildHoleElements = function buildHoleElements(holes) {
-  var categories = {
-    Doors: [],
-    Windows: []
-  };
-  var elements = [];
-  if (!Array.isArray(holes)) return {
-    elements: elements,
-    categories: categories
-  };
-  var templates = Object.values(Holes);
-  var usedNames = new Set();
-  holes.forEach(function (hole) {
-    var _base$info6;
-    if (!hole || hole.is_deleted) return;
-    var base = findBaseHoleTemplate(hole, templates);
-    if (!base) return;
-    var element = buildHoleElementFromTemplate(hole, base);
-    if (!element || !element.name || usedNames.has(element.name)) return;
-    usedNames.add(element.name);
-    elements.push(element);
-    var typeKey = normalizeKey(hole.type);
-    if (typeKey === 'window') {
-      categories.Windows.push(element);
-    } else if (typeKey === 'door') {
-      categories.Doors.push(element);
-    } else if ((_base$info6 = base.info) !== null && _base$info6 !== void 0 && (_base$info6 = _base$info6.tag) !== null && _base$info6 !== void 0 && _base$info6.includes('window')) {
-      categories.Windows.push(element);
-    } else {
-      categories.Doors.push(element);
-    }
-  });
-  return {
-    elements: elements,
-    categories: categories
-  };
-};
 
 // ----------------- catalog init -----------------
-function initCatalogOnce(catalog, holePayload) {
+function initCatalogOnce(catalog) {
   if (!catalog) return;
   if (!catalog.__ksInitialized) {
     for (var x in Areas) catalog.registerElement(Areas[x]);
     for (var _x in Lines) catalog.registerElement(Lines[_x]);
     catalog.__ksInitialized = true;
   }
-  var holeElements = (holePayload === null || holePayload === void 0 ? void 0 : holePayload.elements) || [];
-  holeElements.forEach(function (element) {
-    if (!catalog.hasElement(element.name)) {
-      console.log(element);
-      catalog.registerElement(element);
-    }
-  });
-  var categories = (holePayload === null || holePayload === void 0 ? void 0 : holePayload.categories) || {};
-  Object.entries(categories).forEach(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-      name = _ref2[0],
-      elements = _ref2[1];
-    if (!elements.length) return;
-    if (!catalog.hasCategory(name)) {
-      catalog.registerCategory(name, name, elements);
-      return;
-    }
-    elements.forEach(function (element) {
-      if (!catalog.categoryHasElement(name, element.name)) {
-        catalog.addToCategory(name, element);
-      }
-    });
-  });
 }
-
-// ----------------- store factory -----------------
 function createInstanceStore() {
   var AppState = Map({
     KitchenConfigurator: new State()
@@ -272,7 +137,8 @@ export default function LiteRenderer(props) {
   if (!catalogRef.current) {
     catalogRef.current = new Catalog();
   }
-  initCatalogOnce(catalogRef.current, holePayload);
+  initCatalogOnce(catalogRef.current);
+  registerDynamicHoles(catalogRef.current, holePayload);
 
   // ✅ stable plugins array
   var plugins = useMemo(function () {
@@ -295,7 +161,7 @@ export default function LiteRenderer(props) {
         try {
           var maybeCleanup = p === null || p === void 0 ? void 0 : p(store, stateExtractor);
           if (typeof maybeCleanup === 'function') cleanups.push(maybeCleanup);
-        } catch (_unused5) {
+        } catch (_unused4) {
           // keep prior behavior: do not crash
         }
       }
@@ -313,7 +179,7 @@ export default function LiteRenderer(props) {
           var fn = _step2.value;
           try {
             fn();
-          } catch (_unused4) {}
+          } catch (_unused3) {}
         }
       } catch (err) {
         _iterator2.e(err);
@@ -344,7 +210,7 @@ export default function LiteRenderer(props) {
     };
     try {
       onError === null || onError === void 0 || onError(payload);
-    } catch (_unused6) {}
+    } catch (_unused5) {}
     // eslint-disable-next-line no-console
     console.debug('[LiteRenderer:onError]', payload);
     lastEmittedRef.current = payload;
@@ -405,9 +271,9 @@ export default function LiteRenderer(props) {
       emit(lastExternalEventRef.current, last.errors);
     }
   }, [externalEvent, emit]);
-  var _ref3 = configData || {},
-    logoImg = _ref3.logoImg,
-    companyUrl = _ref3.companyUrl;
+  var _ref = configData || {},
+    logoImg = _ref.logoImg,
+    companyUrl = _ref.companyUrl;
   return /*#__PURE__*/React.createElement(AppContext.Provider, null, /*#__PURE__*/React.createElement(Provider, {
     store: storeRef.current
   }, /*#__PURE__*/React.createElement(LiteKitchenConfigurator, _extends({

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

@@ -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/utils/item-loader.js

@@ -12,7 +12,7 @@ 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 { animateDoor, getSkuAliasFromCatalogElement, isEmpty, translateDrawer } from "../../utils/helper";
 import { isWarningItem } from "../../components/viewer2d/utils";
 var INITIAL_NORMAL_MAP = '';
 
@@ -122,23 +122,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 = getSkuAliasFromCatalogElement(this, element);
   if (rowCount > 0) {
     for (var _x = 0; _x < rowCount; _x++) {
       splitStr.push(objSKU.slice(lineCount * _x, lineCount * (_x + 1)));
@@ -1003,10 +988,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/item.js

@@ -552,7 +552,7 @@ var Item = /*#__PURE__*/function () {
       if (!isEmpty(currentObject === null || currentObject === void 0 || (_currentObject$counte = currentObject.counterTop) === null || _currentObject$counte === void 0 ? void 0 : _currentObject$counte.uri)) {
         var _currentObject$counte2;
         counterTopURI = currentObject === null || currentObject === void 0 || (_currentObject$counte2 = currentObject.counterTop) === null || _currentObject$counte2 === void 0 ? void 0 : _currentObject$counte2.uri;
-      } else if (!isEmpty(state.getIn(['scene', 'layers', 'layer-1', 'counterTop']))) counterTopURI = state.getIn(['scene', 'layers', 'layer-1', 'counterTop']).uri;else counterTopURI = 'https://media.test.diydesignspace.com/uploads/CountTop/202105074107_5/texture/Unique_Calcatta_texture.jpg';
+      } else if (!isEmpty(state.getIn(['scene', 'layers', 'layer-1', 'counterTop']))) counterTopURI = state.getIn(['scene', 'layers', 'layer-1', 'counterTop']).uri;
       state = this.remove(state, state.scene.selectedLayer, selectedPos.selectedItemId).updatedState;
       state = this.create(state, state.scene.selectedLayer, selectedObject.name, selectedPos.x, selectedPos.y, selectedObject.info.width, selectedObject.info.height, selectedPos.rotation, false, [], false, null, counterTopURI).updatedState;
       // state = this.select(state, state.scene.selectedLayer, selectedPos.selectedItemId).updatedState;

package/es/constants/catalog/skinPanel.js

@@ -0,0 +1,9 @@
+// skin panel SKU
+export var SKIN_SKU_BSV_24 = 'BSV'; // 23.25" x 34.5" : For base cabinets
+export var SKIN_SKU_BSV_48 = 'BSV48'; // 48" x 34.5" : For base cabinets back-to-back or island backs
+export var SKIN_SKU_WSV_1242 = 'WSV1242'; // 11.25" x 42" : For 12" deep wall cabinets
+export var SKIN_SKU_WSV_2442 = 'WSV2442'; // 23.25" x 42" : For 24" deep wall cabinets
+export var SKIN_SKU_WSV_2460 = 'WSV2460'; // Usually used for CT3DR or CT2DR SKUs + stacked wall cabinets
+export var SKIN_SKU_USV245325 = 'USV2453.25'; // 23.25" x 53.25" : For tall cabinets
+
+export var SKIN_HEIGHT_53_25 = 53.25; // in inch, height of the skin with SKU USV245325

package/es/constants.js

@@ -452,7 +452,7 @@ export var UNIT_FOOT = 'ft';
 export var UNIT_MILE = 'mi';
 export var UNITS_LENGTH = [UNIT_MILLIMETER, UNIT_CENTIMETER, UNIT_METER, UNIT_INCH, UNIT_FOOT, UNIT_MILE];
 export var CEIL_UNITS_LENGTH = [UNIT_CENTIMETER, UNIT_METER, UNIT_INCH, UNIT_FOOT];
-export var EPSILON = 1e-2;
+export var EPSILON = 0.5;
 
 // distance between item and wall
 export var DISTANCE_EPSILON = 5.0; //5.08; // 2 inch
@@ -771,11 +771,9 @@ export var ROOM_SHAPE_TYPE = {
 export var DOORSTYLE_SCOPE_ALL = 'all';
 export var DOORSTYLE_SCOPE_SINGLE = 'single';
 export var DOORSTYLE_SCOPE_MULTIPLE = 'multiple';
+export var DEFAULT_MOLDING_PIECE_LENGTH = 96; // in inch, 8 feet, standard length for molding pieces
 
-// skin panel SKU
-export var SKIN_SKU_BSV_24 = 'BSV24'; // 23.25" x 34.5" : For base cabinets
-export var SKIN_SKU_BSV_48 = 'BSV48'; // 48" x 34.5" : For base cabinets back-to-back or island backs
-export var SKIN_SKU_WSV_1242 = 'WSV1242'; // 11.25" x 42" : For 12" deep wall cabinets
-export var SKIN_SKU_WSV_2442 = 'WSV2442'; // 23.25" x 42" : For 24" deep wall cabinets
-export var SKIN_SKU_WSV_2460 = 'WSV2460'; // Usually used for CT3DR or CT2DR SKUs + stacked wall cabinets
-export var SKIN_SKU_USV245325 = 'USV2453.25'; // 23.25" x 53.25" : For tall cabinets
+// default urls
+
+export var DEFAULT_INTERIOR_URL = 'http://localhost:4002/uploads/assets/default/maple.jpg';
+export var DEFAULT_DOOR_HANDLE_TEXTURE_URL = 'http://127.0.0.1:4002/uploads/assets/default/steel.jpg';