react-native-fast-image 8.6.13 → 8.6.15

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

@@ -1,6 +1,7 @@
 package com.dylanvann.fastimage;
 
 import android.app.Activity;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 
@@ -17,6 +18,7 @@ import com.facebook.react.views.imagehelper.ImageSource;
 class FastImageViewModule extends ReactContextBaseJavaModule {
 
     private static final String REACT_CLASS = "FastImageView";
+    private static final String TAG = "FastImage";
 
     FastImageViewModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -38,8 +40,18 @@ class FastImageViewModule extends ReactContextBaseJavaModule {
                 for (int i = 0; i < sources.size(); i++) {
                     final ReadableMap source = sources.getMap(i);
                     // Skip sources without a uri (Glide throws on an empty url).
-                    if (!FastImageViewConverter.hasUri(source)) continue;
+                    // preload has no way to report errors, so log them.
+                    if (!FastImageViewConverter.hasUri(source)) {
+                        Log.w(TAG, "preload: skipping a source without a uri");
+                        continue;
+                    }
                     final FastImageSource imageSource = FastImageViewConverter.getImageSource(activity, source);
+                    // Also skip a uri that can't be resolved (e.g. a relative path),
+                    // which resolves to an empty one. The view reports it as an error.
+                    if (imageSource.getUri().toString().isEmpty()) {
+                        Log.w(TAG, "preload: skipping a uri that can't be resolved: " + source.getString("uri"));
+                        continue;
+                    }
 
                     Glide
                             .with(activity.getApplicationContext())

package/ios/FastImage/FFFastImageView.m

@@ -11,6 +11,9 @@
 @property(nonatomic, assign) BOOL needsReload;
 
 @property(nonatomic, strong) NSDictionary* onLoadEvent;
+// 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;
 
 @end
 
@@ -63,11 +66,11 @@
 }
 
 - (void) setImageColor: (UIColor*)imageColor {
-    if (imageColor != nil) {
-        _imageColor = imageColor;
-        if (super.image) {
-            super.image = [self makeImage: super.image withTint: self.imageColor];
-        }
+    _imageColor = imageColor;
+    // Re-apply to the untinted image, so the tint can change or be removed.
+    UIImage* image = self.untintedImage ?: super.image;
+    if (image) {
+        [self setImage: image];
     }
 }
 
@@ -110,8 +113,10 @@
 
 - (void) setImage: (UIImage*)image {
     if (self.imageColor != nil) {
+        self.untintedImage = image;
         super.image = [self makeImage: image withTint: self.imageColor];
     } else {
+        self.untintedImage = nil;
         super.image = image;
     }
 }

package/ios/FastImage/FFFastImageViewManager.m

@@ -1,5 +1,6 @@
 #import "FFFastImageViewManager.h"
 #import "FFFastImageView.h"
+#import <React/RCTLog.h>
 
 #import <SDWebImage/SDImageCache.h>
 #import <SDWebImage/SDWebImagePrefetcher.h>
@@ -30,6 +31,8 @@ RCT_EXPORT_METHOD(preload:(nonnull NSArray<FFFastImageSource *> *)sources)
         // Skip sources without a url (an empty, missing or null uri). NSArray can't
         // hold nil, so adding one throws and crashes the app.
         if (!source.url) {
+            // preload has no way to report errors, so log it.
+            RCTLogWarn(@"FastImage.preload: skipping a source without a valid uri");
             return;
         }
         [source.headers enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString* header, BOOL *stop) {

package/package.json

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