decentraland-ui2 0.27.0 → 0.27.1-17685773876.commit-bcabe46

package/dist/modules/jumpIn.d.ts

@@ -1,10 +1,16 @@
-/**
- * Try to launch the desktop version using the custom protocol `decentraland://position=x,y&realm=zzz`
- * and return a boolean that represents if a loss of focus was detected on the current window
- * (assuming it was due to the interaction generated by the desktop version)
- */
-declare const launchDesktopApp: (options: {
+import { AdvancedNavigatorUAData } from "@dcl/hooks/cjs/hooks/useAdvancedUserAgentData";
+type JumpInOptions = {
     position?: string;
     realm?: string;
-}) => Promise<boolean>;
-export { launchDesktopApp };
+    timeoutMs?: number;
+    userAgentData?: AdvancedNavigatorUAData;
+};
+/**
+ * Attempts to open the desktop app and resolves:
+ *  - true if it detects visibility/focus loss within the timeout
+ *  - rejects with error if it doesn't detect anything within the timeout
+ *
+ * IMPORTANT: call within a user gesture (onclick).
+ */
+export declare function launchDesktopApp(opts?: JumpInOptions): Promise<boolean>;
+export {};

package/dist/modules/jumpIn.js

@@ -1,98 +1,70 @@
-function callOnce(fun) {
-    let result = null;
-    return () => {
-        if (!result) {
-            result = { value: fun() };
-        }
-        return result.value;
-    };
+function buildDecentralandUrl(opts) {
+    const params = new URLSearchParams();
+    if (opts.position)
+        params.set("position", opts.position);
+    if (opts.realm)
+        params.set("realm", opts.realm);
+    return `decentraland://?${params.toString()}`;
 }
-const isMobile = callOnce(() => {
-    if (/Mobi/i.test(navigator.userAgent) ||
-        /Android/i.test(navigator.userAgent)) {
-        return true;
-    }
-    if (/iPad|iPhone|iPod/.test(navigator.platform)) {
-        return true;
-    }
-    if (/Macintosh/i.test(navigator.userAgent) &&
-        navigator.maxTouchPoints &&
-        navigator.maxTouchPoints > 1) {
-        // iPad pro
-        return true;
-    }
-    return false;
-});
-const isElectron = callOnce(() => {
-    // Renderer process
-    if (typeof window !== "undefined" &&
+function isElectronApp() {
+    return ((typeof window !== "undefined" &&
         typeof window.process === "object" &&
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        window.process.type === "renderer") {
-        return true;
-    }
-    // Main process
-    if (typeof process !== "undefined" &&
-        typeof process.versions === "object" &&
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        !!process.versions.electron) {
-        return true;
-    }
-    // Detect the user agent when the `nodeIntegration` option is set to true
-    if (typeof navigator === "object" &&
-        typeof navigator.userAgent === "string" &&
-        navigator.userAgent.indexOf("Electron") >= 0) {
-        return true;
-    }
-    return false;
-});
+        window.process.type === "renderer") ||
+        (typeof process !== "undefined" &&
+            typeof process.versions ===
+                "object" &&
+            !!process.versions.electron) ||
+        (typeof navigator === "object" &&
+            typeof navigator.userAgent === "string" &&
+            navigator.userAgent.includes("Electron")));
+}
 /**
- * Try to launch the desktop version using the custom protocol `decentraland://position=x,y&realm=zzz`
- * and return a boolean that represents if a loss of focus was detected on the current window
- * (assuming it was due to the interaction generated by the desktop version)
+ * Attempts to open the desktop app and resolves:
+ *  - true if it detects visibility/focus loss within the timeout
+ *  - rejects with error if it doesn't detect anything within the timeout
+ *
+ * IMPORTANT: call within a user gesture (onclick).
  */
-const launchDesktopApp = async (options) => {
-    // prevent launch for desktop and mobile
-    if (isElectron() || isMobile()) {
-        return false;
-    }
-    const customProtocolParams = [];
-    if (options.position) {
-        customProtocolParams.push(`position=${options.position}`);
+export function launchDesktopApp(opts = {}) {
+    const { timeoutMs = 750, userAgentData } = opts;
+    const isMobile = userAgentData?.mobile || userAgentData?.tablet;
+    if (isMobile || isElectronApp()) {
+        return Promise.resolve(false);
     }
-    if (options.realm) {
-        customProtocolParams.push(`realm=${options.realm}`);
-    }
-    const customProtocolTarget = `decentraland://?${customProtocolParams.join("&")}`;
-    // assume that the desktop version is installed only if
-    // we detect a loss of focus on window
-    let installed = false;
-    const isInstalled = () => {
-        installed = true;
+    const target = buildDecentralandUrl(opts);
+    let opened = false;
+    const onLoseFocus = () => {
+        opened = true;
+    };
+    const cleanup = () => {
+        document.removeEventListener("visibilitychange", onVis);
+        window.removeEventListener("pagehide", onLoseFocus);
+        window.removeEventListener("blur", onLoseFocus);
     };
-    window.addEventListener("blur", isInstalled);
-    // inject an iframe that open the desktop version
-    // NOTE: this can be also achieved with
-    // ```js
-    //   window.location.href = customProtocolTarget
-    // ```
-    // but in safari redirects into an invalid url if the desktop
-    // client is not installed
-    const iframe = document.createElement("iframe");
-    iframe.setAttribute("style", "display: none");
-    iframe.src = customProtocolTarget;
-    document.body.appendChild(iframe);
-    // wait half of a second to detect the loss of focus because
-    // the time it takes for the `blur` event to be fired varies
-    // depending on the browser
-    return new Promise((resolve) => {
-        setTimeout(() => {
-            window.removeEventListener("blur", isInstalled);
-            document.body.removeChild(iframe);
-            console.log("installed", installed);
-            resolve(installed);
-        }, 500);
+    const onVis = () => {
+        if (document.visibilityState === "hidden")
+            onLoseFocus();
+    };
+    document.addEventListener("visibilitychange", onVis, { passive: true });
+    window.addEventListener("pagehide", onLoseFocus, { passive: true });
+    window.addEventListener("blur", onLoseFocus, { passive: true });
+    window.location.assign(target);
+    return new Promise((resolve, reject) => {
+        const t = setTimeout(() => {
+            cleanup();
+            const success = opened;
+            if (!success) {
+                reject(new Error("Failed to open desktop app"));
+            }
+            else {
+                resolve(success);
+            }
+        }, timeoutMs);
+        if (opened) {
+            clearTimeout(t);
+            cleanup();
+            resolve(true);
+        }
     });
-};
-export { launchDesktopApp };
+}
 //# sourceMappingURL=jumpIn.js.map

package/dist/modules/jumpIn.js.map

@@ -1 +1 @@
-{"version":3,"file":"jumpIn.js","sourceRoot":"","sources":["../../src/modules/jumpIn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jumpIn.js","sourceRoot":"","sources":["../../src/modules/jumpIn.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decentraland-ui2",
-  "version": "0.27.0",
+  "version": "0.27.1-17685773876.commit-bcabe46",
   "description": "Decentraland's UI components and styles",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -98,5 +98,5 @@
   "files": [
     "dist"
   ],
-  "commit": "4c426ca1d58a94ed78837658a85505d3d73e631c"
+  "commit": "bcabe461b469338c8434f1609043f29c35a25982"
 }