kitchen-simulator 4.4.6 → 5.0.0-new-api

package/es/LiteRenderer.js

@@ -1,19 +1,12 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-var _excluded = ["width", "height", "configData", "externalEvent", "onInternalEvent", "onError"];
+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 _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(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
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import PropTypes from 'prop-types';
@@ -29,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';
@@ -80,50 +73,15 @@ function serializeError(err) {
   }
 }
 
-/* ---------- Error Boundary that pushes into buffer ---------- */
-var ToolErrorBoundary = /*#__PURE__*/function (_React$Component) {
-  function ToolErrorBoundary() {
-    _classCallCheck(this, ToolErrorBoundary);
-    return _callSuper(this, ToolErrorBoundary, arguments);
-  }
-  _inherits(ToolErrorBoundary, _React$Component);
-  return _createClass(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;
-    }
-  }]);
-}(React.Component);
-ToolErrorBoundary.propTypes = {
-  pushError: PropTypes.func.isRequired,
-  children: PropTypes.any
-};
-
 // ----------------- catalog init -----------------
 function initCatalogOnce(catalog) {
   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;
+  }
 }
-
-// ----------------- store factory -----------------
 function createInstanceStore() {
   var AppState = Map({
     KitchenConfigurator: new State()
@@ -164,7 +122,11 @@ export default function LiteRenderer(props) {
     externalEvent = props.externalEvent,
     onInternalEvent = props.onInternalEvent,
     onError = props.onError,
+    holes = props.holes,
     passThrough = _objectWithoutProperties(props, _excluded);
+  var holePayload = useMemo(function () {
+    return buildHoleElements(holes);
+  }, [holes]);
 
   // ✅ instance-scoped store (no module singleton)
   var storeRef = useRef(null);
@@ -174,8 +136,9 @@ export default function LiteRenderer(props) {
   var catalogRef = useRef(null);
   if (!catalogRef.current) {
     catalogRef.current = new Catalog();
-    initCatalogOnce(catalogRef.current);
   }
+  initCatalogOnce(catalogRef.current);
+  registerDynamicHoles(catalogRef.current, holePayload);
 
   // ✅ stable plugins array
   var plugins = useMemo(function () {
@@ -313,8 +276,6 @@ export default function LiteRenderer(props) {
     companyUrl = _ref.companyUrl;
   return /*#__PURE__*/React.createElement(AppContext.Provider, null, /*#__PURE__*/React.createElement(Provider, {
     store: storeRef.current
-  }, /*#__PURE__*/React.createElement(ToolErrorBoundary, {
-    pushError: pushError
   }, /*#__PURE__*/React.createElement(LiteKitchenConfigurator, _extends({
     catalog: catalogRef.current,
     width: width,
@@ -328,7 +289,7 @@ export default function LiteRenderer(props) {
     configData: configData,
     externalEvent: externalEvent,
     onInternalEvent: onInternalEvent
-  }, passThrough)))));
+  }, passThrough))));
 }
 LiteRenderer.propTypes = {
   width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
@@ -348,5 +309,6 @@ LiteRenderer.propTypes = {
   externalEvent: PropTypes.object,
   onInternalEvent: PropTypes.func,
   onError: PropTypes.func,
+  holes: PropTypes.array,
   store: PropTypes.object
 };

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

@@ -988,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

@@ -39,7 +39,16 @@ var Item = /*#__PURE__*/function () {
         id: itemID,
         itemID: state.catalog.getIn(['elements', type, 'itemID']),
         name: NameGenerator.generateName('items', state.catalog.getIn(['elements', type, 'info', 'title'])),
+        long_name: state.catalog.getIn(['elements', type, 'long_name']),
+        sizeinfo: state.catalog.getIn(['elements', type, 'info', 'sizeinfo']),
+        description: state.catalog.getIn(['elements', type, 'info', 'description']),
+        base: state.catalog.getIn(['elements', type, 'info', 'image']),
+        shape_svg: state.catalog.getIn(['elements', type, 'info', 'shape_svg']),
+        gltf: state.catalog.getIn(['elements', type, 'gltf']),
+        is_corner: state.catalog.getIn(['elements', type, 'info', 'is_corner']),
+        obj_property: state.catalog.getIn(['elements', type, 'obj']),
         sku_number: state.catalog.getIn(['elements', type, 'obj']).toJS().sku_number,
+        outline: state.catalog.getIn(['elements', type, 'info', 'outline']),
         //style: state.catalog.getIn(['elements', type, 'info', 'door']),
         category: state.catalog.getIn(['elements', type, 'type']),
         layoutpos: state.catalog.getIn(['elements', type, 'info', 'layoutpos']),
@@ -59,18 +68,20 @@ var Item = /*#__PURE__*/function () {
             doorStyle: refItem.doorStyle
           });
         } else {
-          var _state$doorStyle, _ref, _temp$doorStyles$cds$, _temp$doorStyles, _temp$cds, _state3;
+          var _layer$doorStyle, _temp, _ref, _temp$doorStyles$cds$, _temp2, _temp3, _state3;
           var layer = state.getIn(['scene', 'layers', layerID]);
-          var temp = layer.doorStyle || ((_state$doorStyle = state.doorStyle) === null || _state$doorStyle === void 0 ? void 0 : _state$doorStyle.toJS());
-          var cds = (_ref = (_temp$doorStyles$cds$ = temp === null || temp === void 0 || (_temp$doorStyles = temp.doorStyles) === null || _temp$doorStyles === void 0 || (_temp$doorStyles = _temp$doorStyles.cds) === null || _temp$doorStyles === void 0 ? void 0 : _temp$doorStyles.find(function (elem) {
+          var temp = (_layer$doorStyle = layer === null || layer === void 0 ? void 0 : layer.doorStyle) !== null && _layer$doorStyle !== void 0 ? _layer$doorStyle : state.doorStyle;
+          if (!isEmpty(temp) && Map.isMap(temp)) temp = (_temp = temp) === null || _temp === void 0 ? void 0 : _temp.toJS();
+          var cds = (_ref = (_temp$doorStyles$cds$ = (_temp2 = temp) === null || _temp2 === void 0 || (_temp2 = _temp2.doorStyles) === null || _temp2 === void 0 || (_temp2 = _temp2.cds) === null || _temp2 === void 0 ? void 0 : _temp2.find(function (elem) {
             var _state;
             return elem.itemID === ((_state = state) === null || _state === void 0 || (_state = _state.catalog) === null || _state === void 0 ? void 0 : _state.getIn(['elements', type, 'itemID']));
-          })) !== null && _temp$doorStyles$cds$ !== void 0 ? _temp$doorStyles$cds$ : temp === null || temp === void 0 || (_temp$cds = temp.cds) === null || _temp$cds === void 0 ? void 0 : _temp$cds.find(function (elem) {
+          })) !== null && _temp$doorStyles$cds$ !== void 0 ? _temp$doorStyles$cds$ : (_temp3 = temp) === null || _temp3 === void 0 || (_temp3 = _temp3.cds) === null || _temp3 === void 0 ? void 0 : _temp3.find(function (elem) {
             var _state2;
             return elem.itemID === ((_state2 = state) === null || _state2 === void 0 || (_state2 = _state2.catalog) === null || _state2 === void 0 ? void 0 : _state2.getIn(['elements', type, 'itemID']));
           })) !== null && _ref !== void 0 ? _ref : (_state3 = state) === null || _state3 === void 0 || (_state3 = _state3.catalog) === null || _state3 === void 0 ? void 0 : _state3.getIn(['elements', type, 'cds']);
           if (cds) {
-            var updatedDoorStyles = _objectSpread(_objectSpread({}, temp === null || temp === void 0 ? void 0 : temp.doorStyles), {}, {
+            var _temp4;
+            var updatedDoorStyles = _objectSpread(_objectSpread({}, (_temp4 = temp) === null || _temp4 === void 0 ? void 0 : _temp4.doorStyles), {}, {
               cds: [cds],
               cabinet_door_style_id: cds.cabinet_door_style_id
             });
@@ -552,7 +563,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.js

@@ -657,16 +657,16 @@ export var PROJECT_SETTING_OPTION = {
   CHANGE_MEASUREMENT_UNIT: CHANGE_MEASUREMENT_UNIT
 };
 export var 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
@@ -771,4 +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
+export var DEFAULT_MOLDING_PIECE_LENGTH = 96; // in inch, 8 feet, standard length for molding pieces
+
+// 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';