Commit0b16927

haoqunjiang

authored and

yyx990803

committed

fix(transition): check existence ofel.parentNode (vuejs#8422)

fixvuejs#8199* fix(transition): check existence of `el.parentNode`If the new parentNode gets a `textContent` or `innerHTML` property duringpatching, the `transition` node would have been detached early, which means`el.parentNode` no longer exists.* fix(vdom): should not reuse nodes with `textContent` / `innerHTML` props

1 parent8f04135 commit0b16927Copy full SHA for 0b16927

File tree

3 files changed

+30

-1

lines changed

src
- core/vdom
  - patch.js
- platforms/web/runtime/modules
  - transition.js
test/unit/features/transition
- transition.spec.js

3 files changed

+30

-1

lines changed

`‎src/core/vdom/patch.js‎`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,20 @@ export const emptyNode = new VNode('', {}, [])`
`32`	`32`
`33`	`33`	`consthooks=['create','activate','update','remove','destroy']`
`34`	`34`
	`35`	`+functionchildrenIgnored(vnode){`
	`36`	`+returnvnode&&vnode.data&&vnode.data.domProps&&(`
	`37`	`+vnode.data.domProps.innerHTML\|\|vnode.data.domProps.textContent`
	`38`	`+)`
	`39`	`+}`
	`40`	`+`
`35`	`41`	`functionsameVnode(a,b){`
`36`	`42`	`return(`
`37`	`43`	`a.key===b.key&&(`
`38`	`44`	`(`
`39`	`45`	`a.tag===b.tag&&`
`40`	`46`	`a.isComment===b.isComment&&`
`41`	`47`	`isDef(a.data)===isDef(b.data)&&`
	`48`	`+!childrenIgnored(a)&&!childrenIgnored(b)&&`
`42`	`49`	`sameInputType(a,b)`
`43`	`50`	`)\|\|(`
`44`	`51`	`isTrue(a.isAsyncPlaceholder)&&`

`‎src/platforms/web/runtime/modules/transition.js‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ export function leave (vnode: VNodeWithData, rm: Function) {`
`251`	`251`	`return`
`252`	`252`	`}`
`253`	`253`	`// record leaving element`
`254`		`-if(!vnode.data.show){`
	`254`	`+if(!vnode.data.show&&el.parentNode){`
`255`	`255`	`(el.parentNode._pending\|\|(el.parentNode._pending={}))[(vnode.key:any)]=vnode`
`256`	`256`	`}`
`257`	`257`	`beforeLeave&&beforeLeave(el)`

`‎test/unit/features/transition/transition.spec.js‎`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1167,5 +1167,27 @@ if (!isIE9) {`
`1167`	`1167`	`expect(vm.$el.innerHTML).toBe('<!---->')`
`1168`	`1168`	`}).then(done)`
`1169`	`1169`	`})`
	`1170`	`+`
	`1171`	`+// #8199`
	`1172`	`+it('should not throw error when replaced by v-html contents',(done)=>{`
	`1173`	`+constvm=newVue({`
	`1174`	+template:`
	`1175`	`+ <div>`
	`1176`	`+ <div v-if="ok" :class="ok">`
	`1177`	`+ <transition>`
	`1178`	`+ <span>a</span>`
	`1179`	`+ </transition>`
	`1180`	`+ </div>`
	`1181`	`+ <div v-else v-html="ok"></div>`
	`1182`	`+ </div>`
	`1183`	+ `,
	`1184`	`+data:{ok:true}`
	`1185`	`+}).$mount(el)`
	`1186`	`+`
	`1187`	`+vm.ok=false`
	`1188`	`+waitForUpdate(()=>{`
	`1189`	`+expect(vm.$el.children[0].innerHTML).toBe('false')`
	`1190`	`+}).then(done)`
	`1191`	`+})`
`1170`	`1192`	`})`
`1171`	`1193`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0b16927

File tree

3 files changed

3 files changed

`‎src/core/vdom/patch.js‎`

`‎src/platforms/web/runtime/modules/transition.js‎`

`‎test/unit/features/transition/transition.spec.js‎`

0 commit comments