ensure $scopedSlots is always an object (close vuejs#4301)

yyx990803 · yyx990803 · commit aa5f5d1198db · 2016-11-23T18:04:35.000-05:00
diff --git a/flow/component.js b/flow/component.js
@@ -25,7 +25,7 @@ declare interface Component {
   $children: Array<Component>;
   $refs: { [key: string]: Component | Element | Array<Component | Element> | void };
   $slots: { [key: string]: Array<VNode> };
-  $scopedSlots: ?{ [key: string]: () => VNodeChildren };
+  $scopedSlots: { [key: string]: () => VNodeChildren };
   $vnode: VNode;
   $isServer: boolean;
 
diff --git a/src/core/instance/render.js b/src/core/instance/render.js
@@ -16,7 +16,7 @@ export function initRender (vm: Component) {
   vm._staticTrees = null
   vm._renderContext = vm.$options._parentVnode && vm.$options._parentVnode.context
   vm.$slots = resolveSlots(vm.$options._renderChildren, vm._renderContext)
-  vm.$scopedSlots = null
+  vm.$scopedSlots = {}
   // bind the public createElement fn to this instance
   // so that we get proper render context inside it.
   vm.$createElement = bind(createElement, vm)
@@ -45,7 +45,7 @@ export function renderMixin (Vue: Class<Component>) {
       }
     }
 
-    if (_parentVnode) {
+    if (_parentVnode && _parentVnode.data.scopedSlots) {
       vm.$scopedSlots = _parentVnode.data.scopedSlots
     }
 
@@ -191,7 +191,7 @@ export function renderMixin (Vue: Class<Component>) {
     fallback: ?Array<VNode>,
     props: ?Object
   ): ?Array<VNode> {
-    const scopedSlotFn = this.$scopedSlots && this.$scopedSlots[name]
+    const scopedSlotFn = this.$scopedSlots[name]
     if (scopedSlotFn) { // scoped slot
       return scopedSlotFn(props || {}) || fallback
     } else {
