fix(router-view): register instance in init hook

close vuejs#2561
zrh122 · Mar 30, 2019 · 7f55411 · 7f55411
1 parent 7ff4de4
commit 7f55411
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/components/view.js b/src/components/view.js
@@ -69,6 +69,17 @@ export default {
       matched.instances[name] = vnode.componentInstance
     }
 
+    // register instance in init hook
+    // in case kept-alive component be actived when routes changed
+    data.hook.init = (vnode) => {
+      if (vnode.data.keepAlive &&
+        vnode.componentInstance &&
+        vnode.componentInstance !== matched.instances[name]
+      ) {
+        matched.instances[name] = vnode.componentInstance
+      }
+    }
+
     // resolve props
     let propsToPass = data.props = resolveProps(route, matched.props && matched.props[name])
     if (propsToPass) {