fix(runtime-core): should resolve value instead of delete for dynamic props with options

This commit is contained in:
Evan You 2020-04-14 16:17:35 -04:00
parent 0869443d01
commit c80b857eb5
2 changed files with 37 additions and 21 deletions

View File

@ -175,9 +175,17 @@ describe('component props', () => {
expect(proxy.foo).toBe(2) expect(proxy.foo).toBe(2)
expect(proxy.bar).toEqual({ a: 1 }) expect(proxy.bar).toEqual({ a: 1 })
render(h(Comp, { foo: undefined, bar: { b: 2 } }), root) render(h(Comp, { bar: { b: 2 } }), root)
expect(proxy.foo).toBe(1) expect(proxy.foo).toBe(1)
expect(proxy.bar).toEqual({ b: 2 }) expect(proxy.bar).toEqual({ b: 2 })
render(h(Comp, { foo: 3, bar: { b: 3 } }), root)
expect(proxy.foo).toBe(3)
expect(proxy.bar).toEqual({ b: 3 })
render(h(Comp, { bar: { b: 4 } }), root)
expect(proxy.foo).toBe(1)
expect(proxy.bar).toEqual({ b: 4 })
}) })
test('optimized props updates', async () => { test('optimized props updates', async () => {

View File

@ -186,9 +186,18 @@ export function updateProps(
// and converted to camelCase (#955) // and converted to camelCase (#955)
((kebabKey = hyphenate(key)) === key || !hasOwn(rawProps, kebabKey))) ((kebabKey = hyphenate(key)) === key || !hasOwn(rawProps, kebabKey)))
) { ) {
if (options) {
props[key] = resolvePropValue(
options,
rawProps || EMPTY_OBJ,
key,
undefined
)
} else {
delete props[key] delete props[key]
} }
} }
}
for (const key in attrs) { for (const key in attrs) {
if (!rawProps || !hasOwn(rawProps, key)) { if (!rawProps || !hasOwn(rawProps, key)) {
delete attrs[key] delete attrs[key]
@ -250,10 +259,8 @@ function resolvePropValue(
key: string, key: string,
value: unknown value: unknown
) { ) {
let opt = options[key] const opt = options[key]
if (opt == null) { if (opt != null) {
return value
}
const hasDefault = hasOwn(opt, 'default') const hasDefault = hasOwn(opt, 'default')
// default values // default values
if (hasDefault && value === undefined) { if (hasDefault && value === undefined) {
@ -271,6 +278,7 @@ function resolvePropValue(
value = true value = true
} }
} }
}
return value return value
} }