react-native-tvos 0.82.0-0rc5 → 0.83.0-0

package/Libraries/Image/RCTImageUtils.mm

@@ -101,12 +101,11 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize, CGFloat destScale, RCTR
         sourceSize.height = destSize.height;
         sourceSize.width = sourceSize.height * aspect;
       }
-      return (CGRect){
-          {
-              RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
-              RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
-          },
-          RCTCeilSize(sourceSize, destScale)};
+      return (CGRect){{
+                          RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
+                          RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
+                      },
+                      RCTCeilSize(sourceSize, destScale)};
 
     case RCTResizeModeCover:
 
@@ -115,17 +114,16 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize, CGFloat destScale, RCTR
         sourceSize.height = destSize.height;
         sourceSize.width = sourceSize.height * aspect;
         destSize.width = destSize.height * targetAspect;
-        return (CGRect){
-            {RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale), 0}, RCTCeilSize(sourceSize, destScale)};
+        return (CGRect){{RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale), 0},
+                        RCTCeilSize(sourceSize, destScale)};
 
       } else { // target is wider than content
 
         sourceSize.width = destSize.width;
         sourceSize.height = sourceSize.width / aspect;
         destSize.height = destSize.width / targetAspect;
-        return (CGRect){
-            {0, RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale)},
-            RCTCeilSize(sourceSize, destScale)};
+        return (CGRect){{0, RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale)},
+                        RCTCeilSize(sourceSize, destScale)};
       }
 
     case RCTResizeModeCenter:
@@ -140,12 +138,11 @@ CGRect RCTTargetRect(CGSize sourceSize, CGSize destSize, CGFloat destScale, RCTR
         sourceSize.width = sourceSize.height * aspect;
       }
 
-      return (CGRect){
-          {
-              RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
-              RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
-          },
-          RCTCeilSize(sourceSize, destScale)};
+      return (CGRect){{
+                          RCTFloorValue((destSize.width - sourceSize.width) / 2, destScale),
+                          RCTFloorValue((destSize.height - sourceSize.height) / 2, destScale),
+                      },
+                      RCTCeilSize(sourceSize, destScale)};
   }
 }
 
