@plattar/plattar-ar-adapter 1.167.6 → 1.167.7

package/build/es2019/plattar-ar-adapter.js

@@ -1263,15 +1263,6 @@ class ConfiguratorController extends plattar_controller_1.PlattarController {
         const configAR = new configurator_ar_1.ConfiguratorAR({ state: await this.getConfiguratorState(), useARBanner: this.getBooleanAttribute("show-ar-banner") });
         return configAR.init();
     }
-    removeRenderer() {
-        if (this._element) {
-            this._element.remove();
-            this._element = null;
-            return true;
-        }
-        this.removeMessengerObservers();
-        return false;
-    }
     get element() {
         return this._element;
     }
@@ -1482,6 +1473,23 @@ class PlattarController {
             };
         });
     }
+    /**
+     * Removes the currently active renderer view from the DOM
+     */
+    removeRenderer() {
+        // remove all other children
+        const shadow = this.parent.shadowRoot;
+        if (shadow) {
+            let child = shadow.lastElementChild;
+            while (child) {
+                shadow.removeChild(child);
+                child = shadow.lastElementChild;
+            }
+        }
+        this._element = null;
+        this.removeMessengerObservers();
+        return true;
+    }
     /**
      * Returns the Parent Instance
      */
@@ -1533,6 +1541,16 @@ class PlattarController {
         const shadow = this.parent.shadowRoot || this.parent.attachShadow({ mode: 'open' });
         shadow.append(element);
     }
+    /**
+     *
+     * @param element
+     */
+    removeChild(element) {
+        const shadow = this.parent.shadowRoot;
+        if (shadow) {
+            shadow.removeChild(element);
+        }
+    }
 }
 exports.PlattarController = PlattarController;
 
@@ -1756,14 +1774,6 @@ class ProductController extends plattar_controller_1.PlattarController {
             return reject(new Error("ProductController.initAR() - minimum required attributes not set, use product-id as a minimum"));
         });
     }
-    removeRenderer() {
-        if (this._element) {
-            this._element.remove();
-            this._element = null;
-            return true;
-        }
-        return false;
-    }
     get element() {
         return this._element;
     }
@@ -2004,15 +2014,6 @@ class VTOController extends plattar_controller_1.PlattarController {
         const configAR = new configurator_ar_1.ConfiguratorAR({ state: await this.getConfiguratorState(), useARBanner: this.getBooleanAttribute("show-ar-banner") });
         return configAR.init();
     }
-    removeRenderer() {
-        if (this._element) {
-            this._element.remove();
-            this._element = null;
-            return true;
-        }
-        this.removeMessengerObservers();
-        return false;
-    }
     get element() {
         return this._element;
     }
@@ -2026,6 +2027,7 @@ const plattar_api_1 = require("@plattar/plattar-api");
 const configurator_controller_1 = require("./controllers/configurator-controller");
 const vto_controller_1 = require("./controllers/vto-controller");
 const product_controller_1 = require("./controllers/product-controller");
+const util_1 = require("../util/util");
 /**
  * This tracks the current embed type
  */
