Commitcf1ff5b

committed

fix: use correct ns inside <foreignObject> as root node

1 parent894d380 commitcf1ff5bCopy full SHA for cf1ff5b

File tree

+31

-4

lines changed

+31

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,17 +122,18 @@ export function _createElement (`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`-functionapplyNS(vnode,ns){`
	`125`	`+functionapplyNS(vnode,ns,force){`
`126`	`126`	`vnode.ns=ns`
`127`	`127`	`if(vnode.tag==='foreignObject'){`
`128`	`128`	`// use default namespace inside foreignObject`
`129`		`-return`
	`129`	`+ns=undefined`
	`130`	`+force=true`
`130`	`131`	`}`
`131`	`132`	`if(isDef(vnode.children)){`
`132`	`133`	`for(leti=0,l=vnode.children.length;i<l;i++){`
`133`	`134`	`constchild=vnode.children[i]`
`134`		`-if(isDef(child.tag)&&isUndef(child.ns)){`
`135`		`-applyNS(child,ns)`
	`135`	`+if(isDef(child.tag)&&(isUndef(child.ns)\|\|force)){`
	`136`	`+applyNS(child,ns,force)`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`	`}`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,32 @@ describe('create-element', () => {`
`141`	`141`	`expect(vnode.children[0].children[0].ns).toBeUndefined()`
`142`	`142`	`})`
`143`	`143`
	`144`	`+// #6642`
	`145`	`+it('render svg foreignObject component with correct namespace',()=>{`
	`146`	`+constvm=newVue({`
	`147`	+template:`
	`148`	`+ <svg>`
	`149`	`+ <test></test>`
	`150`	`+ </svg>`
	`151`	+ `,
	`152`	`+components:{`
	`153`	`+test:{`
	`154`	+template:`
	`155`	`+ <foreignObject>`
	`156`	`+ <p xmlns="http://www.w3.org/1999/xhtml"></p>`
	`157`	`+ </foreignObject>`
	`158`	+ `
	`159`	`+}`
	`160`	`+}`
	`161`	`+}).$mount()`
	`162`	`+consttestComp=vm.$children[0]`
	`163`	`+expect(testComp.$vnode.ns).toBe('svg')`
	`164`	`+expect(testComp._vnode.tag).toBe('foreignObject')`
	`165`	`+expect(testComp._vnode.ns).toBe('svg')`
	`166`	`+expect(testComp._vnode.children[0].tag).toBe('p')`
	`167`	`+expect(testComp._vnode.children[0].ns).toBeUndefined()`
	`168`	`+})`
	`169`	`+`
`144`	`170`	`// #6506`
`145`	`171`	`it('render SVGAElement in a component correctly',()=>{`
`146`	`172`	`constvm=newVue({`

Comments

(0)