react-native-fast-image 8.16.0 → 8.16.1

package/README.md

@@ -349,6 +349,8 @@ for (const result of results) {
 }
 ```
 
+Each source's `cache` applies, as for a view: with `web` the preload follows the HTTP cache, and with `cacheOnly` it doesn't download. A `cacheOnly` preload resolves `ok` only if the image is cached, and loads it from the disk cache into memory, so a view shows it at once.
+
 ### `FastImage.clearMemoryCache: () => Promise<void>`
 
 Clear all images from memory cache.

package/ios/FastImage/FFFastImageSource.h

@@ -2,6 +2,7 @@
 #import <UIKit/UIKit.h>
 #import <SDWebImage/SDWebImageDownloaderRequestModifier.h>
 #import <SDWebImage/SDWebImageCacheKeyFilter.h>
+#import <SDWebImage/SDWebImageDefine.h>
 
 typedef NS_ENUM(NSInteger, FFFPriority) {
     FFFPriorityLow,
@@ -42,4 +43,8 @@ typedef NS_ENUM(NSInteger, FFFCacheControl) {
 // Caches the image under cacheKey, or nil without one.
 - (SDWebImageCacheKeyFilter *)cacheKeyFilter;
 
+// The load options for `cache`: web follows the HTTP cache, cacheOnly never
+// downloads. For views and preload alike.
+- (SDWebImageOptions)cacheOptions;
+
 @end

package/ios/FastImage/FFFastImageSource.m

@@ -29,6 +29,19 @@
     }];
 }
 
+- (SDWebImageOptions)cacheOptions
+{
+    switch (_cacheControl) {
+        case FFFCacheControlWeb:
+            return SDWebImageRefreshCached;
+        case FFFCacheControlCacheOnly:
+            return SDWebImageFromCacheOnly;
+        case FFFCacheControlImmutable:
+            return 0;
+    }
+    return 0;
+}
+
 - (SDWebImageDownloaderRequestModifier *)requestModifier
 {
     NSDictionary* headers = _headers;

package/ios/FastImage/FFFastImageView.m

@@ -500,17 +500,7 @@ NSString *FFFErrorMessage(NSError *error)
             break;
     }
 
-    switch (_source.cacheControl) {
-        case FFFCacheControlWeb:
-            options |= SDWebImageRefreshCached;
-            break;
-        case FFFCacheControlCacheOnly:
-            options |= SDWebImageFromCacheOnly;
-            break;
-        case FFFCacheControlImmutable:
-            break;
-    }
-    return options;
+    return options | [_source cacheOptions];
 }
 
 // Headers, and the size to decode at (see FFFDownsampledImage), which it

package/ios/FastImage/FFFastImageViewManager.m

@@ -89,8 +89,9 @@ RCT_EXPORT_METHOD(preload:(nonnull NSArray<FFFastImageSource *> *)sources
             }
         };
         // With the prefetcher's options (low priority), but one source at a
-        // time (not SDWebImagePrefetcher), to get each source's result and to
-        // send its headers with its own request only.
+        // time (not SDWebImagePrefetcher), to get each source's result, to
+        // send its headers with its own request only, and to follow its
+        // `cache` (#406).
         SDWebImageOptions prefetcherOptions = [SDWebImagePrefetcher sharedImagePrefetcher].options;
 
         [sources enumerateObjectsUsingBlock:^(FFFastImageSource * _Nonnull source, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -112,6 +113,7 @@ RCT_EXPORT_METHOD(preload:(nonnull NSArray<FFFastImageSource *> *)sources
                     options |= SDWebImageHighPriority;
                 }
             }
+            options |= [source cacheOptions];
             [FFFPendingPreloads addObject:[^{
                 // Once per slot: SDWebImage calls this once with finished set
                 // (a progressive load calls it more, without).

package/package.json

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