Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions packages/runtime-vapor/__tests__/vdomInterop.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -640,6 +640,74 @@ describe('vdomInterop', () => {
'<div>boolean:false:false</div><div>boolean:false:false</div>',
)
})

test('vnode props of a vdom component are a plain object', async () => {
// e.g. Vuetify's useProxiedModel checks `vm.vnode.props?.hasOwnProperty()`
const Field = defineComponent({
props: ['modelValue'],
setup(props) {
const vm = getCurrentInstance()!
expect(vm.vnode.props!.hasOwnProperty('modelValue')).toBe(true)
expect(vm.vnode.props!.hasOwnProperty('onUpdate:modelValue')).toBe(
true,
)
return () =>
h(
'i',
`${props.modelValue}:${vm.vnode.props!.hasOwnProperty('modelValue')}:${vm.vnode.props!.hasOwnProperty('onUpdate:modelValue')}`,
)
},
})
const { vdom, vapor } = await renderParity(
{
App: `<template><components.Field v-model="data.n" /></template>`,
},
() => ref({ n: 1 }),
async data => {
data.value.n++
},
{ Field },
)
expect(vdom.after).toBe('<i>2:true:true</i>')
expect(vapor.after).toBe(vdom.after)
})

test.each([null, { inherited: true }, 'value'])(
'preserves an own __proto__ vnode prop with value %j',
async value => {
let vm: ReturnType<typeof getCurrentInstance>
const Child = defineComponent({
inheritAttrs: false,
setup() {
vm = getCurrentInstance()!
return () => null
},
})
await renderParity(
{
App: `<template><components.Child :[data.key]="data.value" /></template>`,
},
() => shallowRef({ key: '__proto__', value }),
async data => {
expect(Object.getPrototypeOf(vm!.vnode.props)).toBe(
Object.prototype,
)
expect(vm!.vnode.props!.hasOwnProperty('__proto__')).toBe(true)
expect(vm!.vnode.props!.__proto__).toBe(value)

data.value = { key: '__proto__', value: { updated: true } }
await nextTick()

expect(Object.getPrototypeOf(vm!.vnode.props)).toBe(
Object.prototype,
)
expect(vm!.vnode.props!.hasOwnProperty('__proto__')).toBe(true)
expect(vm!.vnode.props!.__proto__).toBe(data.value.value)
},
{ Child },
)
},
)
})

describe('v-model', () => {
Expand Down
3 changes: 2 additions & 1 deletion packages/runtime-vapor/src/componentProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,8 @@ function updateProps(
triggerPropsValue(instance, RAW_VALUES_KEY)
}
const vnode = isInteropEnabled && instance.interopVNode
if (vnode && vnode.vi) vnode.props = rawValues
// vdom code reads vnode props as a plain object (e.g. `props.hasOwnProperty`)
if (vnode && vnode.vi) vnode.props = { ...rawValues }

const present: Record<string, true> | undefined =
propsToUpdate || isInitial ? undefined : Object.create(null)
Expand Down
Loading