kitchen-simulator 4.4.1 → 4.4.2-dynamic-holes

package/lib/LiteRenderer.js

@@ -7,13 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = LiteRenderer;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactRedux = require("react-redux");
@@ -31,15 +27,13 @@ var Lines = _interopRequireWildcard(require("./catalog/lines/wall/planner-elemen
 var Holes = _interopRequireWildcard(require("./catalog/holes/export"));
 var _export2 = require("./plugins/export");
 var _LiteKitchenConfigurator = _interopRequireDefault(require("./LiteKitchenConfigurator"));
-var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "onError"];
+var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "onError", "holes"];
 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; }
 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 _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } // LiteRenderer.jsx
+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; } // LiteRenderer.jsx
 var isBrowser = typeof window !== 'undefined';
 if (isBrowser) window.THREE = THREE;
 
@@ -87,48 +81,147 @@ function serializeError(err) {
     };
   }
 }
-
-/* ---------- Error Boundary that pushes into buffer ---------- */
-var ToolErrorBoundary = /*#__PURE__*/function (_React$Component) {
-  function ToolErrorBoundary() {
-    (0, _classCallCheck2["default"])(this, ToolErrorBoundary);
-    return _callSuper(this, ToolErrorBoundary, arguments);
+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;
   }
-  (0, _inherits2["default"])(ToolErrorBoundary, _React$Component);
-  return (0, _createClass2["default"])(ToolErrorBoundary, [{
-    key: "componentDidCatch",
-    value: function componentDidCatch(error, info) {
-      var pushError = this.props.pushError;
-      pushError({
-        type: 'render-error',
-        error: serializeError(error),
-        info: {
-          componentStack: info === null || info === void 0 ? void 0 : info.componentStack
-        }
-      });
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      return this.props.children;
+};
+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);
     }
-  }]);
-}(_react["default"].Component);
-ToolErrorBoundary.propTypes = {
-  pushError: _propTypes["default"].func.isRequired,
-  children: _propTypes["default"].any
+  });
+  return {
+    elements: elements,
+    categories: categories
+  };
 };
 
 // ----------------- catalog init -----------------
