Custom handling of a leave hook in case of path is

krasimir · Jan 17, 2021 · ba19b45 · ba19b45
1 parent ac68bc6
commit ba19b45
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 8.6.5
+
+Custom handling of a leave hook in case of path is `*`.
+
 ## 8.6.4
 
 Refactoring the leave hook implementation. The leave hook check now run a bit earlier and once per navigating. So far it was running for each of the matched routes. Also the hook now may accept an array of matches. Not only a single Match object.

diff --git a/lib/es/middlewares/checkForLeaveHook.js b/lib/es/middlewares/checkForLeaveHook.js
@@ -16,11 +16,19 @@ export default function checkForLeaveHook(context, done) {
         return;
       }
 
-      var someOfTheLastOnesMatch = context.matches ? context.matches.find(function (match) {
-        return oldMatch.route.path === match.route.path;
-      }) : false;
+      var runHook = false;
+      var newLocationVSOldMatch = context.instance.matchLocation(oldMatch.route.path, context.currentLocationPath);
 
-      if (undefinedOrTrue(context.navigateOptions, "callHooks") && !someOfTheLastOnesMatch) {
+      if (oldMatch.route.path !== "*") {
+        runHook = !newLocationVSOldMatch;
+      } else {
+        var someOfTheLastOnesMatch = context.matches ? context.matches.find(function (match) {
+          return oldMatch.route.path === match.route.path;
+        }) : false;
+        runHook = !someOfTheLastOnesMatch;
+      }
+
+      if (undefinedOrTrue(context.navigateOptions, "callHooks") && runHook) {
         Q(oldMatch.route.hooks.leave.map(function (f) {
           // just so we match the Q interface
           return function (_, d) {

diff --git a/lib/navigo.amd.js b/lib/navigo.amd.js
diff --git a/lib/navigo.amd.js.map b/lib/navigo.amd.js.map
diff --git a/lib/navigo.amd.min.js b/lib/navigo.amd.min.js
diff --git a/lib/navigo.amd.min.js.map b/lib/navigo.amd.min.js.map
diff --git a/lib/navigo.js b/lib/navigo.js
diff --git a/lib/navigo.js.map b/lib/navigo.js.map
diff --git a/lib/navigo.min.js b/lib/navigo.min.js
diff --git a/lib/navigo.min.js.map b/lib/navigo.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "navigo",
-  "version": "8.6.4",
+  "version": "8.6.5",
   "description": "A simple vanilla JavaScript router",
   "main": "lib/navigo.js",
   "browser": "lib/navigo.min.js",

diff --git a/src/middlewares/checkForLeaveHook.ts b/src/middlewares/checkForLeaveHook.ts
@@ -16,15 +16,22 @@ export default function checkForLeaveHook(context: QContext, done) {
           leaveLoopDone();
           return;
         }
-        const someOfTheLastOnesMatch = context.matches
-          ? context.matches.find((match) => {
-              return oldMatch.route.path === match.route.path;
-            })
-          : false;
-        if (
-          undefinedOrTrue(context.navigateOptions, "callHooks") &&
-          !someOfTheLastOnesMatch
-        ) {
+        let runHook = false;
+        const newLocationVSOldMatch = context.instance.matchLocation(
+          oldMatch.route.path as string,
+          context.currentLocationPath
+        );
+        if (oldMatch.route.path !== "*") {
+          runHook = !newLocationVSOldMatch;
+        } else {
+          const someOfTheLastOnesMatch = context.matches
+            ? context.matches.find((match) => {
+                return oldMatch.route.path === match.route.path;
+              })
+            : false;
+          runHook = !someOfTheLastOnesMatch;
+        }
+        if (undefinedOrTrue(context.navigateOptions, "callHooks") && runHook) {
           Q(
             oldMatch.route.hooks.leave
               .map((f) => {