@@ -212,7 +209,8 @@ BOOL RCTUpscalingRequired(
   sourceSize.height *= scale;
 
   // Calculate aspect ratios if needed (don't bother if resizeMode == stretch)
-  CGFloat aspect = 0.0, targetAspect = 0.0;
+  CGFloat aspect = 0.0;
+  CGFloat targetAspect = 0.0;
   if (resizeMode != RCTResizeModeStretch) {
     aspect = sourceSize.width / sourceSize.height;
     targetAspect = destSize.width / destSize.height;
@@ -292,18 +290,31 @@ UIImage *__nullable RCTDecodeImageWithData(NSData *data, CGSize destSize, CGFloa
   // 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);
+  CGImageRef imageRef;
+  BOOL createThumbnail = targetPixelSize.width != 0 && targetPixelSize.height != 0 &&
+      (sourceSize.width > targetPixelSize.width || sourceSize.height > targetPixelSize.height);
+
+  if (createThumbnail) {
+    CGFloat maxPixelSize = fmax(targetPixelSize.width, targetPixelSize.height);
+
+    // Get a thumbnail of the source image. This is usually slower than creating a full-sized image,
+    // but takes up less memory once it's done.
+    imageRef = CGImageSourceCreateThumbnailAtIndex(
+        sourceRef, 0, (__bridge CFDictionaryRef) @{
+          (id)kCGImageSourceShouldAllowFloat : @YES,
+          (id)kCGImageSourceCreateThumbnailWithTransform : @YES,
+          (id)kCGImageSourceCreateThumbnailFromImageAlways : @YES,
+          (id)kCGImageSourceThumbnailMaxPixelSize : @(maxPixelSize),
+        });
+  } else {
+    // Get an image in full size. This is faster than `CGImageSourceCreateThumbnailAtIndex`
+    // and consumes less memory if only the target size doesn't require downscaling.
+    imageRef = CGImageSourceCreateImageAtIndex(
+        sourceRef, 0, (__bridge CFDictionaryRef) @{
+          (id)kCGImageSourceShouldAllowFloat : @YES,
+        });
+  }
+
   CFRelease(sourceRef);
   if (!imageRef) {
     return nil;

package/Libraries/Image/RCTImageView.h

@@ -9,7 +9,7 @@
 #import <React/RCTView.h>
 #import <UIKit/UIKit.h>
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 @class RCTBridge;
 @class RCTImageSource;
@@ -29,4 +29,4 @@ __attribute__((deprecated("This API will be removed along with the legacy archit
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/Libraries/Image/RCTImageView.mm

@@ -17,7 +17,7 @@
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 /**
  * Determines whether an image of `currentSize` should be reloaded for display
@@ -504,4 +504,4 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/Libraries/Image/RCTImageViewManager.h

@@ -7,11 +7,11 @@
 
 #import <React/RCTViewManager.h>
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 __attribute__((deprecated("This API will be removed along with the legacy architecture.")))
 @interface RCTImageViewManager : RCTViewManager
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/Libraries/Image/RCTImageViewManager.mm

@@ -7,7 +7,7 @@
 
 #import <React/RCTImageViewManager.h>
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <UIKit/UIKit.h>
 
@@ -53,10 +53,9 @@ RCT_CUSTOM_VIEW_PROPERTY(tintColor, UIColor, RCTImageView)
   view.renderingMode = json ? UIImageRenderingModeAlwaysTemplate : defaultView.renderingMode;
 }
 
-RCT_EXPORT_METHOD(getSize
-                  : (NSURLRequest *)request successBlock
-                  : (RCTResponseSenderBlock)successBlock errorBlock
-                  : (RCTResponseErrorBlock)errorBlock)
+RCT_EXPORT_METHOD(
+    getSize : (NSURLRequest *)request successBlock : (RCTResponseSenderBlock)
+        successBlock errorBlock : (RCTResponseErrorBlock)errorBlock)
 {
   [[self.bridge moduleForName:@"ImageLoader"
         lazilyLoadIfNecessary:YES] getImageSizeForURLRequest:request
@@ -69,10 +68,9 @@ RCT_EXPORT_METHOD(getSize
                                                        }];
 }
 
-RCT_EXPORT_METHOD(getSizeWithHeaders
-                  : (RCTImageSource *)source resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    getSizeWithHeaders : (RCTImageSource *)source resolve : (RCTPromiseResolveBlock)
+        resolve reject : (RCTPromiseRejectBlock)reject)
 {
   [[self.bridge moduleForName:@"ImageLoader" lazilyLoadIfNecessary:YES]
       getImageSizeForURLRequest:source.request
@@ -85,10 +83,9 @@ RCT_EXPORT_METHOD(getSizeWithHeaders
                           }];
 }
 
-RCT_EXPORT_METHOD(prefetchImage
-                  : (NSURLRequest *)request resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    prefetchImage : (NSURLRequest *)request resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)
+        reject)
 {
   if (!request) {
     reject(@"E_INVALID_URI", @"Cannot prefetch an image for an empty URI", nil);
@@ -107,14 +104,12 @@ RCT_EXPORT_METHOD(prefetchImage
                               }];
 }
 
-RCT_EXPORT_METHOD(queryCache
-                  : (NSArray *)requests resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    queryCache : (NSArray *)requests resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
 {
   resolve([[self.bridge moduleForName:@"ImageLoader"] getImageCacheStatus:requests]);
 }
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/Libraries/Image/RCTLocalAssetImageLoader.mm

@@ -50,8 +50,8 @@ RCT_EXPORT_MODULE()
                                           completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
 {
   UIImage *image = RCTImageFromLocalAssetURL(imageURL);
-  if (image) {
-    if (progressHandler) {
+  if (image != nullptr) {
+    if (progressHandler != nullptr) {
       progressHandler(1, 1);
     }
     completionHandler(nil, image);

package/Libraries/LinkingIOS/RCTLinkingManager.mm

@@ -87,10 +87,8 @@ RCT_EXPORT_MODULE()
   [self sendEventWithName:@"url" body:notification.userInfo];
 }
 
-RCT_EXPORT_METHOD(openURL
-                  : (NSURL *)URL resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    openURL : (NSURL *)URL resolve : (RCTPromiseResolveBlock)resolve reject : (RCTPromiseRejectBlock)reject)
 {
   [RCTSharedApplication() openURL:URL
       options:@{}
@@ -114,10 +112,8 @@ RCT_EXPORT_METHOD(openURL
       }];
 }
 
-RCT_EXPORT_METHOD(canOpenURL
-                  : (NSURL *)URL resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (__unused RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    canOpenURL : (NSURL *)URL resolve : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
 {
   if (RCTRunningInAppExtension()) {
     // Technically Today widgets can open urls, but supporting that would require
@@ -155,7 +151,7 @@ RCT_EXPORT_METHOD(canOpenURL
 RCT_EXPORT_METHOD(getInitialURL : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
 {
   NSURL *initialURL = nil;
-  if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {
+  if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey] != nullptr) {
     initialURL = self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
   } else {
     NSDictionary *userActivityDictionary =
@@ -181,11 +177,9 @@ RCT_EXPORT_METHOD(openSettings : (RCTPromiseResolveBlock)resolve reject : (__unu
       }];
 }
 
-RCT_EXPORT_METHOD(sendIntent
-                  : (NSString *)action extras
-                  : (NSArray *_Nullable)extras resolve
-                  : (RCTPromiseResolveBlock)resolve reject
-                  : (RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(
+    sendIntent : (NSString *)action extras : (NSArray *_Nullable)extras resolve : (RCTPromiseResolveBlock)
+        resolve reject : (RCTPromiseRejectBlock)reject)
 {
   RCTLogError(@"Not implemented: %@", NSStringFromSelector(_cmd));
 }

package/Libraries/Lists/FlatList.js

@@ -13,8 +13,8 @@ import type {ViewStyleProp} from '../StyleSheet/StyleSheet';
 import type {
   ListRenderItem,
   ListRenderItemInfo,
+  ListViewToken,
   ViewabilityConfigCallbackPair,
-  ViewToken,
   VirtualizedListProps,
 } from '@react-native-tvos/virtualized-lists';
 
@@ -573,7 +573,7 @@ class FlatList<ItemT = any> extends React.PureComponent<FlatListProps<ItemT>> {
     return keyExtractor(items, index);
   };
 
-  _pushMultiColumnViewable(arr: Array<ViewToken>, v: ViewToken): void {
+  _pushMultiColumnViewable(arr: Array<ListViewToken>, v: ListViewToken): void {
     const numColumns = numColumnsOrDefault(this.props.numColumns);
     const keyExtractor = this.props.keyExtractor ?? defaultKeyExtractor;
     v.item.forEach((item, ii) => {
@@ -585,22 +585,22 @@ class FlatList<ItemT = any> extends React.PureComponent<FlatListProps<ItemT>> {
 
   _createOnViewableItemsChanged(
     onViewableItemsChanged: ?(info: {
-      viewableItems: Array<ViewToken>,
-      changed: Array<ViewToken>,
+      viewableItems: Array<ListViewToken>,
+      changed: Array<ListViewToken>,
       ...
     }) => void,
     // $FlowFixMe[missing-local-annot]
   ) {
     return (info: {
-      viewableItems: Array<ViewToken>,
-      changed: Array<ViewToken>,
+      viewableItems: Array<ListViewToken>,
+      changed: Array<ListViewToken>,
       ...
     }) => {
       const numColumns = numColumnsOrDefault(this.props.numColumns);
       if (onViewableItemsChanged) {
         if (numColumns > 1) {
-          const changed: Array<ViewToken> = [];
-          const viewableItems: Array<ViewToken> = [];
+          const changed: Array<ListViewToken> = [];
+          const viewableItems: Array<ListViewToken> = [];
           info.viewableItems.forEach(v =>
             this._pushMultiColumnViewable(viewableItems, v),
           );

package/Libraries/Lists/SectionList.d.ts

@@ -35,7 +35,11 @@ export interface SectionBase<ItemT, SectionT = DefaultSectionT> {
 
   renderItem?: SectionListRenderItem<ItemT, SectionT> | undefined;
 
-  ItemSeparatorComponent?: React.ComponentType<any> | null | undefined;
+  ItemSeparatorComponent?:
+    | React.ComponentType<any>
+    | React.ReactElement
+    | null
+    | undefined;
 
   keyExtractor?: ((item: ItemT, index: number) => string) | undefined;
 }

package/Libraries/Lists/ViewabilityHelper.js

@@ -11,7 +11,7 @@
 'use strict';
 
 export type {
-  ViewToken,
+  ListViewToken as ViewToken,
   ViewabilityConfig,
   ViewabilityConfigCallbackPair,
 } from '@react-native-tvos/virtualized-lists';

package/Libraries/Lists/VirtualizedList.js

@@ -19,6 +19,7 @@ const VirtualizedListComponent: VirtualizedListType =
 export type {
   ListRenderItemInfo,
   ListRenderItem,
+  ListViewToken,
   Separators,
   VirtualizedListProps,
 } from '@react-native-tvos/virtualized-lists';

package/Libraries/LogBox/UI/AnsiHighlight.js

@@ -87,7 +87,7 @@ export default function Ansi({
     <View style={styles.container}>
       {parsedLines.map((items, i) => (
         <View style={styles.line} key={i}>
-          <Text>
+          <Text style={styles.text}>
             {items.map((bundle, key) => {
               const textStyle =
                 bundle.fg && COLORS[bundle.fg]
@@ -122,4 +122,7 @@ const styles = StyleSheet.create({
   line: {
     flexDirection: 'row',
   },
+  text: {
+    flexGrow: 1,
+  },
 });

package/Libraries/NativeAnimation/Drivers/RCTEventAnimation.mm

@@ -13,7 +13,7 @@
 
 - (instancetype)initWithEventPath:(NSArray<NSString *> *)eventPath valueNode:(RCTValueAnimatedNode *)valueNode
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _eventPath = eventPath;
     _valueNode = valueNode;
   }

package/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.mm

@@ -16,7 +16,7 @@
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _nodeTag = tag;
     _config = [config copy];
   }
@@ -37,10 +37,10 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)addChild:(RCTAnimatedNode *)child
 {
-  if (!_childNodes) {
+  if (_childNodes == nullptr) {
     _childNodes = [NSMapTable strongToWeakObjectsMapTable];
   }
-  if (child) {
+  if (child != nullptr) {
     [_childNodes setObject:child forKey:child.nodeTag];
     [child onAttachedToNode:self];
   }
@@ -48,10 +48,10 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)removeChild:(RCTAnimatedNode *)child
 {
-  if (!_childNodes) {
+  if (_childNodes == nullptr) {
     return;
   }
-  if (child) {
+  if (child != nullptr) {
     [_childNodes removeObjectForKey:child.nodeTag];
     [child onDetachedFromNode:self];
   }
@@ -59,20 +59,20 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)onAttachedToNode:(RCTAnimatedNode *)parent
 {
-  if (!_parentNodes) {
+  if (_parentNodes == nullptr) {
     _parentNodes = [NSMapTable strongToWeakObjectsMapTable];
   }
-  if (parent) {
+  if (parent != nullptr) {
     [_parentNodes setObject:parent forKey:parent.nodeTag];
   }
 }
 
 - (void)onDetachedFromNode:(RCTAnimatedNode *)parent
 {
-  if (!_parentNodes) {
+  if (_parentNodes == nullptr) {
     return;
   }
-  if (parent) {
+  if (parent != nullptr) {
     [_parentNodes removeObjectForKey:parent.nodeTag];
   }
 }

package/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.mm

@@ -86,7 +86,7 @@ NSString *RCTInterpolateString(
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super initWithTag:tag config:config])) {
+  if ((self = [super initWithTag:tag config:config]) != nullptr) {
     _inputRange = config[@"inputRange"];
 
     NSArray *outputRangeConfig = config[@"outputRange"];
@@ -104,7 +104,7 @@ NSString *RCTInterpolateString(
       switch (_outputType) {
         case RCTInterpolationOutputColor: {
           UIColor *color = [RCTConvert UIColor:value];
-          [outputRange addObject:color ? color : [UIColor whiteColor]];
+          [outputRange addObject:(color != nullptr) ? color : [UIColor whiteColor]];
           break;
         }
         case RCTInterpolationOutputString:
@@ -141,7 +141,7 @@ NSString *RCTInterpolateString(
 - (void)performUpdate
 {
   [super performUpdate];
-  if (!_parentNode) {
+  if (_parentNode == nullptr) {
     return;
   }
 

package/Libraries/NativeAnimation/Nodes/RCTObjectAnimatedNode.mm

@@ -48,7 +48,7 @@ NSString *const NODE_TAG_KEY = @"nodeTag";
   if ([value isKindOfClass:[NSDictionary class]]) {
     NSDictionary<NSString *, id> *dict = (NSDictionary *)value;
     id nodeTag = [dict objectForKey:NODE_TAG_KEY];
-    if (nodeTag && [nodeTag isKindOfClass:[NSNumber class]]) {
+    if ((nodeTag != nullptr) && [nodeTag isKindOfClass:[NSNumber class]]) {
       RCTAnimatedNode *node = [self.parentNodes objectForKey:(NSNumber *)nodeTag];
       if ([node isKindOfClass:[RCTValueAnimatedNode class]]) {
         RCTValueAnimatedNode *valueNode = (RCTValueAnimatedNode *)node;

package/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.mm

@@ -18,7 +18,7 @@
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super initWithTag:tag config:config])) {
+  if ((self = [super initWithTag:tag config:config]) != nullptr) {
     _propsDictionary = [NSMutableDictionary new];
   }
   return self;
@@ -36,11 +36,11 @@
   NSDictionary<NSString *, NSNumber *> *style = self.config[@"style"];
   [style enumerateKeysAndObjectsUsingBlock:^(NSString *property, NSNumber *nodeTag, __unused BOOL *stop) {
     RCTAnimatedNode *node = [self.parentNodes objectForKey:nodeTag];
-    if (node) {
+    if (node != nullptr) {
       if ([node isKindOfClass:[RCTValueAnimatedNode class]]) {
         RCTValueAnimatedNode *valueAnimatedNode = (RCTValueAnimatedNode *)node;
         id animatedObject = valueAnimatedNode.animatedObject;
-        if (animatedObject) {
+        if (animatedObject != nullptr) {
           _propsDictionary[property] = animatedObject;
         } else {
           _propsDictionary[property] = @(valueAnimatedNode.value);

package/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.mm

@@ -18,7 +18,7 @@
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super initWithTag:tag config:config])) {
+  if ((self = [super initWithTag:tag config:config]) != nullptr) {
     _animationId = config[@"animationId"];
     _toValueNodeTag = config[@"toValue"];
     _valueNodeTag = config[@"value"];

package/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.mm

@@ -14,7 +14,7 @@
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super initWithTag:tag config:config])) {
+  if ((self = [super initWithTag:tag config:config]) != nullptr) {
     _propsDictionary = [NSMutableDictionary new];
   }
   return self;

package/Libraries/NativeAnimation/RCTAnimationUtils.mm

@@ -90,9 +90,15 @@ uint32_t RCTInterpolateColorInRange(CGFloat value, NSArray<NSNumber *> *inputRan
   CGFloat inputMin = inputRange[rangeIndex].doubleValue;
   CGFloat inputMax = inputRange[rangeIndex + 1].doubleValue;
 
-  CGFloat redMin, greenMin, blueMin, alphaMin;
+  CGFloat redMin;
+  CGFloat greenMin;
+  CGFloat blueMin;
+  CGFloat alphaMin;
   [outputRange[rangeIndex] getRed:&redMin green:&greenMin blue:&blueMin alpha:&alphaMin];
-  CGFloat redMax, greenMax, blueMax, alphaMax;
+  CGFloat redMax;
+  CGFloat greenMax;
+  CGFloat blueMax;
+  CGFloat alphaMax;
   [outputRange[rangeIndex + 1] getRed:&redMax green:&greenMax blue:&blueMax alpha:&alphaMax];
 
   return RCTColorFromComponents(

package/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm

@@ -118,11 +118,9 @@ RCT_EXPORT_METHOD(disconnectAnimatedNodes : (double)parentTag childTag : (double
   }];
 }
 
-RCT_EXPORT_METHOD(startAnimatingNode
-                  : (double)animationId nodeTag
-                  : (double)nodeTag config
-                  : (NSDictionary<NSString *, id> *)config endCallback
-                  : (RCTResponseSenderBlock)callBack)
+RCT_EXPORT_METHOD(
+    startAnimatingNode : (double)animationId nodeTag : (double)nodeTag config : (NSDictionary<NSString *, id> *)
+        config endCallback : (RCTResponseSenderBlock)callBack)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager startAnimatingNode:[NSNumber numberWithDouble:animationId]
@@ -228,10 +226,9 @@ RCT_EXPORT_METHOD(stopListeningToAnimatedNodeValue : (double)tag)
   }];
 }
 
-RCT_EXPORT_METHOD(addAnimatedEventToView
-                  : (double)viewTag eventName
-                  : (nonnull NSString *)eventName eventMapping
-                  : (JS::NativeAnimatedModule::EventMapping &)eventMapping)
+RCT_EXPORT_METHOD(
+    addAnimatedEventToView : (double)viewTag eventName : (nonnull NSString *)
+        eventName eventMapping : (JS::NativeAnimatedModule::EventMapping &)eventMapping)
 {
   NSMutableDictionary *eventMappingDict = [NSMutableDictionary new];
   eventMappingDict[@"nativeEventPath"] = RCTConvertVecToArray(eventMapping.nativeEventPath());
@@ -247,10 +244,9 @@ RCT_EXPORT_METHOD(addAnimatedEventToView
   }];
 }
 
-RCT_EXPORT_METHOD(removeAnimatedEventFromView
-                  : (double)viewTag eventName
-                  : (nonnull NSString *)eventName animatedNodeTag
-                  : (double)animatedNodeTag)
+RCT_EXPORT_METHOD(
+    removeAnimatedEventFromView : (double)viewTag eventName : (nonnull NSString *)eventName animatedNodeTag : (double)
+        animatedNodeTag)
 {
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager removeAnimatedEventFromView:[NSNumber numberWithDouble:viewTag]