-function initCatalogOnce(catalog) {
+function initCatalogOnce(catalog, holePayload) {
   if (!catalog) return;
-  if (catalog.__ksInitialized) return;
-  for (var x in Areas) catalog.registerElement(Areas[x]);
-  for (var _x in Lines) catalog.registerElement(Lines[_x]);
-  for (var _x2 in Holes) catalog.registerElement(Holes[_x2]);
-  catalog.registerCategory('Windows', 'Windows', [Holes.windowClear, Holes.windowCross, Holes.windowDoubleHung, Holes.windowVertical]);
-  catalog.registerCategory('Doors', 'Doors', [Holes.doorInterior, Holes.doorExterior, Holes.doorCloset, Holes.doorSliding, Holes.doorwayFramed, Holes.doorwayFrameless]);
-  catalog.__ksInitialized = true;
+  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 = (0, _slicedToArray2["default"])(_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 -----------------
@@ -172,7 +265,11 @@ function LiteRenderer(props) {
     externalEvent = props.externalEvent,
     onInternalEvent = props.onInternalEvent,
     onError = props.onError,
+    holes = props.holes,
     passThrough = (0, _objectWithoutProperties2["default"])(props, _excluded);
+  var holePayload = (0, _react.useMemo)(function () {
+    return buildHoleElements(holes);
+  }, [holes]);
 
   // ✅ instance-scoped store (no module singleton)
   var storeRef = (0, _react.useRef)(null);
@@ -182,8 +279,8 @@ function LiteRenderer(props) {
   var catalogRef = (0, _react.useRef)(null);
   if (!catalogRef.current) {
     catalogRef.current = new _catalog["default"]();
-    initCatalogOnce(catalogRef.current);
   }
+  initCatalogOnce(catalogRef.current, holePayload);
 
   // ✅ stable plugins array
   var plugins = (0, _react.useMemo)(function () {
@@ -206,7 +303,7 @@ function LiteRenderer(props) {
         try {
           var maybeCleanup = p === null || p === void 0 ? void 0 : p(store, stateExtractor);
           if (typeof maybeCleanup === 'function') cleanups.push(maybeCleanup);
-        } catch (_unused4) {
+        } catch (_unused5) {
           // keep prior behavior: do not crash
         }
       }
@@ -224,7 +321,7 @@ function LiteRenderer(props) {
           var fn = _step2.value;
           try {
             fn();
-          } catch (_unused3) {}
+          } catch (_unused4) {}
         }
       } catch (err) {
         _iterator2.e(err);
@@ -255,7 +352,7 @@ function LiteRenderer(props) {
     };
     try {
       onError === null || onError === void 0 || onError(payload);
-    } catch (_unused5) {}
+    } catch (_unused6) {}
     // eslint-disable-next-line no-console
     console.debug('[LiteRenderer:onError]', payload);
     lastEmittedRef.current = payload;
@@ -316,13 +413,11 @@ function LiteRenderer(props) {
       emit(lastExternalEventRef.current, last.errors);
     }
   }, [externalEvent, emit]);
-  var _ref = configData || {},
-    logoImg = _ref.logoImg,
-    companyUrl = _ref.companyUrl;
+  var _ref3 = configData || {},
+    logoImg = _ref3.logoImg,
+    companyUrl = _ref3.companyUrl;
   return /*#__PURE__*/_react["default"].createElement(_AppContext["default"].Provider, null, /*#__PURE__*/_react["default"].createElement(_reactRedux.Provider, {
     store: storeRef.current
-  }, /*#__PURE__*/_react["default"].createElement(ToolErrorBoundary, {
-    pushError: pushError
   }, /*#__PURE__*/_react["default"].createElement(_LiteKitchenConfigurator["default"], (0, _extends2["default"])({
     catalog: catalogRef.current,
     width: width,
@@ -336,7 +431,7 @@ function LiteRenderer(props) {
     configData: configData,
     externalEvent: externalEvent,
     onInternalEvent: onInternalEvent
-  }, passThrough)))));
+  }, passThrough))));
 }
 LiteRenderer.propTypes = {
   width: _propTypes["default"].oneOfType([_propTypes["default"].number, _propTypes["default"].string]),
@@ -356,6 +451,7 @@ LiteRenderer.propTypes = {
   externalEvent: _propTypes["default"].object,
   onInternalEvent: _propTypes["default"].func,
   onError: _propTypes["default"].func,
+  holes: _propTypes["default"].array,
   store: _propTypes["default"].object
 };
 module.exports = exports.default;

package/lib/constants.js

@@ -667,16 +667,16 @@ var PROJECT_SETTING_OPTION = exports.PROJECT_SETTING_OPTION = {
   CHANGE_MEASUREMENT_UNIT: CHANGE_MEASUREMENT_UNIT
 };
 var HOLE_NAMES = exports.HOLE_NAMES = {
-  WINDOW_CLEAR: 'Window',
-  WINDOW_CROSS: 'Cross Window',
-  WINDOW_DOUBLE_HUNG: 'Double Hung Window',
-  WINDOW_VERTICAL: 'window-vertical',
+  WINDOW_CLEAR: 'Clear',
+  WINDOW_CROSS: 'Cross',
+  WINDOW_DOUBLE_HUNG: 'Double Hung',
+  WINDOW_VERTICAL: 'Vertical',
   DOOR_CLOSET: 'Closet',
   DOOR_EXTERIOR: 'Exterior',
   DOOR_INTERIOR: 'Interior',
   DOOR_SLIDING: 'Sliding',
   DOOR_FRAMED: 'Framed Doorway',
-  DOOR_FRAMELESS: 'FrameLess Doorway'
+  DOOR_FRAMELESS: 'Frameless Doorway'
 };
 
 // direction type

package/lib/devLiteRenderer.js

@@ -21,6 +21,7 @@ var _furnishingPayload = _interopRequireDefault(require("./mocks/furnishingPaylo
 var _rectangleShape = _interopRequireDefault(require("./mocks/rectangleShape.json"));
 var _moldingPayload = _interopRequireDefault(require("./mocks/moldingPayload.json"));
 var _replaceCabinetPayload = _interopRequireDefault(require("./mocks/replaceCabinetPayload.json"));
+var _holesPayload = _interopRequireDefault(require("./mocks/holesPayload.json"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _LiteRenderer = _interopRequireDefault(require("./LiteRenderer"));
 var _antd = require("antd");
@@ -864,6 +865,7 @@ function WorkSpace(props) {
     logoImg: "/assets/logo.png",
     companyUrl: "https://example.com",
     toolbarButtons: [],
+    holes: _holesPayload["default"],
     externalEvent: externalEvent,
     onInternalEvent: onInternalEvent,
     onError: function onError(payload) {