react-native-fast-image 8.13.0 → 8.13.2

package/android/src/main/java/com/dylanvann/fastimage/FastImageViewWithUrl.java

@@ -18,7 +18,6 @@ import com.bumptech.glide.RequestManager;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
-import com.bumptech.glide.request.Request;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.DrawableImageViewTarget;
 import com.bumptech.glide.request.target.SizeReadyCallback;
@@ -472,7 +471,9 @@ class FastImageViewWithUrl extends AppCompatImageView {
     }
 
     public void clearView(@Nullable RequestManager requestManager) {
-        if (requestManager != null && getTag() != null && getTag() instanceof Request) {
+        // Glide keeps the view's request under its own tag id, not getTag().
+        // Without a request this does nothing.
+        if (requestManager != null) {
             requestManager.clear(this);
         }
     }

package/ios/FastImage/FFFastImageView.m

@@ -404,6 +404,12 @@ NSString *FFFErrorMessage(NSError *error)
     _needsReload = NO;
     self.waitsForSize = NO;
     self.decodedBox = CGSizeZero;
+    // The previous load, if it's still running, is for a source the view no
+    // longer shows: cancel it (a new download would, but a data uri or no
+    // source doesn't start one), and ignore what it still sends (SDWebImage
+    // completes a cancelled load with an error; see downloadImage:).
+    self.loadCount++;
+    [self sd_cancelCurrentImageLoad];
 
     if (_source) {
         // Load base64 images.
@@ -572,12 +578,19 @@ NSString *FFFErrorMessage(NSError *error)
         return;
     }
     // Like SDAnimatedImageView's sd_setImageWithURL, which sets the image
-    // class to SDAnimatedImage (loadContext sets it).
+    // class to SDAnimatedImage (loadContext sets it). Only while this is the
+    // current load: SDWebImage sets the placeholder when a load it cancelled
+    // completes, which could replace a newer image.
+    SDSetImageBlock setImage = ^(UIImage* _Nullable image, NSData* _Nullable data, SDImageCacheType cacheType, NSURL* _Nullable imageURL) {
+        if (weakSelf.loadCount == load) {
+            weakSelf.image = image;
+        }
+    };
     [self sd_internalSetImageWithURL: url
                     placeholderImage: _defaultSource
                              options: options
                              context: context
-                       setImageBlock: nil
+                       setImageBlock: setImage
                             progress: progress
                            completed: ^(UIImage* _Nullable image,
                     NSData* _Nullable data,
@@ -585,9 +598,10 @@ NSString *FFFErrorMessage(NSError *error)
                     SDImageCacheType cacheType,
                     BOOL finished,
                     NSURL* _Nullable imageURL) {
-                // Restarted for a new size (reloadIfResized): the new load
-                // sends the events.
-                if (weakSelf.loadCount != load && weakSelf.source == source) {
+                // Replaced by another load (a new source, or the same one
+                // restarted for a new size), which sends the events. This
+                // one was cancelled, which SDWebImage reports as an error.
+                if (weakSelf.loadCount != load) {
                     return;
                 }
                 // The download was running when the app went to the

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-fast-image",
-    "version": "8.13.0",
+    "version": "8.13.2",
     "description": "🚩 FastImage, performant React Native image component.",
     "keywords": [
         "cache",