react-native-fast-image 8.28.0 → 8.28.1

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

@@ -131,6 +131,12 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
         view.setPaused(paused);
     }
 
+    // Set when the image has an onProgress (see onProgress).
+    @ReactProp(name = "trackProgress")
+    public void setTrackProgress(FastImageViewWithUrl view, boolean trackProgress) {
+        view.trackProgress = trackProgress;
+    }
+
     @ReactProp(name = "resizeMode")
     public void setResizeMode(FastImageViewWithUrl view, String resizeMode) {
         // repeat fills the view with the tiled image (see setImageDrawable).
@@ -163,11 +169,15 @@ class FastImageViewManager extends SimpleViewManager<FastImageViewWithUrl> imple
                 .build();
     }
 
+    // Sends the progress to the views loading the url that have an onProgress:
+    // the others would send an event to JS for every chunk, for nothing (and
+    // on the New Architecture each would log an unhandled event).
     @Override
     public void onProgress(String key, long bytesRead, long expectedLength) {
         List<FastImageViewWithUrl> viewsForKey = VIEWS_FOR_URLS.get(key);
         if (viewsForKey != null) {
             for (FastImageViewWithUrl view : viewsForKey) {
+                if (!view.trackProgress) continue;
                 WritableMap event = new WritableNativeMap();
                 event.putInt("loaded", (int) bytesRead);
                 event.putInt("total", (int) expectedLength);

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

@@ -183,6 +183,8 @@ class FastImageViewWithUrl extends AppCompatImageView {
 
     // Pauses GIFs on the frame they're showing (the view's own animation).
     private boolean mPaused = false;
+    // Whether to send progress events (the image has an onProgress).
+    boolean trackProgress = false;
 
     // The `transition` prop (from the next load): how long a loaded image
     // takes to fade in, in milliseconds (0 for no fade), whether it also fades

package/dist/index.cjs.js

@@ -183,6 +183,7 @@ function FastImageBase({ source, defaultSource, tintColor, onLoadStart, onProgre
 		defaultSource: resolvedDefaultSource,
 		onFastImageLoadStart: onLoadStart,
 		onFastImageProgress: withProgress(onProgress),
+		trackProgress: !!onProgress,
 		onFastImageLoad: onLoad,
 		onFastImageError: onError,
 		onFastImageLoadEnd: onLoadEnd && ((event) => onLoadEnd(loadResult(event.nativeEvent))),
@@ -272,7 +273,8 @@ const FastImageView = (0, react_native.requireNativeComponent)("FastImageView",
 	onFastImageProgress: true,
 	onFastImageLoad: true,
 	onFastImageError: true,
-	onFastImageLoadEnd: true
+	onFastImageLoadEnd: true,
+	trackProgress: true
 } });
 //#endregion
 exports.FastImageBackground = FastImageBackground;

package/dist/index.js

@@ -156,6 +156,7 @@ function FastImageBase({ source, defaultSource, tintColor, onLoadStart, onProgre
 		defaultSource: resolvedDefaultSource,
 		onFastImageLoadStart: onLoadStart,
 		onFastImageProgress: withProgress(onProgress),
+		trackProgress: !!onProgress,
 		onFastImageLoad: onLoad,
 		onFastImageError: onError,
 		onFastImageLoadEnd: onLoadEnd && ((event) => onLoadEnd(loadResult(event.nativeEvent))),
@@ -245,7 +246,8 @@ const FastImageView = requireNativeComponent("FastImageView", FastImage, { nativ
 	onFastImageProgress: true,
 	onFastImageLoad: true,
 	onFastImageError: true,
-	onFastImageLoadEnd: true
+	onFastImageLoadEnd: true,
+	trackProgress: true
 } });
 //#endregion
 export { FastImageBackground, FastImage as default };

package/ios/FastImage/FFFastImageView.h

@@ -12,6 +12,8 @@
 
 @property (nonatomic, copy) RCTDirectEventBlock onFastImageLoadStart;
 @property (nonatomic, copy) RCTDirectEventBlock onFastImageProgress;
+// Whether to send progress events (the image has an onProgress).
+@property (nonatomic, assign) BOOL trackProgress;
 @property (nonatomic, copy) RCTDirectEventBlock onFastImageError;
 @property (nonatomic, copy) RCTDirectEventBlock onFastImageLoad;
 @property (nonatomic, copy) RCTDirectEventBlock onFastImageLoadEnd;

package/ios/FastImage/FFFastImageView.m

@@ -1036,7 +1036,7 @@ NSString *FFFErrorMessage(NSError *error)
     // there's a handler as the load starts. A handler added while loading is
     // used from the next load.
     SDImageLoaderProgressBlock progress = nil;
-    if (events && self.onFastImageProgress) {
+    if (events && self.trackProgress && self.onFastImageProgress) {
         progress = ^(NSInteger receivedSize, NSInteger expectedSize, NSURL* _Nullable targetURL) {
             // Without a Content-Length the total is unknown (-1 or 0), and a
             // percentage can't be worked out from it, so don't send those.

package/ios/FastImage/FFFastImageViewManager.m

@@ -114,6 +114,7 @@ RCT_EXPORT_VIEW_PROPERTY(transitionBetweenImages, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(transitionSkipOnCacheHit, NSString)
 RCT_EXPORT_VIEW_PROPERTY(downsample, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(blurRadius, CGFloat)
+RCT_EXPORT_VIEW_PROPERTY(trackProgress, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(onFastImageLoadStart, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onFastImageProgress, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onFastImageError, RCTDirectEventBlock)

package/package.json

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