@plattar/plattar-ar-adapter 1.167.6 → 1.167.7

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

@@ -1881,17 +1881,6 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
             }
             return _InitARGenerated;
           }())
-        }, {
-          key: "removeRenderer",
-          value: function removeRenderer() {
-            if (this._element) {
-              this._element.remove();
-              this._element = null;
-              return true;
-            }
-            this.removeMessengerObservers();
-            return false;
-          }
         }, {
           key: "element",
           get: function get() {
@@ -2220,9 +2209,28 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
             return startARQRCode;
           }()
           /**
-           * Returns the Parent Instance
+           * Removes the currently active renderer view from the DOM
            */
           )
+        }, {
+          key: "removeRenderer",
+          value: function removeRenderer() {
+            // remove all other children
+            var shadow = this.parent.shadowRoot;
+            if (shadow) {
+              var child = shadow.lastElementChild;
+              while (child) {
+                shadow.removeChild(child);
+                child = shadow.lastElementChild;
+              }
+            }
+            this._element = null;
+            this.removeMessengerObservers();
+            return true;
+          }
+          /**
+           * Returns the Parent Instance
+           */
         }, {
           key: "parent",
           get: function get() {
@@ -2286,6 +2294,18 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
             });
             shadow.append(element);
           }
+          /**
+           *
+           * @param element
+           */
+        }, {
+          key: "removeChild",
+          value: function removeChild(element) {
+            var shadow = this.parent.shadowRoot;
+            if (shadow) {
+              shadow.removeChild(element);
+            }
+          }
         }]);
         return PlattarController;
       }();
@@ -2569,16 +2589,6 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
               return reject(new Error("ProductController.initAR() - minimum required attributes not set, use product-id as a minimum"));
             });
           }
-        }, {
-          key: "removeRenderer",
-          value: function removeRenderer() {
-            if (this._element) {
-              this._element.remove();
-              this._element = null;
-              return true;
-            }
-            return false;
-          }
         }, {
           key: "element",
           get: function get() {
@@ -3034,17 +3044,6 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
             }
             return _InitARGenerated;
           }())
-        }, {
-          key: "removeRenderer",
-          value: function removeRenderer() {
-            if (this._element) {
-              this._element.remove();
-              this._element = null;
-              return true;
-            }
-            this.removeMessengerObservers();
-            return false;
-          }
         }, {
           key: "element",
           get: function get() {
@@ -3071,6 +3070,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       var configurator_controller_1 = require("./controllers/configurator-controller");
       var vto_controller_1 = require("./controllers/vto-controller");
       var product_controller_1 = require("./controllers/product-controller");
+      var util_1 = require("../util/util");
       /**
        * This tracks the current embed type
        */
@@ -3104,6 +3104,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
           _this25._observerState = ObserverState.Unlocked;
           _this25._controller = null;
           _this25._currentSceneID = null;
+          _this25._currentServer = null;
           _this25._observer = null;
           return _this25;
         }
@@ -3127,9 +3128,6 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
           key: "create",
           value: function create() {
             var _this26 = this;
-            // server cannot be changed once its set - defaults to production
-            var 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(function (mutations) {
                 if (_this26._observerState === ObserverState.Unlocked) {
@@ -3193,15 +3191,22 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
         }, {
           key: "_CreateLegacyEmbed",
           value: function _CreateLegacyEmbed() {
-            this._controller = new product_controller_1.ProductController(this);
-            var 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
+            var 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);
+              var 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");
             }
           }
           /**
@@ -3211,6 +3216,21 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
         }, {
           key: "_CreateEmbed",
           value: function _CreateEmbed(attributeName) {
+            // check if controller needs to be destroyed due to server change
+            var 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"));
             var embedType = this.hasAttribute("embed-type") ? this.getAttribute("embed-type") : "configurator";
             var currentEmbed = this._currentType;
             if (embedType) {
@@ -3416,6 +3436,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       }( /*#__PURE__*/_wrapNativeSuper(HTMLElement));
       exports["default"] = PlattarEmbed;
     }, {
+      "../util/util": 15,
       "./controllers/configurator-controller": 8,
       "./controllers/product-controller": 10,
       "./controllers/vto-controller": 11,
@@ -4089,6 +4110,32 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
           _classCallCheck(this, Util);
         }
         _createClass(Util, null, [{
+          key: "isValidServerLocation",
+          value: function 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;
+          }
+        }, {
           key: "canAugment",
           value: function canAugment() {
             return Util.canQuicklook() || Util.canSceneViewer();
@@ -4188,7 +4235,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       Object.defineProperty(exports, "__esModule", {
         value: true
       });
-      exports["default"] = "1.167.6";
+      exports["default"] = "1.167.7";
     }, {}],
     17: [function (require, module, exports) {
       "use strict";
@@ -9111,11 +9158,19 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
             var shortenURL = this.hasAttribute("shorten") ? this.getAttribute("shorten") : "false";
             if (shortenURL && shortenURL.toLowerCase() === "true") {
               this._ShortenURL(url).then(function (newURL) {
-                _this56._GenerateQRCode(newURL, width, height);
+                // make sure by time promise is resolved that the original url hasn't been updated
+                var updatedURL = _this56.hasAttribute("url") ? _this56.getAttribute("url") : undefined;
+                if (updatedURL === url) {
+                  _this56._GenerateQRCode(newURL, width, height);
+                }
               })["catch"](function (_err) {
                 console.warn(_err);
                 // ignore error and just generate normal QR Code
-                _this56._GenerateQRCode(url, width, height);
+                // make sure by time promise is resolved that the original url hasn't been updated
+                var updatedURL = _this56.hasAttribute("url") ? _this56.getAttribute("url") : undefined;
+                if (updatedURL === url) {
+                  _this56._GenerateQRCode(url, width, height);
+                }
               });
             } else {
               this._GenerateQRCode(url, width, height);
@@ -9261,7 +9316,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       "./version": 111
     }],
     111: [function (require, module, exports) {
-      module.exports = "1.160.1";
+      module.exports = "1.165.1";
     }, {}],
     112: [function (require, module, exports) {
       "use strict";
@@ -10566,8 +10621,10 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       module.exports = Util;
     }, {}],
     131: [function (require, module, exports) {
-      module.exports = "1.165.1";
-    }, {}],
+      arguments[4][111][0].apply(exports, arguments);
+    }, {
+      "dup": 111
+    }],
     132: [function (require, module, exports) {
       (function (global) {
         (function () {