Commit1cf02ef

committed

fix: also clone component slot children during deepClone

1 parentcfd73c2 commit1cf02efCopy full SHA for 1cf02ef

File tree

+22

-9

lines changed

+22

-9

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -673,9 +673,12 @@ export function createPatchFunction (backend) {`
`673`	`673`	`// create an empty node and replace it`
`674`	`674`	`oldVnode=emptyNodeAt(oldVnode)`
`675`	`675`	`}`
	`676`	`+`
`676`	`677`	`// replacing existing element`
`677`	`678`	`constoldElm=oldVnode.elm`
`678`	`679`	`constparentElm=nodeOps.parentNode(oldElm)`
	`680`	`+`
	`681`	`+// create new node`
`679`	`682`	`createElm(`
`680`	`683`	`vnode,`
`681`	`684`	`insertedVnodeQueue,`
`@@ -686,9 +689,8 @@ export function createPatchFunction (backend) {`
`686`	`689`	`nodeOps.nextSibling(oldElm)`
`687`	`690`	`)`
`688`	`691`
	`692`	`+// update parent placeholder node element, recursively`
`689`	`693`	`if(isDef(vnode.parent)){`
`690`		`-// component root element replaced.`
`691`		`-// update parent placeholder node element, recursively`
`692`	`694`	`letancestor=vnode.parent`
`693`	`695`	`constpatchable=isPatchable(vnode)`
`694`	`696`	`while(ancestor){`
`@@ -717,6 +719,7 @@ export function createPatchFunction (backend) {`
`717`	`719`	`}`
`718`	`720`	`}`
`719`	`721`
	`722`	`+// destroy old node`
`720`	`723`	`if(isDef(parentElm)){`
`721`	`724`	`removeVnodes(parentElm,[oldVnode],0,0)`
`722`	`725`	`}elseif(isDef(oldVnode.tag)){`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,23 +86,29 @@ export function createTextVNode (val: string \| number) {`
`86`	`86`	`// multiple renders, cloning them avoids errors when DOM manipulations rely`
`87`	`87`	`// on their elm reference.`
`88`	`88`	`exportfunctioncloneVNode(vnode:VNode,deep?:boolean):VNode{`
	`89`	`+const componentOptions=vnode.componentOptions`
`89`	`90`	`constcloned=newVNode(`
`90`	`91`	`vnode.tag,`
`91`	`92`	`vnode.data,`
`92`	`93`	`vnode.children,`
`93`	`94`	`vnode.text,`
`94`	`95`	`vnode.elm,`
`95`	`96`	`vnode.context,`
`96`		`-vnode.componentOptions,`
	`97`	`+componentOptions,`
`97`	`98`	`vnode.asyncFactory`
`98`	`99`	`)`
`99`	`100`	`cloned.ns=vnode.ns`
`100`	`101`	`cloned.isStatic=vnode.isStatic`
`101`	`102`	`cloned.key=vnode.key`
`102`	`103`	`cloned.isComment=vnode.isComment`
`103`	`104`	`cloned.isCloned=true`
`104`		`-if(deep&&vnode.children){`
`105`		`-cloned.children=cloneVNodes(vnode.children)`
	`105`	`+if(deep){`
	`106`	`+if(vnode.children){`
	`107`	`+cloned.children=cloneVNodes(vnode.children,true)`
	`108`	`+}`
	`109`	`+if(componentOptions&&componentOptions.children){`
	`110`	`+componentOptions.children=cloneVNodes(componentOptions.children,true)`
	`111`	`+}`
`106`	`112`	`}`
`107`	`113`	`returncloned`
`108`	`114`	`}`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -686,6 +686,7 @@ describe('Component slot', () => {`
`686`	`686`	`expect(vm.$el.innerHTML).toBe('<div>default<span>foo</span></div>')`
`687`	`687`	`})`
`688`	`688`
	`689`	`+// #6372, #6915`
`689`	`690`	`it('should handle nested components in slots properly',done=>{`
`690`	`691`	`constTestComponent={`
`691`	`692`	template:`
`@@ -706,7 +707,10 @@ describe('Component slot', () => {`
`706`	`707`	`<test-component ref="test">`
`707`	`708`	`<div>`
`708`	`709`	`<foo/>`
`709`		`- </div><bar/>`
	`710`	`+ </div>`
	`711`	`+ <bar>`
	`712`	`+ <foo/>`
	`713`	`+ </bar>`
`710`	`714`	`</test-component>`
`711`	`715`	`</div>`
`712`	`716`	`,
`@@ -716,16 +720,16 @@ describe('Component slot', () => {`
`716`	`720`	template:`<div>foo</div>`
`717`	`721`	`},`
`718`	`722`	`bar:{`
`719`		-template:`<div>bar</div>`
	`723`	+template:`<div>bar<slot/></div>`
`720`	`724`	`}`
`721`	`725`	`}`
`722`	`726`	`}).$mount()`
`723`	`727`
`724`		-expect(vm.$el.innerHTML).toBe(`<b><div><div>foo</div></div><div>bar</div></b>`)
	`728`	+expect(vm.$el.innerHTML).toBe(`<b><div><div>foo</div></div><div>bar<div>foo</div></div></b>`)
`725`	`729`
`726`	`730`	`vm.$refs.test.toggleEl=false`
`727`	`731`	`waitForUpdate(()=>{`
`728`		-expect(vm.$el.innerHTML).toBe(`<i><div><div>foo</div></div><div>bar</div></i>`)
	`732`	+expect(vm.$el.innerHTML).toBe(`<i><div><div>foo</div></div><div>bar<div>foo</div></div></i>`)
`729`	`733`	`}).then(done)`
`730`	`734`	`})`
`731`	`735`

Comments

(0)