fix: fixed enter cb not called in out-in transitions still

Author: ronald-d-rogers

Diff for: src/components/view.js

@@ -81,13 +81,12 @@ export default {
         vnode.componentInstance !== matched.instances[name]
       ) {
         matched.instances[name] = vnode.componentInstance
-        // if the route transition has already been confirmed then we weren't
-        // able to call the cbs during confirmation as the component was not
-        // registered yet, so we call it here.
-        if (matched.enteredCbs[name]) {
-          handleRouteEntered(matched, name)
-        }
       }
+
+      // if the route transition has already been confirmed then we weren't
+      // able to call the cbs during confirmation as the component was not
+      // registered yet, so we call it here.
+      handleRouteEntered(route)
     }
 
     // resolve props

Diff for: src/history/base.js

@@ -177,10 +177,9 @@ export class History {
     }
 
     runQueue(queue, iterator, () => {
-      const enteredCbs = []
       // wait until async components are resolved before
       // extracting in-component enter guards
-      const enterGuards = extractEnterGuards(activated, enteredCbs)
+      const enterGuards = extractEnterGuards(activated)
       const queue = enterGuards.concat(this.router.resolveHooks)
       runQueue(queue, iterator, () => {
         if (this.pending !== route) {
@@ -190,9 +189,7 @@ export class History {
         onComplete(route)
         if (this.router.app) {
           this.router.app.$nextTick(() => {
-            enteredCbs.forEach(cb => {
-              cb()
-            })
+            handleRouteEntered(route)
           })
         }
       })
@@ -296,23 +293,21 @@ function bindGuard (guard: NavigationGuard, instance: ?_Vue): ?NavigationGuard {
 }
 
 function extractEnterGuards (
-  activated: Array<RouteRecord>,
-  cbs: Array<Function>,
+  activated: Array<RouteRecord>
 ): Array<?Function> {
   return extractGuards(
     activated,
     'beforeRouteEnter',
     (guard, _, match, key) => {
-      return bindEnterGuard(guard, match, key, cbs)
+      return bindEnterGuard(guard, match, key)
     }
   )
 }
 
 function bindEnterGuard (
   guard: NavigationGuard,
   match: RouteRecord,
-  key: string,
-  cbs: Array<Function>,
+  key: string
 ): NavigationGuard {
   return function routeEnterGuard (to, from, next) {
     return guard(to, from, cb => {
@@ -321,13 +316,6 @@ function bindEnterGuard (
           match.enteredCbs[key] = []
         }
         match.enteredCbs[key].push(cb)
-        cbs.push(() => {
-          // if the instance is registered call the cb here, otherwise it will
-          // get called when it is registered in the component's lifecycle hooks
-          if (match.instances[key]) {
-            handleRouteEntered(match, key)
-          }
-        })
       }
       next(cb)
     })

Diff for: src/util/route.js

@@ -131,12 +131,17 @@ function queryIncludes (current: Dictionary<string>, target: Dictionary<string>)
   return true
 }
 
-export function handleRouteEntered (record: RouteRecord, name: string) {
-  const instance = record.instances[name]
-  const cbs = record.enteredCbs[name]
-  if (!instance || !cbs) return
-  delete record.enteredCbs[name]
-  for (let i = 0; i < cbs.length; i++) {
-    cbs[i](instance)
+export function handleRouteEntered (route: Route) {
+  for (let i = 0; i < route.matched.length; i++) {
+    const record = route.matched[i]
+    for (const name in record.instances) {
+      const instance = record.instances[name]
+      const cbs = record.enteredCbs[name]
+      if (!instance || !cbs) continue
+      delete record.enteredCbs[name]
+      for (let i = 0; i < cbs.length; i++) {
+        cbs[i](instance)
+      }
+    }
   }
 }