fix: ensure proxied normal slot uses correct key

yyx990803 · yyx990803 · commit b32c4b693535 · 2019-01-10T12:32:06.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,7 @@ export function normalizeScopedSlots (
   }
   // expose normal slots on scopedSlots
   for (const key in normalSlots) {
-    res[key] = () => normalSlots[key]
+    res[key] = proxyNormalSlot(normalSlots, key)
   }
   res._normalized = true
   return res
@@ -31,3 +31,7 @@ function normalizeScopedSlot(fn: Function) {
     return Array.isArray(res) ? res : res ? [res] : res
   }
 }
+
+function proxyNormalSlot(slots, key) {
+  return () => slots[key]
+}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export function normalizeScopedSlots (`
`19`	`19`	`}`
`20`	`20`	`// expose normal slots on scopedSlots`
`21`	`21`	`for (const key in normalSlots) {`
`22`		`- res[key] = () => normalSlots[key]`
	`22`	`+ res[key] = proxyNormalSlot(normalSlots, key)`
`23`	`23`	`}`
`24`	`24`	`res._normalized = true`
`25`	`25`	`return res`
`@@ -31,3 +31,7 @@ function normalizeScopedSlot(fn: Function) {`
`31`	`31`	`return Array.isArray(res) ? res : res ? [res] : res`
`32`	`32`	`}`
`33`	`33`	`}`
	`34`	`+`
	`35`	`+function proxyNormalSlot(slots, key) {`
	`36`	`+ return () => slots[key]`
	`37`	`+}`