react-native 0.70.6 → 0.71.0-rc.1

package/Libraries/Image/RCTImageLoaderProtocol.h

@@ -8,11 +8,11 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBridge.h>
-#import <React/RCTResizeMode.h>
-#import <React/RCTURLRequestHandler.h>
+#import <React/RCTImageCache.h>
 #import <React/RCTImageDataDecoder.h>
 #import <React/RCTImageURLLoader.h>
-#import <React/RCTImageCache.h>
+#import <React/RCTResizeMode.h>
+#import <React/RCTURLRequestHandler.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -34,12 +34,9 @@ NS_ASSUME_NONNULL_BEGIN
  * Use PriorityPrefetch to prefetch images at a lower priority.
  * The priority logic is up to each @RCTImageLoaderProtocol implementation
  */
-typedef NS_ENUM(NSInteger, RCTImageLoaderPriority) {
-  RCTImageLoaderPriorityImmediate,
-  RCTImageLoaderPriorityPrefetch
-};
+typedef NS_ENUM(NSInteger, RCTImageLoaderPriority) { RCTImageLoaderPriorityImmediate, RCTImageLoaderPriorityPrefetch };
 
-@protocol RCTImageLoaderProtocol<RCTURLRequestHandler>
+@protocol RCTImageLoaderProtocol <RCTURLRequestHandler>
 
 /**
  * The maximum number of concurrent image loading tasks. Loading and decoding
@@ -80,14 +77,14 @@ typedef NS_ENUM(NSInteger, RCTImageLoaderPriority) {
                                                            callback:(RCTImageLoaderCompletionBlock)callback;
 
 /**
-* As above, but includes target `size`, `scale` and `resizeMode`, which are used to
-* select the optimal dimensions for the loaded image. The `clipped` option
-* controls whether the image will be clipped to fit the specified size exactly,
-* or if the original aspect ratio should be retained.
-* `partialLoadBlock` is meant for custom image loaders that do not ship with the core RN library.
-* It is meant to be called repeatedly while loading the image as higher quality versions are decoded,
-* for instance with progressive JPEGs.
-*/
+ * As above, but includes target `size`, `scale` and `resizeMode`, which are used to
+ * select the optimal dimensions for the loaded image. The `clipped` option
+ * controls whether the image will be clipped to fit the specified size exactly,
+ * or if the original aspect ratio should be retained.
+ * `partialLoadBlock` is meant for custom image loaders that do not ship with the core RN library.
+ * It is meant to be called repeatedly while loading the image as higher quality versions are decoded,
+ * for instance with progressive JPEGs.
+ */
 - (nullable RCTImageLoaderCancellationBlock)loadImageWithURLRequest:(NSURLRequest *)imageURLRequest
                                                                size:(CGSize)size
                                                               scale:(CGFloat)scale
