zakeke-configurator-react 0.0.76 → 0.0.79

package/dist/index.js

@@ -21967,11 +21967,11 @@ class SceneViewer {
             this._sceneHelper.dispose();
             this._sceneHelper = null;
         }
-        if (this._environmentManager !== null) {
+        if (this._environmentManager) {
             this._environmentManager.dispose();
             this._environmentManager = null;
         }
-        if (this._glowManager !== null) {
+        if (this._glowManager) {
             this._glowManager.dispose();
             this._glowManager = null;
         }
@@ -23256,78 +23256,71 @@ class SceneViewer {
         });
     }
     refreshMeshDesignAsync(meshID, submeshID = 0, effect) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._sceneDesignManager)
-                this._sceneDesignManager.refreshMeshDesignAsync(meshID, submeshID, effect);
+            (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.refreshMeshDesignAsync(meshID, submeshID, effect);
         });
     }
     setCustomizerGrids(grids) {
+        var _a;
         this._grids = grids;
-        if (this._sceneDesignManager)
-            this._sceneDesignManager.setCustomizerGrids(grids);
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.setCustomizerGrids(grids);
     }
     removeDesignItem(guid) {
-        if (this._sceneDesignManager)
-            this._sceneDesignManager.removeItem(guid);
+        var _a;
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.removeItem(guid);
     }
     addDesignItemText(settings, sideId) {
-        if (this._sceneDesignManager) {
-            return this._sceneDesignManager.addItemText(settings, sideId);
-        }
-        return null;
+        var _a;
+        return (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.addItemText(settings, sideId);
     }
     addDesignItemImage(imageID, sideId) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._sceneDesignManager)
