vue 2.7.0-alpha.4 → 2.7.0-alpha.5

package/dist/vue.common.dev.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.7.0-alpha.4
+ * Vue.js v2.7.0-alpha.5
  * (c) 2014-2022 Evan You
  * Released under the MIT License.
  */
@@ -2261,34 +2261,33 @@ function isAsyncPlaceholder(node) {
     return node.isComment && node.asyncFactory;
 }
 
-function normalizeScopedSlots(ownerVm, slots, normalSlots) {
+function normalizeScopedSlots(ownerVm, scopedSlots, normalSlots, prevScopedSlots) {
     var res;
-    var prevSlots = ownerVm.$scopedSlots;
     var hasNormalSlots = Object.keys(normalSlots).length > 0;
-    var isStable = slots ? !!slots.$stable : !hasNormalSlots;
-    var key = slots && slots.$key;
-    if (!slots) {
+    var isStable = scopedSlots ? !!scopedSlots.$stable : !hasNormalSlots;
+    var key = scopedSlots && scopedSlots.$key;
+    if (!scopedSlots) {
         res = {};
     }
-    else if (slots._normalized) {
+    else if (scopedSlots._normalized) {
         // fast path 1: child component re-render only, parent did not change
-        return slots._normalized;
+        return scopedSlots._normalized;
     }
     else if (isStable &&
-        prevSlots &&
-        prevSlots !== emptyObject &&
-        key === prevSlots.$key &&
+        prevScopedSlots &&
+        prevScopedSlots !== emptyObject &&
+        key === prevScopedSlots.$key &&
         !hasNormalSlots &&
-        !prevSlots.$hasNormal) {
+        !prevScopedSlots.$hasNormal) {
         // fast path 2: stable scoped slots w/ no normal slots to proxy,
         // only need to normalize once
-        return prevSlots;
+        return prevScopedSlots;
     }
     else {
         res = {};
-        for (var key_1 in slots) {
-            if (slots[key_1] && key_1[0] !== '$') {
-                res[key_1] = normalizeScopedSlot(ownerVm, normalSlots, key_1, slots[key_1]);
+        for (var key_1 in scopedSlots) {
+            if (scopedSlots[key_1] && key_1[0] !== '$') {
+                res[key_1] = normalizeScopedSlot(ownerVm, normalSlots, key_1, scopedSlots[key_1]);
             }
         }
     }
@@ -2300,8 +2299,8 @@ function normalizeScopedSlots(ownerVm, slots, normalSlots) {
     }
     // avoriaz seems to mock a non-extensible $scopedSlots object
     // and when that is passed down this would cause an error
-    if (slots && Object.isExtensible(slots)) {
-        slots._normalized = res;
+    if (scopedSlots && Object.isExtensible(scopedSlots)) {
+        scopedSlots._normalized = res;
     }
     def(res, '$stable', isStable);
     def(res, '$key', key);
@@ -3087,7 +3086,7 @@ function renderMixin(Vue) {
         var vm = this;
         var _a = vm.$options, render = _a.render, _parentVnode = _a._parentVnode;
         if (_parentVnode) {
-            vm.$scopedSlots = normalizeScopedSlots(vm.$parent, _parentVnode.data.scopedSlots, vm.$slots);
+            vm.$scopedSlots = normalizeScopedSlots(vm.$parent, _parentVnode.data.scopedSlots, vm.$slots, vm.$scopedSlots);
             if (vm._slotsProxy) {
                 syncSetupSlots(vm._slotsProxy, vm.$scopedSlots);
             }
@@ -5798,7 +5797,7 @@ Object.defineProperty(Vue.prototype, '$ssrContext', {
 Object.defineProperty(Vue, 'FunctionalRenderContext', {
     value: FunctionalRenderContext
 });
-Vue.version = '2.7.0-alpha.4';
+Vue.version = '2.7.0-alpha.5';
 
 // these are reserved for web because they are directly compiled away
 // during template compilation