refactor(view): add keepAlive check

posva · posva · commit 97bedf2fd126 · 2020-01-14T11:43:50.000+01:00
diff --git a/src/components/view.js b/src/components/view.js
@@ -26,10 +26,11 @@ export default {
     let depth = 0
     let inactive = false
     while (parent && parent._routerRoot !== parent) {
-      if (parent.$vnode && parent.$vnode.data.routerView) {
+      const vnodeData = parent.$vnode ? parent.$vnode.data : {}
+      if (vnodeData.routerView) {
         depth++
       }
-      if (parent._directInactive && parent._inactive) {
+      if (vnodeData.keepAlive && parent._directInactive && parent._inactive) {
         inactive = true
       }
       parent = parent.$parent

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,11 @@ export default {`
`26`	`26`	`let depth = 0`
`27`	`27`	`let inactive = false`
`28`	`28`	`while (parent && parent._routerRoot !== parent) {`
`29`		`- if (parent.$vnode && parent.$vnode.data.routerView) {`
	`29`	`+ const vnodeData = parent.$vnode ? parent.$vnode.data : {}`
	`30`	`+ if (vnodeData.routerView) {`
`30`	`31`	`depth++`
`31`	`32`	`}`
`32`		`- if (parent._directInactive && parent._inactive) {`
	`33`	`+ if (vnodeData.keepAlive && parent._directInactive && parent._inactive) {`
`33`	`34`	`inactive = true`
`34`	`35`	`}`
`35`	`36`	`parent = parent.$parent`