@@ -116,7 +113,7 @@ typedef NS_ENUM(NSInteger, RCTImageLoaderPriority) {
  * the information, and won't decode the image if it doesn't have to.
  */
 - (RCTImageLoaderCancellationBlock)getImageSizeForURLRequest:(NSURLRequest *)imageURLRequest
-                                                       block:(void(^)(NSError *error, CGSize size))completionBlock;
+                                                       block:(void (^)(NSError *error, CGSize size))completionBlock;
 /**
  * Determines whether given image URLs are cached locally. The `requests` array is expected
  * to contain objects convertible to NSURLRequest. The return value maps URLs to strings:

package/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h

@@ -13,7 +13,7 @@
 RCT_EXTERN BOOL RCTImageLoadingPerfInstrumentationEnabled(void);
 RCT_EXTERN void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled);
 
-@protocol RCTImageLoaderWithAttributionProtocol<RCTImageLoaderProtocol, RCTImageLoaderLoggableProtocol>
+@protocol RCTImageLoaderWithAttributionProtocol <RCTImageLoaderProtocol, RCTImageLoaderLoggableProtocol>
 
 // TODO (T61325135): Remove C++ checks
 #ifdef __cplusplus
@@ -26,7 +26,7 @@ RCT_EXTERN void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled);
                                                 scale:(CGFloat)scale
                                               clipped:(BOOL)clipped
                                            resizeMode:(RCTResizeMode)resizeMode
-                                             priority: (RCTImageLoaderPriority)priority
+                                             priority:(RCTImageLoaderPriority)priority
                                           attribution:(const facebook::react::ImageURLLoaderAttribution &)attribution
                                         progressBlock:(RCTImageLoaderProgressBlock)progressBlock
                                      partialLoadBlock:(RCTImageLoaderPartialLoadBlock)partialLoadBlock

package/Libraries/Image/RCTImageStoreManager.mm

@@ -14,19 +14,18 @@
 #import <ImageIO/ImageIO.h>
 #import <MobileCoreServices/UTType.h>
 #import <React/RCTAssert.h>
+#import <React/RCTImageUtils.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
-#import <React/RCTImageUtils.h>
 
 #import "RCTImagePlugins.h"
 
 static NSString *const RCTImageStoreURLScheme = @"rct-image-store";
 
-@interface RCTImageStoreManager() <NativeImageStoreIOSSpec>
+@interface RCTImageStoreManager () <NativeImageStoreIOSSpec>
 @end
 
-@implementation RCTImageStoreManager
-{
+@implementation RCTImageStoreManager {
   NSMutableDictionary<NSString *, NSData *> *_store;
   NSUInteger _id;
 }
@@ -37,7 +36,7 @@ RCT_EXPORT_MODULE()
 
 - (float)handlerPriority
 {
-    return 1;
+  return 1;
 }
 
 - (void)removeImageForTag:(NSString *)imageTag withBlock:(void (^)(void))block
@@ -91,36 +90,38 @@ RCT_EXPORT_MODULE()
   });
 }
 
-RCT_EXPORT_METHOD(removeImageForTag:(NSString *)imageTag)
+RCT_EXPORT_METHOD(removeImageForTag : (NSString *)imageTag)
 {
   [_store removeObjectForKey:imageTag];
 }
 
-RCT_EXPORT_METHOD(hasImageForTag:(NSString *)imageTag
-                  callback:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(hasImageForTag : (NSString *)imageTag callback : (RCTResponseSenderBlock)callback)
 {
-  callback(@[@(_store[imageTag] != nil)]);
+  callback(@[ @(_store[imageTag] != nil) ]);
 }
 
 // TODO (#5906496): Name could be more explicit - something like getBase64EncodedDataForTag:?
-RCT_EXPORT_METHOD(getBase64ForTag:(NSString *)imageTag
-                  successCallback:(RCTResponseSenderBlock)successCallback
-                  errorCallback:(RCTResponseSenderBlock)errorCallback)
+RCT_EXPORT_METHOD(getBase64ForTag
+                  : (NSString *)imageTag successCallback
+                  : (RCTResponseSenderBlock)successCallback errorCallback
+                  : (RCTResponseSenderBlock)errorCallback)
 {
   NSData *imageData = _store[imageTag];
   if (!imageData) {
-    errorCallback(@[RCTJSErrorFromNSError(RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag]))]);
+    errorCallback(
+        @[ RCTJSErrorFromNSError(RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag])) ]);
     return;
   }
   // Dispatching to a background thread to perform base64 encoding
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    successCallback(@[[imageData base64EncodedStringWithOptions:0]]);
+    successCallback(@[ [imageData base64EncodedStringWithOptions:0] ]);
   });
 }
 
-RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
-                  successCallback:(RCTResponseSenderBlock)successCallback
-                  errorCallback:(RCTResponseSenderBlock)errorCallback)
+RCT_EXPORT_METHOD(addImageFromBase64
+                  : (NSString *)base64String successCallback
+                  : (RCTResponseSenderBlock)successCallback errorCallback
+                  : (RCTResponseSenderBlock)errorCallback)
 
 {
   // Dispatching to a background thread to perform base64 decoding
@@ -128,10 +129,10 @@ RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
     NSData *imageData = [[NSData alloc] initWithBase64EncodedString:base64String options:0];
     if (imageData) {
       dispatch_async(self->_methodQueue, ^{
-        successCallback(@[[self _storeImageData:imageData]]);
+        successCallback(@[ [self _storeImageData:imageData] ]);
       });
     } else {
-      errorCallback(@[RCTJSErrorFromNSError(RCTErrorWithMessage(@"Failed to add image from base64String"))]);
+      errorCallback(@[ RCTJSErrorFromNSError(RCTErrorWithMessage(@"Failed to add image from base64String")) ]);
     }
   });
 }
@@ -166,7 +167,8 @@ RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
 
     CGImageSourceRef sourceRef = CGImageSourceCreateWithData((__bridge CFDataRef)imageData, NULL);
     if (!sourceRef) {
-      NSError *error = RCTErrorWithMessage([NSString stringWithFormat:@"Unable to decode data for imageTag: %@", imageTag]);
+      NSError *error =
+          RCTErrorWithMessage([NSString stringWithFormat:@"Unable to decode data for imageTag: %@", imageTag]);
       [delegate URLRequest:cancellationBlock didCompleteWithError:error];
       return;
     }
@@ -183,7 +185,6 @@ RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
     [delegate URLRequest:cancellationBlock didReceiveResponse:response];
     [delegate URLRequest:cancellationBlock didReceiveData:imageData];
     [delegate URLRequest:cancellationBlock didCompleteWithError:nil];
-
   });
 
   return cancellationBlock;
@@ -196,7 +197,8 @@ RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
   }
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeImageStoreIOSSpecJSI>(params);
 }
@@ -208,7 +210,8 @@ RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
 - (NSString *)storeImage:(UIImage *)image
 {
   RCTAssertMainQueue();
-  RCTLogWarn(@"RCTImageStoreManager.storeImage() is deprecated and has poor performance. Use an alternative method instead.");
+  RCTLogWarn(
+      @"RCTImageStoreManager.storeImage() is deprecated and has poor performance. Use an alternative method instead.");
   __block NSString *imageTag;
   dispatch_sync(_methodQueue, ^{
     imageTag = [self _storeImageData:RCTGetImageData(image, 0.75)];
@@ -219,7 +222,8 @@ RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
 - (UIImage *)imageForTag:(NSString *)imageTag
 {
   RCTAssertMainQueue();
-  RCTLogWarn(@"RCTImageStoreManager.imageForTag() is deprecated and has poor performance. Use an alternative method instead.");
+  RCTLogWarn(
+      @"RCTImageStoreManager.imageForTag() is deprecated and has poor performance. Use an alternative method instead.");
   __block NSData *imageData;
   dispatch_sync(_methodQueue, ^{
     imageData = self->_store[imageTag];
@@ -250,6 +254,7 @@ RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
 
 @end
 
-Class RCTImageStoreManagerCls(void) {
+Class RCTImageStoreManagerCls(void)
+{
   return RCTImageStoreManager.class;
 }

package/Libraries/Image/RCTImageURLLoader.h

@@ -14,10 +14,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 typedef void (^RCTImageLoaderProgressBlock)(int64_t progress, int64_t total);
 typedef void (^RCTImageLoaderPartialLoadBlock)(UIImage *image);
-typedef void (^RCTImageLoaderCompletionBlock)(NSError * _Nullable error, UIImage * _Nullable image);
+typedef void (^RCTImageLoaderCompletionBlock)(NSError *_Nullable error, UIImage *_Nullable image);
 // Metadata is passed as a id in an additional parameter because there are forks of RN without this parameter,
 // and the complexity of RCTImageLoader would make using protocols here difficult to typecheck.
-typedef void (^RCTImageLoaderCompletionBlockWithMetadata)(NSError * _Nullable error, UIImage * _Nullable image, id _Nullable metadata);
+typedef void (^RCTImageLoaderCompletionBlockWithMetadata)(
+    NSError *_Nullable error,
+    UIImage *_Nullable image,
+    id _Nullable metadata);
 typedef dispatch_block_t RCTImageLoaderCancellationBlock;
 
 /**
@@ -41,12 +44,12 @@ typedef dispatch_block_t RCTImageLoaderCancellationBlock;
  * applicable.
  */
 - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL
-                                              size:(CGSize)size
-                                             scale:(CGFloat)scale
-                                        resizeMode:(RCTResizeMode)resizeMode
-                                   progressHandler:(RCTImageLoaderProgressBlock)progressHandler
-                                partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
-                                 completionHandler:(RCTImageLoaderCompletionBlock)completionHandler;
+                                                       size:(CGSize)size
+                                                      scale:(CGFloat)scale
+                                                 resizeMode:(RCTResizeMode)resizeMode
+                                            progressHandler:(RCTImageLoaderProgressBlock)progressHandler
+                                         partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler
+                                          completionHandler:(RCTImageLoaderCompletionBlock)completionHandler;
 
 @optional
 

package/Libraries/Image/RCTImageURLLoaderWithAttribution.h

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTImageURLLoader.h>
-#import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTImageLoaderLoggable.h>
+#import <React/RCTImageLoaderProtocol.h>
+#import <React/RCTImageURLLoader.h>
 
 // TODO (T61325135): Remove C++ checks
 #ifdef __cplusplus
@@ -31,7 +31,9 @@ struct ImageURLLoaderAttribution {
 @property (nonatomic, strong, readonly) NSURL *imageURL;
 @property (nonatomic, copy, readonly) RCTImageLoaderCancellationBlock cancellationBlock;
 
-- (instancetype)initWithRequestId:(NSString *)requestId imageURL:(NSURL *)imageURL cancellationBlock:(RCTImageLoaderCancellationBlock)cancellationBlock;
+- (instancetype)initWithRequestId:(NSString *)requestId
+                         imageURL:(NSURL *)imageURL
+                cancellationBlock:(RCTImageLoaderCancellationBlock)cancellationBlock;
 - (void)cancel;
 
 @end
@@ -53,7 +55,7 @@ struct ImageURLLoaderAttribution {
                                         scale:(CGFloat)scale
                                    resizeMode:(RCTResizeMode)resizeMode
                                     requestId:(NSString *)requestId
-                                    priority: (RCTImageLoaderPriority)priority
+                                     priority:(RCTImageLoaderPriority)priority
                                   attribution:(const facebook::react::ImageURLLoaderAttribution &)attribution
                               progressHandler:(RCTImageLoaderProgressBlock)progressHandler
                            partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler

package/Libraries/Image/RCTImageURLLoaderWithAttribution.mm

@@ -9,7 +9,9 @@
 
 @implementation RCTImageURLLoaderRequest
 
-- (instancetype)initWithRequestId:(NSString *)requestId imageURL:(NSURL *)imageURL cancellationBlock:(RCTImageLoaderCancellationBlock)cancellationBlock
+- (instancetype)initWithRequestId:(NSString *)requestId
+                         imageURL:(NSURL *)imageURL
+                cancellationBlock:(RCTImageLoaderCancellationBlock)cancellationBlock
 {
   if (self = [super init]) {
     _requestId = requestId;

package/Libraries/Image/RCTImageUtils.h

@@ -18,16 +18,14 @@ NS_ASSUME_NONNULL_BEGIN
  * calculates the rectangle to draw the image into so that it will be sized and
  * positioned correctly according to the specified resizeMode.
  */
-RCT_EXTERN CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
-                                CGFloat destScale, RCTResizeMode resizeMode);
+RCT_EXTERN CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode);
 
 /**
  * This function takes a source size (typically from an image), a target rect
  * that it will be drawn into (typically relative to a CGContext), and works out
  * the transform needed to draw the image at the correct scale and position.
  */
-RCT_EXTERN CGAffineTransform RCTTransformFromTargetRect(CGSize sourceSize,
-                                                        CGRect targetRect);
+RCT_EXTERN CGAffineTransform RCTTransformFromTargetRect(CGSize sourceSize, CGRect targetRect);
 
 /**
  * This function takes an input content size & scale (typically from an image),
@@ -35,18 +33,25 @@ RCT_EXTERN CGAffineTransform RCTTransformFromTargetRect(CGSize sourceSize,
  * UIImageView) and then calculates the optimal size at which to redraw the
  * image so that it will be displayed correctly with the specified resizeMode.
  */
-RCT_EXTERN CGSize RCTTargetSize(CGSize sourceSize, CGFloat sourceScale,
-                                CGSize destSize, CGFloat destScale,
-                                RCTResizeMode resizeMode, BOOL allowUpscaling);
+RCT_EXTERN CGSize RCTTargetSize(
+    CGSize sourceSize,
+    CGFloat sourceScale,
+    CGSize destSize,
+    CGFloat destScale,
+    RCTResizeMode resizeMode,
+    BOOL allowUpscaling);
 
 /**
  * This function takes an input content size & scale (typically from an image),
  * a target size & scale that it will be displayed at, and determines if the
  * source will need to be upscaled to fit (which may result in pixelization).
  */
-RCT_EXTERN BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
-                                     CGSize destSize, CGFloat destScale,
-                                     RCTResizeMode resizeMode);
+RCT_EXTERN BOOL RCTUpscalingRequired(
+    CGSize sourceSize,
+    CGFloat sourceScale,
+    CGSize destSize,
+    CGFloat destScale,
+    RCTResizeMode resizeMode);
 
 /**
  * This function takes the source data for an image and decodes it at the
@@ -55,10 +60,8 @@ RCT_EXTERN BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
  * 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 RCTDecodeImageWithData(NSData *data,
-                                                      CGSize destSize,
-                                                      CGFloat destScale,
-                                                      RCTResizeMode resizeMode);
+RCT_EXTERN UIImage *__nullable
+RCTDecodeImageWithData(NSData *data, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode);
 
 /**
  * This function takes the source data for an image and decodes just the
@@ -80,10 +83,8 @@ RCT_EXTERN NSData *__nullable RCTGetImageData(UIImage *image, float quality);
  * and `destScale` is its scale. The `transform` argument controls how the
  * source image will be mapped to the destination image.
  */
-RCT_EXTERN UIImage *__nullable RCTTransformImage(UIImage *image,
-                                                 CGSize destSize,
-                                                 CGFloat destScale,
-                                                 CGAffineTransform transform);
+RCT_EXTERN UIImage *__nullable
+RCTTransformImage(UIImage *image, CGSize destSize, CGFloat destScale, CGAffineTransform transform);
 
 /*
  * Return YES if image has an alpha component

package/Libraries/Image/RCTImageUtils.m

@@ -27,30 +27,35 @@ static CGFloat RCTFloorValue(CGFloat value, CGFloat scale)
 
 static CGSize RCTCeilSize(CGSize size, CGFloat scale)
 {
-  return (CGSize){
-    RCTCeilValue(size.width, scale),
-    RCTCeilValue(size.height, scale)
-  };
+  return (CGSize){RCTCeilValue(size.width, scale), RCTCeilValue(size.height, scale)};
 }
 
 static CGImagePropertyOrientation CGImagePropertyOrientationFromUIImageOrientation(UIImageOrientation imageOrientation)
 {
   // see https://stackoverflow.com/a/6699649/496389
   switch (imageOrientation) {
-    case UIImageOrientationUp: return kCGImagePropertyOrientationUp;
-    case UIImageOrientationDown: return kCGImagePropertyOrientationDown;
-    case UIImageOrientationLeft: return kCGImagePropertyOrientationLeft;
-    case UIImageOrientationRight: return kCGImagePropertyOrientationRight;
-    case UIImageOrientationUpMirrored: return kCGImagePropertyOrientationUpMirrored;
-    case UIImageOrientationDownMirrored: return kCGImagePropertyOrientationDownMirrored;
-    case UIImageOrientationLeftMirrored: return kCGImagePropertyOrientationLeftMirrored;
-    case UIImageOrientationRightMirrored: return kCGImagePropertyOrientationRightMirrored;
-    default: return kCGImagePropertyOrientationUp;
+    case UIImageOrientationUp:
+      return kCGImagePropertyOrientationUp;
+    case UIImageOrientationDown:
+      return kCGImagePropertyOrientationDown;
+    case UIImageOrientationLeft:
+      return kCGImagePropertyOrientationLeft;
+    case UIImageOrientationRight:
+      return kCGImagePropertyOrientationRight;
+    case UIImageOrientationUpMirrored:
+      return kCGImagePropertyOrientationUpMirrored;
+    case UIImageOrientationDownMirrored:
+      return kCGImagePropertyOrientationDownMirrored;
+    case UIImageOrientationLeftMirrored:
+      return kCGImagePropertyOrientationLeftMirrored;
+    case UIImageOrientationRightMirrored:
+      return kCGImagePropertyOrientationRightMirrored;
+    default:
+      return kCGImagePropertyOrientationUp;
   }
 }
 
-CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
-                     CGFloat destScale, RCTResizeMode resizeMode)
+CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode)
 {
   if (CGSizeEqualToSize(destSize, CGSizeZero)) {
     // Assume we require the largest size available
@@ -70,8 +75,7 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
 
   // Calculate target aspect ratio if needed
   CGFloat targetAspect = 0.0;
-  if (resizeMode != RCTResizeModeCenter &&
-      resizeMode != RCTResizeModeStretch) {
+  if (resizeMode != RCTResizeModeCenter && resizeMode != RCTResizeModeStretch) {
     targetAspect = destSize.width / destSize.height;
     if (aspect == targetAspect) {
       resizeMode = RCTResizeModeStretch;
@@ -97,12 +101,11 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
         sourceSize.width = sourceSize.height * aspect;
       }
       return (CGRect){
-        {
-          RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
-          RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
-        },
-        RCTCeilSize(sourceSize, destScale)
-      };
+          {
+              RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
+              RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
+          },
+          RCTCeilSize(sourceSize, destScale)};
 
     case RCTResizeModeCover:
 
@@ -112,9 +115,7 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
         sourceSize.width = sourceSize.height * aspect;
         destSize.width = destSize.height * targetAspect;
         return (CGRect){
-          {RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale), 0},
-          RCTCeilSize(sourceSize, destScale)
-        };
+            {RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale), 0}, RCTCeilSize(sourceSize, destScale)};
 
       } else { // target is wider than content
 
@@ -122,9 +123,8 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
         sourceSize.height = sourceSize.width / aspect;
         destSize.height = destSize.width / targetAspect;
         return (CGRect){
-          {0, RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale)},
-          RCTCeilSize(sourceSize, destScale)
-        };
+            {0, RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale)},
+            RCTCeilSize(sourceSize, destScale)};
       }
 
     case RCTResizeModeCenter:
@@ -140,31 +140,30 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize,
       }
 
       return (CGRect){
-        {
-          RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
-          RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
-        },
-        RCTCeilSize(sourceSize, destScale)
-      };
+          {
+              RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
+              RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
+          },
+          RCTCeilSize(sourceSize, destScale)};
   }
 }
 
 CGAffineTransform RCTTransformFromTargetRect(CGSize sourceSize, CGRect targetRect)
 {
   CGAffineTransform transform = CGAffineTransformIdentity;
-  transform = CGAffineTransformTranslate(transform,
-                                         targetRect.origin.x,
-                                         targetRect.origin.y);
-  transform = CGAffineTransformScale(transform,
-                                     targetRect.size.width / sourceSize.width,
-                                     targetRect.size.height / sourceSize.height);
+  transform = CGAffineTransformTranslate(transform, targetRect.origin.x, targetRect.origin.y);
+  transform = CGAffineTransformScale(
+      transform, targetRect.size.width / sourceSize.width, targetRect.size.height / sourceSize.height);
   return transform;
 }
 
-CGSize RCTTargetSize(CGSize sourceSize, CGFloat sourceScale,
-                     CGSize destSize, CGFloat destScale,
-                     RCTResizeMode resizeMode,
-                     BOOL allowUpscaling)
+CGSize RCTTargetSize(
+    CGSize sourceSize,
+    CGFloat sourceScale,
+    CGSize destSize,
+    CGFloat destScale,
+    RCTResizeMode resizeMode,
+    BOOL allowUpscaling)
 {
   switch (resizeMode) {
     case RCTResizeModeCenter:
@@ -181,7 +180,6 @@ CGSize RCTTargetSize(CGSize sourceSize, CGFloat sourceScale,
       return RCTCeilSize(destSize, destScale);
 
     default: {
-
       // Get target size
       CGSize size = RCTTargetRect(sourceSize, destSize, destScale, resizeMode).size;
       if (!allowUpscaling) {
@@ -195,9 +193,12 @@ CGSize RCTTargetSize(CGSize sourceSize, CGFloat sourceScale,
   }
 }
 
-BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
-                          CGSize destSize, CGFloat destScale,
-                          RCTResizeMode resizeMode)
+BOOL RCTUpscalingRequired(
+    CGSize sourceSize,
+    CGFloat sourceScale,
+    CGSize destSize,
+    CGFloat destScale,
+    RCTResizeMode resizeMode)
 {
   if (CGSizeEqualToSize(destSize, CGSizeZero)) {
     // Assume we require the largest size available
@@ -253,10 +254,7 @@ BOOL RCTUpscalingRequired(CGSize sourceSize, CGFloat sourceScale,
   }
 }
 
-UIImage *__nullable RCTDecodeImageWithData(NSData *data,
-                                           CGSize destSize,
-                                           CGFloat destScale,
-                                           RCTResizeMode resizeMode)
+UIImage *__nullable RCTDecodeImageWithData(NSData *data, CGSize destSize, CGFloat destScale, RCTResizeMode resizeMode)
 {
   CGImageSourceRef sourceRef = CGImageSourceCreateWithData((__bridge CFDataRef)data, NULL);
   if (!sourceRef) {
@@ -292,14 +290,14 @@ UIImage *__nullable RCTDecodeImageWithData(NSData *data,
   // 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));
+  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),
+    (id)kCGImageSourceShouldAllowFloat : @YES,
+    (id)kCGImageSourceCreateThumbnailWithTransform : @YES,
+    (id)kCGImageSourceCreateThumbnailFromImageAlways : @YES,
+    (id)kCGImageSourceThumbnailMaxPixelSize : @(maxPixelSize),
   };
 
   // Get thumbnail
@@ -310,9 +308,7 @@ UIImage *__nullable RCTDecodeImageWithData(NSData *data,
   }
 
   // Return image
-  UIImage *image = [UIImage imageWithCGImage:imageRef
-                                       scale:destScale
-                                 orientation:UIImageOrientationUp];
+  UIImage *image = [UIImage imageWithCGImage:imageRef scale:destScale orientation:UIImageOrientationUp];
   CGImageRelease(imageRef);
   return image;
 }
@@ -360,10 +356,7 @@ NSData *__nullable RCTGetImageData(UIImage *image, float quality)
   return (__bridge_transfer NSData *)imageData;
 }
 
-UIImage *__nullable RCTTransformImage(UIImage *image,
-                                      CGSize destSize,
-                                      CGFloat destScale,
-                                      CGAffineTransform transform)
+UIImage *__nullable RCTTransformImage(UIImage *image, CGSize destSize, CGFloat destScale, CGAffineTransform transform)
 {
   if (destSize.width <= 0 | destSize.height <= 0 || destScale <= 0) {
     return nil;
@@ -373,7 +366,8 @@ UIImage *__nullable RCTTransformImage(UIImage *image,
   UIGraphicsImageRendererFormat *const rendererFormat = [UIGraphicsImageRendererFormat defaultFormat];
   rendererFormat.opaque = opaque;
   rendererFormat.scale = destScale;
-  UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:destSize format:rendererFormat];
+  UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:destSize
+                                                                                   format:rendererFormat];
   return [renderer imageWithActions:^(UIGraphicsImageRendererContext *_Nonnull context) {
     CGContextConcatCTM(context.CGContext, transform);
     [image drawAtPoint:CGPointZero];

package/Libraries/Image/RCTImageView.h

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <UIKit/UIKit.h>
-#import <React/RCTView.h>
 #import <React/RCTResizeMode.h>
+#import <React/RCTView.h>
+#import <UIKit/UIKit.h>
 
 @class RCTBridge;
 @class RCTImageSource;