fixed image cache information store

provide cache information in the onStartLoad handler
gatsbyjs · Sep 3, 2018 · b7854d8 · b7854d8
1 parent ce75b87
commit b7854d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/packages/gatsby-image/index.d.ts b/packages/gatsby-image/index.d.ts
@@ -38,7 +38,7 @@ interface GatsbyImageProps {
   position?: string
   backgroundColor?: string | boolean
   onLoad?: () => void
-  onStartLoad?: () => void
+  onStartLoad?: (param: { wasCached: boolean }) => void
   Tag?: string
 }
 

diff --git a/packages/gatsby-image/src/index.js b/packages/gatsby-image/src/index.js
@@ -26,12 +26,7 @@ const inImageCache = props => {
     ? convertedProps.fluid.src
     : convertedProps.fixed.src
 
-  if (imageCache[src]) {
-    return true
-  } else {
-    imageCache[src] = true
-    return false
-  }
+  return imageCache[src] || false
 }
 
 let io
@@ -172,7 +167,7 @@ class Image extends React.Component {
 
   componentDidMount() {
     if (this.state.isVisible && typeof this.props.onStartLoad === `function`) {
-      this.props.onStartLoad()
+      this.props.onStartLoad({ wasCached: inImageCache(this.props) })
     }
   }
 
@@ -183,7 +178,7 @@ class Image extends React.Component {
           !this.state.isVisible &&
           typeof this.props.onStartLoad === `function`
         ) {
-          this.props.onStartLoad();
+          this.props.onStartLoad({ wasCached: inImageCache(this.props) })
         }
 
         this.setState({ isVisible: true, imgLoaded: false })
@@ -309,6 +304,7 @@ class Image extends React.Component {
                 sizes={image.sizes}
                 style={imageStyle}
                 onLoad={() => {
+                  imageCache[image.src] = true
                   this.state.IOSupported && this.setState({ imgLoaded: true })
                   this.props.onLoad && this.props.onLoad()
                 }}
@@ -410,6 +406,7 @@ class Image extends React.Component {
                 style={imageStyle}
                 onLoad={() => {
                   this.setState({ imgLoaded: true })
+                  imageCache[image.src] = true
                   this.props.onLoad && this.props.onLoad()
                 }}
                 onError={this.props.onError}