@alfalab/bridge-to-native 1.4.0 → 1.4.1

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalLinksService = void 0;
 const query_and_headers_keys_1 = require("../../query-and-headers-keys");
 const constants_1 = require("../constants");
-const close_webview_util_1 = require("./close-webview-util");
+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,18 +14,26 @@ 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'
+            ? (0, utils_1.appendFromCurrentQueryParamForIos)(originalNativeUrl)
+            : originalNativeUrl;
         if (closeWebviewBeforeCallNativeDeeplinkHandler &&
             this.nativeParamsService.canUseNativeFeature('savedBackStack')) {
-            (0, close_webview_util_1.closeWebviewUtil)();
+            (0, utils_1.closeWebviewUtil)();
             // Проверено, ОС получает диплинк и передаёт его NA, не смотря на то,
             // что это происходит в следующей макрозадаче после команды на закрытие WV.
-            setTimeout(() => window.location.replace(`${this.nativeParamsService.appId}://${clearedDeeplinkPath}`), 0);
+            setTimeout(() => window.location.replace(preparedNativeUrl), 0);
             return;
         }
-        window.location.replace(`${this.nativeParamsService.appId}://${clearedDeeplinkPath}`);
+        this.navigateByNativeApp(preparedNativeUrl);
     }
     getHrefToOpenInBrowser(link) {
         if (!this.nativeParamsService.canUseNativeFeature('linksInBrowser')) {
@@ -35,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);
@@ -51,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();
@@ -62,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/client/services-and-utils/native-navigation-and-title-service.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NativeNavigationAndTitleService = void 0;
 const query_and_headers_keys_1 = require("../../query-and-headers-keys");
-const close_webview_util_1 = require("./close-webview-util");
+const utils_1 = require("./utils");
 const NativeHistoryStackStub = 0;
 /**
  * Сервис, отвечающий за взаимодействие WA с WV компонентами NA —
@@ -39,7 +39,7 @@ class NativeNavigationAndTitleService {
     }
     // eslint-disable-next-line class-methods-use-this -- удобней использовать метод в контексте экземпляра.
     closeWebview() {
-        (0, close_webview_util_1.closeWebviewUtil)();
+        (0, utils_1.closeWebviewUtil)();
     }
     goBack() {
         if (this.isGoBackLocked) {
@@ -57,7 +57,7 @@ class NativeNavigationAndTitleService {
         const maxStepsToBack = this.nativeHistoryStack.length - 1;
         if (stepsToBack > maxStepsToBack) {
             if (autoCloseWebview) {
-                (0, close_webview_util_1.closeWebviewUtil)();
+                (0, utils_1.closeWebviewUtil)();
                 return;
             }
             this.numOfBackSteps = maxStepsToBack;
@@ -154,7 +154,7 @@ class NativeNavigationAndTitleService {
         }
         this.numOfBackSteps = 1;
         if (this.nativeHistoryStack.length < 1) {
-            (0, close_webview_util_1.closeWebviewUtil)();
+            (0, utils_1.closeWebviewUtil)();
             return;
         }
         this.saveNativeHistoryStack();

package/client/services-and-utils/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function appendFromCurrentQueryParamForIos(nativeUrl: string): string;
+export declare const closeWebviewUtil: () => void;

package/client/services-and-utils/utils.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.closeWebviewUtil = void 0;
+exports.appendFromCurrentQueryParamForIos = appendFromCurrentQueryParamForIos;
+const QUERY_CLOSE_WEBVIEW_KEY = 'closeWebView';
+const QUERY_CLOSE_WEBVIEW_VALUE = 'true';
+const QUERY_FROM_CURRENT_KEY = 'fromCurrent';
+const QUERY_FROM_CURRENT_VALUE = 'true';
+function appendFromCurrentQueryParamForIos(nativeUrl) {
+    const qIndex = nativeUrl.indexOf('?');
+    if (qIndex === -1) {
+        return `${nativeUrl}?${QUERY_FROM_CURRENT_KEY}=${QUERY_FROM_CURRENT_VALUE}`;
+    }
+    const base = nativeUrl.slice(0, qIndex);
+    const query = nativeUrl.slice(qIndex + 1);
+    const params = new URLSearchParams(query);
+    params.set(QUERY_FROM_CURRENT_KEY, QUERY_FROM_CURRENT_VALUE);
+    return `${base}?${params.toString()}`;
+}
+const closeWebviewUtil = () => {
+    const originalPageUrl = new URL(window.location.href);
+    originalPageUrl.searchParams.set(QUERY_CLOSE_WEBVIEW_KEY, QUERY_CLOSE_WEBVIEW_VALUE);
+    window.location.href = originalPageUrl.toString();
+};
+exports.closeWebviewUtil = closeWebviewUtil;

package/package.json

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

package/client/services-and-utils/close-webview-util.d.ts

@@ -1 +0,0 @@
-export declare const closeWebviewUtil: () => void;

package/client/services-and-utils/close-webview-util.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeWebviewUtil = void 0;
-const QUERY_CLOSE_WEBVIEW_KEY = 'closeWebView';
-const QUERY_CLOSE_WEBVIEW_VALUE = 'true';
-const closeWebviewUtil = () => {
-    const originalPageUrl = new URL(window.location.href);
-    originalPageUrl.searchParams.set(QUERY_CLOSE_WEBVIEW_KEY, QUERY_CLOSE_WEBVIEW_VALUE);
-    window.location.href = originalPageUrl.toString();
-};
-exports.closeWebviewUtil = closeWebviewUtil;