Merge pull request vuejs#277 from vuejs/issue-221

fix: handle slots correctly

Author: lmiller1990

src/mount.ts

@@ -26,6 +26,7 @@ import { config } from './config'
 import { MountingOptions, Slot } from './types'
 import {
   isFunctionalComponent,
+  isHTML,
   isObjectComponent,
   mergeGlobalProperties
 } from './utils'
@@ -289,8 +290,14 @@ export function mount(
         }
 
         if (typeof slot === 'string') {
-          // slot is most probably a scoped slot string or a plain string
-          acc[name] = (props: VNodeProps) => h(processSlot(slot), props)
+          // if it is HTML we process and render it using h
+          if (isHTML(slot)) {
+            acc[name] = (props: VNodeProps) => h(processSlot(slot), props)
+          }
+          // otherwise it is just a string so we just return it as-is
+          else {
+            acc[name] = () => slot
+          }
           return acc
         }
 

src/utils.ts

@@ -82,3 +82,17 @@ export function isFunctionalComponent(component: any) {
 export function isObjectComponent(component: any) {
   return typeof component !== 'function' && !isClassComponent(component)
 }
+
+// https://stackoverflow.com/questions/15458876/check-if-a-string-is-html-or-not/15458987#answer-15458968
+export function isHTML(str: string) {
+  var a = document.createElement('div')
+  a.innerHTML = str
+
+  for (let c = a.childNodes, i = c.length; i--; ) {
+    if (c[i].nodeType == 1) {
+      return true
+    }
+  }
+
+  return false
+}

tests/mountingOptions/slots.spec.ts

@@ -15,6 +15,7 @@ describe('slots', () => {
           named: namedString
         }
       })
+      expect(wrapper.vm.$slots.default()[0].children).toBe(defaultString)
       expect(wrapper.find('.default').text()).toBe(defaultString)
       expect(wrapper.find('.named').text()).toBe(namedString)
     })