refactor: do not override scoped slots when exposing normal slots

yyx990803 · yyx990803 · commit 3a1a9359607e · 2019-01-10T14:25:09.000-05:00
diff --git a/src/core/vdom/helpers/normalize-scoped-slots.js b/src/core/vdom/helpers/normalize-scoped-slots.js
@@ -19,7 +19,9 @@ export function normalizeScopedSlots (
   }
   // expose normal slots on scopedSlots
   for (const key in normalSlots) {
-    res[key] = proxyNormalSlot(normalSlots, key)
+    if (!(key in res)) {
+      res[key] = proxyNormalSlot(normalSlots, key)
+    }
   }
   res._normalized = true
   return res

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ export function normalizeScopedSlots (`
`19`	`19`	`}`
`20`	`20`	`// expose normal slots on scopedSlots`
`21`	`21`	`for (const key in normalSlots) {`
`22`		`- res[key] = proxyNormalSlot(normalSlots, key)`
	`22`	`+ if (!(key in res)) {`
	`23`	`+ res[key] = proxyNormalSlot(normalSlots, key)`
	`24`	`+ }`
`23`	`25`	`}`
`24`	`26`	`res._normalized = true`
`25`	`27`	`return res`