react-native-fast-image 8.9.0 → 8.10.0

package/README.md

@@ -208,9 +208,11 @@ e.g. `onLoad={e => console.log(e.nativeEvent.width, e.nativeEvent.height)}`
 
 ---
 
-### `onError?: () => void`
+### `onError?: (event) => void`
 
-Called on an image fetching error.
+Called on an image fetching error, with a message describing it (e.g. the HTTP status code).
+
+e.g. `onError={e => console.log(e.nativeEvent.error)}`
 
 ---
 

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

@@ -41,11 +41,26 @@ public class FastImageRequestListener implements RequestListener<Drawable> {
         }
         FastImageViewWithUrl view = (FastImageViewWithUrl) ((ImageViewTarget) target).getView();
         view.onImageFailed(thumbnail);
-        FastImageEvents.send(view, REACT_ON_ERROR_EVENT);
+        WritableMap event = new WritableNativeMap();
+        event.putString("error", errorMessage(e));
+        FastImageEvents.send(view, REACT_ON_ERROR_EVENT, event);
         FastImageEvents.send(view, REACT_ON_LOAD_END_EVENT);
         return false;
     }
 
+    // The first root cause's message, e.g. "Not Found, status code: 404".
+    // The first root cause's message, e.g. "Not Found, status code: 404" (also
+    // for preload results).
+    static String errorMessage(@androidx.annotation.Nullable GlideException e) {
+        if (e != null) {
+            for (Throwable cause : e.getRootCauses()) {
+                if (cause.getMessage() != null) return cause.getMessage();
+            }
+            if (e.getMessage() != null) return e.getMessage();
+        }
+        return "Failed to load the image";
+    }
+
     @Override
     public boolean onResourceReady(Drawable resource, Object model, final Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
         if (!(target instanceof ImageViewTarget)) {

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

@@ -122,7 +122,7 @@ class FastImageViewModule extends ReactContextBaseJavaModule {
                                     .listener(new RequestListener<Drawable>() {
                                         @Override
                                         public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
-                                            results[index] = failure(errorMessage(e));
+                                            results[index] = failure(FastImageRequestListener.errorMessage(e));
                                             preloadsInFlight--;
                                             finishOne.run();
                                             startPendingPreloads();
@@ -164,17 +164,6 @@ class FastImageViewModule extends ReactContextBaseJavaModule {
         return result;
     }
 
-    // The first root cause's message, e.g. "Not Found, status code: 404".
-    private static String errorMessage(@Nullable GlideException e) {
-        if (e != null) {
-            for (Throwable cause : e.getRootCauses()) {
-                if (cause.getMessage() != null) return cause.getMessage();
-            }
-            if (e.getMessage() != null) return e.getMessage();
-        }
-        return "Failed to load the image";
-    }
-
     @ReactMethod
     public void clearMemoryCache(final Promise promise) {
         final Activity activity = getCurrentActivity();

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

@@ -308,7 +308,7 @@ class FastImageViewWithUrl extends AppCompatImageView {
         // (#1028, #945).
         if (mSource != null && (imageSource == null || imageSource.getUri().toString().length() == 0)) {
             WritableMap event = new WritableNativeMap();
-            event.putString("message", "Invalid source prop:" + mSource);
+            event.putString("error", "Invalid source: " + mSource);
             FastImageEvents.send(this, REACT_ON_ERROR_EVENT, event);
             FastImageEvents.send(this, REACT_ON_LOAD_END_EVENT);
 

package/dist/index.cjs.js.flow

@@ -13,6 +13,12 @@ export type OnLoadEvent = SyntheticEvent<
     }>,
 >
 
+export type OnErrorEvent = SyntheticEvent<
+    $ReadOnly<{|
+        error: string,
+    |}>,
+>
+
 export type OnProgressEvent = SyntheticEvent<
     $ReadOnly<{|
         loaded: number,
@@ -70,7 +76,7 @@ export type FastImageSource = {
 
 export type FastImageProps = $ReadOnly<{|
     ...ViewProps,
-    onError?: ?() => void,
+    onError?: ?(event: OnErrorEvent) => void,
     onLoad?: ?(event: OnLoadEvent) => void,
     onLoadEnd?: ?() => void,
     onLoadStart?: ?() => void,

package/dist/index.d.ts

@@ -35,6 +35,11 @@ export interface OnLoadEvent {
         target?: number;
     };
 }
+export interface OnErrorEvent {
+    nativeEvent: {
+        error: string;
+    };
+}
 export interface OnProgressEvent {
     nativeEvent: {
         loaded: number;
@@ -78,7 +83,7 @@ export interface FastImageProps extends AccessibilityProps, ViewProps {
     onLoadStart?(): void;
     onProgress?(event: OnProgressEvent): void;
     onLoad?(event: OnLoadEvent): void;
-    onError?(): void;
+    onError?(event: OnErrorEvent): void;
     onLoadEnd?(): void;
     /**
      * onLayout function

package/dist/index.js.flow

@@ -13,6 +13,12 @@ export type OnLoadEvent = SyntheticEvent<
     }>,
 >
 
+export type OnErrorEvent = SyntheticEvent<
+    $ReadOnly<{|
+        error: string,
+    |}>,
+>
+
 export type OnProgressEvent = SyntheticEvent<
     $ReadOnly<{|
         loaded: number,
@@ -70,7 +76,7 @@ export type FastImageSource = {
 
 export type FastImageProps = $ReadOnly<{|
     ...ViewProps,
-    onError?: ?() => void,
+    onError?: ?(event: OnErrorEvent) => void,
     onLoad?: ?(event: OnLoadEvent) => void,
     onLoadEnd?: ?() => void,
     onLoadStart?: ?() => void,

package/ios/FastImage/FFFastImageView.h

@@ -28,3 +28,7 @@
 
 @end
 
+// An error's description, with the HTTP status code when there is one.
+FOUNDATION_EXTERN NSString *FFFErrorMessage(NSError *error);
+
+

package/ios/FastImage/FFFastImageView.m

@@ -2,6 +2,7 @@
 #import <SDWebImage/UIImage+MultiFormat.h>
 #import <SDWebImage/UIView+WebCache.h>
 #import <React/RCTUtils.h>
+#import <SDWebImage/SDWebImageError.h>
 
 @interface FFFastImageView ()
 
@@ -12,6 +13,7 @@
 @property(nonatomic, assign) BOOL needsReload;
 
 @property(nonatomic, strong) NSDictionary* onLoadEvent;
+@property(nonatomic, strong) NSDictionary* onErrorEvent;
 // The image before tinting, kept while a tint is applied so the tint can be
 // changed or removed. nil when there's no tint (super.image is untinted).
 @property(nonatomic, strong) UIImage* untintedImage;
@@ -120,7 +122,7 @@ static CFTimeInterval FFFEnteredBackgroundAt = 0;
 - (void) setOnFastImageError: (RCTDirectEventBlock)onFastImageError {
     _onFastImageError = onFastImageError;
     if (self.hasErrored && _onFastImageError) {
-        _onFastImageError(@{});
+        _onFastImageError(self.onErrorEvent);
     }
 }
 
@@ -194,6 +196,26 @@ static CFTimeInterval FFFEnteredBackgroundAt = 0;
     [self updateContentMode];
 }
 
+// The error's description, with the HTTP status code when there is one (as on
+// Android): SDWebImage keeps the code out of the description. Also for preload
+// results.
+NSString *FFFErrorMessage(NSError *error)
+{
+    NSNumber *statusCode = error.userInfo[SDWebImageErrorDownloadStatusCodeKey];
+    if (statusCode) {
+        return [NSString stringWithFormat: @"%@, status code: %@", error.localizedDescription, statusCode];
+    }
+    return error.localizedDescription ?: @"Failed to load the image";
+}
+
+- (void) sendOnError: (nullable NSString*)message {
+    self.hasErrored = YES;
+    self.onErrorEvent = @{ @"error": message ?: @"Failed to load the image" };
+    if (self.onFastImageError) {
+        self.onFastImageError(self.onErrorEvent);
+    }
+}
+
 - (void) sendOnLoad: (UIImage*)image {
     self.onLoadEvent = @{
             @"width": [NSNumber numberWithDouble: image.size.width],
@@ -258,10 +280,7 @@ static CFTimeInterval FFFEnteredBackgroundAt = 0;
                 // Not decodable: fail like a remote image, showing defaultSource.
                 [self setImage: _defaultSource];
                 self.showsLoadedImage = NO;
-                self.hasErrored = YES;
-                if (self.onFastImageError) {
-                    self.onFastImageError(@{});
-                }
+                [self sendOnError: @"Failed to decode the image"];
                 if (self.onFastImageLoadEnd) {
                     self.onFastImageLoadEnd(@{});
                 }
@@ -391,10 +410,7 @@ static CFTimeInterval FFFEnteredBackgroundAt = 0;
                 if (error) {
                     // SDWebImage shows the placeholder (defaultSource or nothing).
                     weakSelf.showsLoadedImage = NO;
-                    weakSelf.hasErrored = YES;
-                    if (weakSelf.onFastImageError) {
-                        weakSelf.onFastImageError(@{});
-                    }
+                    [weakSelf sendOnError: FFFErrorMessage(error)];
                     if (weakSelf.onFastImageLoadEnd) {
                         weakSelf.onFastImageLoadEnd(@{});
                     }

package/ios/FastImage/FFFastImageViewManager.m

@@ -26,16 +26,6 @@ RCT_EXPORT_VIEW_PROPERTY(onFastImageLoad, RCTDirectEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(onFastImageLoadEnd, RCTDirectEventBlock)
 RCT_REMAP_VIEW_PROPERTY(tintColor, imageColor, UIColor)
 
-// The error's description, with the HTTP status code when there is one.
-static NSString *FFFErrorMessage(NSError *error)
-{
-    NSNumber *statusCode = error.userInfo[SDWebImageErrorDownloadStatusCodeKey];
-    if (statusCode) {
-        return [NSString stringWithFormat:@"%@, status code: %@", error.localizedDescription, statusCode];
-    }
-    return error.localizedDescription ?: @"Failed to load the image";
-}
-
 // Preloads waiting to start, in the order they were added, and the number
 // loading, across all preload calls. Like SDWebImagePrefetcher, at most
 // maxConcurrentPrefetchCount load at a time, so a long list doesn't queue

package/package.json

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