theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(transition): avoid repeated code (#483)

Browse Source
This commit is contained in:
Gabriel Loiácono 2019-11-23 02:02:39 -03:00 committed by Evan You
parent 8574db9a04
commit f399b5476f
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/runtime-dom/src/components/CSSTransition.ts
View File

@ -251,13 +251,12 @@ function getTransitionInfo(
): CSSTransitionInfo { ): CSSTransitionInfo {
const styles: any = window.getComputedStyle(el) const styles: any = window.getComputedStyle(el)
// JSDOM may return undefined for transition properties // JSDOM may return undefined for transition properties
const transitionDelays = (styles[TRANSITION + 'Delay'] || '').split(', ') const getStyleProperties = (key: string) => (styles[key] || '').split(', ')
const transitionDurations = (styles[TRANSITION + 'Duration'] || '').split( const transitionDelays = getStyleProperties(TRANSITION + 'Delay')
', ' const transitionDurations = getStyleProperties(TRANSITION + 'Duration')
)
const transitionTimeout = getTimeout(transitionDelays, transitionDurations) const transitionTimeout = getTimeout(transitionDelays, transitionDurations)
const animationDelays = (styles[ANIMATION + 'Delay'] || '').split(', ') const animationDelays = getStyleProperties(ANIMATION + 'Delay')
const animationDurations = (styles[ANIMATION + 'Duration'] || '').split(', ') const animationDurations = getStyleProperties(ANIMATION + 'Duration')
const animationTimeout = getTimeout(animationDelays, animationDurations) const animationTimeout = getTimeout(animationDelays, animationDurations)
let type: CSSTransitionInfo['type'] = null let type: CSSTransitionInfo['type'] = null
@ -301,12 +300,7 @@ function getTimeout(delays: string[], durations: string[]): number {
while (delays.length < durations.length) { while (delays.length < durations.length) {
delays = delays.concat(delays) delays = delays.concat(delays)
} }
return Math.max.apply( return Math.max(...durations.map((d, i) => toMs(d) + toMs(delays[i])))
null,
durations.map((d, i) => {
return toMs(d) + toMs(delays[i])
})
)
} }
// Old versions of Chromium (below 61.0.3163.100) formats floating pointer // Old versions of Chromium (below 61.0.3163.100) formats floating pointer