kitchen-simulator 1.0.0-alin.33 → 1.0.0-alin.40

package/es/LiteKitchenConfigurator.js

@@ -103,7 +103,8 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       redirectURL: '',
       snackBarMessage: '',
       isSaved: false,
-      isLeaving: false
+      isLeaving: false,
+      stateCatalog: _this.props.catalog
     };
 
     // For UTM tracking
@@ -467,6 +468,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
+      var _oldState$catalog, _plannerState$catalog;
       var stateExtractor = nextProps.stateExtractor,
         state = nextProps.state,
         projectActions = nextProps.projectActions,
@@ -478,6 +480,15 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         handleExternalEvent(nextProps);
       }
       var plannerState = stateExtractor(state);
+      var oldState = stateExtractor(this.props.state);
+      if ((oldState === null || oldState === void 0 || (_oldState$catalog = oldState.catalog) === null || _oldState$catalog === void 0 ? void 0 : _oldState$catalog.elements) !== (plannerState === null || plannerState === void 0 || (_plannerState$catalog = plannerState.catalog) === null || _plannerState$catalog === void 0 ? void 0 : _plannerState$catalog.elements)) {
+        // copy state.catalog to the props.catalog
+        // let catalog = this.state.stateCatalog;
+        // console.log('111111', plannerState?.catalog?.elements.toJS());
+        // catalog.elements = plannerState?.catalog?.elements.toJS();
+        // console.log('222222', catalog);
+        // this.setState({ stateCatalog: catalog });
+      }
       var catalogReady = plannerState.getIn(['catalog', 'ready']);
       if (!catalogReady) {
         projectActions.initCatalog(catalog);
@@ -573,7 +584,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/React.createElement(Content, _extends({
         width: contentW,
         height: contentH,
-        catalog: this.props.catalog,
+        catalog: this.state.stateCatalog,
         state: extractedState,
         toolBar: this.state.toolbar,
         setToolbar: this.setToolbar,

package/es/LiteRenderer.js

@@ -249,8 +249,6 @@ export default function LiteRenderer(props) {
     colorAlias = _ref.colorAlias,
     subgroups = _ref.subgroups;
   var _ref2 = dataBundle || {},
-    _ref2$data = _ref2.data,
-    data = _ref2$data === void 0 ? [] : _ref2$data,
     _ref2$appliances = _ref2.appliances,
     appliances = _ref2$appliances === void 0 ? [] : _ref2$appliances,
     _ref2$furnishing = _ref2.furnishing,
@@ -262,14 +260,10 @@ export default function LiteRenderer(props) {
   var id = configData.id,
     logoImg = configData.logoImg,
     companyUrl = configData.companyUrl;
-  var _React$useState = React.useState([]),
+  var _React$useState = React.useState(false),
     _React$useState2 = _slicedToArray(_React$useState, 2),
-    outlineSVGData = _React$useState2[0],
-    setOutlineSVGData = _React$useState2[1];
-  var _React$useState3 = React.useState(false),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    catalogInitiated = _React$useState4[0],
-    setCatalogInitiated = _React$useState4[1];
+    catalogInitiated = _React$useState2[0],
+    setCatalogInitiated = _React$useState2[1];
   useEffect(function () {
     var initMyCatalog = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -388,103 +382,27 @@ export default function LiteRenderer(props) {
         return _ref4.apply(this, arguments);
       };
     }();
-    var loadSVGs = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        var svgLoadPromises, outlineData;
-        return _regeneratorRuntime.wrap(function (_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              svgLoadPromises = data.map(/*#__PURE__*/function () {
-                var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(item) {
-                  var _parsed$xml$viewBox, _parsed$xml$viewBox2, response, svgText, loader, parsed, _t;
-                  return _regeneratorRuntime.wrap(function (_context3) {
-                    while (1) switch (_context3.prev = _context3.next) {
-                      case 0:
-                        if (item.outline) {
-                          _context3.next = 1;
-                          break;
-                        }
-                        return _context3.abrupt("return", null);
-                      case 1:
-                        _context3.prev = 1;
-                        _context3.next = 2;
-                        return fetch(item.outline, {
-                          cache: 'no-store'
-                        });
-                      case 2:
-                        response = _context3.sent;
-                        _context3.next = 3;
-                        return response.text();
-                      case 3:
-                        svgText = _context3.sent;
-                        loader = new SVGLoader();
-                        parsed = loader.parse(svgText);
-                        if (!isEmpty(parsed.paths)) {
-                          _context3.next = 4;
-                          break;
-                        }
-                        return _context3.abrupt("return", null);
-                      case 4:
-                        return _context3.abrupt("return", {
-                          paths: parsed.paths,
-                          svgWidth: parseFloat(parsed.xml.getAttribute('width')) || ((_parsed$xml$viewBox = parsed.xml.viewBox) === null || _parsed$xml$viewBox === void 0 || (_parsed$xml$viewBox = _parsed$xml$viewBox.animVal) === null || _parsed$xml$viewBox === void 0 ? void 0 : _parsed$xml$viewBox.width) || 0,
-                          svgHeight: parseFloat(parsed.xml.getAttribute('height')) || ((_parsed$xml$viewBox2 = parsed.xml.viewBox) === null || _parsed$xml$viewBox2 === void 0 || (_parsed$xml$viewBox2 = _parsed$xml$viewBox2.animVal) === null || _parsed$xml$viewBox2 === void 0 ? void 0 : _parsed$xml$viewBox2.height) || 0,
-                          reverse: !parseFloat(parsed.xml.getAttribute('height'))
-                        });
-                      case 5:
-                        _context3.prev = 5;
-                        _t = _context3["catch"](1);
-                        console.error('Failed to load SVG:', item.outline, _t);
-                        return _context3.abrupt("return", null);
-                      case 6:
-                      case "end":
-                        return _context3.stop();
-                    }
-                  }, _callee3, null, [[1, 5]]);
-                }));
-                return function (_x3) {
-                  return _ref6.apply(this, arguments);
-                };
-              }());
-              _context4.next = 1;
-              return Promise.all(svgLoadPromises);
-            case 1:
-              outlineData = _context4.sent;
-              setOutlineSVGData(outlineData);
-            case 2:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4);
-      }));
-      return function loadSVGs() {
-        return _ref5.apply(this, arguments);
-      };
-    }();
     var initCatalog = /*#__PURE__*/function () {
-      var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-        return _regeneratorRuntime.wrap(function (_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        return _regeneratorRuntime.wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               setCatalogInitiated(false);
-              _context5.next = 1;
+              _context3.next = 1;
               return initMyCatalog();
             case 1:
-              _context5.next = 2;
+              _context3.next = 2;
               return loadMoldings();
             case 2:
-              _context5.next = 3;
-              return loadSVGs();
-            case 3:
               setCatalogInitiated(true);
-            case 4:
+            case 3:
             case "end":
-              return _context5.stop();
+              return _context3.stop();
           }
-        }, _callee5);
+        }, _callee3);
       }));
       return function initCatalog() {
-        return _ref7.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }();
     initCatalog();
