fix(types): scoped slots can return a single VNode

vuejs · Oct 18, 2018 · 551be9a · 551be9a
1 parent 0737d11
commit 551be9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/types/test/options-test.ts b/types/test/options-test.ts
@@ -307,11 +307,15 @@ Vue.component('component-with-scoped-slot', {
 Vue.component('narrow-array-of-vnode-type', {
   render (h): VNode {
     const slot = this.$scopedSlots.default({})
-    if (typeof slot !== 'string') {
+    if (Array.isArray(slot)) {
       const first = slot[0]
       if (!Array.isArray(first) && typeof first !== 'string') {
         return first;
       }
+    } else if (typeof slot === 'string') {
+      return h('div', slot.toUpperCase())
+    } else {
+      return slot
     }
     return h();
   }

diff --git a/types/vnode.d.ts b/types/vnode.d.ts
@@ -1,6 +1,6 @@
 import { Vue } from "./vue";
 
-export type ScopedSlot = (props: any) => VNodeChildrenArrayContents | string;
+export type ScopedSlot = (props: any) => VNodeChildrenArrayContents | VNode | string;
 
 export type VNodeChildren = VNodeChildrenArrayContents | [ScopedSlot] | string;
 export interface VNodeChildrenArrayContents extends Array<VNode | string | VNodeChildrenArrayContents> {}