@alfalab/bridge-to-native 0.0.9-beta-648b4e7 → 0.0.10

package/bridge-to-native.js

@@ -1,8 +1,7 @@
 "use strict";
+/* eslint-disable no-underscore-dangle */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeToNative = void 0;
-/* eslint-disable no-underscore-dangle */
-//@ts-nocheck
 const constants_1 = require("./constants");
 const native_fallbacks_1 = require("./native-fallbacks");
 const native_navigation_and_title_1 = require("./native-navigation-and-title");
@@ -16,11 +15,6 @@ class BridgeToNative {
         // Webview, запущенное в Android окружении имеет объект `Android` в window.
         this.AndroidBridge = window.Android;
         this.environment = this.AndroidBridge ? 'android' : 'ios';
-        if (!(window === null || window === void 0 ? void 0 : window.locationReplaceStack)) {
-            window.locationReplaceStack = [];
-            console.log('window.locationReplaceStack created:');
-            console.log(window.locationReplaceStack);
-        }
         const previousState = !!sessionStorage.getItem(constants_1.PREVIOUS_B2N_STATE_STORAGE_KEY);
         if (previousState) {
             this.restorePreviousState();

package/native-fallbacks.js

@@ -110,22 +110,13 @@ class NativeFallbacks {
         const appId = (0, utils_1.getAppId)(environment, iosAppId);
         if (!forceOpenInWebview && this.b2n.canUseNativeFeature('linksInBrowser')) {
             url.searchParams.append('openInBrowser', 'true');
-            window.locationReplaceStack.push(url.href);
-            console.log('window.locationReplaceStack edited');
-            console.log(window.locationReplaceStack);
             window.location.replace(url.href);
         }
         else if (iosAppId || checkAndroidAllowOpenInNewWebview()) {
-            window.locationReplaceStack.push(`${appId}://webFeature?type=recommendation&url=${encodeURIComponent(url.href)}`);
-            console.log('window.locationReplaceStack edited');
-            console.log(window.locationReplaceStack);
             window.location.replace(`${appId}://webFeature?type=recommendation&url=${encodeURIComponent(url.href)}`);
         }
         else {
             (_a = this.b2n.nativeNavigationAndTitle) === null || _a === void 0 ? void 0 : _a.setInitialView('');
-            window.locationReplaceStack.push(url.href);
-            console.log('window.locationReplaceStack edited');
-            console.log(window.locationReplaceStack);
             window.location.replace(url.href);
         }
     }

package/native-navigation-and-title.d.ts

@@ -28,8 +28,9 @@ export declare class NativeNavigationAndTitle {
     goBackAFewSteps(stepsNumber: number, autoCloseWebview?: boolean): void;
     /**
      * @param path Путь для перехода на функциональность внутри приложения.
+     * @param historyState (https://developer.mozilla.org/en-US/docs/Web/API/History/state) для новой записи в истории.
      */
-    handleRedirect(path: string): void;
+    handleRedirect(path: string, historyState?: Record<string, unknown>): void;
     /**
      * В этом варианте аргументы 2,3,4 соответствуют аргументам 1,2,3 метода `src/shared/utils/handle-redirect`.
      *
@@ -37,8 +38,9 @@ export declare class NativeNavigationAndTitle {
      * @param appName См. первый параметр `src/handle-redirect.ts`.
      * @param path См. второй параметр `src/handle-redirect.ts`.
      * @param params См. третий параметр `src/handle-redirect.ts`.
+     * @param historyState (https://developer.mozilla.org/en-US/docs/Web/API/History/state) для новой записи в истории.
      */
-    handleRedirect(pageTitle: string, appName: string, path?: string, params?: Record<string, string>): void;
+    handleRedirect(pageTitle: string, appName: string, path?: string, params?: Record<string, string>, historyState?: Record<string, unknown>): void;
     /**
      * Информирует натив, что веб находится на первом экране (сбрасывает историю переходов, не влияя на браузерную
      * историю), а значит следующее нажатие на кнопку "Назад" в нативе закроет вебвью.

package/native-navigation-and-title.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NativeNavigationAndTitle = void 0;
-//@ts-nocheck
 const constants_1 = require("./constants");
 const utils_1 = require("./utils");
 /**
@@ -68,15 +67,17 @@ class NativeNavigationAndTitle {
      * и регистрирует этот переход в приложении, чтобы кнопка «Назад» в Нативе вызывала
      * переход назад в вебе.
      */
-    handleRedirect(pageTitleOrPath, appName, path, params) {
-        if (appName) {
-            this._handleWindowRedirect(appName, path, params);
+    handleRedirect(pageTitleOrPath, appNameOrHistoryState, path, params, historyState) {
+        const checkAppNameArgument = (argument) => Boolean(appNameOrHistoryState && typeof appNameOrHistoryState === 'string');
+        const isAppNameArgument = checkAppNameArgument(appNameOrHistoryState);
+        if (isAppNameArgument) {
+            this._handleWindowRedirect(appNameOrHistoryState, path, params, historyState);
         }
         else {
             const { appName: extractedAppName, path: extractedPath, query: extractedQuery, } = (0, utils_1.extractAppNameRouteAndQuery)(pageTitleOrPath);
-            this._handleWindowRedirect(extractedAppName, extractedPath, extractedQuery);
+            this._handleWindowRedirect(extractedAppName, extractedPath, extractedQuery, appNameOrHistoryState);
         }
-        const title = appName ? pageTitleOrPath : '';
+        const title = isAppNameArgument ? pageTitleOrPath : '';
         this.nativeHistoryStack.push(title);
         this.syncHistoryWithNative(title, 'navigation');
     }
@@ -144,23 +145,12 @@ class NativeNavigationAndTitle {
         if (this.b2n.environment === 'ios') {
             if (closeIOSWebviewBeforeCallNativeDeeplinkHandler) {
                 this.b2n.closeWebview();
-                setTimeout(() => {
-                    window.locationReplaceStack.push(`${this.b2n.iosAppId}://${clearedDeeplinkPath}`);
-                    console.log('window.locationReplaceStack edited');
-                    console.log(window.locationReplaceStack);
-                    window.location.replace(`${this.b2n.iosAppId}://${clearedDeeplinkPath}`);
-                }, 0);
+                setTimeout(() => window.location.replace(`${this.b2n.iosAppId}://${clearedDeeplinkPath}`), 0);
                 return;
             }
-            window.locationReplaceStack.push(`${this.b2n.iosAppId}://${clearedDeeplinkPath}`);
-            console.log('window.locationReplaceStack edited');
-            console.log(window.locationReplaceStack);
             window.location.replace(`${this.b2n.iosAppId}://${clearedDeeplinkPath}`);
         }
         else {
-            window.locationReplaceStack.push(`alfabank://${clearedDeeplinkPath}`);
-            console.log('window.locationReplaceStack edited');
-            console.log(window.locationReplaceStack);
             window.location.replace(`alfabank://${clearedDeeplinkPath}`);
         }
     }
@@ -286,9 +276,6 @@ class NativeNavigationAndTitle {
             const pageIdStr = pageId ? `&pageId=${pageId}` : '';
             const paramsToSend = `ios:setPageSettings/${pageTitleStr + pageIdStr}`;
             if (this.lastSetPageSettingsParams !== paramsToSend) {
-                window.locationReplaceStack.push(paramsToSend);
-                console.log('window.locationReplaceStack edited');
-                console.log(window.locationReplaceStack);
                 window.location.replace(paramsToSend);
                 this.lastSetPageSettingsParams = paramsToSend;
             }

package/package.json

@@ -1,7 +1,7 @@
 {
     "license": "UNLICENSED",
     "name": "@alfalab/bridge-to-native",
-    "version": "0.0.9-beta-648b4e7",
+    "version": "0.0.10",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/core-ds/bridge-to-native.git"

package/types.d.ts

@@ -30,7 +30,7 @@ export declare type PreviousNativeNavigationAndTitleState = {
     title: string;
 };
 export declare type SyncPurpose = 'initialization' | 'navigation' | 'title-replacing';
-export declare type HandleRedirect = (appName: string, path?: string, params?: Record<string, string>) => void;
+export declare type HandleRedirect = (appName: string, path?: string, params?: Record<string, string>, historyState?: Record<string, unknown>) => void;
 export declare type Theme = 'light' | 'dark';
 export declare type ExternalNavigationOptions = {
     onClick?: () => void;