Commit08382f0

committed

fix(props): should not unwrap props that are raw refs

1 parent947993f commit08382f0Copy full SHA for 08382f0

File tree

+36

-12

lines changed

+36

-12

lines changed

Lines changed: 18 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,19 +95,25 @@ function initProps(vm: Component, propsOptions: Object) {`
`95`	`95`	`vm`
`96`	`96`	`)`
`97`	`97`	`}`
`98`		`-defineReactive(props,key,value,()=>{`
`99`		`-if(!isRoot&&!isUpdatingChildComponent){`
`100`		`-warn(`
`101`		-`Avoid mutating a prop directly since the value will be `+
`102`		-`overwritten whenever the parent component re-renders. `+
`103`		-`Instead, use a data or computed property based on the prop's `+
`104`		-`value. Prop being mutated: "${key}"`,
`105`		`-vm`
`106`		`-)`
`107`		`-}`
`108`		`-})`
	`98`	`+defineReactive(`
	`99`	`+props,`
	`100`	`+key,`
	`101`	`+value,`
	`102`	`+()=>{`
	`103`	`+if(!isRoot&&!isUpdatingChildComponent){`
	`104`	`+warn(`
	`105`	+`Avoid mutating a prop directly since the value will be `+
	`106`	+`overwritten whenever the parent component re-renders. `+
	`107`	+`Instead, use a data or computed property based on the prop's `+
	`108`	+`value. Prop being mutated: "${key}"`,
	`109`	`+vm`
	`110`	`+)`
	`111`	`+}`
	`112`	`+},`
	`113`	`+true`
	`114`	`+)`
`109`	`115`	`}else{`
`110`		`-defineReactive(props,key,value)`
	`116`	`+defineReactive(props,key,value,undefined,true)`
`111`	`117`	`}`
`112`	`118`	`// static props are already proxied on the component's prototype`
`113`	`119`	`// during Vue.extend(). We only need to proxy props defined at`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`importVuefrom'vue'`
`2`	`2`	`import{hasSymbol}from'core/util/env'`
`3`	`3`	`importtestObjectOptionfrom'../../../helpers/test-object-option'`
	`4`	`+import{ref}from'v3'`
`4`	`5`
`5`	`6`	`describe('Options props',()=>{`
`6`	`7`	`testObjectOption('props')`
`@@ -593,4 +594,21 @@ describe('Options props', () => {`
`593`	`594`	`'Invalid prop type: "String" is not a constructor'`
`594`	`595`	`).toHaveBeenWarned()`
`595`	`596`	`})`
	`597`	`+`
	`598`	`+// #12930`
	`599`	`+it('should not unwrap prop values that are raw refs',()=>{`
	`600`	`+letval`
	`601`	`+constComp={`
	`602`	`+props:['msg'],`
	`603`	`+created(){`
	`604`	`+val=this.msg`
	`605`	`+},`
	`606`	`+render(){}`
	`607`	`+}`
	`608`	`+constr=ref()`
	`609`	`+newVue({`
	`610`	`+render:h=>h(Comp,{props:{msg:r}})`
	`611`	`+}).$mount()`
	`612`	`+expect(val).toBe(r)`
	`613`	`+})`
`596`	`614`	`})`

Comments

(0)