fix(slots): functional component text slots

Author: TheAlexLichter

packages/create-instance/create-functional-component.js

@@ -4,35 +4,35 @@ import { compileToFunctions } from 'vue-template-compiler'
 import { throwError } from 'shared/util'
 import { validateSlots } from './validate-slots'
 
-function createFunctionalSlots (slots = {}, h) {
-  if (Array.isArray(slots.default)) {
-    return slots.default.map(h)
-  }
+function startsWithTag (str) {
+  return str && str.trim()[0] === '<'
+}
 
-  if (typeof slots.default === 'string') {
-    return [h(compileToFunctions(slots.default))]
+function createVNodeForFunctionalSlot (slot, slotType, h) {
+  if (typeof slot === 'string' && !startsWithTag(slot)) {
+    return slot
   }
-  const children = []
-  Object.keys(slots).forEach(slotType => {
+
+  const component =
+    typeof slot === 'string' ? compileToFunctions(slot) : slot
+  const newSlot = h(component)
+  newSlot.data.slot = slotType
+  return newSlot
+}
+
+function createFunctionalSlots (slots = {}, h) {
+  return Object.keys(slots).reduce((children, slotType) => {
     if (Array.isArray(slots[slotType])) {
-      slots[slotType].forEach(slot => {
-        const component =
-          typeof slot === 'string' ? compileToFunctions(slot) : slot
-        const newSlot = h(component)
-        newSlot.data.slot = slotType
-        children.push(newSlot)
-      })
-    } else {
-      const component =
-        typeof slots[slotType] === 'string'
-          ? compileToFunctions(slots[slotType])
-          : slots[slotType]
-      const slot = h(component)
-      slot.data.slot = slotType
-      children.push(slot)
+      const mappedSlots = slots[slotType]
+        .map(slot => createVNodeForFunctionalSlot(slot, slotType, h))
+
+      return children.concat(mappedSlots)
     }
-  })
-  return children
+
+    return children.concat(
+      createVNodeForFunctionalSlot(slots[slotType], slotType, h)
+    )
+  }, [])
 }
 
 export default function createFunctionalComponent (