@alfalab/bridge-to-native 1.3.2-beta.0084dcb → 1.3.2-beta.531b429

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

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

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

@@ -0,0 +1,11 @@
+"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;

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

@@ -3,7 +3,7 @@ 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 utils_1 = require("./utils");
+const close_webview_util_1 = require("./close-webview-util");
 const QUERY_OPEN_IN_BROWSER_KEY = 'openInBrowser';
 const QUERY_OPEN_IN_BROWSER_VALUE = 'true';
 /**
@@ -16,19 +16,15 @@ class ExternalLinksService {
     }
     handleNativeDeeplink(deeplink, closeWebviewBeforeCallNativeDeeplinkHandler = false) {
         const clearedDeeplinkPath = deeplink.replace(constants_1.DEEP_LINK_PATTERN, '');
-        const nativeUrl = `${this.nativeParamsService.appId}://${clearedDeeplinkPath}`;
-        const replaceUrl = this.nativeParamsService.environment === 'ios'
-            ? (0, utils_1.appendFromCurrentQueryParamForIos)(nativeUrl)
-            : nativeUrl;
         if (closeWebviewBeforeCallNativeDeeplinkHandler &&
             this.nativeParamsService.canUseNativeFeature('savedBackStack')) {
-            (0, utils_1.closeWebviewUtil)();
+            (0, close_webview_util_1.closeWebviewUtil)();
             // Проверено, ОС получает диплинк и передаёт его NA, не смотря на то,
             // что это происходит в следующей макрозадаче после команды на закрытие WV.
-            setTimeout(() => window.location.replace(replaceUrl), 0);
+            setTimeout(() => window.location.replace(`${this.nativeParamsService.appId}://${clearedDeeplinkPath}`), 0);
             return;
         }
-        window.location.replace(replaceUrl);
+        window.location.replace(`${this.nativeParamsService.appId}://${clearedDeeplinkPath}`);
     }
     getHrefToOpenInBrowser(link) {
         if (!this.nativeParamsService.canUseNativeFeature('linksInBrowser')) {

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 utils_1 = require("./utils");
+const close_webview_util_1 = require("./close-webview-util");
 /**
  * Сервис, отвечающий за взаимодействие WA с WV компонентами NA —
  * «заголовком» и кнопкой «назад».
@@ -24,7 +24,7 @@ class NativeNavigationAndTitleService {
     }
     // eslint-disable-next-line class-methods-use-this -- удобней использовать метод в контексте экземпляра.
     closeWebview() {
-        (0, utils_1.closeWebviewUtil)();
+        (0, close_webview_util_1.closeWebviewUtil)();
     }
     goBack() {
         this.goBackAFewStepsClientSide(-1, true);
@@ -38,7 +38,7 @@ class NativeNavigationAndTitleService {
         const maxStepsToBack = this.nativeHistoryStack.length - 1;
         if (stepsToBack > maxStepsToBack) {
             if (autoCloseWebview) {
-                (0, utils_1.closeWebviewUtil)();
+                (0, close_webview_util_1.closeWebviewUtil)();
                 return;
             }
             this.numOfBackSteps = maxStepsToBack;
@@ -119,7 +119,7 @@ class NativeNavigationAndTitleService {
         this.nativeHistoryStack = this.nativeHistoryStack.slice(0, -this.numOfBackSteps);
         this.numOfBackSteps = 1;
         if (this.nativeHistoryStack.length < 1) {
-            (0, utils_1.closeWebviewUtil)();
+            (0, close_webview_util_1.closeWebviewUtil)();
             return;
         }
         this.syncHistoryWithNative();

package/package.json

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

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

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

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

@@ -1,25 +0,0 @@
-"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;