diff options
Diffstat (limited to 'animism-align/frontend/app/views/viewer/player/player.fullscreen.js')
| -rw-r--r-- | animism-align/frontend/app/views/viewer/player/player.fullscreen.js | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/animism-align/frontend/app/views/viewer/player/player.fullscreen.js b/animism-align/frontend/app/views/viewer/player/player.fullscreen.js index 5683418..26219c4 100644 --- a/animism-align/frontend/app/views/viewer/player/player.fullscreen.js +++ b/animism-align/frontend/app/views/viewer/player/player.fullscreen.js @@ -53,16 +53,30 @@ class PlayerFullscreen extends Component { if (!(element.type in fullscreenComponents)) { return null } - const isEntering = floatInRange(element.start_ts, play_ts, element.fade_in_end_ts) - const FullscreenComponent = fullscreenComponents[element.type] - const transitionDuration = (isEntering ? (1000 * element.fadeInDuration) : (1000 * element.fadeOutDuration)) + 'ms' + let { + type, index, + fadeInDuration, fadeOutDuration, + start_ts, end_ts, + fade_in_end_ts, fade_out_start_ts, + } = element + const isEntering = floatInRange(start_ts, play_ts, fade_in_end_ts) + const isLeaving = floatInRange(fade_out_start_ts, play_ts, end_ts) + const FullscreenComponent = fullscreenComponents[type] + fadeInDuration *= 1000 + fadeOutDuration *= 1000 + if (!isEntering && !isLeaving) { + fadeInDuration = 0 + fadeOutDuration = 0 + } + const transitionDuration = (isEntering ? fadeInDuration : fadeOutDuration) + 'ms' + console.log(play_ts, isEntering, isLeaving, fadeInDuration, fadeOutDuration) return ( <CSSTransition - key={element.index} + key={index} classNames="fade" timeout={{ - enter: element.fadeInDuration * 1000, - exit: element.fadeOutDuration * 1000, + enter: fadeInDuration, + exit: fadeOutDuration, }} component={FirstChild} > |