test/vue
1
0
Fork 0
mirror of https://gitee.com/vuejs/vue.git synced 2024-12-05 05:27:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ensure instance-unique keys for <transition> child nodes during pending node removal (fix #4702)

Browse Source
This commit is contained in:
Evan You 2017-01-16 18:00:34 -05:00
parent c66991d961
commit 85d6f115bb
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/platforms/web/runtime/components/transition.js
View File

@ -127,9 +127,13 @@ export default {
return placeholder(h, rawChild) return placeholder(h, rawChild)
} }
const key = child.key = child.key == null || child.isStatic // ensure a key that is unique to the vnode type and to this transition
? `__v${child.tag + this._uid}__` // component instance. This key will be used to remove pending leaving nodes
: child.key // during entering.
const id = `__transition-${this._uid}-`
const key = child.key = child.key == null
? id + child.tag
: child.key.indexOf(id) === 0 ? child.key : id + child.key
const data = (child.data || (child.data = {})).transition = extractTransitionData(this) const data = (child.data || (child.data = {})).transition = extractTransitionData(this)
const oldRawChild = this._vnode const oldRawChild = this._vnode
const oldChild: any = getRealChild(oldRawChild) const oldChild: any = getRealChild(oldRawChild)

1
src/platforms/web/runtime/modules/transition.js
View File

@ -103,7 +103,6 @@ export function enter (vnode: VNodeWithData, toggleDisplay: ?() => void) {
const parent = el.parentNode const parent = el.parentNode
const pendingNode = parent && parent._pending && parent._pending[vnode.key] const pendingNode = parent && parent._pending && parent._pending[vnode.key]
if (pendingNode && if (pendingNode &&
pendingNode.context === vnode.context &&
pendingNode.tag === vnode.tag && pendingNode.tag === vnode.tag &&
pendingNode.elm._leaveCb) { pendingNode.elm._leaveCb) {
pendingNode.elm._leaveCb() pendingNode.elm._leaveCb()