[iOS]:- fixed image resize mode in release mode for iOS

packages/react-native/Libraries/Image/RCTBundleAssetImageLoader.mm

@@ -11,6 +11,7 @@
 #import <memory>
 
 #import <React/RCTUtils.h>
+#import <React/RCTImageUtils.h>
 #import <ReactCommon/RCTTurboModule.h>
 
 #import "RCTImagePlugins.h"
@@ -49,7 +50,7 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
                                          partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
                                           completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
 {
-  UIImage *image = RCTImageFromLocalAssetURL(imageURL);
+    UIImage *image = RCTDecodeImageWithLocalAssetURL(imageURL, size, scale, resizeMode);
   if (image) {
     if (progressHandler) {
       progressHandler(1, 1);

packages/react-native/Libraries/Image/RCTImageUtils.h

@@ -63,6 +63,16 @@ RCT_EXTERN BOOL RCTUpscalingRequired(
 RCT_EXTERN UIImage *__nullable
 RCTDecodeImageWithData(NSData *data, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode);
 
+/**
+ * This function takes the source url for an image and decodes it at the
+ * specified size. If the original image is smaller than the destination size,
+ * the resultant image's scale will be decreased to compensate, so the
+ * width/height of the returned image is guaranteed to be >= destSize.
+ * Pass a destSize of CGSizeZero to decode the image at its original size.
+ */
+RCT_EXTERN UIImage *__nullable
+RCTDecodeImageWithLocalAssetURL(NSURL *url, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode);
+
 /**
  * This function takes the source data for an image and decodes just the
  * metadata, without decompressing the image itself.

packages/react-native/Libraries/Image/RCTImageUtils.mm

@@ -55,6 +55,68 @@ static CGImagePropertyOrientation CGImagePropertyOrientationFromUIImageOrientati
   }
 }
 
+static UIImage* decodeImageFromCGImageSourceRef(
+    CGImageSourceRef sourceRef,
+    CGSize destSize,
+    CGFloat destScale,
+    RCTResizeMode resizeMode)
+{
+  if (!sourceRef) {
+    return nil;
+  }
+
+  // Get original image size
+  CFDictionaryRef imageProperties = CGImageSourceCopyPropertiesAtIndex(sourceRef, 0, NULL);
+  if (!imageProperties) {
+    CFRelease(sourceRef);
+    return nil;
+  }
+  NSNumber *width = (NSNumber *)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelWidth);
+  NSNumber *height = (NSNumber *)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelHeight);
+  CGSize sourceSize = {width.doubleValue, height.doubleValue};
+  CFRelease(imageProperties);
+
+  if (CGSizeEqualToSize(destSize, CGSizeZero)) {
+    destSize = sourceSize;
+    if (!destScale) {
+      destScale = 1;
+    }
+  } else if (!destScale) {
+    destScale = RCTScreenScale();
+  }
+
+  if (resizeMode == RCTResizeModeStretch) {
+    // Decoder cannot change aspect ratio, so RCTResizeModeStretch is equivalent
+    // to RCTResizeModeCover for our purposes
+    resizeMode = RCTResizeModeCover;
+  }
+
+  // Calculate target size
+  CGSize targetSize = RCTTargetSize(sourceSize, 1, destSize, destScale, resizeMode, NO);
+  CGSize targetPixelSize = RCTSizeInPixels(targetSize, destScale);
+  CGFloat maxPixelSize =
+    fmax(fmin(sourceSize.width, targetPixelSize.width), fmin(sourceSize.height, targetPixelSize.height));
+
+  NSDictionary<NSString *, NSNumber *> *options = @{
+    (id)kCGImageSourceShouldAllowFloat : @YES,
+    (id)kCGImageSourceCreateThumbnailWithTransform : @YES,
+    (id)kCGImageSourceCreateThumbnailFromImageAlways : @YES,
+    (id)kCGImageSourceThumbnailMaxPixelSize : @(maxPixelSize),
+  };
+
+  // Get thumbnail
+  CGImageRef imageRef = CGImageSourceCreateThumbnailAtIndex(sourceRef, 0, (__bridge CFDictionaryRef)options);
+  CFRelease(sourceRef);
+  if (!imageRef) {
+    return nil;
+  }
+
+  // Return image
+  UIImage *image = [UIImage imageWithCGImage:imageRef scale:destScale orientation:UIImageOrientationUp];
+  CGImageRelease(imageRef);
+  return image;
+}
+
 CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode)
 {
   if (CGSizeEqualToSize(destSize, CGSizeZero)) {
@@ -257,60 +319,27 @@ BOOL RCTUpscalingRequired(
 UIImage *__nullable RCTDecodeImageWithData(NSData *data, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode)
 {
   CGImageSourceRef sourceRef = CGImageSourceCreateWithData((__bridge CFDataRef)data, NULL);
-  if (!sourceRef) {
-    return nil;
-  }
+    return decodeImageFromCGImageSourceRef(sourceRef, destSize, destScale, resizeMode);
 
-  // Get original image size
-  CFDictionaryRef imageProperties = CGImageSourceCopyPropertiesAtIndex(sourceRef, 0, NULL);
-  if (!imageProperties) {
-    CFRelease(sourceRef);
-    return nil;
-  }
-  NSNumber *width = (NSNumber *)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelWidth);
-  NSNumber *height = (NSNumber *)CFDictionaryGetValue(imageProperties, kCGImagePropertyPixelHeight);
-  CGSize sourceSize = {width.doubleValue, height.doubleValue};
-  CFRelease(imageProperties);
 
-  if (CGSizeEqualToSize(destSize, CGSizeZero)) {
-    destSize = sourceSize;
-    if (!destScale) {
-      destScale = 1;
+ }
+UIImage *__nullable RCTDecodeImageWithLocalAssetURL(NSURL *url, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode)
+{
+    // If the resizeMode is the default (assuming it's RCTResizeModeCover), directly return the image from the local asset URL
+    if (resizeMode == RCTResizeModeCover) {
+        return RCTImageFromLocalAssetURL(url);
     }
-  } else if (!destScale) {
-    destScale = RCTScreenScale();
-  }
-
-  if (resizeMode == RCTResizeModeStretch) {
-    // Decoder cannot change aspect ratio, so RCTResizeModeStretch is equivalent
-    // to RCTResizeModeCover for our purposes
-    resizeMode = RCTResizeModeCover;
-  }
 
-  // Calculate target size
-  CGSize targetSize = RCTTargetSize(sourceSize, 1, destSize, destScale, resizeMode, NO);
-  CGSize targetPixelSize = RCTSizeInPixels(targetSize, destScale);
-  CGFloat maxPixelSize =
-      fmax(fmin(sourceSize.width, targetPixelSize.width), fmin(sourceSize.height, targetPixelSize.height));
+    // Otherwise, proceed with the original logic using decodeImageFromCGImageSourceRef
+    CGImageSourceRef sourceRef = CGImageSourceCreateWithURL((__bridge CFURLRef)url, NULL);
+    UIImage *image = decodeImageFromCGImageSourceRef(sourceRef, destSize, destScale, resizeMode);
 
-  NSDictionary<NSString *, NSNumber *> *options = @{
-    (id)kCGImageSourceShouldAllowFloat : @YES,
-    (id)kCGImageSourceCreateThumbnailWithTransform : @YES,
-    (id)kCGImageSourceCreateThumbnailFromImageAlways : @YES,
-    (id)kCGImageSourceThumbnailMaxPixelSize : @(maxPixelSize),
-  };
-
-  // Get thumbnail
-  CGImageRef imageRef = CGImageSourceCreateThumbnailAtIndex(sourceRef, 0, (__bridge CFDictionaryRef)options);
-  CFRelease(sourceRef);
-  if (!imageRef) {
-    return nil;
-  }
+    // If decoding the image failed, fallback to getting the image from the local asset URL
+    if (!image) {
+        image = RCTImageFromLocalAssetURL(url);
+    }
 
-  // Return image
-  UIImage *image = [UIImage imageWithCGImage:imageRef scale:destScale orientation:UIImageOrientationUp];
-  CGImageRelease(imageRef);
-  return image;
+    return image;
 }
 
 NSDictionary<NSString *, id> *__nullable RCTGetImageMetadata(NSData *data)

packages/react-native/Libraries/Image/RCTLocalAssetImageLoader.mm

@@ -11,6 +11,7 @@
 #import <memory>
 
 #import <React/RCTUtils.h>
+#import <React/RCTImageUtils.h>
 #import <ReactCommon/RCTTurboModule.h>
 
 #import "RCTImagePlugins.h"
@@ -49,7 +50,7 @@ - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
                                          partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
                                           completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
 {
-  UIImage *image = RCTImageFromLocalAssetURL(imageURL);
+    UIImage *image = RCTDecodeImageWithLocalAssetURL(imageURL, size, scale, resizeMode);
   if (image) {
     if (progressHandler) {
       progressHandler(1, 1);