From ebc1893faccd1a9d953a8e8feddcb49cf1b9004d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Mon, 18 Mar 2019 17:42:16 +0800
Subject: [PATCH] fix(slots): fix slots not updating when passing down normal
 slots as $scopedSlots

fix #9699
---
 .../vdom/helpers/normalize-scoped-slots.js    |  2 +-
 .../component/component-scoped-slot.spec.js   | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/core/vdom/helpers/normalize-scoped-slots.js b/src/core/vdom/helpers/normalize-scoped-slots.js
index cc0348f6..1e43fd39 100644
--- a/src/core/vdom/helpers/normalize-scoped-slots.js
+++ b/src/core/vdom/helpers/normalize-scoped-slots.js
@@ -10,8 +10,8 @@ export function normalizeScopedSlots (
   prevSlots?: { [key: string]: Function } | void
 ): any {
   let res
-  const isStable = slots ? !!slots.$stable : true
   const hasNormalSlots = Object.keys(normalSlots).length > 0
+  const isStable = slots ? !!slots.$stable : !hasNormalSlots
   const key = slots && slots.$key
   if (!slots) {
     res = {}
diff --git a/test/unit/features/component/component-scoped-slot.spec.js b/test/unit/features/component/component-scoped-slot.spec.js
index 8960d8bf..f8a0f11b 100644
--- a/test/unit/features/component/component-scoped-slot.spec.js
+++ b/test/unit/features/component/component-scoped-slot.spec.js
@@ -1277,4 +1277,36 @@ describe('Component scoped slot', () => {
     }).$mount()
     expect(vm.$el.textContent).toMatch('fallback')
   })
+
+  // #9699
+  // Component only has normal slots, but is passing down $scopedSlots directly
+  // $scopedSlots should not be marked as stable in this case
+  it('render function passing $scopedSlots w/ normal slots down', done => {
+    const one = {
+      template: `<div><slot name="footer"/></div>`
+    }
+
+    const two = {
+      render(h) {
+        return h(one, {
+          scopedSlots: this.$scopedSlots
+        })
+      }
+    }
+
+    const vm = new Vue({
+      data: { count: 0 },
+      render(h) {
+        return h(two, [
+          h('span', { slot: 'footer' }, this.count)
+        ])
+      }
+    }).$mount()
+
+    expect(vm.$el.textContent).toMatch(`0`)
+    vm.count++
+    waitForUpdate(() => {
+      expect(vm.$el.textContent).toMatch(`1`)
+    }).then(done)
+  })
 })