@alfalab/bridge-to-native 1.4.0-beta.560edfc → 1.4.0-beta.7b254fa

package/client/services-and-utils/external-links-service.d.ts

@@ -6,10 +6,12 @@ import { type NativeParamsService } from './native-params-service';
  */
 export declare class ExternalLinksService {
     private nativeParamsService;
+    private navigationByNativeAppInProgress;
     constructor(nativeParamsService: NativeParamsService);
     handleNativeDeeplink(deeplink: string, closeWebviewBeforeCallNativeDeeplinkHandler?: boolean): void;
     getHrefToOpenInBrowser(link: string): string;
     openInBrowser(link: string): void;
     openInNewWebview(link: string, nativeTitle?: string, closeCurrentWebview?: boolean): void;
     openPdf(url: string, type?: PdfType, title?: string): void;
+    private navigateByNativeApp;
 }

package/client/services-and-utils/external-links-service.js

@@ -4,6 +4,7 @@ exports.ExternalLinksService = void 0;
 const query_and_headers_keys_1 = require("../../query-and-headers-keys");
 const constants_1 = require("../constants");
 const utils_1 = require("./utils");
+const CANCEL_NEW_CALLS_TO_NA_TIME = 150;
 const QUERY_OPEN_IN_BROWSER_KEY = 'openInBrowser';
 const QUERY_OPEN_IN_BROWSER_VALUE = 'true';
 /**
@@ -13,8 +14,12 @@ const QUERY_OPEN_IN_BROWSER_VALUE = 'true';
 class ExternalLinksService {
     constructor(nativeParamsService) {
         this.nativeParamsService = nativeParamsService;
+        this.navigationByNativeAppInProgress = false;
     }
     handleNativeDeeplink(deeplink, closeWebviewBeforeCallNativeDeeplinkHandler = false) {
+        if (this.navigationByNativeAppInProgress) {
+            return;
+        }
         const clearedDeeplinkPath = deeplink.replace(constants_1.DEEP_LINK_PATTERN, '');
         const originalNativeUrl = `${this.nativeParamsService.appId}://${clearedDeeplinkPath}`;
         const preparedNativeUrl = this.nativeParamsService.environment === 'ios'
@@ -28,7 +33,7 @@ class ExternalLinksService {
             setTimeout(() => window.location.replace(preparedNativeUrl), 0);
             return;
         }
-        window.location.replace(preparedNativeUrl);
+        this.navigateByNativeApp(preparedNativeUrl);
     }
     getHrefToOpenInBrowser(link) {
         if (!this.nativeParamsService.canUseNativeFeature('linksInBrowser')) {
@@ -39,13 +44,16 @@ class ExternalLinksService {
         return url.href;
     }
     openInBrowser(link) {
+        if (this.navigationByNativeAppInProgress) {
+            return;
+        }
         if (!this.nativeParamsService.canUseNativeFeature('linksInBrowser')) {
             this.openInNewWebview(link);
             return;
         }
         const url = new URL(link);
         url.searchParams.append(QUERY_OPEN_IN_BROWSER_KEY, QUERY_OPEN_IN_BROWSER_VALUE);
-        window.location.replace(url.href);
+        this.navigateByNativeApp(url.href);
     }
     openInNewWebview(link, nativeTitle = '', closeCurrentWebview = false) {
         const url = new URL(link);
@@ -55,6 +63,9 @@ class ExternalLinksService {
         this.handleNativeDeeplink(`/webFeature?type=recommendation&url=${encodeURIComponent(url.toString())}`, closeCurrentWebview);
     }
     openPdf(url, type = 'pdfFile', title) {
+        if (this.navigationByNativeAppInProgress) {
+            return;
+        }
         let replaceUrl = url;
         if (this.nativeParamsService.environment === 'ios') {
             const params = new URLSearchParams();
@@ -66,10 +77,18 @@ class ExternalLinksService {
             const paramsStr = params.toString();
             replaceUrl = `${this.nativeParamsService.appId}:///dashboard/pdf_viewer?${paramsStr}`;
         }
-        const windowObjectReference = window.open(replaceUrl);
-        if (windowObjectReference === null) {
-            window.location.replace(replaceUrl);
-        }
+        replaceUrl =
+            this.nativeParamsService.environment === 'ios'
+                ? (0, utils_1.appendFromCurrentQueryParamForIos)(replaceUrl)
+                : replaceUrl;
+        this.navigateByNativeApp(replaceUrl);
+    }
+    navigateByNativeApp(url) {
+        this.navigationByNativeAppInProgress = true;
+        window.location.replace(url);
+        setTimeout(() => {
+            this.navigationByNativeAppInProgress = false;
+        }, CANCEL_NEW_CALLS_TO_NA_TIME);
     }
 }
 exports.ExternalLinksService = ExternalLinksService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfalab/bridge-to-native",
-  "version": "1.4.0-beta.560edfc",
+  "version": "1.4.0-beta.7b254fa",
   "license": "MIT",
   "description": "Утилита для удобной работы веб приложения внутри нативного приложения и коммуникации с ним.",
   "engines": {