avoid merging text nodes when the node is a cloned slot node (fix vuejs#4209)

yyx990803 · yyx990803 · commit eb92723df543 · 2016-11-15T23:07:50.000-05:00
diff --git a/src/core/vdom/helpers/normalize-children.js b/src/core/vdom/helpers/normalize-children.js
@@ -28,7 +28,9 @@ export function normalizeChildren (
         }
       } else if (c instanceof VNode) {
         if (c.text && last && last.text) {
-          last.text += c.text
+          if (!last.isCloned) {
+            last.text += c.text
+          }
         } else {
           // inherit parent namespace
           if (ns) {
diff --git a/test/unit/features/component/component-slot.spec.js b/test/unit/features/component/component-slot.spec.js
@@ -574,4 +574,27 @@ describe('Component slot', () => {
     }).$mount()
     expect(vm.$el.innerHTML.trim()).toBe('<div>two</div><div>one</div>')
   })
+
+  // #4209
+  it('slot of multiple text nodes should not be infinitely merged', done => {
+    const wrap = {
+      template: `<inner ref="inner">foo<slot></slot></inner>`,
+      components: {
+        inner: {
+          data: () => ({ a: 1 }),
+          template: `<div>{{a}}<slot></slot></div>`
+        }
+      }
+    }
+    const vm = new Vue({
+      template: `<wrap ref="wrap">bar</wrap>`,
+      components: { wrap }
+    }).$mount()
+
+    expect(vm.$el.textContent).toBe('1foobar')
+    vm.$refs.wrap.$refs.inner.a++
+    waitForUpdate(() => {
+      expect(vm.$el.textContent).toBe('2foobar')
+    }).then(done)
+  })
 })
