@tinkoff/router 0.6.122 → 0.6.152

package/lib/history/client.browser.js

@@ -1,4 +1,5 @@
 import { History } from './base.browser.js';
+import { BackNavigationType } from '../types.browser.js';
 import { wrapHistory } from './wrapper.browser.js';
 
 const isHistoryState = (state) => {
@@ -55,8 +56,9 @@ class ClientHistory extends History {
     currentIndex = 0;
     currentState;
     historyUnsubscribeCallback;
+    backNavigationWithinRouteType;
     historyWrapper;
-    constructor() {
+    constructor({ backNavigationWithinRouteType, } = {}) {
         super();
         this.historyWrapper = wrapHistory({
             onNavigate: ({ url, replace, navigateState }) => {
@@ -67,6 +69,8 @@ class ClientHistory extends History {
                 });
             },
         });
+        this.backNavigationWithinRouteType =
+            backNavigationWithinRouteType ?? BackNavigationType.PREFER_UPDATE;
     }
     onNavigate;
     getCurrentState() {
@@ -78,7 +82,9 @@ class ClientHistory extends History {
             : generateState(navigation);
         this.currentIndex = this.currentState.index;
         this.historyWrapper.init(this.currentState);
-        this.historyUnsubscribeCallback = this.historyWrapper.subscribe(async ({ path, state, hasUAVisualTransition }) => {
+        this.historyUnsubscribeCallback = this.historyWrapper.subscribe(
+        // eslint-disable-next-line max-statements
+        async ({ path, state, hasUAVisualTransition }) => {
             try {
                 let navigationType;
                 let navigateState;
@@ -89,12 +95,34 @@ class ClientHistory extends History {
                     const { key, type } = state;
                     this.currentState = state;
                     navigateState = state.navigateState;
-                    if (key === prevKey &&
-                        (type === 'updateCurrentRoute' || prevType === 'updateCurrentRoute')) {
-                        navigationType = 'updateCurrentRoute';
+                    if (key !== prevKey) {
+                        navigateState = 'navigate';
                     }
                     else {
-                        navigationType = 'navigate';
+                        if (this.backNavigationWithinRouteType === BackNavigationType.PREFER_UPDATE) {
+                            if (type === 'updateCurrentRoute' || prevType === 'updateCurrentRoute') {
+                                navigationType = 'updateCurrentRoute';
+                            }
+                            else {
+                                navigationType = 'navigate';
+                            }
+                        }
+                        if (this.backNavigationWithinRouteType === BackNavigationType.CURRENT_TYPE) {
+                            if (isBack ? prevType === 'updateCurrentRoute' : type === 'updateCurrentRoute') {
+                                navigationType = 'updateCurrentRoute';
+                            }
+                            else {
+                                navigationType = 'navigate';
+                            }
+                        }
+                        if (this.backNavigationWithinRouteType === BackNavigationType.PREVIOUS_TYPE) {
+                            if (isBack ? type === 'updateCurrentRoute' : type === 'updateCurrentRoute') {
+                                navigationType = 'updateCurrentRoute';
+                            }
+                            else {
+                                navigationType = 'navigate';
+                            }
+                        }
                     }
                 }
                 else {

package/lib/history/client.d.ts

@@ -1,5 +1,5 @@
 import { History } from './base';
-import type { Navigation, HistoryOptions, HistoryState } from '../types';
+import { HistoryOptions, HistoryState, Navigation, BackNavigationType } from '../types';
 import type { Wrapper } from './wrapper';
 import { wrapHistory } from './wrapper';
 export declare class ClientHistory extends History {
@@ -8,8 +8,11 @@ export declare class ClientHistory extends History {
     private currentIndex;
     private currentState;
     private historyUnsubscribeCallback;
+    private backNavigationWithinRouteType;
     protected historyWrapper: Wrapper<HistoryState>;
-    constructor();
+    constructor({ backNavigationWithinRouteType, }?: {
+        backNavigationWithinRouteType?: BackNavigationType;
+    });
     protected onNavigate: Parameters<typeof wrapHistory>[0]['onNavigate'];
     getCurrentState(): HistoryState | undefined;
     init(navigation: Navigation): void;

package/lib/history/client.es.js

@@ -1,4 +1,5 @@
 import { History } from './base.es.js';
+import { BackNavigationType } from '../types.es.js';
 import { wrapHistory } from './wrapper.es.js';
 
 const isHistoryState = (state) => {
@@ -55,8 +56,9 @@ class ClientHistory extends History {
     currentIndex = 0;
     currentState;
     historyUnsubscribeCallback;
+    backNavigationWithinRouteType;
     historyWrapper;
-    constructor() {
+    constructor({ backNavigationWithinRouteType, } = {}) {
         super();
         this.historyWrapper = wrapHistory({
             onNavigate: ({ url, replace, navigateState }) => {
@@ -67,6 +69,8 @@ class ClientHistory extends History {
                 });
             },
         });
+        this.backNavigationWithinRouteType =
+            backNavigationWithinRouteType ?? BackNavigationType.PREFER_UPDATE;
     }
     onNavigate;
     getCurrentState() {
@@ -78,7 +82,9 @@ class ClientHistory extends History {
             : generateState(navigation);
         this.currentIndex = this.currentState.index;
         this.historyWrapper.init(this.currentState);
-        this.historyUnsubscribeCallback = this.historyWrapper.subscribe(async ({ path, state, hasUAVisualTransition }) => {
+        this.historyUnsubscribeCallback = this.historyWrapper.subscribe(
+        // eslint-disable-next-line max-statements
+        async ({ path, state, hasUAVisualTransition }) => {
             try {
                 let navigationType;
                 let navigateState;
@@ -89,12 +95,34 @@ class ClientHistory extends History {
                     const { key, type } = state;
                     this.currentState = state;
                     navigateState = state.navigateState;
-                    if (key === prevKey &&
-                        (type === 'updateCurrentRoute' || prevType === 'updateCurrentRoute')) {
-                        navigationType = 'updateCurrentRoute';
+                    if (key !== prevKey) {
+                        navigateState = 'navigate';
                     }
                     else {
-                        navigationType = 'navigate';
+                        if (this.backNavigationWithinRouteType === BackNavigationType.PREFER_UPDATE) {
+                            if (type === 'updateCurrentRoute' || prevType === 'updateCurrentRoute') {
+                                navigationType = 'updateCurrentRoute';
+                            }
+                            else {
+                                navigationType = 'navigate';
+                            }
+                        }
+                        if (this.backNavigationWithinRouteType === BackNavigationType.CURRENT_TYPE) {
+                            if (isBack ? prevType === 'updateCurrentRoute' : type === 'updateCurrentRoute') {
+                                navigationType = 'updateCurrentRoute';
+                            }
+                            else {
+                                navigationType = 'navigate';
+                            }
+                        }
+                        if (this.backNavigationWithinRouteType === BackNavigationType.PREVIOUS_TYPE) {
+                            if (isBack ? type === 'updateCurrentRoute' : type === 'updateCurrentRoute') {
+                                navigationType = 'updateCurrentRoute';
+                            }
+                            else {
+                                navigationType = 'navigate';
+                            }
+                        }
                     }
                 }
                 else {

package/lib/history/client.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var base = require('./base.js');
+var types = require('../types.js');
 var wrapper = require('./wrapper.js');
 
 const isHistoryState = (state) => {
@@ -59,8 +60,9 @@ class ClientHistory extends base.History {
     currentIndex = 0;
     currentState;
     historyUnsubscribeCallback;
+    backNavigationWithinRouteType;
     historyWrapper;
-    constructor() {
+    constructor({ backNavigationWithinRouteType, } = {}) {
         super();
         this.historyWrapper = wrapper.wrapHistory({
             onNavigate: ({ url, replace, navigateState }) => {
@@ -71,6 +73,8 @@ class ClientHistory extends base.History {
                 });
             },
         });
+        this.backNavigationWithinRouteType =
+            backNavigationWithinRouteType ?? types.BackNavigationType.PREFER_UPDATE;
     }
     onNavigate;
     getCurrentState() {
@@ -82,7 +86,9 @@ class ClientHistory extends base.History {
             : generateState(navigation);
         this.currentIndex = this.currentState.index;
         this.historyWrapper.init(this.currentState);
-        this.historyUnsubscribeCallback = this.historyWrapper.subscribe(async ({ path, state, hasUAVisualTransition }) => {
+        this.historyUnsubscribeCallback = this.historyWrapper.subscribe(
+        // eslint-disable-next-line max-statements
+        async ({ path, state, hasUAVisualTransition }) => {
             try {
                 let navigationType;
                 let navigateState;
@@ -93,12 +99,34 @@ class ClientHistory extends base.History {
                     const { key, type } = state;
                     this.currentState = state;
                     navigateState = state.navigateState;
-                    if (key === prevKey &&
-                        (type === 'updateCurrentRoute' || prevType === 'updateCurrentRoute')) {
-                        navigationType = 'updateCurrentRoute';
+                    if (key !== prevKey) {
+                        navigateState = 'navigate';
                     }
                     else {
-                        navigationType = 'navigate';
+                        if (this.backNavigationWithinRouteType === types.BackNavigationType.PREFER_UPDATE) {
+                            if (type === 'updateCurrentRoute' || prevType === 'updateCurrentRoute') {
+                                navigationType = 'updateCurrentRoute';
+                            }
+                            else {
+                                navigationType = 'navigate';
+                            }
+                        }
+                        if (this.backNavigationWithinRouteType === types.BackNavigationType.CURRENT_TYPE) {
+                            if (isBack ? prevType === 'updateCurrentRoute' : type === 'updateCurrentRoute') {
+                                navigationType = 'updateCurrentRoute';
+                            }
+                            else {
+                                navigationType = 'navigate';
+                            }
+                        }
+                        if (this.backNavigationWithinRouteType === types.BackNavigationType.PREVIOUS_TYPE) {
+                            if (isBack ? type === 'updateCurrentRoute' : type === 'updateCurrentRoute') {
+                                navigationType = 'updateCurrentRoute';
+                            }
+                            else {
+                                navigationType = 'navigate';
+                            }
+                        }
                     }
                 }
                 else {

package/lib/index.browser.js

@@ -2,6 +2,7 @@ export { Router } from './router/browser.browser.js';
 export { NoSpaRouter } from './router/clientNoSpa.browser.js';
 export { AbstractRouter } from './router/abstract.browser.js';
 export { History } from './history/base.browser.js';
+export { BackNavigationType } from './types.browser.js';
 export { logger, setLogger } from './logger.browser.js';
 export { Provider } from './components/react/index.browser.js';
 export { RouteTree } from './tree/tree.browser.js';

package/lib/index.es.js

@@ -2,6 +2,7 @@ export { Router } from './router/server.es.js';
 export { NoSpaRouter } from './router/clientNoSpa.es.js';
 export { AbstractRouter } from './router/abstract.es.js';
 export { History } from './history/base.es.js';
+export { BackNavigationType } from './types.es.js';
 export { logger, setLogger } from './logger.es.js';
 export { Provider } from './components/react/index.es.js';
 export { RouteTree } from './tree/tree.es.js';

package/lib/index.js

@@ -6,6 +6,7 @@ var server = require('./router/server.js');
 var clientNoSpa = require('./router/clientNoSpa.js');
 var abstract = require('./router/abstract.js');
 var base = require('./history/base.js');
+var types = require('./types.js');
 var logger = require('./logger.js');
 var index = require('./components/react/index.js');
 var tree = require('./tree/tree.js');
@@ -22,6 +23,10 @@ exports.Router = server.Router;
 exports.NoSpaRouter = clientNoSpa.NoSpaRouter;
 exports.AbstractRouter = abstract.AbstractRouter;
 exports.History = base.History;
+Object.defineProperty(exports, 'BackNavigationType', {
+	enumerable: true,
+	get: function () { return types.BackNavigationType; }
+});
 Object.defineProperty(exports, 'logger', {
 	enumerable: true,
 	get: function () { return logger.logger; }

package/lib/router/abstract.browser.js

@@ -149,7 +149,7 @@ class AbstractRouter {
         if (!prevNavigation) {
             throw new Error('updateCurrentRoute should only be called after navigate to some route');
         }
-        const { replace, params, navigateState } = updateRouteOptions;
+        const { replace, params, navigateState, isBack } = updateRouteOptions;
         const { to: from, url: fromUrl } = prevNavigation;
         const navigation = {
             type: 'updateCurrentRoute',
@@ -162,6 +162,7 @@ class AbstractRouter {
             navigateState,
             code: updateRouteOptions.code,
             key: this.uuid(),
+            isBack,
         };
         logger.debug({
             event: 'update-current-route',
@@ -187,7 +188,7 @@ class AbstractRouter {
         const resolvedUrl = this.resolveUrl(navigateOptions);
         const { to: from, url: fromUrl } = prevNavigation ?? {};
         const redirectFrom = redirect ? this.getCurrentRoute() : undefined;
-        let navigation = {
+        const navigation = {
             type: 'navigate',
             from,
             url: resolvedUrl,
@@ -209,10 +210,7 @@ class AbstractRouter {
         await this.runHooks('beforeResolve', navigation);
         const to = this.resolveRoute({ url: resolvedUrl, params, navigateState }, { wildcard: true });
         if (to) {
-            navigation = {
-                ...navigation,
-                to,
-            };
+            navigation.to = to;
         }
         logger.debug({
             event: 'navigation',
@@ -302,7 +300,7 @@ class AbstractRouter {
         }
         throw new Error('Navigation blocked');
     }
-    cancel() { }
+    cancel(_) { }
     normalizePathname(pathname) {
         let normalized = pathname;
         if (this.mergeSlashes) {

package/lib/router/abstract.d.ts

@@ -1,13 +1,14 @@
 import type { Url } from '@tinkoff/url';
 import type { AsyncParallelTapableHookInstance, AsyncTapableHookInstance, SyncTapableHookInstance } from '@tinkoff/hook-runner';
 import { TapableHooks } from '@tinkoff/hook-runner';
-import type { Route, NavigateOptions, UpdateCurrentRouteOptions, Navigation, NavigationGuard, NavigationHook, NavigationSyncHook, HookName, Params, SyncHookName, HistoryOptions, RouterPlugin } from '../types';
+import { Route, NavigateOptions, UpdateCurrentRouteOptions, Navigation, NavigationGuard, NavigationHook, NavigationSyncHook, HookName, Params, SyncHookName, HistoryOptions, RouterPlugin, BackNavigationType } from '../types';
 import type { History } from '../history/base';
 import type { RouteTree } from '../tree/tree';
 export interface Options {
     trailingSlash?: boolean;
     mergeSlashes?: boolean;
     enableViewTransitions?: boolean;
+    backNavigationWithinRouteType?: BackNavigationType;
     routes?: Route[];
     onRedirect?: NavigationHook;
     onNotFound?: NavigationHook;
@@ -103,7 +104,7 @@ export declare abstract class AbstractRouter {
     protected redirect(navigation: Navigation, target: NavigateOptions): Promise<void>;
     protected notfound(navigation: Navigation): Promise<void>;
     protected block(navigation: Navigation): Promise<void>;
-    cancel(): Navigation | void;
+    cancel(_?: Navigation): Navigation | void;
     protected normalizePathname(pathname?: string): string;
     protected resolveUrl({ url, query, params, preserveQuery, hash }: NavigateOptions): Url;
     protected resolveRoute({ url, params, navigateState }: {

package/lib/router/abstract.es.js

@@ -149,7 +149,7 @@ class AbstractRouter {
         if (!prevNavigation) {
             throw new Error('updateCurrentRoute should only be called after navigate to some route');
         }
-        const { replace, params, navigateState } = updateRouteOptions;
+        const { replace, params, navigateState, isBack } = updateRouteOptions;
         const { to: from, url: fromUrl } = prevNavigation;
         const navigation = {
             type: 'updateCurrentRoute',
@@ -162,6 +162,7 @@ class AbstractRouter {
             navigateState,
             code: updateRouteOptions.code,
             key: this.uuid(),
+            isBack,
         };
         logger.debug({
             event: 'update-current-route',
@@ -187,7 +188,7 @@ class AbstractRouter {
         const resolvedUrl = this.resolveUrl(navigateOptions);
         const { to: from, url: fromUrl } = prevNavigation ?? {};
         const redirectFrom = redirect ? this.getCurrentRoute() : undefined;
-        let navigation = {
+        const navigation = {
             type: 'navigate',
             from,
             url: resolvedUrl,
@@ -209,10 +210,7 @@ class AbstractRouter {
         await this.runHooks('beforeResolve', navigation);
         const to = this.resolveRoute({ url: resolvedUrl, params, navigateState }, { wildcard: true });
         if (to) {
-            navigation = {
-                ...navigation,
-                to,
-            };
+            navigation.to = to;
         }
         logger.debug({
             event: 'navigation',
@@ -302,7 +300,7 @@ class AbstractRouter {
         }
         throw new Error('Navigation blocked');
     }
-    cancel() { }
+    cancel(_) { }
     normalizePathname(pathname) {
         let normalized = pathname;
         if (this.mergeSlashes) {

package/lib/router/abstract.js

@@ -158,7 +158,7 @@ class AbstractRouter {
         if (!prevNavigation) {
             throw new Error('updateCurrentRoute should only be called after navigate to some route');
         }
-        const { replace, params, navigateState } = updateRouteOptions;
+        const { replace, params, navigateState, isBack } = updateRouteOptions;
         const { to: from, url: fromUrl } = prevNavigation;
         const navigation = {
             type: 'updateCurrentRoute',
@@ -171,6 +171,7 @@ class AbstractRouter {
             navigateState,
             code: updateRouteOptions.code,
             key: this.uuid(),
+            isBack,
         };
         logger.logger.debug({
             event: 'update-current-route',
@@ -196,7 +197,7 @@ class AbstractRouter {
         const resolvedUrl = this.resolveUrl(navigateOptions);
         const { to: from, url: fromUrl } = prevNavigation ?? {};
         const redirectFrom = redirect ? this.getCurrentRoute() : undefined;
-        let navigation = {
+        const navigation = {
             type: 'navigate',
             from,
             url: resolvedUrl,
@@ -218,10 +219,7 @@ class AbstractRouter {
         await this.runHooks('beforeResolve', navigation);
         const to = this.resolveRoute({ url: resolvedUrl, params, navigateState }, { wildcard: true });
         if (to) {
-            navigation = {
-                ...navigation,
-                to,
-            };
+            navigation.to = to;
         }
         logger.logger.debug({
             event: 'navigation',
@@ -311,7 +309,7 @@ class AbstractRouter {
         }
         throw new Error('Navigation blocked');
     }
-    cancel() { }
+    cancel(_) { }
     normalizePathname(pathname) {
         let normalized = pathname;
         if (this.mergeSlashes) {

package/lib/router/browser.browser.js

@@ -34,8 +34,15 @@ class Router extends ClientRouter {
             return this.flattenDelayedNavigation(delayedNavigation);
         }
     }
-    async run(payload) {
-        const navigation = { ...payload };
+    async run(navigation) {
+        // if navigation was cancelled before, do not run it
+        if (navigation.skipped) {
+            logger.debug({
+                event: 'run.cancel',
+                navigation,
+            });
+            return;
+        }
         const to = (navigation.to.redirect !== undefined
             ? this.resolve(navigation.to.redirect)?.actualPath
             : navigation.to?.actualPath) ?? '';
@@ -91,7 +98,7 @@ class Router extends ClientRouter {
     }
     commitNavigation(navigation) {
         // if we have parallel navigation do not update current url, as it outdated anyway
-        if (navigation.cancelled || navigation.skipped) {
+        if (navigation.skipped) {
             logger.debug({
                 event: 'delay-ignore-commit',
                 navigation,
@@ -102,7 +109,7 @@ class Router extends ClientRouter {
     }
     async runGuards(navigation) {
         // drop checking guards if we have delayed navigation
-        if (navigation.cancelled) {
+        if (navigation.skipped) {
             logger.debug({
                 event: 'delay-ignore-guards',
                 navigation,
@@ -116,7 +123,7 @@ class Router extends ClientRouter {
         // except only for case when current navigation already happened
         // and we should synchronize this update with app
         // (in case app has some logic for currently showing url on afterNavigate or afterRouteUpdate)
-        if (navigation.cancelled && this.lastNavigation !== navigation) {
+        if (navigation.skipped && this.lastNavigation !== navigation) {
             logger.debug({
                 event: 'delay-ignore-hooks',
                 navigation,
@@ -142,7 +149,7 @@ class Router extends ClientRouter {
                     });
                     // set cancelled flag
                     if (this.currentNavigation) {
-                        this.currentNavigation.cancelled = true;
+                        this.currentNavigation.skipped = true;
                         this.currentNavigation = null;
                     }
                     // resolve current navigation to start new navigation asap
@@ -263,17 +270,18 @@ class Router extends ClientRouter {
             catch (error) { }
         }
     }
-    cancel() {
-        if (!this.isNavigating())
-            return;
+    cancel(navigation) {
         logger.debug({
-            event: 'cancelled',
-            navigation: this.currentNavigation,
+            event: 'cancel',
+            navigation: navigation ?? this.currentNavigation,
         });
-        const cancelled = this.currentNavigation;
-        this.currentNavigation.skipped = true;
-        this.currentNavigation = null;
-        return cancelled;
+        if (navigation) {
+            navigation.skipped = true;
+        }
+        if (!navigation || navigation === this.currentNavigation) {
+            this.currentNavigation.skipped = true;
+            this.currentNavigation = null;
+        }
     }
 }
 

package/lib/router/browser.d.ts

@@ -10,7 +10,7 @@ export declare class Router extends ClientRouter {
     constructor(options: Options);
     rehydrate(navigation: Navigation): Promise<void>;
     start(): Promise<any>;
-    protected run(payload: Navigation): Promise<any>;
+    protected run(navigation: Navigation): Promise<any>;
     protected delayNavigation(navigation: Navigation): Promise<void>;
     protected commitNavigation(navigation: Navigation): void;
     protected runGuards(navigation: Navigation): Promise<void>;
@@ -22,6 +22,6 @@ export declare class Router extends ClientRouter {
     private getPrevTransition;
     private restoreAppliedViewTransitions;
     private saveAppliedViewTransitions;
-    cancel(): Navigation;
+    cancel(navigation?: Navigation): void;
 }
 //# sourceMappingURL=browser.d.ts.map

package/lib/router/client.browser.js

@@ -9,8 +9,10 @@ class ClientRouter extends AbstractRouter {
     fullRehydrationInProcess = null;
     constructor(options) {
         super(options);
-        this.history = new ClientHistory();
-        this.history.listen(async ({ type, url, navigateState, replace, history, hasUAVisualTransition, ...rest }) => {
+        this.history = new ClientHistory({
+            backNavigationWithinRouteType: options.backNavigationWithinRouteType,
+        });
+        this.history.listen(async ({ type, url, navigateState, replace, history, hasUAVisualTransition, isBack, ...rest }) => {
             const currentUrl = this.getCurrentUrl();
             const { pathname, query, hash } = this.resolveUrl({ url });
             const isSameUrlNavigation = (currentUrl ? currentUrl.pathname : window.location.pathname) === pathname;
@@ -40,6 +42,7 @@ class ClientRouter extends AbstractRouter {
                     hash,
                     replace,
                     navigateState,
+                    isBack,
                 }, { history });
             }
             else {
@@ -48,6 +51,7 @@ class ClientRouter extends AbstractRouter {
                     replace,
                     navigateState,
                     hasUAVisualTransition,
+                    isBack,
                     ...rest,
                 }, { history });
             }

package/lib/router/client.es.js

@@ -9,8 +9,10 @@ class ClientRouter extends AbstractRouter {
     fullRehydrationInProcess = null;
     constructor(options) {
         super(options);
-        this.history = new ClientHistory();
-        this.history.listen(async ({ type, url, navigateState, replace, history, hasUAVisualTransition, ...rest }) => {
+        this.history = new ClientHistory({
+            backNavigationWithinRouteType: options.backNavigationWithinRouteType,
+        });
+        this.history.listen(async ({ type, url, navigateState, replace, history, hasUAVisualTransition, isBack, ...rest }) => {
             const currentUrl = this.getCurrentUrl();
             const { pathname, query, hash } = this.resolveUrl({ url });
             const isSameUrlNavigation = (currentUrl ? currentUrl.pathname : window.location.pathname) === pathname;
@@ -40,6 +42,7 @@ class ClientRouter extends AbstractRouter {
                     hash,
                     replace,
                     navigateState,
+                    isBack,
                 }, { history });
             }
             else {
@@ -48,6 +51,7 @@ class ClientRouter extends AbstractRouter {
                     replace,
                     navigateState,
                     hasUAVisualTransition,
+                    isBack,
                     ...rest,
                 }, { history });
             }

package/lib/router/client.js

@@ -13,8 +13,10 @@ class ClientRouter extends abstract.AbstractRouter {
     fullRehydrationInProcess = null;
     constructor(options) {
         super(options);
-        this.history = new client.ClientHistory();
-        this.history.listen(async ({ type, url, navigateState, replace, history, hasUAVisualTransition, ...rest }) => {
+        this.history = new client.ClientHistory({
+            backNavigationWithinRouteType: options.backNavigationWithinRouteType,
+        });
+        this.history.listen(async ({ type, url, navigateState, replace, history, hasUAVisualTransition, isBack, ...rest }) => {
             const currentUrl = this.getCurrentUrl();
             const { pathname, query, hash } = this.resolveUrl({ url });
             const isSameUrlNavigation = (currentUrl ? currentUrl.pathname : window.location.pathname) === pathname;
@@ -44,6 +46,7 @@ class ClientRouter extends abstract.AbstractRouter {
                     hash,
                     replace,
                     navigateState,
+                    isBack,
                 }, { history });
             }
             else {
@@ -52,6 +55,7 @@ class ClientRouter extends abstract.AbstractRouter {
                     replace,
                     navigateState,
                     hasUAVisualTransition,
+                    isBack,
                     ...rest,
                 }, { history });
             }

package/lib/types.browser.js

@@ -0,0 +1,14 @@
+/**
+ * Navigation type for browser "Back/Forward" within the same route
+ * prefer-update - always return via update
+ * current-type - return with current navigation type
+ * previous-type - return with the navigation type of the target route
+ */
+var BackNavigationType;
+(function (BackNavigationType) {
+    BackNavigationType["CURRENT_TYPE"] = "current-type";
+    BackNavigationType["PREFER_UPDATE"] = "prefer-update";
+    BackNavigationType["PREVIOUS_TYPE"] = "previous-type";
+})(BackNavigationType || (BackNavigationType = {}));
+
+export { BackNavigationType };

package/lib/types.d.ts

@@ -24,10 +24,10 @@ export interface BaseNavigateOptions {
     hash?: string;
     navigateState?: any;
     code?: number;
+    isBack?: boolean;
 }
 export interface NavigateOptions extends BaseNavigateOptions {
     url?: string;
-    isBack?: boolean;
     viewTransition?: boolean;
     viewTransitionTypes?: string[];
     hasUAVisualTransition?: boolean;
@@ -49,7 +49,6 @@ export interface Navigation {
     replace?: boolean;
     navigateState?: any;
     history?: boolean;
-    cancelled?: boolean;
     skipped?: boolean;
     code?: number;
     isBack?: boolean;
@@ -83,4 +82,15 @@ export interface HistoryState {
     viewTransition?: boolean;
     viewTransitionTypes?: string[];
 }
+/**
+ * Navigation type for browser "Back/Forward" within the same route
+ * prefer-update - always return via update
+ * current-type - return with current navigation type
+ * previous-type - return with the navigation type of the target route
+ */
+export declare enum BackNavigationType {
+    CURRENT_TYPE = "current-type",
+    PREFER_UPDATE = "prefer-update",
+    PREVIOUS_TYPE = "previous-type"
+}
 //# sourceMappingURL=types.d.ts.map

package/lib/types.es.js

@@ -0,0 +1,14 @@
+/**
+ * Navigation type for browser "Back/Forward" within the same route
+ * prefer-update - always return via update
+ * current-type - return with current navigation type
+ * previous-type - return with the navigation type of the target route
+ */
+var BackNavigationType;
+(function (BackNavigationType) {
+    BackNavigationType["CURRENT_TYPE"] = "current-type";
+    BackNavigationType["PREFER_UPDATE"] = "prefer-update";
+    BackNavigationType["PREVIOUS_TYPE"] = "previous-type";
+})(BackNavigationType || (BackNavigationType = {}));
+
+export { BackNavigationType };

package/lib/types.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Navigation type for browser "Back/Forward" within the same route
+ * prefer-update - always return via update
+ * current-type - return with current navigation type
+ * previous-type - return with the navigation type of the target route
+ */
+exports.BackNavigationType = void 0;
+(function (BackNavigationType) {
+    BackNavigationType["CURRENT_TYPE"] = "current-type";
+    BackNavigationType["PREFER_UPDATE"] = "prefer-update";
+    BackNavigationType["PREVIOUS_TYPE"] = "previous-type";
+})(exports.BackNavigationType || (exports.BackNavigationType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.6.122",
+  "version": "0.6.152",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -21,14 +21,14 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@tinkoff/hook-runner": "0.8.1",
-    "@tinkoff/react-hooks": "0.5.1",
-    "@tinkoff/url": "0.12.1",
+    "@tinkoff/hook-runner": "0.8.2",
+    "@tinkoff/react-hooks": "0.5.2",
+    "@tinkoff/url": "0.12.2",
     "@tinkoff/utils": "^2.1.2",
     "use-sync-external-store": "^1.4.0"
   },
   "peerDependencies": {
-    "@tramvai/core": "6.68.4",
+    "@tramvai/core": "6.77.2",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"
   },