Commit0ad8e8d

committed

fix(shallowReactive): should track value if already reactive when set in shallowReactive

1 parentd30f6fd commit0ad8e8dCopy full SHA for 0ad8e8d

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,10 @@ function initProps(vm: Component, propsOptions: Object) {`
`110`	`110`	`)`
`111`	`111`	`}`
`112`	`112`	`},`
`113`		`-true`
	`113`	`+true/* shallow */`
`114`	`114`	`)`
`115`	`115`	`}else{`
`116`		`-defineReactive(props,key,value,undefined,true)`
	`116`	`+defineReactive(props,key,value,undefined,true/* shallow */)`
`117`	`117`	`}`
`118`	`118`	`// static props are already proxied on the component's prototype`
`119`	`119`	`// during Vue.extend(). We only need to proxy props defined at`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,8 @@ export function defineReactive(`
`131`	`131`	`val?:any,`
`132`	`132`	`customSetter?:Function\|null,`
`133`	`133`	`shallow?:boolean,`
`134`		`-mock?:boolean`
	`134`	`+mock?:boolean,`
	`135`	`+observeEvenIfShallow=false`
`135`	`136`	`){`
`136`	`137`	`constdep=newDep()`
`137`	`138`
`@@ -150,7 +151,7 @@ export function defineReactive(`
`150`	`151`	`val=obj[key]`
`151`	`152`	`}`
`152`	`153`
`153`		`-letchildOb=!shallow&&observe(val,false,mock)`
	`154`	`+letchildOb=shallow?val&&val.__ob__ :observe(val,false,mock)`
`154`	`155`	`Object.defineProperty(obj,key,{`
`155`	`156`	`enumerable:true,`
`156`	`157`	`configurable:true,`
`@@ -194,7 +195,7 @@ export function defineReactive(`
`194`	`195`	`}else{`
`195`	`196`	`val=newVal`
`196`	`197`	`}`
`197`		`-childOb=!shallow&&observe(newVal,false,mock)`
	`198`	`+childOb=shallow?newVal&&newVal.__ob__ :observe(newVal,false,mock)`
`198`	`199`	`if(__DEV__){`
`199`	`200`	`dep.notify({`
`200`	`201`	`type:TriggerOpTypes.SET,`

Comments

(0)