@plattar/plattar-ar-adapter 1.168.2 → 1.169.2

package/dist/embed/controllers/configurator-controller.js

@@ -210,9 +210,9 @@ class ConfiguratorController extends plattar_controller_1.PlattarController {
         const showAR = this.getAttribute("show-ar");
         const showUI = this.getAttribute("show-ui");
         if (configState) {
-            let encodedState = configState.state.encode();
+            const encodedState = configState.state.encode();
             if (encodedState.length < 6000) {
-                viewer.setAttribute("config-state", configState.state.encode());
+                viewer.setAttribute("config-state", encodedState);
             }
         }
         if (showAR) {

package/dist/embed/controllers/webxr-controller.d.ts

@@ -0,0 +1,16 @@
+import { LauncherAR } from "../../ar/launcher-ar";
+import { DecodedConfiguratorState } from "../../util/configurator-state";
+import { PlattarController } from "./plattar-controller";
+/**
+ * Manages an instance of the <plattar-ewall> HTML Element
+ */
+export declare class WebXRController extends PlattarController {
+    private _cachedConfigState;
+    getConfiguratorState(): Promise<DecodedConfiguratorState>;
+    onAttributesUpdated(attributeName: string): Promise<void>;
+    startViewerQRCode(options: any): Promise<HTMLElement>;
+    get element(): HTMLElement | null;
+    startQRCode(options: any): Promise<HTMLElement>;
+    startRenderer(): Promise<HTMLElement>;
+    initAR(): Promise<LauncherAR>;
+}

package/dist/embed/controllers/webxr-controller.js

@@ -0,0 +1,144 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebXRController = void 0;
+const util_1 = require("../../util/util");
+const plattar_controller_1 = require("./plattar-controller");
+/**
+ * Manages an instance of the <plattar-ewall> HTML Element
+ */
+class WebXRController extends plattar_controller_1.PlattarController {
+    constructor() {
+        super(...arguments);
+        this._cachedConfigState = null;
+    }
+    async getConfiguratorState() {
+        if (this._cachedConfigState) {
+            return this._cachedConfigState;
+        }
+        this._cachedConfigState = this.createConfiguratorState();
+        return this._cachedConfigState;
+    }
+    async onAttributesUpdated(attributeName) {
+        const state = this._state;
+        if (state === plattar_controller_1.ControllerState.Renderer) {
+            const viewer = this.element;
+            if (viewer) {
+                if (attributeName === "variation-id") {
+                    const variationIDs = this.getAttribute("variation-id");
+                    const variationIDsList = variationIDs ? variationIDs.split(",") : [];
+                    if (variationIDsList.length > 0) {
+                        await viewer.messenger.selectVariationID(variationIDsList);
+                    }
+                }
+                if (attributeName === "variation-sku") {
+                    const variationSKUs = this.getAttribute("variation-sku");
+                    const variationSKUList = variationSKUs ? variationSKUs.split(",") : [];
+                    if (variationSKUList.length > 0) {
+                        await viewer.messenger.selectVariationSKU(variationSKUList);
+                    }
+                }
+            }
+            return;
+        }
+        // re-render the QR Code when attributes have changed
+        if (state === plattar_controller_1.ControllerState.QRCode) {
+            if (attributeName === "variation-id") {
+                const configState = await this.getConfiguratorState();
+                const variationIDs = this.getAttribute("variation-id");
+                const variationIDsList = variationIDs ? variationIDs.split(",") : [];
+                variationIDsList.forEach((variationID) => {
+                    configState.state.setVariationID(variationID);
+                });
+            }
+            if (attributeName === "variation-sku") {
+                const configState = await this.getConfiguratorState();
+                const variationSKUs = this.getAttribute("variation-sku");
+                const variationSKUList = variationSKUs ? variationSKUs.split(",") : [];
+                variationSKUList.forEach((variationSKU) => {
+                    configState.state.setVariationSKU(variationSKU);
+                });
+            }
+            this.startQRCode(this._prevQROpt);
+            return;
+        }
+    }
+    startViewerQRCode(options) {
+        return this.startQRCode(options);
+    }
+    get element() {
+        return this._element;
+    }
+    async startQRCode(options) {
+        // remove the old renderer instance if any
+        this.removeRenderer();
+        const sceneID = this.getAttribute("scene-id");
+        if (!sceneID) {
+            throw new Error("WebXRController.startQRCode() - minimum required attributes not set, use scene-id as a minimum");
+        }
+        const opt = options || this._GetDefaultQROptions();
+        const viewer = document.createElement("plattar-qrcode");
+        this._element = viewer;
+        // required attributes with defaults for plattar-viewer node
+        const width = this.getAttribute("width") || "500px";
+        const height = this.getAttribute("height") || "500px";
+        viewer.setAttribute("width", width);
+        viewer.setAttribute("height", height);
+        if (opt.color) {
+            viewer.setAttribute("color", opt.color);
+        }
+        if (opt.margin) {
+            viewer.setAttribute("margin", "" + opt.margin);
+        }
+        if (opt.qrType) {
+            viewer.setAttribute("qr-type", opt.qrType);
+        }
+        viewer.setAttribute("shorten", (opt.shorten && (opt.shorten === true || opt.shorten === "true")) ? "true" : "false");
+        const dst = location.href;
+        viewer.setAttribute("url", opt.url || dst);
+        this._state = plattar_controller_1.ControllerState.QRCode;
+        this._prevQROpt = opt;
+        return new Promise((accept, reject) => {
+            viewer.onload = () => {
+                return accept(viewer);
+            };
+            this.append(viewer);
+        });
+    }
+    async startRenderer() {
+        // remove the old renderer instance if any
+        this.removeRenderer();
+        if (!util_1.Util.canAugment()) {
+            return this.startQRCode(this._GetDefaultQROptions());
+        }
+        const sceneID = this.getAttribute("scene-id");
+        if (!sceneID) {
+            throw new Error("WebXRController.startRenderer() - minimum required attributes not set, use scene-id as a minimum");
+        }
+        // required attributes with defaults for plattar-configurator node
+        const width = this.getAttribute("width") || "500px";
+        const height = this.getAttribute("height") || "500px";
+        const server = this.getAttribute("server") || "production";
+        const viewer = document.createElement("plattar-8wall");
+        this._element = viewer;
+        viewer.setAttribute("width", width);
+        viewer.setAttribute("height", height);
+        viewer.setAttribute("server", server);
+        viewer.setAttribute("scene-id", sceneID);
+        const showAR = this.getAttribute("show-ar");
+        const showUI = this.getAttribute("show-ui");
+        if (showAR) {
+            viewer.setAttribute("show-ar", showAR);
+        }
+        if (showUI) {
+            viewer.setAttribute("show-ui", showUI);
+        }
+        return new Promise((accept, reject) => {
+            this.append(viewer);
+            return accept(viewer);
+        });
+    }
+    async initAR() {
+        throw new Error("WebXRController.initAR() - cannot proceed as AR not available in webxr");
+    }
+}
+exports.WebXRController = WebXRController;

package/dist/embed/plattar-embed.js

@@ -5,6 +5,7 @@ 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");
+const webxr_controller_1 = require("./controllers/webxr-controller");
 /**
  * This tracks the current embed type
  */
@@ -13,7 +14,8 @@ var EmbedType;
     EmbedType[EmbedType["Configurator"] = 0] = "Configurator";
     EmbedType[EmbedType["Legacy"] = 1] = "Legacy";
     EmbedType[EmbedType["VTO"] = 2] = "VTO";
-    EmbedType[EmbedType["None"] = 3] = "None";
+    EmbedType[EmbedType["WebXR"] = 3] = "WebXR";
+    EmbedType[EmbedType["None"] = 4] = "None";
 })(EmbedType || (EmbedType = {}));
 /**
  * Controls the state of the observer
@@ -153,6 +155,9 @@ class PlattarEmbed extends HTMLElement {
                 case "vto":
                     this._currentType = EmbedType.VTO;
                     break;
+                case "webxr":
+                    this._currentType = EmbedType.WebXR;
+                    break;
                 case "viewer":
                 case "configurator":
                 default:
@@ -181,6 +186,9 @@ class PlattarEmbed extends HTMLElement {
                 case EmbedType.Configurator:
                     this._controller = new configurator_controller_1.ConfiguratorController(this);
                     break;
+                case EmbedType.WebXR:
+                    this._controller = new webxr_controller_1.WebXRController(this);
+                    break;
                 case EmbedType.VTO:
                     this._controller = new vto_controller_1.VTOController(this);
                     break;

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "1.168.2";
+declare const _default: "1.169.2";
 export default _default;

package/dist/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = "1.168.2";
+exports.default = "1.169.2";

package/dist/viewers/scene-viewer.js

@@ -27,7 +27,7 @@ class SceneViewer extends ar_viewer_1.ARViewer {
         if (this.isVertical) {
             intent += '&enable_vertical_placement=true';
         }
-        intent += ' #Intent;scheme=https;package=com.google.ar.core;action=android.intent.action.VIEW;';
+        intent += '#Intent;scheme=https;package=com.google.ar.core;action=android.intent.action.VIEW;';
         intent += `S.browser_fallback_url=${linkOverride};end;`;
         const anchor = document.createElement("a");
         anchor.setAttribute("href", intent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plattar/plattar-ar-adapter",
-  "version": "1.168.2",
+  "version": "1.169.2",
   "description": "Plattar AR Adapter for interfacing with Google & Apple WebAR",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -41,14 +41,14 @@
     "@plattar/plattar-api": "^1.159.1",
     "@plattar/plattar-qrcode": "1.165.1",
     "@plattar/plattar-services": "^1.157.1",
-    "@plattar/plattar-web": "^1.165.1"
+    "@plattar/plattar-web": "^1.169.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.9",
-    "@babel/core": "^7.23.9",
-    "@babel/preset-env": "^7.23.9",
+    "@babel/cli": "^7.24.1",
+    "@babel/core": "^7.24.3",
+    "@babel/preset-env": "^7.24.3",
     "browserify": "^17.0.0",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.3",
     "uglify-js": "^3.17.4"
   },
   "publishConfig": {