feat: enabled slots option to take class components (#826)

vuejs · Jul 15, 2018 · 4916fed · 4916fed
1 parent 65449b3
commit 4916fed
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 20 deletions.
diff --git a/packages/create-instance/validate-slots.js b/packages/create-instance/validate-slots.js
@@ -2,11 +2,11 @@
 
 import { throwError } from 'shared/util'
 import { compileToFunctions } from 'vue-template-compiler'
+import { isVueComponent } from '../shared/validators'
 
 function isValidSlot (slot: any): boolean {
   return (
-    Array.isArray(slot) ||
-    (slot !== null && typeof slot === 'object') ||
+    isVueComponent(slot) ||
     typeof slot === 'string'
   )
 }
@@ -23,24 +23,16 @@ function requiresTemplateCompiler (slot: any): void {
 
 export function validateSlots (slots: SlotsObject): void {
   Object.keys(slots).forEach(key => {
-    if (!isValidSlot(slots[key])) {
-      throwError(
-        `slots[key] must be a Component, string or an array ` + `of Components`
-      )
-    }
+    const slot = Array.isArray(slots[key]) ? slots[key] : [slots[key]]
 
-    requiresTemplateCompiler(slots[key])
-
-    if (Array.isArray(slots[key])) {
-      slots[key].forEach(slotValue => {
-        if (!isValidSlot(slotValue)) {
-          throwError(
-            `slots[key] must be a Component, string or an array ` +
-              `of Components`
-          )
-        }
-        requiresTemplateCompiler(slotValue)
-      })
-    }
+    slot.forEach(slotValue => {
+      if (!isValidSlot(slotValue)) {
+        throwError(
+          `slots[key] must be a Component, string or an array ` +
+            `of Components`
+        )
+      }
+      requiresTemplateCompiler(slotValue)
+    })
   })
 }
diff --git a/test/specs/mounting-options/slots.spec.js b/test/specs/mounting-options/slots.spec.js
@@ -546,4 +546,26 @@ describeWithMountingMethods('options.slots', mountingMethod => {
       wrapper.find('div').trigger('click')
     }
   )
+
+  it('mounts component with default slot if passed class component in slot object', () => {
+    const wrapper = mountingMethod(ComponentWithSlots, {
+      slots: { default: ComponentAsAClass }
+    })
+    if (mountingMethod.name === 'renderToString') {
+      expect(wrapper).contains('<div></div>')
+    } else {
+      expect(wrapper.contains(ComponentAsAClass)).to.equal(true)
+    }
+  })
+
+  it('mounts component with default slot if passed class component in array in slot object', () => {
+    const wrapper = mountingMethod(ComponentWithSlots, {
+      slots: { default: [ComponentAsAClass] }
+    })
+    if (mountingMethod.name === 'renderToString') {
+      expect(wrapper).contains('<div></div>')
+    } else {
+      expect(wrapper.contains(ComponentAsAClass)).to.equal(true)
+    }
+  })
 })