-                yield this._sceneDesignManager.addItemImage(imageID, sideId);
+            yield ((_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.addItemImage(imageID, sideId));
         });
     }
     getDesignItemsInfo() {
-        if (this._sceneDesignManager)
-            return this._sceneDesignManager.getItemsInfo();
-        return null;
+        var _a, _b;
+        return (_b = (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.getItemsInfo()) !== null && _b !== void 0 ? _b : [];
     }
     setDesignItemText(guid, text) {
-        if (this._sceneDesignManager) {
-            this._sceneDesignManager.setItemText(guid, text);
-        }
+        var _a;
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.setItemText(guid, text);
     }
     setDesignItemBold(guid, bold) {
-        if (this._sceneDesignManager)
-            this._sceneDesignManager.setItemBold(guid, bold);
+        var _a;
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.setItemBold(guid, bold);
     }
     setDesignItemItalic(guid, italic) {
-        if (this._sceneDesignManager)
-            this._sceneDesignManager.setItemItalic(guid, italic);
+        var _a;
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.setItemItalic(guid, italic);
     }
     setDesignItemColor(guid, color) {
-        if (this._sceneDesignManager)
-            this._sceneDesignManager.setItemColor(guid, color);
+        var _a;
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.setItemColor(guid, color);
     }
     setDesignItemFontFamily(guid, fontFamily) {
-        if (this._sceneDesignManager) {
-            this._sceneDesignManager.setItemFontFamily(guid, fontFamily);
-        }
+        var _a;
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.setItemFontFamily(guid, fontFamily);
     }
     setDesignItemImage(guid, image) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._sceneDesignManager) {
-                yield this._sceneDesignManager.setItemImage(guid, image);
-            }
+            yield ((_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.setItemImage(guid, image));
         });
     }
     setItemTextOnPath(guid, areaId, value) {
-        if (this._sceneDesignManager) {
-            this._sceneDesignManager.setItemTextOnPath(guid, areaId, value);
-        }
+        var _a;
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.setItemTextOnPath(guid, areaId, value);
     }
     removeDesignItemImage(guid) {
-        if (this._sceneDesignManager) {
-            this._sceneDesignManager.removeItemImage(guid);
-        }
+        var _a;
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.removeItemImage(guid);
     }
     setDesignVisibility(meshId, opacity) {
-        this._sceneDesignManager.setDesignVisibility(meshId, opacity);
+        var _a;
+        (_a = this._sceneDesignManager) === null || _a === void 0 ? void 0 : _a.setDesignVisibility(meshId, opacity);
     }
     setupShaderMaterialsCameraPosition() {
         if (this._scene) {
@@ -38476,15 +38469,21 @@ class ZakekeEnvironment {
                     // Search the attribute
                     this.zkProduct.get("attributes").each(attribute => {
                         if (Object(_helpers__WEBPACK_IMPORTED_MODULE_5__["isPlatformCode"])(attribute.get("attributeCode"))) {
-                            if (Object(_helpers__WEBPACK_IMPORTED_MODULE_5__["compare"])(JSON.parse(attribute.get("attributeCode")), JSON.parse(platformSelection.attributeCode))) {
-                                let option = attribute.get("options").find(option => {
-                                    return Object(_helpers__WEBPACK_IMPORTED_MODULE_5__["compare"])(JSON.parse(option.get("optionCode")), JSON.parse(platformSelection.optionCode));
-                                });
-                                if (option) {
-                                    this.selection.selectAttributeValue(attribute.get('attributeID'), option.get('optionID'));
-                                    platformSelection.attributeLabel = attribute.get("name");
+                            try {
+                                if (Object(_helpers__WEBPACK_IMPORTED_MODULE_5__["compare"])(JSON.parse(attribute.get("attributeCode")), JSON.parse(platformSelection.attributeCode))) {
+                                    let option = attribute.get("options").find(option => {
+                                        return Object(_helpers__WEBPACK_IMPORTED_MODULE_5__["compare"])(JSON.parse(option.get("optionCode")), JSON.parse(platformSelection.optionCode));
+                                    });
+                                    if (option) {
+                                        this.selection.selectAttributeValue(attribute.get('attributeID'), option.get('optionID'));
+                                        platformSelection.attributeLabel = attribute.get("name");
+                                    }
                                 }
                             }
+                            catch (ex) {
+                                console.error("Failed parsing attribute from data:", platformSelection);
+                                console.error(ex);
+                            }
                         }
                     });
                 }
@@ -39886,6 +39885,21 @@ function compare(_obj1, _obj2) {
     }
     let obj1 = copy(_obj1);
     let obj2 = copy(_obj2);
+    // Special DIS case, where the code is a object with id and other parameters.
+    // We need to expand it
+    try {
+        const idJson1 = JSON.parse(obj1.id);
+        if (idJson1.id) {
+            obj1 = idJson1;
+        }
+        console.log("Code is a valid json with Id for obj1, use json instead", obj1, obj2);
+        const idJson2 = JSON.parse(obj2.id);
+        if (idJson2.id) {
+            obj2 = idJson2;
+        }
+        console.log("Code is a valid json with Id for obj2, use json instead", obj1, obj2);
+    }
+    catch (ex) { }
     // Remove dummy property
     delete obj1.zakekePlatform;
     delete obj2.zakekePlatform;
@@ -39908,9 +39922,12 @@ function compare(_obj1, _obj2) {
             same = compare(v, obj2[k]);
         }
         if (isValidJSON(v) || isValidJSON(obj2[k])) {
-            const a = typeof v === "object" ? v : JSON.parse(v);
-            const b = typeof obj2[k] === "object" ? obj2[k] : JSON.parse(obj2[k]);
-            same = compare(a, b);
+            try {
+                const a = typeof v === "object" ? v : JSON.parse(v);
+                const b = typeof obj2[k] === "object" ? obj2[k] : JSON.parse(obj2[k]);
+                same = compare(a, b);
+            }
+            catch (_a) { }
         }
         if (!same)
             break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zakeke-configurator-react",
-  "version": "0.0.76",
+  "version": "0.0.79",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/declarations/composer/Module/src/index.d.ts",