add createVNodes()

Author: 38elements

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

@@ -25,7 +25,7 @@ export default function createFunctionalComponent (
           mountingOptions.context.children.map(
             x => (typeof x === 'function' ? x(h) : x)
           )) ||
-          createSlotVNodes(h, mountingOptions.slots || {}, this)
+          createSlotVNodes(this, mountingOptions.slots || {})
       )
     },
     name: component.name,

packages/create-instance/create-instance.js

@@ -142,7 +142,7 @@ export default function createInstance (
     provide: options.provide,
     render (h) {
       const slots = options.slots
-        ? createSlotVNodes(h, options.slots, this)
+        ? createSlotVNodes(this, options.slots)
         : undefined
       return h(
         Constructor,

packages/create-instance/create-slot-vnodes.js

@@ -2,26 +2,33 @@
 
 import { compileToFunctions } from 'vue-template-compiler'
 
+function createVNodes (
+  vm: Component,
+  slotValue: string
+): Array<VNode> {
+  const el = compileToFunctions(`<div>${slotValue}</div>`)
+  const _staticRenderFns = vm._renderProxy.$options.staticRenderFns
+  // version < 2.5
+  if (!vm._renderProxy._staticTrees) {
+    vm._renderProxy._staticTrees = []
+  }
+  vm._renderProxy.$options.staticRenderFns = el.staticRenderFns
+  const vnode = el.render.call(vm._renderProxy, vm.$createElement)
+  vm._renderProxy.$options.staticRenderFns = _staticRenderFns
+  return vnode.children
+}
+
 function createVNodesForSlot (
-  h: Function,
+  vm: Component,
   slotValue: SlotValue,
   name: string,
-  vm: Component
 ): VNode | string {
   let vnode
   if (typeof slotValue === 'string') {
-    const el = compileToFunctions(`<div>${slotValue}</div>`)
-    const _staticRenderFns = vm._renderProxy.$options.staticRenderFns
-    // version < 2.5
-    if (!vm._renderProxy._staticTrees) {
-      vm._renderProxy._staticTrees = []
-    }
-    vm._renderProxy.$options.staticRenderFns = el.staticRenderFns
-    vnode = el.render.call(vm._renderProxy, h)
-    vm._renderProxy.$options.staticRenderFns = _staticRenderFns
-    vnode = vnode.children[0]
+    const vnodes = createVNodes(vm, slotValue)
+    vnode = vnodes[0]
   } else {
-    vnode = h(slotValue)
+    vnode = vm.$createElement(slotValue)
   }
   if (vnode.data) {
     vnode.data.slot = name
@@ -32,19 +39,18 @@ function createVNodesForSlot (
 }
 
 export function createSlotVNodes (
-  h: Function,
-  slots: SlotsObject,
-  vm: Component
+  vm: Component,
+  slots: SlotsObject
 ): Array<VNode | string> {
   return Object.keys(slots).reduce((acc, key) => {
     const content = slots[key]
     if (Array.isArray(content)) {
       const nodes = content.map(
-        slotDef => createVNodesForSlot(h, slotDef, key, vm)
+        slotDef => createVNodesForSlot(vm, slotDef, key)
       )
       return acc.concat(nodes)
     }
 
-    return acc.concat(createVNodesForSlot(h, content, key, vm))
+    return acc.concat(createVNodesForSlot(vm, content, key))
   }, [])
 }