@@ -493,16 +411,7 @@ export default function LiteRenderer(props) {
 
   // Register items once SVGs are loaded
   useEffect(function () {
-    if (!outlineSVGData.length) return;
     var Item = [];
-    data.forEach(function (obj, index) {
-      Item.push(exporter(_objectSpread(_objectSpread({}, obj), {}, {
-        type: 'cabinet',
-        outlineSVGData: outlineSVGData[index],
-        render2DItem: render2DItem,
-        render3DItem: render3DItem
-      })));
-    });
     appliances.forEach(function (obj) {
       Item.push(exporter(_objectSpread(_objectSpread({}, obj), {}, {
         render2DItem: render2DItem,
@@ -525,7 +434,7 @@ export default function LiteRenderer(props) {
       })));
     });
     for (var x in Item) MyCatalog.registerElement(Item[x]);
-  }, [outlineSVGData, data, appliances, furnishing, lighting]);
+  }, [appliances, furnishing, lighting]);
   useEffect(function () {
     if (projectElement.length === 0) return;
     if (!catalogInitiated) return;
@@ -556,7 +465,6 @@ export default function LiteRenderer(props) {
       return state.get('KitchenConfigurator');
     },
     categoryData: categoryData,
-    data: data,
     configData: configData,
     externalEvent: externalEvent
   }, passThrough)))));

