Commit318f29f

authored and

committed

fix(core): disable dependency collection in lifecycle hooks and data getter (vuejs#7596)

This fixes the parent being updated more than necessary due to collecting child propsas dependencies during its own update computation.fixvuejs#7573

1 parentd7d9b00 commit318f29fCopy full SHA for 318f29f

File tree

+42

-2

lines changed

+42

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import { createEmptyVNode } from '../vdom/vnode'`
`7`	`7`	`import{observerState}from'../observer/index'`
`8`	`8`	`import{updateComponentListeners}from'./events'`
`9`	`9`	`import{resolveSlots}from'./render-helpers/resolve-slots'`
	`10`	`+import{pushTarget,popTarget}from'../observer/dep'`
`10`	`11`
`11`	`12`	`import{`
`12`	`13`	`warn,`
`@@ -315,6 +316,8 @@ export function deactivateChildComponent (vm: Component, direct?: boolean) {`
`315`	`316`	`}`
`316`	`317`
`317`	`318`	`exportfunctioncallHook(vm:Component,hook:string){`
	`319`	`+// #7573 disable dep collection when invoking lifecycle hooks`
	`320`	`+pushTarget()`
`318`	`321`	`consthandlers=vm.$options[hook]`
`319`	`322`	`if(handlers){`
`320`	`323`	`for(leti=0,j=handlers.length;i<j;i++){`
`@@ -328,4 +331,5 @@ export function callHook (vm: Component, hook: string) {`
`328`	`331`	`if(vm._hasHookEvent){`
`329`	`332`	`vm.$emit('hook:'+hook)`
`330`	`333`	`}`
	`334`	`+popTarget()`
`331`	`335`	`}`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`/@flow /`
`2`	`2`
`3`	`3`	`importconfigfrom'../config'`
`4`		`-importDepfrom'../observer/dep'`
`5`	`4`	`importWatcherfrom'../observer/watcher'`
	`5`	`+importDep,{pushTarget,popTarget}from'../observer/dep'`
`6`	`6`	`import{isUpdatingChildComponent}from'./lifecycle'`
`7`	`7`
`8`	`8`	`import{`
`@@ -150,11 +150,15 @@ function initData (vm: Component) {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`exportfunctiongetData(data:Function,vm:Component):any{`
	`153`	`+// #7573 disable dep collection when invoking data getters`
	`154`	`+pushTarget()`
`153`	`155`	`try{`
`154`	`156`	`returndata.call(vm,vm)`
`155`	`157`	`}catch(e){`
`156`	`158`	handleError(e,vm,`data()`)
`157`	`159`	`return{}`
	`160`	`+}finally{`
	`161`	`+popTarget()`
`158`	`162`	`}`
`159`	`163`	`}`
`160`	`164`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ export default class Dep {`
`48`	`48`	`Dep.target=null`
`49`	`49`	`consttargetStack=[]`
`50`	`50`
`51`		`-exportfunctionpushTarget(_target:Watcher){`
	`51`	`+exportfunctionpushTarget(_target:?Watcher){`
`52`	`52`	`if(Dep.target)targetStack.push(Dep.target)`
`53`	`53`	`Dep.target=_target`
`54`	`54`	`}`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,38 @@ describe('Options data', () => {`
`93`	`93`	`expect(vm.$refs.test.b).toBe(1)`
`94`	`94`	`})`
`95`	`95`
	`96`	`+it('props should not be reactive',done=>{`
	`97`	`+letcalls=0`
	`98`	`+constvm=newVue({`
	`99`	+template:`<child :msg="msg"></child>`,
	`100`	`+data:{`
	`101`	`+msg:'hello'`
	`102`	`+},`
	`103`	`+beforeUpdate(){calls++},`
	`104`	`+components:{`
	`105`	`+child:{`
	`106`	+template:`<span>{{ localMsg }}</span>`,
	`107`	`+props:['msg'],`
	`108`	`+data(){`
	`109`	`+return{localMsg:this.msg}`
	`110`	`+},`
	`111`	`+computed:{`
	`112`	`+computedMsg(){`
	`113`	`+returnthis.msg+' world'`
	`114`	`+}`
	`115`	`+}`
	`116`	`+}`
	`117`	`+}`
	`118`	`+}).$mount()`
	`119`	`+constchild=vm.$children[0]`
	`120`	`+vm.msg='hi'`
	`121`	`+waitForUpdate(()=>{`
	`122`	`+expect(child.localMsg).toBe('hello')`
	`123`	`+expect(child.computedMsg).toBe('hi world')`
	`124`	`+expect(calls).toBe(1)`
	`125`	`+}).then(done)`
	`126`	`+})`
	`127`	`+`
`96`	`128`	`it('should have access to methods',()=>{`
`97`	`129`	`constvm=newVue({`
`98`	`130`	`methods:{`

Comments

(0)