@tinkoff/router 0.3.18 → 0.3.21

package/lib/router/abstract.browser.js

@@ -236,6 +236,7 @@ class AbstractRouter {
         }
         throw new Error('Navigation blocked');
     }
+    cancel() { }
     normalizePathname(pathname) {
         let normalized = pathname;
         if (this.mergeSlashes) {

package/lib/router/abstract.d.ts

@@ -65,6 +65,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;
     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

@@ -236,6 +236,7 @@ class AbstractRouter {
         }
         throw new Error('Navigation blocked');
     }
+    cancel() { }
     normalizePathname(pathname) {
         let normalized = pathname;
         if (this.mergeSlashes) {

package/lib/router/abstract.js

@@ -245,6 +245,7 @@ class AbstractRouter {
         }
         throw new Error('Navigation blocked');
     }
+    cancel() { }
     normalizePathname(pathname) {
         let normalized = pathname;
         if (this.mergeSlashes) {

package/lib/router/browser.browser.js

@@ -70,7 +70,7 @@ class Router extends ClientRouter {
     }
     commitNavigation(navigation) {
         // if we have parallel navigation do not update current url, as it outdated anyway
-        if (navigation.cancelled) {
+        if (navigation.cancelled || navigation.skipped) {
             logger.debug({
                 event: 'delay-ignore-commit',
                 navigation,
@@ -226,6 +226,18 @@ class Router extends ClientRouter {
             catch (error) { }
         }
     }
+    cancel() {
+        if (!this.isNavigating())
+            return;
+        logger.debug({
+            event: 'cancelled',
+            navigation: this.currentNavigation,
+        });
+        const cancelled = this.currentNavigation;
+        this.currentNavigation.skipped = true;
+        this.currentNavigation = null;
+        return cancelled;
+    }
 }
 
 export { Router };

package/lib/router/browser.d.ts

@@ -20,5 +20,6 @@ export declare class Router extends ClientRouter {
     private shouldApplyViewTransition;
     private restoreAppliedViewTransitions;
     private saveAppliedViewTransitions;
+    cancel(): Navigation;
 }
 //# sourceMappingURL=browser.d.ts.map

package/lib/types.d.ts

@@ -43,6 +43,7 @@ export interface Navigation {
     navigateState?: any;
     history?: boolean;
     cancelled?: boolean;
+    skipped?: boolean;
     code?: number;
     redirect?: boolean;
     redirectFrom?: NavigationRoute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/router",
-  "version": "0.3.18",
+  "version": "0.3.21",
   "description": "router",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,7 +27,7 @@
     "use-sync-external-store": "^1.2.0"
   },
   "peerDependencies": {
-    "@tramvai/core": "3.14.1",
+    "@tramvai/core": "3.15.1",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"
   },