package/es/catalog/catalog.js

@@ -247,7 +247,10 @@ var Catalog = /*#__PURE__*/function () {
       if (name === '') {
         throw new Error('Category has empty name');
       }
-      return !this.hasCategory(name);
+      if (this.hasCategory(name)) {
+        throw new Error('Category has already been registered');
+      }
+      return true;
     }
 
     /**

package/es/components/viewer2d/item.js

@@ -6,6 +6,7 @@ import { convert } from "../../utils/convert-units-lite";
 import { GeometryUtils } from "../../utils/export";
 import { MODE_ROTATING_ITEM, WALL_CABINET_LAYOUTPOS } from "../../constants";
 import { isEmpty, returnReplaceableDeepSearchType } from "./utils";
+import { findCatalogElement } from "../../utils/geometry";
 var STYLE_LINE = {
   fill: '#0096fd',
   stroke: '#0096fd'
@@ -21,6 +22,7 @@ var STYLE_CIRCLE2 = {
   cursor: 'ew-resize'
 };
 export default function Item(_ref, _ref2) {
+  var _element$render2D;
   var layer = _ref.layer,
     item = _ref.item,
     scene = _ref.scene,
@@ -117,12 +119,7 @@ export default function Item(_ref, _ref2) {
     if (layer.selected.items.size > 0) {
       selectedItem = layer.getIn(['items', layer.selected.items.get(0)]);
       var catid = selectedItem.type;
-      var cat = catalog.elements[catid];
-      if (!cat) cat = catalog.elements[returnReplaceableDeepSearchType(catid)];
-      if (cat === undefined || cat === null) {
-        cat = catalog.getIn(['elements', catid]);
-        if (!cat) cat = catalog.getIn(['elements', returnReplaceableDeepSearchType(catid)]);
-      }
+      var cat = findCatalogElement(catalog, catid);
       currentItem = {
         selectedItem: selectedItem,
         cat: cat
@@ -137,8 +134,7 @@ export default function Item(_ref, _ref2) {
         rotRad: item.rotation / 180 * Math.PI
       };
       var catid = item.type;
-      var cat = catalog.elements[catid];
-      if (!cat) cat = catalog.elements[returnReplaceableDeepSearchType(catid)];
+      var cat = findCatalogElement(catalog, catid);
       var width = convert(item.properties.getIn(['width', '_length'])).from('in').to('cm');
       var height = convert(item.properties.getIn(['depth', '_length'])).from('in').to('cm');
       // let width = cat.info.sizeinfo.width;
@@ -314,7 +310,7 @@ export default function Item(_ref, _ref2) {
       }
     });
   }
-  var renderedItem = element.render2D.call(element, item, layer, scene);
+  var renderedItem = element === null || element === void 0 || (_element$render2D = element.render2D) === null || _element$render2D === void 0 ? void 0 : _element$render2D.call(element, item, layer, scene);
   var isSmall = false;
   if (width < 40) isSmall = true;
   var parts = [];

package/es/devLiteRenderer.js

@@ -4,7 +4,7 @@ import ContainerDimensions from 'react-container-dimensions';
 import mockProps from "./mocks/mockProps.json";
 import mockCategoryData from "./mocks/categoryData.json";
 import mockDataBundle from "./mocks/dataBundle.json";
-import cabinetPaylod from "./mocks/cabinetPayload.json";
+import cabinetPaylod from "./mocks/cabinetPayload2.json";
 import doorStylePaylod from "./mocks/doorStylePayload.json";
 import oStylePaylod from "./mocks/oStylePayload.json";
 import rectangleData from "./mocks/rectangleShape.json";

package/es/utils/geometry.js

@@ -873,18 +873,18 @@ export function getAllItemSnap(allItemRects) {
     var snap4 = itemrectInfo(rect.rect[3].x + ox0, rect.rect[3].y + oy0, nrot, cur && cur.size, rect.layoutpos, rect.is_corner);
     var sizeinfo = otherItems[index].cat && otherItems[index].cat.info.sizeinfo;
     if (sizeinfo) {
-      var leftBlindLength = sizeinfo.leftBlindLength,
-        rightBlindLength = sizeinfo.rightBlindLength;
-      if (leftBlindLength > 0) {
-        var vx = leftBlindLength - ch;
+      var left_blind_length = sizeinfo.left_blind_length,
+        right_blind_length = sizeinfo.right_blind_length;
+      if (left_blind_length > 0) {
+        var vx = left_blind_length - ch;
         var vy = cw;
         var dx = vx * cos + vy * sin;
         var dy = vx * sin - vy * cos;
         var snap6 = itemrectInfo(rect.rect[0].x + dx, rect.rect[0].y + dy, rect.rotRad + Math.PI / 2, cur && cur.size, rect.layoutpos, rect.is_corner);
         allItemSnap.push(snap6);
       }
-      if (rightBlindLength > 0) {
-        var _vx = ch - rightBlindLength;
+      if (right_blind_length > 0) {
+        var _vx = ch - right_blind_length;
         var _vy = cw;
         var _dx = _vx * cos + _vy * sin;
         var _dy = _vx * sin - _vy * cos;

package/es/utils/isolate-event-handler.js

@@ -8,8 +8,6 @@ import { EXTERNAL_EVENT_ADD_WALL, EXTERNAL_EVENT_TOGGLE_TO_3D, EXTERNAL_EVENT_TO
 import { isEmpty } from "./helper";
 import exporter from "../catalog/utils/exporter";
 import { render2DItem, render3DItem } from "../catalog/utils/item-loader";
-import Catalog from "../catalog/catalog";
-import { CatalogElement, safeLoadMapList } from "../models";
 var loadSVGsByItem = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(item) {
     var _parsed$xml$viewBox, _parsed$xml$viewBox2, response, svgText, loader, parsed, _t;

package/lib/LiteKitchenConfigurator.js

@@ -112,7 +112,8 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       redirectURL: '',
       snackBarMessage: '',
       isSaved: false,
-      isLeaving: false
+      isLeaving: false,
+      stateCatalog: _this.props.catalog
     };
 
     // For UTM tracking
@@ -476,6 +477,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
+      var _oldState$catalog, _plannerState$catalog;
       var stateExtractor = nextProps.stateExtractor,
         state = nextProps.state,
         projectActions = nextProps.projectActions,
@@ -487,6 +489,15 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
         (0, _isolateEventHandler.handleExternalEvent)(nextProps);
       }
       var plannerState = stateExtractor(state);
+      var oldState = stateExtractor(this.props.state);
+      if ((oldState === null || oldState === void 0 || (_oldState$catalog = oldState.catalog) === null || _oldState$catalog === void 0 ? void 0 : _oldState$catalog.elements) !== (plannerState === null || plannerState === void 0 || (_plannerState$catalog = plannerState.catalog) === null || _plannerState$catalog === void 0 ? void 0 : _plannerState$catalog.elements)) {
+        // copy state.catalog to the props.catalog
+        // let catalog = this.state.stateCatalog;
+        // console.log('111111', plannerState?.catalog?.elements.toJS());
+        // catalog.elements = plannerState?.catalog?.elements.toJS();
+        // console.log('222222', catalog);
+        // this.setState({ stateCatalog: catalog });
+      }
       var catalogReady = plannerState.getIn(['catalog', 'ready']);
       if (!catalogReady) {
         projectActions.initCatalog(catalog);
@@ -582,7 +593,7 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement(_export2.Content, (0, _extends2["default"])({
         width: contentW,
         height: contentH,
-        catalog: this.props.catalog,
+        catalog: this.state.stateCatalog,
         state: extractedState,
         toolBar: this.state.toolbar,
         setToolbar: this.setToolbar,

package/lib/LiteRenderer.js

@@ -41,7 +41,7 @@ var _exporter = _interopRequireDefault(require("./catalog/utils/exporter"));
 var THREE = _interopRequireWildcard(require("three"));
 var _LiteKitchenConfigurator = _interopRequireDefault(require("./LiteKitchenConfigurator"));
 var _excluded = ["width", "height", "projectElement", "categoryData", "dataBundle", "configData", "options", "user", "auth", "featureFlags", "sentry", "analytics", "externalEvent", "onError"];
-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 _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 _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 _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)); }
@@ -258,8 +258,6 @@ function LiteRenderer(props) {
     colorAlias = _ref.colorAlias,
     subgroups = _ref.subgroups;
   var _ref2 = dataBundle || {},
-    _ref2$data = _ref2.data,
-    data = _ref2$data === void 0 ? [] : _ref2$data,
     _ref2$appliances = _ref2.appliances,
     appliances = _ref2$appliances === void 0 ? [] : _ref2$appliances,
     _ref2$furnishing = _ref2.furnishing,
@@ -271,14 +269,10 @@ function LiteRenderer(props) {
   var id = configData.id,
     logoImg = configData.logoImg,
     companyUrl = configData.companyUrl;
-  var _React$useState = _react["default"].useState([]),
+  var _React$useState = _react["default"].useState(false),
     _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
-    outlineSVGData = _React$useState2[0],
-    setOutlineSVGData = _React$useState2[1];
-  var _React$useState3 = _react["default"].useState(false),
-    _React$useState4 = (0, _slicedToArray2["default"])(_React$useState3, 2),
-    catalogInitiated = _React$useState4[0],
-    setCatalogInitiated = _React$useState4[1];
+    catalogInitiated = _React$useState2[0],
+    setCatalogInitiated = _React$useState2[1];
   (0, _react.useEffect)(function () {
     var initMyCatalog = /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
@@ -397,103 +391,27 @@ function LiteRenderer(props) {
         return _ref4.apply(this, arguments);
       };
     }();
-    var loadSVGs = /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var svgLoadPromises, outlineData;
-        return _regenerator["default"].wrap(function (_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              svgLoadPromises = data.map(/*#__PURE__*/function () {
-                var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(item) {
-                  var _parsed$xml$viewBox, _parsed$xml$viewBox2, response, svgText, loader, parsed, _t;
-                  return _regenerator["default"].wrap(function (_context3) {
-                    while (1) switch (_context3.prev = _context3.next) {
-                      case 0:
-                        if (item.outline) {
-                          _context3.next = 1;
-                          break;
-                        }
-                        return _context3.abrupt("return", null);
-                      case 1:
-                        _context3.prev = 1;
-                        _context3.next = 2;
-                        return fetch(item.outline, {
-                          cache: 'no-store'
-                        });
-                      case 2:
-                        response = _context3.sent;
-                        _context3.next = 3;
-                        return response.text();
-                      case 3:
-                        svgText = _context3.sent;
-                        loader = new _SVGLoader.SVGLoader();
-                        parsed = loader.parse(svgText);
-                        if (!(0, _helper.isEmpty)(parsed.paths)) {
-                          _context3.next = 4;
-                          break;
-                        }
-                        return _context3.abrupt("return", null);
-                      case 4:
-                        return _context3.abrupt("return", {
-                          paths: parsed.paths,
-                          svgWidth: parseFloat(parsed.xml.getAttribute('width')) || ((_parsed$xml$viewBox = parsed.xml.viewBox) === null || _parsed$xml$viewBox === void 0 || (_parsed$xml$viewBox = _parsed$xml$viewBox.animVal) === null || _parsed$xml$viewBox === void 0 ? void 0 : _parsed$xml$viewBox.width) || 0,
-                          svgHeight: parseFloat(parsed.xml.getAttribute('height')) || ((_parsed$xml$viewBox2 = parsed.xml.viewBox) === null || _parsed$xml$viewBox2 === void 0 || (_parsed$xml$viewBox2 = _parsed$xml$viewBox2.animVal) === null || _parsed$xml$viewBox2 === void 0 ? void 0 : _parsed$xml$viewBox2.height) || 0,
-                          reverse: !parseFloat(parsed.xml.getAttribute('height'))
-                        });
-                      case 5:
-                        _context3.prev = 5;
-                        _t = _context3["catch"](1);
-                        console.error('Failed to load SVG:', item.outline, _t);
-                        return _context3.abrupt("return", null);
-                      case 6:
-                      case "end":
-                        return _context3.stop();
-                    }
-                  }, _callee3, null, [[1, 5]]);
-                }));
-                return function (_x3) {
-                  return _ref6.apply(this, arguments);
-                };
-              }());
-              _context4.next = 1;
-              return Promise.all(svgLoadPromises);
-            case 1:
-              outlineData = _context4.sent;
-              setOutlineSVGData(outlineData);
-            case 2:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4);
-      }));
-      return function loadSVGs() {
-        return _ref5.apply(this, arguments);
-      };
-    }();
     var initCatalog = /*#__PURE__*/function () {
-      var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
-        return _regenerator["default"].wrap(function (_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+        return _regenerator["default"].wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               setCatalogInitiated(false);
-              _context5.next = 1;
+              _context3.next = 1;
               return initMyCatalog();
             case 1:
-              _context5.next = 2;
+              _context3.next = 2;
               return loadMoldings();
             case 2:
-              _context5.next = 3;
-              return loadSVGs();
-            case 3:
               setCatalogInitiated(true);
-            case 4:
+            case 3:
             case "end":
-              return _context5.stop();
+              return _context3.stop();
           }
-        }, _callee5);
+        }, _callee3);
       }));
       return function initCatalog() {
-        return _ref7.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }();
     initCatalog();