@@ -2056,6 +2058,7 @@ class PlattarEmbed extends HTMLElement {
         this._observerState = ObserverState.Unlocked;
         this._controller = null;
         this._currentSceneID = null;
+        this._currentServer = null;
         this._observer = null;
     }
     get viewer() {
@@ -2071,9 +2074,6 @@ class PlattarEmbed extends HTMLElement {
      * creates a brand new instance of this embed
      */
     create() {
-        // server cannot be changed once its set - defaults to production
-        const server = this.hasAttribute("server") ? this.getAttribute("server") : "production";
-        plattar_api_1.Server.create(plattar_api_1.Server.match(server || "production"));
         if (!this._observer) {
             this._observer = new MutationObserver((mutations) => {
                 if (this._observerState === ObserverState.Unlocked) {
@@ -2130,15 +2130,23 @@ class PlattarEmbed extends HTMLElement {
      * embedding products with variations (without a scene-id)
      */
     _CreateLegacyEmbed() {
-        this._controller = new product_controller_1.ProductController(this);
-        const init = this.hasAttribute("init") ? this.getAttribute("init") : null;
-        switch (init) {
-            case "viewer":
-                this.startViewer();
-                break;
-            case "qrcode":
-                this.startQRCode();
-                break;
+        // server cannot be changed once its set - defaults to production
+        const server = this.hasAttribute("server") ? this.getAttribute("server") : "production";
+        if (util_1.Util.isValidServerLocation(server)) {
+            plattar_api_1.Server.create(plattar_api_1.Server.match(server || "production"));
+            this._controller = new product_controller_1.ProductController(this);
+            const init = this.hasAttribute("init") ? this.getAttribute("init") : null;
+            switch (init) {
+                case "viewer":
+                    this.startViewer();
+                    break;
+                case "qrcode":
+                    this.startQRCode();
+                    break;
+            }
+        }
+        else {
+            console.warn("PlattarEmbed.CreateLegacy - cannot create as server attribute " + server + " is invalid, embed status remains unchanged");
         }
     }
     /**
@@ -2146,6 +2154,21 @@ class PlattarEmbed extends HTMLElement {
      * this can also be called when attributes/state changes so embeds can be re-loaded
      */
     _CreateEmbed(attributeName) {
+        // check if controller needs to be destroyed due to server change
+        const serverAttribute = this.hasAttribute("server") ? this.getAttribute("server") : "production";
+        if (this._currentServer !== serverAttribute) {
+            this._currentServer = serverAttribute || "production";
+            // reset the controller if any
+            if (this._controller) {
+                this._controller.removeRenderer();
+                this._controller = null;
+            }
+        }
+        if (!util_1.Util.isValidServerLocation(this._currentServer)) {
+            console.warn("PlattarEmbed.Create - cannot create as server attribute " + this._currentServer + " is invalid, embed status remains unchanged");
+            return;
+        }
+        plattar_api_1.Server.create(plattar_api_1.Server.match(this._currentServer || "production"));
         const embedType = this.hasAttribute("embed-type") ? this.getAttribute("embed-type") : "configurator";
         const currentEmbed = this._currentType;
         if (embedType) {
@@ -2264,7 +2287,7 @@ class PlattarEmbed extends HTMLElement {
 }
 exports.default = PlattarEmbed;
 
-},{"./controllers/configurator-controller":8,"./controllers/product-controller":10,"./controllers/vto-controller":11,"@plattar/plattar-api":44}],13:[function(require,module,exports){
+},{"../util/util":15,"./controllers/configurator-controller":8,"./controllers/product-controller":10,"./controllers/vto-controller":11,"@plattar/plattar-api":44}],13:[function(require,module,exports){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -2750,6 +2773,30 @@ exports.Util = void 0;
  * Static Utility Functions
  */
 class Util {
+    static isValidServerLocation(server) {
+        if (!server) {
+            return false;
+        }
+        switch (server.toLowerCase()) {
+            case "staging.plattar.space":
+            case "cdn-staging.plattar.space":
+            case "staging":
+            case "app.plattar.com":
+            case "cdn.plattar.com":
+            case "prod":
+            case "production":
+            case "review.plattar.com":
+            case "review":
+            case "qa":
+            case "dev":
+            case "developer":
+            case "development":
+            case "local":
+            case "localhost":
+                return true;
+        }
+        return false;
+    }
     static canAugment() {
         return Util.canQuicklook() || Util.canSceneViewer();
     }
@@ -2819,7 +2866,7 @@ exports.Util = Util;
 },{}],16:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = "1.167.6";
+exports.default = "1.167.7";
 
 },{}],17:[function(require,module,exports){
 "use strict";
@@ -6770,11 +6817,21 @@ class BaseElement extends HTMLElement {
 
         if (shortenURL && shortenURL.toLowerCase() === "true") {
             this._ShortenURL(url).then((newURL) => {
-                this._GenerateQRCode(newURL, width, height);
+                // make sure by time promise is resolved that the original url hasn't been updated
+                const updatedURL = this.hasAttribute("url") ? this.getAttribute("url") : undefined;
+
+                if (updatedURL === url) {
+                    this._GenerateQRCode(newURL, width, height);
+                }
             }).catch((_err) => {
                 console.warn(_err);
                 // ignore error and just generate normal QR Code
-                this._GenerateQRCode(url, width, height);
+                // make sure by time promise is resolved that the original url hasn't been updated
+                const updatedURL = this.hasAttribute("url") ? this.getAttribute("url") : undefined;
+
+                if (updatedURL === url) {
+                    this._GenerateQRCode(url, width, height);
+                }
             });
         }
         else {
@@ -6924,7 +6981,7 @@ module.exports = {
     version: Version
 };
 },{"./elements/qrcode-element.js":109,"./version":111}],111:[function(require,module,exports){
-module.exports = "1.160.1";
+module.exports = "1.165.1";
 
 },{}],112:[function(require,module,exports){
 "use strict";
@@ -8022,9 +8079,8 @@ class Util {
 
 module.exports = Util;
 },{}],131:[function(require,module,exports){
-module.exports = "1.165.1";
-
-},{}],132:[function(require,module,exports){
+arguments[4][111][0].apply(exports,arguments)
+},{"dup":111}],132:[function(require,module,exports){
 (function (global){(function (){
 "use strict";