Skip to content

fix: class and style should be properly normalized in cloneVNode #1967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 26, 2020
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
50 changes: 50 additions & 0 deletions packages/runtime-core/__tests__/vnode.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,56 @@ describe('vnode', () => {
setCurrentRenderingInstance(null)
})

test('cloneVNode class normalization', () => {
const vnode = createVNode('div')
const expectedProps = {
class: 'a b'
}
expect(cloneVNode(vnode, { class: 'a b' }).props).toMatchObject(
expectedProps
)
expect(cloneVNode(vnode, { class: ['a', 'b'] }).props).toMatchObject(
expectedProps
)
expect(
cloneVNode(vnode, { class: { a: true, b: true } }).props
).toMatchObject(expectedProps)
expect(
cloneVNode(vnode, { class: [{ a: true, b: true }] }).props
).toMatchObject(expectedProps)
})

test('cloneVNode style normalization', () => {
const vnode = createVNode('div')
const expectedProps = {
style: {
color: 'blue',
width: '300px'
}
}
expect(
cloneVNode(vnode, { style: 'color: blue; width: 300px;' }).props
).toMatchObject(expectedProps)
expect(
cloneVNode(vnode, {
style: {
color: 'blue',
width: '300px'
}
}).props
).toMatchObject(expectedProps)
expect(
cloneVNode(vnode, {
style: [
{
color: 'blue',
width: '300px'
}
]
}).props
).toMatchObject(expectedProps)
})

describe('mergeProps', () => {
test('class', () => {
let props1: Data = { class: 'c' }
Expand Down
6 changes: 1 addition & 5 deletions packages/runtime-core/src/vnode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -433,11 +433,7 @@ export function cloneVNode<T, U>(
// This is intentionally NOT using spread or extend to avoid the runtime
// key enumeration cost.
const { props, patchFlag } = vnode
const mergedProps = extraProps
? props
? mergeProps(props, extraProps)
: extend({}, extraProps)
: props
const mergedProps = extraProps ? mergeProps(props || {}, extraProps) : props
return {
__v_isVNode: true,
[ReactiveFlags.SKIP]: true,
Expand Down