@@ -502,16 +420,7 @@ function LiteRenderer(props) {
 
   // Register items once SVGs are loaded
   (0, _react.useEffect)(function () {
-    if (!outlineSVGData.length) return;
     var Item = [];
-    data.forEach(function (obj, index) {
-      Item.push((0, _exporter["default"])(_objectSpread(_objectSpread({}, obj), {}, {
-        type: 'cabinet',
-        outlineSVGData: outlineSVGData[index],
-        render2DItem: _itemLoader.render2DItem,
-        render3DItem: _itemLoader.render3DItem
-      })));
-    });
     appliances.forEach(function (obj) {
       Item.push((0, _exporter["default"])(_objectSpread(_objectSpread({}, obj), {}, {
         render2DItem: _itemLoader.render2DItem,
@@ -534,7 +443,7 @@ function LiteRenderer(props) {
       })));
     });
     for (var x in Item) MyCatalog.registerElement(Item[x]);
-  }, [outlineSVGData, data, appliances, furnishing, lighting]);
+  }, [appliances, furnishing, lighting]);
   (0, _react.useEffect)(function () {
     if (projectElement.length === 0) return;
     if (!catalogInitiated) return;
@@ -565,7 +474,6 @@ function LiteRenderer(props) {
       return state.get('KitchenConfigurator');
     },
     categoryData: categoryData,
-    data: data,
     configData: configData,
     externalEvent: externalEvent
   }, passThrough)))));

