return unregister fn from router hook register methods

Author: yyx990803

flow/declarations.js

@@ -15,6 +15,8 @@ declare type NavigationGuard = (
   next: (to?: RawLocation | false | Function | void) => void
 ) => any
 
+declare type AfterNavigationHook = (to: Route, from: Route) => any
+
 declare type RouterOptions = {
   routes?: Array<RouteConfig>;
   mode?: string;

src/index.js

@@ -30,7 +30,7 @@ export default class VueRouter {
   fallback: boolean;
   beforeHooks: Array<?NavigationGuard>;
   resolveHooks: Array<?NavigationGuard>;
-  afterHooks: Array<?((to: Route, from: Route) => any)>;
+  afterHooks: Array<?AfterNavigationHook>;
 
   constructor (options: RouterOptions = {}) {
     this.app = null
@@ -118,16 +118,16 @@ export default class VueRouter {
     })
   }
 
-  beforeEach (fn: Function) {
-    this.beforeHooks.push(fn)
+  beforeEach (fn: Function): Function {
+    return registerHook(this.beforeHooks, fn)
   }
 
-  beforeResolve (fn: Function) {
-    this.resolveHooks.push(fn)
+  beforeResolve (fn: Function): Function {
+    return registerHook(this.resolveHooks, fn)
   }
 
-  afterEach (fn: Function) {
-    this.afterHooks.push(fn)
+  afterEach (fn: Function): Function {
+    return registerHook(this.afterHooks, fn)
   }
 
   onReady (cb: Function, errorCb?: Function) {
@@ -212,6 +212,14 @@ export default class VueRouter {
   }
 }
 
+function registerHook (list: Array<any>, fn: Function): Function {
+  list.push(fn)
+  return () => {
+    const i = list.indexOf(fn)
+    if (i > -1) list.splice(i, 1)
+  }
+}
+
 function createHref (base: string, fullPath: string, mode) {
   var path = mode === 'hash' ? '#' + fullPath : fullPath
   return base ? cleanPath(base + '/' + path) : path

types/router.d.ts

@@ -20,9 +20,9 @@ declare class VueRouter {
   mode: RouterMode;
   currentRoute: Route;
 
-  beforeEach (guard: NavigationGuard): void;
-  beforeResolve (guard: NavigationGuard): void;
-  afterEach (hook: (to: Route, from: Route) => any): void;
+  beforeEach (guard: NavigationGuard): Function;
+  beforeResolve (guard: NavigationGuard): Function;
+  afterEach (hook: (to: Route, from: Route) => any): Function;
   push (location: RawLocation, onComplete?: Function, onAbort?: Function): void;
   replace (location: RawLocation, onComplete?: Function, onAbort?: Function): void;
   go (n: number): void;

types/test/index.ts

@@ -111,12 +111,20 @@ matched.forEach(m => {
   const redirect: RedirectOption | undefined = m.redirect;
 });
 
-router.beforeEach((to, from, next) => {
+const unregister = router.beforeEach((to, from, next) => {
   to.params;
   next("/");
   next();
 });
 
+unregister();
+
+router.beforeResolve((to, from, next) => {
+  to.params;
+  from.params;
+  next()
+});
+
 router.afterEach((to, from) => {
   to.params;
   from.params;