react-native-fast-image 9.2.2 → 9.3.0

package/ios/FastImage/FFFastImageView.m

@@ -224,7 +224,7 @@ static UIImage* FFFBlurredImage(UIImage* image, CGFloat scale, CGFloat radius, B
     }
 }
 
-- (void) setResizeMode: (RCTResizeMode)resizeMode {
+- (void) setResizeMode: (FFFResizeMode)resizeMode {
     if (_resizeMode != resizeMode) {
         BOOL repeated = _resizeMode == RCTResizeModeRepeat;
         _resizeMode = resizeMode;
@@ -242,10 +242,13 @@ static UIImage* FFFBlurredImage(UIImage* image, CGFloat scale, CGFloat radius, B
 // view down to fit, as React Native's Image and Android do (#866); only a
 // smaller one is shown at its own size. UIViewContentModeCenter alone showed
 // large images at full size, cropped. So it depends on the image and the
-// view's size.
+// view's size. `none` is the image at its own size, centered, whatever its
+// size (cropped by the view).
 - (void) updateContentMode {
     UIViewContentMode contentMode = (UIViewContentMode) _resizeMode;
-    if (_resizeMode == RCTResizeModeRepeat) {
+    if (_resizeMode == FFFResizeModeNone) {
+        contentMode = UIViewContentModeCenter;
+    } else if (_resizeMode == RCTResizeModeRepeat) {
         // The tiled image (see tiledImage:) fills the view.
         contentMode = UIViewContentModeScaleToFill;
     } else if (_resizeMode == RCTResizeModeCenter) {
@@ -803,9 +806,10 @@ NSString *FFFErrorMessage(NSError *error)
 // Whether images are decoded at about the view's size (downsample, from
 // SDWebImage 5.19, and always for photo library images, which are large and
 // usually shown small: Photos makes them at the size asked for, on any
-// version). Not for `repeat`, which tiles the image at its own size.
+// version). Not for `repeat`, which tiles the image at its own size, or
+// `none`, which shows it at its own size.
 - (BOOL) downsamples {
-    if (_resizeMode == RCTResizeModeRepeat) {
+    if (_resizeMode == RCTResizeModeRepeat || _resizeMode == FFFResizeModeNone) {
         return NO;
     }
     return [_source isPhotoLibrary] || (_downsample && [FFFDownsampledImage isSupported]);
@@ -1009,6 +1013,7 @@ NSString *FFFErrorMessage(NSError *error)
             // Only on disk, also when it comes from there.
             context[SDWebImageContextStoreCacheType] = @(SDImageCacheTypeDisk);
         }
+        [FFFDownsampledImage forgetSmallerFullSizeImageForURL: source.url context: context];
         return context;
     }
     [FFFDownsampledImage addToContext: context box: box cover: cover];

package/ios/FastImage/FFFastImageViewManager.m

@@ -103,7 +103,7 @@ RCT_EXPORT_MODULE(FastImageView)
 RCT_EXPORT_VIEW_PROPERTY(source, FFFastImageSource)
 RCT_EXPORT_VIEW_PROPERTY(sources, FFFastImageSourceArray)
 RCT_EXPORT_VIEW_PROPERTY(defaultSource, UIImage)
-RCT_EXPORT_VIEW_PROPERTY(resizeMode, RCTResizeMode)
+RCT_EXPORT_VIEW_PROPERTY(resizeMode, FFFResizeMode)
 RCT_EXPORT_VIEW_PROPERTY(recyclingKey, NSString)
 RCT_EXPORT_VIEW_PROPERTY(loopCount, NSInteger)
 RCT_EXPORT_VIEW_PROPERTY(imageRendering, NSString)
@@ -288,6 +288,8 @@ RCT_EXPORT_METHOD(preload:(nonnull NSArray<FFFastImageSource *> *)sources
             [results addObject:[NSNull null]];
             SDWebImageOptions options = FFFPreloadOptions(source);
             SDWebImageMutableContext *context = FFFPreloadContext(source);
+            // It looks in the memory cache first, for the full-size image.
+            [FFFDownsampledImage forgetSmallerFullSizeImageForURL:source.url context:context];
             if (!source.memoryCache) {
                 // Not decoded (only its header is read, for the size), and not
                 // kept in memory, also when it comes from the disk cache.

package/ios/FastImage/RCTConvert+FFFastImage.h

@@ -1,9 +1,12 @@
 #import <React/RCTConvert.h>
 
+#import "FFFastImageView.h"
+
 @class FFFastImageSource;
 
 @interface RCTConvert (FFFastImage)
 
++ (FFFResizeMode)FFFResizeMode:(id)json;
 + (FFFastImageSource *)FFFastImageSource:(id)json;
 + (NSArray<FFFastImageSource *> *)FFFastImageSourceArray:(id)json;
 

package/ios/FastImage/RCTConvert+FFFastImage.m

@@ -3,6 +3,17 @@
 
 @implementation RCTConvert (FFFastImage)
 
+RCT_ENUM_CONVERTER(FFFResizeMode, (@{
+                                     @"cover": @(RCTResizeModeCover),
+                                     @"contain": @(RCTResizeModeContain),
+                                     @"stretch": @(RCTResizeModeStretch),
+                                     @"center": @(RCTResizeModeCenter),
+                                     // objectFit="scale-down": as center on iOS.
+                                     @"scale-down": @(RCTResizeModeCenter),
+                                     @"repeat": @(RCTResizeModeRepeat),
+                                     @"none": @(FFFResizeModeNone),
+                                     }), RCTResizeModeCover, integerValue);
+
 RCT_ENUM_CONVERTER(FFFPriority, (@{
                                    @"low": @(FFFPriorityLow),
                                    @"normal": @(FFFPriorityNormal),

package/package.json

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