package/lib/catalog/catalog.js

@@ -254,7 +254,10 @@ var Catalog = exports["default"] = /*#__PURE__*/function () {
       if (name === '') {
         throw new Error('Category has empty name');
       }
-      return !this.hasCategory(name);
+      if (this.hasCategory(name)) {
+        throw new Error('Category has already been registered');
+      }
+      return true;
     }
 
     /**

package/lib/components/viewer2d/item.js

@@ -14,6 +14,7 @@ var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _export = require("../../utils/export");
 var _constants = require("../../constants");
 var _utils = require("./utils");
+var _geometry = require("../../utils/geometry");
 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); }
 var STYLE_LINE = {
   fill: '#0096fd',
@@ -30,6 +31,7 @@ var STYLE_CIRCLE2 = {
   cursor: 'ew-resize'
 };
 function Item(_ref, _ref2) {
+  var _element$render2D;
   var layer = _ref.layer,
     item = _ref.item,
     scene = _ref.scene,
@@ -126,12 +128,7 @@ function Item(_ref, _ref2) {
     if (layer.selected.items.size > 0) {
       selectedItem = layer.getIn(['items', layer.selected.items.get(0)]);
       var catid = selectedItem.type;
-      var cat = catalog.elements[catid];
-      if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
-      if (cat === undefined || cat === null) {
-        cat = catalog.getIn(['elements', catid]);
-        if (!cat) cat = catalog.getIn(['elements', (0, _utils.returnReplaceableDeepSearchType)(catid)]);
-      }
+      var cat = (0, _geometry.findCatalogElement)(catalog, catid);
       currentItem = {
         selectedItem: selectedItem,
         cat: cat
@@ -146,8 +143,7 @@ function Item(_ref, _ref2) {
         rotRad: item.rotation / 180 * Math.PI
       };
       var catid = item.type;
-      var cat = catalog.elements[catid];
-      if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
+      var cat = (0, _geometry.findCatalogElement)(catalog, catid);
       var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from('in').to('cm');
       var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from('in').to('cm');
       // let width = cat.info.sizeinfo.width;
@@ -323,7 +319,7 @@ function Item(_ref, _ref2) {
       }
     });
   }
-  var renderedItem = element.render2D.call(element, item, layer, scene);
+  var renderedItem = element === null || element === void 0 || (_element$render2D = element.render2D) === null || _element$render2D === void 0 ? void 0 : _element$render2D.call(element, item, layer, scene);
   var isSmall = false;
   if (width < 40) isSmall = true;
   var parts = [];

package/lib/devLiteRenderer.js

@@ -8,7 +8,7 @@ var _reactContainerDimensions = _interopRequireDefault(require("react-container-
 var _mockProps = _interopRequireDefault(require("./mocks/mockProps.json"));
 var _categoryData = _interopRequireDefault(require("./mocks/categoryData.json"));
 var _dataBundle = _interopRequireDefault(require("./mocks/dataBundle.json"));
-var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload.json"));
+var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload2.json"));
 var _doorStylePayload = _interopRequireDefault(require("./mocks/doorStylePayload.json"));
 var _oStylePayload = _interopRequireDefault(require("./mocks/oStylePayload.json"));
 var _rectangleShape = _interopRequireDefault(require("./mocks/rectangleShape.json"));

package/lib/utils/geometry.js

@@ -972,18 +972,18 @@ function getAllItemSnap(allItemRects) {
     var snap4 = itemrectInfo(rect.rect[3].x + ox0, rect.rect[3].y + oy0, nrot, cur && cur.size, rect.layoutpos, rect.is_corner);
     var sizeinfo = otherItems[index].cat && otherItems[index].cat.info.sizeinfo;
     if (sizeinfo) {
-      var leftBlindLength = sizeinfo.leftBlindLength,
-        rightBlindLength = sizeinfo.rightBlindLength;
-      if (leftBlindLength > 0) {
-        var vx = leftBlindLength - ch;
+      var left_blind_length = sizeinfo.left_blind_length,
+        right_blind_length = sizeinfo.right_blind_length;
+      if (left_blind_length > 0) {
+        var vx = left_blind_length - ch;
         var vy = cw;
         var dx = vx * cos + vy * sin;
         var dy = vx * sin - vy * cos;
         var snap6 = itemrectInfo(rect.rect[0].x + dx, rect.rect[0].y + dy, rect.rotRad + Math.PI / 2, cur && cur.size, rect.layoutpos, rect.is_corner);
         allItemSnap.push(snap6);
       }
-      if (rightBlindLength > 0) {
-        var _vx = ch - rightBlindLength;
+      if (right_blind_length > 0) {
+        var _vx = ch - right_blind_length;
         var _vy = cw;
         var _dx = _vx * cos + _vy * sin;
         var _dy = _vx * sin - _vy * cos;

package/lib/utils/isolate-event-handler.js

@@ -13,8 +13,6 @@ var _constants = require("../constants");
 var _helper = require("./helper");
 var _exporter = _interopRequireDefault(require("../catalog/utils/exporter"));
 var _itemLoader = require("../catalog/utils/item-loader");
-var _catalog = _interopRequireDefault(require("../catalog/catalog"));
-var _models = require("../models");
 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; }
 var loadSVGsByItem = /*#__PURE__*/function () {

package/package.json

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