default slot should use fallback content when it contains all whitespace nodes (fix vuejs#5097)

yyx990803 · yyx990803 · commit 303824ea9c76 · 2017-03-08T12:28:34.000+08:00
diff --git a/src/core/instance/render-helpers/resolve-slots.js b/src/core/instance/render-helpers/resolve-slots.js
@@ -29,16 +29,17 @@ export function resolveSlots (
       defaultSlot.push(child)
     }
   }
-  // ignore single whitespace
-  if (defaultSlot.length && !(
-    defaultSlot.length === 1 &&
-    (defaultSlot[0].text === ' ' || defaultSlot[0].isComment)
-  )) {
+  // ignore whitespace
+  if (!defaultSlot.every(isWhitespace)) {
     slots.default = defaultSlot
   }
   return slots
 }
 
+function isWhitespace (node: VNode): boolean {
+  return node.isComment || node.text === ' '
+}
+
 export function resolveScopedSlots (
   fns: Array<[string, Function]>
 ): { [key: string]: Function } {
diff --git a/test/unit/features/component/component-slot.spec.js b/test/unit/features/component/component-slot.spec.js
@@ -274,10 +274,10 @@ describe('Component slot', () => {
           <slot name="second"><p>second named slot</p></slot>
         </div>
       `,
-      parentContent: `<div slot="first">1</div> <div slot="second">2</div>`
+      parentContent: `<div slot="first">1</div> <div slot="second">2</div> <div slot="second">2+</div>`
     })
     expect(child.$el.innerHTML).toBe(
-      '<div>1</div> <p>this is the default slot</p> <div>2</div>'
+      '<div>1</div> <p>this is the default slot</p> <div>2</div><div>2+</div>'
     )
   })
 

Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,17 @@ export function resolveSlots (`
`29`	`29`	`defaultSlot.push(child)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`		`- // ignore single whitespace`
`33`		`- if (defaultSlot.length && !(`
`34`		`- defaultSlot.length === 1 &&`
`35`		`- (defaultSlot[0].text === ' ' \|\| defaultSlot[0].isComment)`
`36`		`- )) {`
	`32`	`+ // ignore whitespace`
	`33`	`+ if (!defaultSlot.every(isWhitespace)) {`
`37`	`34`	`slots.default = defaultSlot`
`38`	`35`	`}`
`39`	`36`	`return slots`
`40`	`37`	`}`
`41`	`38`
	`39`	`+function isWhitespace (node: VNode): boolean {`
	`40`	`+ return node.isComment \|\| node.text === ' '`
	`41`	`+}`
	`42`	`+`
`42`	`43`	`export function resolveScopedSlots (`
`43`	`44`	`fns: Array<[string, Function]>`
`44`	`45`	`): { [key: string]: Function } {`