better cancellation

Author: olegman

src/browser-router.tsx

@@ -37,8 +37,7 @@ export default class BrowserRouter extends Router {
         };
     }
     async navigate(path, ctx = new Context()) {
-        // TODO: better cancellation
-        if (this.router.isRunning) this.router.cancel();
+        // if (this.router.isRunning) this.router.cancel(false);
         const { redirect, error } = await this.router.resolve({ path, ctx });
         if (error === null) {
             if (redirect) {
@@ -47,7 +46,7 @@ export default class BrowserRouter extends Router {
                 this.history.push(path);
             }
         } else {
-            this.history.push(path);
+            if (error.message !== 'Cancelled') this.history.push(path);
         }
     }
     async push(path) {
@@ -72,7 +71,6 @@ export default class BrowserRouter extends Router {
     }
     private _locationChanged = async ({ pathname, hash, search }, historyAction) => {
         const path = pathname + search + hash;
-        // TODO: better cancellation
         if (this.router.isRunning) this.router.cancel();
         let { location, route, status, params, redirect, result, ctx, error } = await this.router.run({ path });
         if (error && error.message === 'Cancelled') return;

yarn.lock

@@ -10,25 +10,25 @@ object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
-path-to-regexp@^1.6.0:
+path-to-regexp@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
   dependencies:
     isarray "0.0.1"
 
-query-string@^4.2.3:
+query-string@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.2.tgz#ec0fd765f58a50031a3968c2431386f8947a5cdd"
   dependencies:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
 [email protected]:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/router-async/-/router-async-0.5.4.tgz#c1666746089562c125c85ccee5c5e357c0ff1a48"
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/router-async/-/router-async-0.5.6.tgz#b9f05c62ef2f1659e6ce988200b53a366f73a3e2"
   dependencies:
-    path-to-regexp "^1.6.0"
-    query-string "^4.2.3"
+    path-to-regexp "^1.7.0"
+    query-string "^4.3.2"
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"