@alfalab/bridge-to-native 0.0.9-beta-fa134e1 → 0.0.9-beta-37f9ff1

package/bridge-to-native.d.ts

@@ -6,16 +6,15 @@ import type { Environment, HandleRedirect, NativeFeatureKey, NativeParams, Theme
  * для использования в вебвью окружении.
  */
 export declare class BridgeToNative {
-    private readonly handleRedirect;
-    private readonly blankPagePath;
-    private readonly nativeParams?;
     readonly AndroidBridge: {
         setPageSettings: (params: string) => void;
     } | undefined;
     readonly environment: Environment;
     readonly nativeFallbacks: NativeFallbacks;
     private nextPageId;
-    constructor(handleRedirect: HandleRedirect, blankPagePath: string, nativeParams?: NativeParams | undefined);
+    private readonly _blankPagePath;
+    private readonly _handleRedirect;
+    constructor(handleRedirect: HandleRedirect, blankPagePath: string, nativeParams?: NativeParams);
     private _nativeNavigationAndTitle;
     get nativeNavigationAndTitle(): NativeNavigationAndTitle;
     private _originalWebviewParams;

package/bridge-to-native.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable no-underscore-dangle */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeToNative = void 0;
 const constants_1 = require("./constants");
@@ -11,9 +12,6 @@ const utils_1 = require("./utils");
  */
 class BridgeToNative {
     constructor(handleRedirect, blankPagePath, nativeParams) {
-        this.handleRedirect = handleRedirect;
-        this.blankPagePath = blankPagePath;
-        this.nativeParams = nativeParams;
         // Webview, запущенное в Android окружении имеет объект `Android` в window.
         this.AndroidBridge = window.Android;
         this.environment = this.AndroidBridge ? 'android' : 'ios';
@@ -21,6 +19,7 @@ class BridgeToNative {
         if (previousState) {
             this.restorePreviousState();
             this.nativeFallbacks = new native_fallbacks_1.NativeFallbacks(this);
+            this._blankPagePath = blankPagePath;
             return;
         }
         this._appVersion =
@@ -30,9 +29,11 @@ class BridgeToNative {
         this._iosAppId = this.getIosAppId(nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.iosAppId);
         this._theme = (nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.theme) === 'dark' ? 'dark' : 'light';
         this._originalWebviewParams = (nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.originalWebviewParams) || '';
-        this._nativeNavigationAndTitle = new native_navigation_and_title_1.NativeNavigationAndTitle(this, (nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.nextPageId) || null, nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.title, handleRedirect);
+        this._nativeNavigationAndTitle = new native_navigation_and_title_1.NativeNavigationAndTitle(this, nativeParams ? nativeParams.nextPageId : null, nativeParams === null || nativeParams === void 0 ? void 0 : nativeParams.title, handleRedirect);
+        this._handleRedirect = handleRedirect;
         this.nextPageId = nativeParams ? nativeParams.nextPageId : null;
         this.nativeFallbacks = new native_fallbacks_1.NativeFallbacks(this);
+        this._blankPagePath = blankPagePath;
     }
     get nativeNavigationAndTitle() {
         return this._nativeNavigationAndTitle;
@@ -105,7 +106,7 @@ class BridgeToNative {
             appVersion: this._appVersion,
             theme: this._theme,
             nextPageId: this.nextPageId,
-            originalWebviewParams: this.originalWebviewParams,
+            originalWebviewParams: this._originalWebviewParams || '',
             iosAppId: this._iosAppId,
         };
         sessionStorage.setItem(constants_1.PREVIOUS_B2N_STATE_STORAGE_KEY, JSON.stringify(currentState));
@@ -138,7 +139,7 @@ class BridgeToNative {
         this._theme = previousState.theme;
         this._originalWebviewParams = previousState.originalWebviewParams;
         this.nextPageId = previousState.nextPageId;
-        this._nativeNavigationAndTitle = new native_navigation_and_title_1.NativeNavigationAndTitle(this, previousState.nextPageId, '', this.handleRedirect);
+        this._nativeNavigationAndTitle = new native_navigation_and_title_1.NativeNavigationAndTitle(this, previousState.nextPageId, '', this._handleRedirect);
         sessionStorage.removeItem(constants_1.PREVIOUS_B2N_STATE_STORAGE_KEY);
     }
 }

package/native-fallbacks.d.ts

@@ -4,7 +4,7 @@ import type { BridgeToNative } from './bridge-to-native';
  * Класс содержит реализацию обходных путей для веб-фич, которые не работают в нативном-вебвью.
  */
 export declare class NativeFallbacks {
-    private readonly b2n;
+    private b2n;
     constructor(b2n: BridgeToNative);
     /**
      * Метод, возвращающий пропсы для ссылок, ведущих на ВНЕШНИЙ ресурс. Которые просто

package/native-fallbacks.js

@@ -41,7 +41,7 @@ class NativeFallbacks {
      */
     getExternalLinkProps(link, options = {}) {
         const { onClick, forceOpenInWebview } = options;
-        const { iosAppId, environment, checkAndroidAllowOpenInNewWebview } = this.b2n;
+        const { iosAppId, environment, appVersion, checkAndroidAllowOpenInNewWebview } = this.b2n;
         const url = (0, utils_1.getUrlInstance)(link);
         const appId = (0, utils_1.getAppId)(environment, iosAppId);
         if (!forceOpenInWebview && this.b2n.canUseNativeFeature('linksInBrowser')) {
@@ -105,7 +105,7 @@ class NativeFallbacks {
      */
     visitExternalResource(link, forceOpenInWebview = false) {
         var _a;
-        const { iosAppId, environment, checkAndroidAllowOpenInNewWebview } = this.b2n;
+        const { iosAppId, appVersion, environment, checkAndroidAllowOpenInNewWebview } = this.b2n;
         const url = (0, utils_1.getUrlInstance)(link);
         const appId = (0, utils_1.getAppId)(environment, iosAppId);
         if (!forceOpenInWebview && this.b2n.canUseNativeFeature('linksInBrowser')) {

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

@@ -4,14 +4,12 @@ import { BridgeToNative } from './bridge-to-native';
  * Класс, отвечающий за взаимодействие с нативными элементами в приложении – заголовком и нативной кнопкой назад.
  */
 export declare class NativeNavigationAndTitle {
-    private readonly b2n;
-    private readonly pageId;
-    private readonly initialNativeTitle;
-    private readonly handleWindowRedirect;
+    private b2n;
     private nativeHistoryStack;
     private numOfBackSteps;
     private lastSetPageSettingsParams;
-    constructor(b2n: BridgeToNative, pageId: number | null, initialNativeTitle: string, handleWindowRedirect: HandleRedirect);
+    private readonly _handleWindowRedirect;
+    constructor(b2n: BridgeToNative, pageId: number | null, initialNativeTitle: string | undefined, handleWindowRedirect: HandleRedirect);
     /**
      * Метод, вызывающий `history.back()` или закрывающий вебвью, если нет записей
      * в истории переходов.

package/native-navigation-and-title.js

@@ -9,15 +9,13 @@ const utils_1 = require("./utils");
 class NativeNavigationAndTitle {
     constructor(b2n, pageId, initialNativeTitle = '', handleWindowRedirect) {
         this.b2n = b2n;
-        this.pageId = pageId;
-        this.initialNativeTitle = initialNativeTitle;
-        this.handleWindowRedirect = handleWindowRedirect;
         this.nativeHistoryStack = [''];
         this.numOfBackSteps = 1;
         // Тут сохраняются параметры, которые в последний раз были отправлены в приложение.
         // Просто, чтобы не слать одинаковые сигналы в приложение.
         this.lastSetPageSettingsParams = '';
         this.handleBack = this.handleBack.bind(this);
+        this._handleWindowRedirect = handleWindowRedirect;
         const previousState = !!sessionStorage.getItem(constants_1.PREVIOUS_NATIVE_NAVIGATION_AND_TITLE_STATE_STORAGE_KEY);
         if (pageId) {
             this.supportSharedSession(pageId, initialNativeTitle);
@@ -65,17 +63,17 @@ class NativeNavigationAndTitle {
         window.history.go(-this.numOfBackSteps);
     }
     /**
-     * Метод вызывает handle-redirect и регистрирует этот переход в
-     * приложении, чтобы кнопка «Назад» в Нативе вызывала
+     * Метод вызывает `src/shared/utils/handle-redirect` из `newclick-host-ui`
+     * и регистрирует этот переход в приложении, чтобы кнопка «Назад» в Нативе вызывала
      * переход назад в вебе.
      */
     handleRedirect(pageTitleOrPath, appName, path, params) {
         if (appName) {
-            this.handleWindowRedirect(appName, path, params);
+            this._handleWindowRedirect(appName, path, params);
         }
         else {
             const { appName: extractedAppName, path: extractedPath, query: extractedQuery, } = (0, utils_1.extractAppNameRouteAndQuery)(pageTitleOrPath);
-            this.handleWindowRedirect(extractedAppName, extractedPath, extractedQuery);
+            this._handleWindowRedirect(extractedAppName, extractedPath, extractedQuery);
         }
         const title = appName ? pageTitleOrPath : '';
         this.nativeHistoryStack.push(title);
@@ -129,7 +127,7 @@ class NativeNavigationAndTitle {
         // В b2n этот метод отмечен модификатором доступа private, но тут его нужно вызвать
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        this.handleRedirect(this.b2n.blankPagePath);
+        this.handleRedirect(this.b2n._blankPagePath);
         this.goBack();
     }
     /**
@@ -276,7 +274,7 @@ class NativeNavigationAndTitle {
             const pageIdStr = pageId ? `&pageId=${pageId}` : '';
             const paramsToSend = `ios:setPageSettings/${pageTitleStr + pageIdStr}`;
             if (this.lastSetPageSettingsParams !== paramsToSend) {
-                window.location.replace(paramsToSend);
+                // 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-fa134e1",
+    "version": "0.0.9-beta-37f9ff1",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/core-ds/bridge-to-native.git"

package/types.d.ts

@@ -19,6 +19,7 @@ export declare type WebViewWindow = Window & {
     Android?: {
         setPageSettings: (params: string) => void;
     };
+    handleRedirect?: (appName: string, path?: string, params?: Record<string, string>) => VoidFunction;
 };
 export declare type PdfType = 'pdfFile' | 'base64' | 'binary';
 export declare type PreviousBridgeToNativeState = Omit<NativeParams, 'title' | 'theme'> & {