staggered, cancellable preloading of all section image assets, as soon as the section loads

2 files changed, 16 insertions, 17 deletions

diff --git a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js
index 60ba7c9..a05789b 100644
--- a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js
+++ b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js
@@ -1,29 +1,21 @@
 import React from 'react'
 
 import { CURTAIN_COLOR_LOOKUP } from 'app/constants'
+import { displayElementImageURL } from 'app/utils/annotation.utils'
+
 export const FullscreenImage = ({ element, media, transitionDuration }) => {
   const color = element.color || CURTAIN_COLOR_LOOKUP.white
 
-  const item = media.lookup[element.settings.media_id]
+  const mediaItem = media.lookup[element.settings.media_id]
   const style = {
     backgroundColor: color.backgroundColor,
     color: color.textColor,
     transitionDuration,
   }
   
-  let url;
-  // console.log(element, item)
-  if (item.type === 'gallery') {
-    const index = parseInt(element.settings.frame_index)
-    const frame_id = item.settings.image_order[index]
-    const frame = item.settings.display_lookup[frame_id]
-    if (!frame) {
-      console.error("Slide not found:", element.settings.frame_index)
-      return <div />
-    }
-    url = frame.url
-  } else {
-    url = item.settings.display.url
+  let url = displayElementImageURL(element, mediaItem)
+  if (!url) {
+    return <div />
   }
 
   return (
diff --git a/animism-align/frontend/app/views/viewer/player/player.container.js b/animism-align/frontend/app/views/viewer/player/player.container.js
index 87a325b..8602284 100644
--- a/animism-align/frontend/app/views/viewer/player/player.container.js
+++ b/animism-align/frontend/app/views/viewer/player/player.container.js
@@ -2,7 +2,8 @@ import React, { Component } from 'react'
 import { connect } from 'react-redux'
 
 import actions from 'app/actions'
-import { floatEQ, floatInRange, clamp } from 'app/utils'
+import { floatInRange, clamp } from 'app/utils'
+import { preloadSectionImages } from 'app/utils/image.utils'
 
 import PlayerTranscript from './player.transcript'
 import PlayerFullscreen from './player.fullscreen'
@@ -70,8 +71,13 @@ class PlayerContainer extends Component {
   }
 
   componentDidUpdate(prevProps) {
-    if (this.props.audio.play_ts === prevProps.audio.play_ts) return
-    this.handleTimeUpdate()
+    if (this.props.audio.play_ts !== prevProps.audio.play_ts) {
+      this.handleTimeUpdate()
+    }
+    if (this.props.currentSection !== prevProps.currentSection) {
+      this.preloader && this.preloader.cancel()
+      this.preloader = preloadSectionImages(this.props.currentSection, this.props.mediaLookup)
+    }
   }
 
   handleTimeUpdate() {
@@ -114,6 +120,7 @@ class PlayerContainer extends Component {
 const mapStateToProps = state => ({
   viewer: state.viewer,
   audio: state.audio,
+  mediaLookup: state.media.index.lookup,
   sections: state.viewer.sections,
   currentSection: state.viewer.currentSection,
   autoAdvance: state.viewer.autoAdvance,