@plattar/plattar-ar-adapter 1.139.1 → 1.140.1

package/dist/ar/scene-ar.d.ts

@@ -1,12 +1,18 @@
 import { LauncherAR } from "./launcher-ar";
+export interface SceneVariationSelection {
+    readonly sceneProductID?: string;
+    readonly productID?: string;
+    readonly variationID?: string;
+}
 /**
  * Performs AR functionality related to Plattar Scenes
  */
 export declare class SceneAR extends LauncherAR {
     private _analytics;
     private readonly _sceneID;
+    private readonly _variationSelection;
     private _ar;
-    constructor(sceneID?: string | undefined | null);
+    constructor(sceneID?: string | undefined | null, variationSelection?: SceneVariationSelection | undefined | null);
     get sceneID(): string;
     private _SetupAnalytics;
     /**

package/dist/ar/scene-ar.js

@@ -16,7 +16,7 @@ const launcher_ar_1 = require("./launcher-ar");
  * Performs AR functionality related to Plattar Scenes
  */
 class SceneAR extends launcher_ar_1.LauncherAR {
-    constructor(sceneID = null) {
+    constructor(sceneID = null, variationSelection = null) {
         super();
         // analytics instance
         this._analytics = null;
@@ -24,6 +24,7 @@ class SceneAR extends launcher_ar_1.LauncherAR {
             throw new Error("SceneAR.constructor(sceneID) - sceneID must be defined");
         }
         this._sceneID = sceneID;
+        this._variationSelection = variationSelection || {};
         this._ar = null;
     }
     get sceneID() {
@@ -67,9 +68,25 @@ class SceneAR extends launcher_ar_1.LauncherAR {
             // add our scene products
             sceneProducts.forEach((sceneProduct) => {
                 const product = sceneProduct.relationships.find(plattar_api_1.Product);
-                if (sceneProduct.attributes.include_in_augment && product && product.attributes.product_variation_id) {
-                    configurator.addSceneProduct(sceneProduct.id, product.attributes.product_variation_id);
-                    totalARObjectCount++;
+                const selection = this._variationSelection;
+                // we have a specific product selection
+                if (sceneProduct.attributes.include_in_augment) {
+                    // check if this product is the one we want (from selection optionally)
+                    if (product && (product.id === selection.productID) && selection.variationID) {
+                        configurator.addSceneProduct(sceneProduct.id, selection.variationID);
+                        totalARObjectCount++;
+                    }
+                    else if (product) {
+                        // check if this scene-product is the one we want (from selection)
+                        if ((sceneProduct.id === selection.sceneProductID) && selection.variationID) {
+                            configurator.addSceneProduct(sceneProduct.id, selection.variationID);
+                            totalARObjectCount++;
+                        }
+                        else if (product.attributes.product_variation_id) {
+                            configurator.addSceneProduct(sceneProduct.id, product.attributes.product_variation_id);
+                            totalARObjectCount++;
+                        }
+                    }
                 }
             });
             // add our scene models

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

@@ -49,12 +49,24 @@ class VTOController extends plattar_controller_1.PlattarController {
                 // optional attributes
                 const configState = this.getAttribute("config-state");
                 const showAR = this.getAttribute("show-ar");
+                const productID = this.getAttribute("product-id");
+                const sceneProductID = this.getAttribute("scene-product-id");
+                const variationID = this.getAttribute("variation-id");
                 if (configState) {
                     dst += "&config_state=" + configState;
                 }
                 if (showAR) {
                     dst += "&show_ar=" + showAR;
                 }
+                if (productID) {
+                    dst += "&product_id=" + productID;
+                }
+                if (sceneProductID) {
+                    dst += "&scene_product_id=" + sceneProductID;
+                }
+                if (variationID) {
+                    dst += "&variation_id=" + variationID;
+                }
                 viewer.setAttribute("url", opt.url || dst);
                 viewer.onload = () => {
                     return accept(viewer);
@@ -86,12 +98,24 @@ class VTOController extends plattar_controller_1.PlattarController {
                 // optional attributes
                 const configState = this.getAttribute("config-state");
                 const showAR = this.getAttribute("show-ar");
+                const productID = this.getAttribute("product-id");
+                const sceneProductID = this.getAttribute("scene-product-id");
+                const variationID = this.getAttribute("variation-id");
                 if (configState) {
                     viewer.setAttribute("config-state", configState);
                 }
                 if (showAR) {
                     viewer.setAttribute("show-ar", showAR);
                 }
+                if (productID) {
+                    viewer.setAttribute("product-id", productID);
+                }
+                if (sceneProductID) {
+                    viewer.setAttribute("scene-product-id", sceneProductID);
+                }
+                if (variationID) {
+                    viewer.setAttribute("variation-id", variationID);
+                }
                 viewer.onload = () => {
                     return accept(viewer);
                 };
@@ -194,7 +218,14 @@ class VTOController extends plattar_controller_1.PlattarController {
         // otherwise no config-state or viewer is active
         // fallback to using default SceneAR implementation
         if (sceneID) {
-            const sceneAR = new __1.SceneAR(sceneID);
+            const productID = this.getAttribute("product-id");
+            const sceneProductID = this.getAttribute("scene-product-id");
+            const variationID = this.getAttribute("variation-id");
+            const sceneAR = new __1.SceneAR(sceneID, {
+                productID: productID ? productID : undefined,
+                sceneProductID: sceneProductID ? sceneProductID : undefined,
+                variationID: variationID ? variationID : undefined
+            });
             sceneAR.init().then(accept).catch(reject);
             return;
         }

package/dist/util/util.d.ts

@@ -6,8 +6,13 @@ export declare class Util {
     static canQuicklook(): boolean;
     static canSceneViewer(): boolean;
     static canRealityViewer(): boolean;
-    static isSafari(): boolean;
+    static isSafariOnIOS(): boolean;
     static isChromeOnIOS(): boolean;
+    static isIOS(): boolean;
+    static isAndroid(): boolean;
+    static isFirefox(): boolean;
+    static isOculus(): boolean;
+    static isSafari(): boolean;
     static getIOSVersion(): number[];
     static getChromeVersion(): number;
 }

package/dist/util/util.js

@@ -6,58 +6,45 @@ exports.Util = void 0;
  */
 class Util {
     static canAugment() {
-        const userAgent = navigator.userAgent;
-        // test google chrome on IOS and standard IOS test
-        if ((/CriOS/i.test(userAgent) || /Macintosh|iPad|iPhone|iPod/.test(userAgent)) && !window.MSStream) {
-            // inside facebook browser
-            if (/\bFB[\w_]+\//.test(userAgent)) {
-                return false;
-            }
-            // inside instagram browser
-            if (/\bInstagram/i.test(userAgent)) {
-                return false;
+        return Util.canQuicklook() || Util.canSceneViewer();
+    }
+    static canQuicklook() {
+        if (Util.isIOS()) {
+            const isWKWebView = Boolean((window && window).webkit && window.webkit.messageHandlers);
+            if (isWKWebView) {
+                return Boolean(/CriOS\/|EdgiOS\/|FxiOS\/|GSA\/|DuckDuckGo\//.test(navigator.userAgent));
             }
-            return Util.canQuicklook();
-        }
-        else if (/android/i.test(userAgent)) {
-            return true;
+            const tempAnchor = document.createElement("a");
+            return tempAnchor.relList && tempAnchor.relList.supports && tempAnchor.relList.supports("ar");
         }
         return false;
     }
-    static canQuicklook() {
-        const tempAnchor = document.createElement("a");
-        return tempAnchor.relList &&
-            tempAnchor.relList.supports &&
-            tempAnchor.relList.supports("ar");
-    }
     static canSceneViewer() {
-        return Util.canAugment() && /android/i.test(navigator.userAgent);
+        return Util.isAndroid() && !Util.isFirefox() && !Util.isOculus();
     }
     static canRealityViewer() {
-        if (!Util.canAugment()) {
-            return false;
-        }
-        if (/Macintosh|iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
-            if (Util.isSafari() && Util.getIOSVersion()[0] >= 13) {
-                return true;
-            }
-        }
-        return false;
+        return Util.isIOS() && Util.getIOSVersion()[0] >= 13;
     }
-    static isSafari() {
-        if (navigator.vendor && navigator.userAgent) {
-            return navigator.vendor.indexOf("Apple") > -1 &&
-                navigator.userAgent.indexOf("CriOS") === -1 &&
-                navigator.userAgent.indexOf("FxiOS") === -1;
-        }
-        return false;
+    static isSafariOnIOS() {
+        return Util.isIOS() && Util.isSafari();
     }
     static isChromeOnIOS() {
-        const userAgent = navigator.userAgent;
-        if (userAgent) {
-            return Util.canAugment() && /CriOS/i.test(userAgent);
-        }
-        return false;
+        return Util.isIOS() && /CriOS\//.test(navigator.userAgent);
+    }
+    static isIOS() {
+        return (/iPad|iPhone|iPod/.test(navigator.userAgent) && !self.MSStream) || (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1);
+    }
+    static isAndroid() {
+        return /android/i.test(navigator.userAgent);
+    }
+    static isFirefox() {
+        return /firefox/i.test(navigator.userAgent);
+    }
+    static isOculus() {
+        return /OculusBrowser/.test(navigator.userAgent);
+    }
+    static isSafari() {
+        return /Safari\//.test(navigator.userAgent);
     }
     static getIOSVersion() {
         if (/iP(hone|od|ad)/.test(navigator.platform)) {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "1.139.1";
+declare const _default: "1.140.1";
 export default _default;

package/dist/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plattar/plattar-ar-adapter",
-  "version": "1.139.1",
+  "version": "1.140.1",
   "description": "Plattar AR Adapter for interfacing with Google & Apple WebAR",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -45,11 +45,11 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.19.6",
-    "@babel/preset-env": "^7.19.4",
+    "@babel/core": "^7.20.2",
+    "@babel/preset-env": "^7.20.2",
     "browserify": "^17.0.0",
     "typescript": "^4.8.4",
-    "uglify-js": "^3.17.3"
+    "uglify-js": "^3.17.4"
   },
   "publishConfig": {
     "access": "public"