theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(runtime-core/vnode): should not render boolean values in vnode children (close #574)

Browse Source
This commit is contained in:
Evan You 2020-01-06 11:57:19 -05:00
parent 137893a4fd
commit 84dc5a6862
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/runtime-core/__tests__/vnode.spec.ts
View File

@ -120,6 +120,12 @@ describe('vnode', () => {
expect(normalizeVNode(null)).toMatchObject({ type: Comment }) expect(normalizeVNode(null)).toMatchObject({ type: Comment })
expect(normalizeVNode(undefined)).toMatchObject({ type: Comment }) expect(normalizeVNode(undefined)).toMatchObject({ type: Comment })
// boolean -> Comment
// this is for usage like `someBoolean && h('div')` and behavior consistency
// with 2.x (#574)
expect(normalizeVNode(true)).toMatchObject({ type: Comment })
expect(normalizeVNode(false)).toMatchObject({ type: Comment })
// array -> Fragment // array -> Fragment
expect(normalizeVNode(['foo'])).toMatchObject({ type: Fragment }) expect(normalizeVNode(['foo'])).toMatchObject({ type: Fragment })
@ -137,7 +143,6 @@ describe('vnode', () => {
// primitive types // primitive types
expect(normalizeVNode('foo')).toMatchObject({ type: Text, children: `foo` }) expect(normalizeVNode('foo')).toMatchObject({ type: Text, children: `foo` })
expect(normalizeVNode(1)).toMatchObject({ type: Text, children: `1` }) expect(normalizeVNode(1)).toMatchObject({ type: Text, children: `1` })
expect(normalizeVNode(true)).toMatchObject({ type: Text, children: `true` })
}) })
test('type shapeFlag inference', () => { test('type shapeFlag inference', () => {

4
packages/runtime-core/src/vnode.ts
View File

@ -337,7 +337,7 @@ export function createCommentVNode(
} }
export function normalizeVNode<T, U>(child: VNodeChild<T, U>): VNode<T, U> { export function normalizeVNode<T, U>(child: VNodeChild<T, U>): VNode<T, U> {
if (child == null) { if (child == null || typeof child === 'boolean') {
// empty placeholder // empty placeholder
return createVNode(Comment) return createVNode(Comment)
} else if (isArray(child)) { } else if (isArray(child)) {
@ -348,7 +348,7 @@ export function normalizeVNode<T, U>(child: VNodeChild<T, U>): VNode<T, U> {
// always produce all-vnode children arrays // always produce all-vnode children arrays
return child.el === null ? child : cloneVNode(child) return child.el === null ? child : cloneVNode(child)
} else { } else {
// primitive types // strings and numbers
return createVNode(Text, null, String(child)) return createVNode(Text, null, String(child))
} }
} }