react-native-fast-image 8.30.1 → 8.31.1

package/ios/FastImage/FFFastImageSource.h

@@ -72,6 +72,10 @@ typedef NS_ENUM(NSInteger, FFFCacheControl) {
 // a cache, where the size it was decoded from isn't recorded), or zero.
 - (CGSize)photoPixelSize;
 
+// Whether the data is an image FastImage can show: a format SDWebImage
+// recognizes (an SVG only if its first element is <svg>), or one ImageIO
+// reads that SDWebImage's check doesn't know (AVIF, ICO, ICNS, PSD).
++ (BOOL)isImageData:(NSData *)data;
 // The HTTP cache of `cache: 'web'` images: their own rather than the app's
 // shared NSURLCache, so clearDiskCache can empty it without the app's other
 // responses. 50 MB, as on Android.

package/ios/FastImage/FFFastImageSource.m

@@ -8,7 +8,9 @@
 #import <SDWebImage/SDImageCodersManager.h>
 #import <SDWebImage/SDImageAWebPCoder.h>
 #import "FFFAnimatedWebPCoder.h"
+#import "FFFAnimatedAVIFCoder.h"
 #import <objc/message.h>
+#import <ImageIO/ImageIO.h>
 
 // In FFFastImageView.m.
 FOUNDATION_EXTERN NSString *FFFErrorMessage(NSError *error);
@@ -224,8 +226,7 @@ static BOOL FFFLooksLikeSVG(NSData *data)
  willCacheResponse:(NSCachedURLResponse *)proposedResponse
  completionHandler:(void (^)(NSCachedURLResponse *cachedResponse))completionHandler
 {
-    SDImageFormat format = [NSData sd_imageFormatForImageData:proposedResponse.data];
-    if (format == SDImageFormatUndefined || (format == SDImageFormatSVG && !FFFLooksLikeSVG(proposedResponse.data))) {
+    if (![FFFastImageSource isImageData:proposedResponse.data]) {
         completionHandler(nil);
         return;
     }
@@ -260,6 +261,21 @@ static id<SDImageCoder> FFFSVGCoder;
         [SDImageCodersManager.sharedManager addCoder:FFFAnimatedWebPCoder.sharedCoder];
     }
 
+    // Animated AVIF: likewise, SDWebImage's own coders only decode an AVIF's
+    // first frame, so ImageIO's animated decoding does (iOS 16 and later).
+    // Not if the app has registered libavif's coder (SDWebImageAVIFCoder).
+    Class avifCoderClass = NSClassFromString(@"SDImageAVIFCoder");
+    BOOL hasAVIFCoder = NO;
+    for (id<SDImageCoder> registered in SDImageCodersManager.sharedManager.coders) {
+        if (avifCoderClass && [registered isKindOfClass:avifCoderClass]) {
+            hasAVIFCoder = YES;
+            break;
+        }
+    }
+    if (!hasAVIFCoder) {
+        [SDImageCodersManager.sharedManager addCoder:FFFAnimatedAVIFCoder.sharedCoder];
+    }
+
     // SVG: registered with SDWebImage's coders, as the pod's setup does (unless
     // the app has already): SDWebImage then picks it for SVG data, including
     // for FastImage's animated and downsampled image classes. Giving the
@@ -396,6 +412,24 @@ static id<SDImageCoder> FFFSVGCoder;
     [[FFFastImageSource webURLCache] removeCachedResponseForRequest:[NSURLRequest requestWithURL:_url]];
 }
 
++ (BOOL)isImageData:(NSData *)data
+{
+    SDImageFormat format = [NSData sd_imageFormatForImageData:data];
+    if (format == SDImageFormatSVG) {
+        return FFFLooksLikeSVG(data);
+    }
+    if (format != SDImageFormatUndefined) {
+        return YES;
+    }
+    CGImageSourceRef source = CGImageSourceCreateWithData((__bridge CFDataRef)data, NULL);
+    if (!source) {
+        return NO;
+    }
+    BOOL image = CGImageSourceGetType(source) != NULL && CGImageSourceGetCount(source) > 0;
+    CFRelease(source);
+    return image;
+}
+
 + (NSURLCache *)webURLCache
 {
     static NSURLCache *cache;

package/ios/FastImage/FFFastImageViewManager.m

@@ -6,7 +6,6 @@
 #import <SDWebImage/SDWebImageManager.h>
 #import <SDWebImage/SDWebImageError.h>
 #import <SDWebImage/SDWebImagePrefetcher.h>
-#import <SDWebImage/NSData+ImageContentType.h>
 
 // configureCache's limits, by their names in JS. Each is set in the app's
 // Info.plist (FastImageMaxDiskSize, ...) or changed at runtime, which is saved
@@ -405,7 +404,7 @@ RCT_EXPORT_METHOD(writeToCache:(FFFastImageSource *)source
                 resolve(FFFFailure(@"Can't read the file"));
                 return;
             }
-            if ([NSData sd_imageFormatForImageData:data] == SDImageFormatUndefined) {
+            if (![FFFastImageSource isImageData:data]) {
                 resolve(FFFFailure(@"Not an image"));
                 return;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-fast-image",
-    "version": "8.30.1",
+    "version": "8.31.1",
     "description": "FastImage, performant React Native image component.",
     "keywords": [
         "cache",
@@ -38,7 +38,9 @@
         "RNFastImage.podspec"
     ],
     "scripts": {
-        "build": "rm -rf dist && tsc -p tsconfig.build.json && rolldown -c && for f in index index.cjs index.web index.cjs.web; do cp src/index.js.flow dist/$f.js.flow; done",
+        "build": "bun run build:package && bun run build:docs",
+        "build:package": "rm -rf dist && tsc -p tsconfig.build.json && rolldown -c",
+        "build:docs": "bun run --cwd website build",
         "lint": "oxlint",
         "release": "semantic-release",
         "test": "bun test",