fix: support text slots (#711)

vuejs · Jun 13, 2018 · 93b8d98 · 93b8d98
1 parent 55d831f
commit 93b8d98
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/packages/create-instance/add-slots.js b/packages/create-instance/add-slots.js
@@ -2,11 +2,20 @@
 
 import { compileToFunctions } from 'vue-template-compiler'
 
+function startsWithTag (str) {
+  return str && str.trim()[0] === '<'
+}
+
 function createVNodesForSlot (
   h: Function,
   slotValue: SlotValue,
   name: string
-): Array<VNode> {
+): VNode | string {
+  if (typeof slotValue === 'string' &&
+  !startsWithTag(slotValue)) {
+    return slotValue
+  }
+
   const el = typeof slotValue === 'string'
     ? compileToFunctions(slotValue)
     : slotValue
@@ -19,7 +28,7 @@ function createVNodesForSlot (
 export function createSlotVNodes (
   h: Function,
   slots: SlotsObject
-): Array<VNode> {
+): Array<VNode | string> {
   return Object.keys(slots).reduce((acc, key) => {
     const content = slots[key]
     if (Array.isArray(content)) {

diff --git a/test/specs/mounting-options/slots.spec.js b/test/specs/mounting-options/slots.spec.js
@@ -164,6 +164,20 @@ describeWithMountingMethods('options.slots', (mountingMethod) => {
     }
   })
 
+  it('mounts component with text slot', () => {
+    const wrapper = mountingMethod(ComponentWithSlots, {
+      slots: {
+        default: 'hello,',
+        header: 'world'
+      }
+    })
+    if (mountingMethod.name === 'renderToString') {
+      expect(wrapper).contains('hello,world')
+    } else {
+      expect(wrapper.text()).to.contain('hello,world')
+    }
+  })
+
   it('mounts component with named slot if passed component in slot object', () => {
     const wrapper = mountingMethod(ComponentWithSlots, {
       slots: {