Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions packages/runtime-dom/src/components/Transition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -371,18 +371,45 @@ function whenTransitionEnds(
let ended = 0
const end = () => {
el.removeEventListener(endEvent, onEnd)
cancelFeedback()
resolveIfNotStale()
}
const onEnd = (e: Event) => {
if (e.target === el && ++ended >= propCount) {
end()
}
}
setTimeout(() => {
if (ended < propCount) {
end()

const fallbackTimeout = () => {
let loopStart: number | null = null
let rafId: number
const loop = (timeStamp: number) => {
if (id !== el._endId) {
return
}

if (!loopStart) {
loopStart = timeStamp
}

const elapsed = timeStamp - loopStart
if (elapsed >= timeout + 1) {
if (ended < propCount) {
end()
}
return
}

rafId = requestAnimationFrame(loop)
}
}, timeout + 1)

rafId = requestAnimationFrame(loop)

return () => cancelAnimationFrame(rafId)
}

const cancelFeedback = fallbackTimeout()

el.addEventListener(endEvent, onEnd)
}

Expand Down
Loading