react-native-tvos 0.82.1-0 → 0.83.0-0

package/React/Views/RCTComponentData.mm

@@ -50,7 +50,7 @@ static SEL selectorForType(NSString *type)
                               bridge:(RCTBridge *)bridge
                      eventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _bridge = bridge;
     _eventDispatcher = eventDispatcher;
     _managerClass = managerClass;
@@ -71,12 +71,12 @@ static SEL selectorForType(NSString *type)
 
 - (RCTViewManager *)manager
 {
-  if (!_manager && [self isBridgeMode]) {
+  if ((_manager == nullptr) && [self isBridgeMode]) {
     _manager = [_bridge moduleForClass:_managerClass];
-  } else if (!_manager && !_bridgelessViewManager) {
+  } else if ((_manager == nullptr) && (_bridgelessViewManager == nullptr)) {
     _bridgelessViewManager = [_bridge moduleForClass:_managerClass];
   }
-  return _manager ? _manager : _bridgelessViewManager;
+  return (_manager != nullptr) ? _manager : _bridgelessViewManager;
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)init)
@@ -108,7 +108,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 {
   json = RCTNilIfNull(json);
   if (!isShadowView) {
-    if (!json && !_defaultView) {
+    if ((json == nullptr) && (_defaultView == nullptr)) {
       // Only create default view if json is null
       _defaultView = [self createViewWithTag:nil rootTag:nil];
     }
@@ -132,11 +132,11 @@ static RCTPropBlock createEventSetter(
       eventHandler = ^(NSDictionary *event) {
         // The component no longer exists, we shouldn't send the event
         id<RCTComponent> strongTarget = weakTarget;
-        if (!strongTarget) {
+        if (strongTarget == nullptr) {
           return;
         }
 
-        if (eventInterceptor) {
+        if (eventInterceptor != nullptr) {
           eventInterceptor(propName, event, strongTarget.reactTag);
         } else {
           RCTComponentEvent *componentEvent = [[RCTComponentEvent alloc] initWithName:propName
@@ -160,13 +160,13 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
   __block NSMutableData *defaultValue = nil;
 
   return ^(id target, id json) {
-    if (!target) {
+    if (target == nullptr) {
       return;
     }
 
     // Get default value
-    if (!defaultValue) {
-      if (!json) {
+    if (defaultValue == nullptr) {
+      if (json == nullptr) {
         // We only set the defaultValue when we first pass a non-null
         // value, so if the first value sent for a prop is null, it's
         // a no-op (we'd be resetting it to its default when its
@@ -188,10 +188,10 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
     // Get value
     BOOL freeValueOnCompletion = NO;
     void *value = defaultValue.mutableBytes;
-    if (json) {
+    if (json != nullptr) {
       freeValueOnCompletion = YES;
       value = malloc(typeSignature.methodReturnLength);
-      if (!value) {
+      if (value == nullptr) {
         // CWE - 391 : Unchecked error condition
         // https://www.cvedetails.com/cwe-details/391/Unchecked-Error-Condition.html
         // https://eli.thegreenplace.net/2009/10/30/handling-out-of-memory-conditions-in-c
@@ -203,7 +203,7 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
     }
 
     // Set value
-    if (!targetInvocation) {
+    if (targetInvocation == nullptr) {
       NSMethodSignature *signature = [target methodSignatureForSelector:setter];
       targetInvocation = [NSInvocation invocationWithMethodSignature:signature];
       targetInvocation.selector = setter;
@@ -254,7 +254,7 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
     // Disect keypath
     NSString *key = name;
     NSArray<NSString *> *parts = [keyPath componentsSeparatedByString:@"."];
-    if (parts) {
+    if (parts != nullptr) {
       key = parts.lastObject;
       parts = [parts subarrayWithRange:(NSRange){0, parts.count - 1}];
     }
@@ -277,7 +277,7 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
     } else {
       // Ordinary property handlers
       NSMethodSignature *typeSignature = [[RCTConvert class] methodSignatureForSelector:type];
-      if (!typeSignature) {
+      if (typeSignature == nullptr) {
         RCTLogError(@"No +[RCTConvert %@] function found.", NSStringFromSelector(type));
         return ^(__unused id<RCTComponent> view, __unused id json) {
         };
@@ -349,7 +349,7 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
 {
   RCTPropBlockDictionary *propBlocks = isShadowView ? _shadowPropBlocks : _viewPropBlocks;
   RCTPropBlock propBlock = propBlocks[name];
-  if (!propBlock) {
+  if (propBlock == nullptr) {
     propBlock = [self createPropBlock:name isShadowView:isShadowView];
 
 #if RCT_DEBUG
@@ -383,7 +383,7 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
 
 - (void)setProps:(NSDictionary<NSString *, id> *)props forView:(id<RCTComponent>)view isShadowView:(BOOL)isShadowView
 {
-  if (!view) {
+  if (view == nullptr) {
     return;
   }
 
@@ -469,13 +469,13 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
 
     // We need to handle both propConfig_* and propConfigShadow_* methods
     const char *underscorePos = strchr(selectorName + strlen("propConfig"), '_');
-    if (!underscorePos) {
+    if (underscorePos == nullptr) {
       continue;
     }
 
     NSString *name = @(underscorePos + 1);
     NSString *type = ((NSArray<NSString *> * (*)(id, SEL)) objc_msgSend)(managerClass, selector)[0];
-    if (RCT_DEBUG && propTypes[name] && ![propTypes[name] isEqualToString:type]) {
+    if (RCT_DEBUG && (propTypes[name] != nullptr) && ![propTypes[name] isEqualToString:type]) {
       RCTLogError(
           @"Property '%@' of component '%@' redefined from '%@' "
            "to '%@'",

package/React/Views/RCTConvert+CoreLocation.m

@@ -15,8 +15,8 @@ RCT_CONVERTER(CLLocationDistance, CLLocationDistance, doubleValue);
 + (CLLocationCoordinate2D)CLLocationCoordinate2D:(id)json
 {
   json = [self NSDictionary:json];
-  return (CLLocationCoordinate2D){
-      [self CLLocationDegrees:json[@"latitude"]], [self CLLocationDegrees:json[@"longitude"]]};
+  return (CLLocationCoordinate2D){[self CLLocationDegrees:json[@"latitude"]],
+                                  [self CLLocationDegrees:json[@"longitude"]]};
 }
 
 @end

package/React/Views/RCTDebuggingOverlayManager.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 RCTDebuggingOverlayManager : RCTViewManager
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Views/RCTDebuggingOverlayManager.m

@@ -8,7 +8,7 @@
 #import "RCTDebuggingOverlayManager.h"
 #import "RCTDebuggingOverlay.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
@@ -65,4 +65,4 @@ RCT_EXPORT_METHOD(clearElementsHighlights : (nonnull NSNumber *)viewTag)
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Views/RCTFont+Private.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTDefines.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+RCT_EXTERN UIFont *__nullable RCTGetLegacyDefaultFont(CGFloat fontSize, UIFontWeight fontWeight);
+
+NS_ASSUME_NONNULL_END

package/React/Views/RCTFont.h

@@ -17,8 +17,10 @@ typedef CGFloat RCTFontWeight;
  * provide a different base font, use this override. The font weight supplied to your
  * handler will be one of "ultralight", "thin", "light", "regular", "medium",
  * "semibold", "extrabold", "bold", "heavy", or "black".
+ *
+ * @deprecated Use RCTSetDefaultFontResolver
  */
-RCT_EXTERN void RCTSetDefaultFontHandler(RCTFontHandler handler);
+RCT_EXTERN void RCTSetDefaultFontHandler(RCTFontHandler handler) __attribute__((deprecated));
 RCT_EXTERN BOOL RCTHasFontHandlerSet(void);
 RCT_EXTERN RCTFontWeight RCTGetFontWeight(UIFont *font);
 

package/React/Views/RCTFont.mm

@@ -6,6 +6,8 @@
  */
 
 #import "RCTFont.h"
+#import "RCTFont+Private.h"
+
 #import "RCTAssert.h"
 #import "RCTLog.h"
 
@@ -122,6 +124,15 @@ static NSString *FontWeightDescriptionFromUIFontWeight(UIFontWeight fontWeight)
   return @"regular";
 }
 
+UIFont *RCTGetLegacyDefaultFont(CGFloat size, UIFontWeight fontWeight)
+{
+  if (defaultFontHandler != nil) {
+    return defaultFontHandler(size, FontWeightDescriptionFromUIFontWeight(fontWeight));
+  } else {
+    return nil;
+  }
+}
+
 static UIFont *cachedSystemFont(CGFloat size, RCTFontWeight weight)
 {
   static NSCache<NSValue *, UIFont *> *fontCache = [NSCache new];
@@ -135,8 +146,8 @@ static UIFont *cachedSystemFont(CGFloat size, RCTFontWeight weight)
   NSValue *cacheKey = [[NSValue alloc] initWithBytes:&key objCType:@encode(CacheKey)];
   UIFont *font = [fontCache objectForKey:cacheKey];
 
-  if (!font) {
-    if (defaultFontHandler) {
+  if (font == nil) {
+    if (defaultFontHandler != nil) {
       NSString *fontWeightDescription = FontWeightDescriptionFromUIFontWeight(weight);
       font = defaultFontHandler(size, fontWeightDescription);
     } else {

package/React/Views/RCTLayout.m

@@ -14,31 +14,27 @@ RCTLayoutMetrics RCTLayoutMetricsFromYogaNode(YGNodeRef yogaNode)
 {
   RCTLayoutMetrics layoutMetrics;
 
-  CGRect frame = (CGRect){
-      (CGPoint){
-          RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetLeft(yogaNode)),
-          RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetTop(yogaNode))},
-      (CGSize){
-          RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(yogaNode)),
-          RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(yogaNode))}};
-
-  UIEdgeInsets padding = (UIEdgeInsets){
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))};
-
-  UIEdgeInsets borderWidth = (UIEdgeInsets){
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))};
-
-  UIEdgeInsets compoundInsets = (UIEdgeInsets){
-      borderWidth.top + padding.top,
-      borderWidth.left + padding.left,
-      borderWidth.bottom + padding.bottom,
-      borderWidth.right + padding.right};
+  CGRect frame = (CGRect){(CGPoint){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetLeft(yogaNode)),
+                                    RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetTop(yogaNode))},
+                          (CGSize){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetWidth(yogaNode)),
+                                   RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetHeight(yogaNode))}};
+
+  UIEdgeInsets padding =
+      (UIEdgeInsets){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
+                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
+                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
+                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))};
+
+  UIEdgeInsets borderWidth =
+      (UIEdgeInsets){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
+                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
+                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
+                     RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))};
+
+  UIEdgeInsets compoundInsets = (UIEdgeInsets){borderWidth.top + padding.top,
+                                               borderWidth.left + padding.left,
+                                               borderWidth.bottom + padding.bottom,
+                                               borderWidth.right + padding.right};
 
   CGRect bounds = (CGRect){CGPointZero, frame.size};
   CGRect contentFrame = UIEdgeInsetsInsetRect(bounds, compoundInsets);

package/React/Views/RCTModalHostView.h

@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <React/RCTInvalidating.h>
 #import <React/RCTModalHostViewManager.h>
@@ -67,4 +67,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/React/Views/RCTModalHostView.m

@@ -7,7 +7,7 @@
 
 #import "RCTModalHostView.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <UIKit/UIKit.h>
 
@@ -299,4 +299,4 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Views/RCTModalHostViewController.h

@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 #import "RCTModalHostView.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 RCTModalHostViewController : UIViewController
@@ -23,4 +23,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/React/Views/RCTModalHostViewController.m

@@ -7,7 +7,7 @@
 
 #import "RCTModalHostViewController.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import "RCTLog.h"
 #import "RCTModalHostView.h"
@@ -104,4 +104,4 @@
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Views/RCTModalHostViewManager.h

@@ -9,7 +9,7 @@
 #import <React/RCTInvalidating.h>
 #import <React/RCTViewManager.h>
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 typedef void (^RCTModalViewInteractionBlock)(
     UIViewController *reactViewController,
@@ -31,4 +31,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/React/Views/RCTModalHostViewManager.m

@@ -7,7 +7,7 @@
 
 #import "RCTModalHostViewManager.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import "RCTBridge.h"
 #import "RCTModalHostView.h"
@@ -128,4 +128,4 @@ RCT_EXPORT_VIEW_PROPERTY(onDismiss, RCTDirectEventBlock)
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Views/RCTModalManager.h

@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
@@ -19,4 +19,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/React/Views/RCTModalManager.m

@@ -7,7 +7,7 @@
 
 #import "RCTModalManager.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 @interface RCTModalManager ()
 
@@ -43,4 +43,4 @@ RCT_EXPORT_MODULE();
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Views/RCTRootShadowView.m

@@ -7,7 +7,7 @@
 
 #import "RCTRootShadowView.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import "RCTI18nUtil.h"
 #import "RCTShadowView+Layout.h"
@@ -42,7 +42,7 @@
 
 @end
 
-#else // RCT_FIT_RM_OLD_COMPONENT
+#else // RCT_REMOVE_LEGACY_ARCH
 
 @implementation RCTRootShadowView
 - (void)layoutWithAffectedShadowViews:(NSPointerArray *)affectedShadowViews
@@ -50,4 +50,4 @@
 }
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Views/RCTShadowView+Layout.m

@@ -18,21 +18,19 @@
 - (UIEdgeInsets)paddingAsInsets
 {
   YGNodeRef yogaNode = self.yogaNode;
-  return (UIEdgeInsets){
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))};
+  return (UIEdgeInsets){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeTop)),
+                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeLeft)),
+                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeBottom)),
+                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetPadding(yogaNode, YGEdgeRight))};
 }
 
 - (UIEdgeInsets)borderAsInsets
 {
   YGNodeRef yogaNode = self.yogaNode;
-  return (UIEdgeInsets){
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
-      RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))};
+  return (UIEdgeInsets){RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeTop)),
+                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeLeft)),
+                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeBottom)),
+                        RCTCoreGraphicsFloatFromYogaFloat(YGNodeLayoutGetBorder(yogaNode, YGEdgeRight))};
 }
 
 - (UIEdgeInsets)compoundInsets
@@ -40,11 +38,10 @@
   UIEdgeInsets borderAsInsets = self.borderAsInsets;
   UIEdgeInsets paddingAsInsets = self.paddingAsInsets;
 
-  return (UIEdgeInsets){
-      borderAsInsets.top + paddingAsInsets.top,
-      borderAsInsets.left + paddingAsInsets.left,
-      borderAsInsets.bottom + paddingAsInsets.bottom,
-      borderAsInsets.right + paddingAsInsets.right};
+  return (UIEdgeInsets){borderAsInsets.top + paddingAsInsets.top,
+                        borderAsInsets.left + paddingAsInsets.left,
+                        borderAsInsets.bottom + paddingAsInsets.bottom,
+                        borderAsInsets.right + paddingAsInsets.right};
 }
 
 - (CGSize)availableSize

package/React/Views/RCTShadowView.m

@@ -16,7 +16,7 @@
 #import "UIView+Private.h"
 #import "UIView+React.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 typedef void (^RCTActionBlock)(RCTShadowView *shadowViewSelf, id value);
 typedef void (^RCTResetActionBlock)(RCTShadowView *shadowViewSelf);
@@ -294,9 +294,8 @@ static void RCTProcessMetaPropsBorder(const YGValue metaProps[META_PROP_COUNT],
 {
   YGNodeRef yogaNode = _yogaNode;
 
-  CGSize oldMinimumSize = (CGSize){
-      RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinWidth(yogaNode), 0.0),
-      RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinHeight(yogaNode), 0.0)};
+  CGSize oldMinimumSize = (CGSize){RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinWidth(yogaNode), 0.0),
+                                   RCTCoreGraphicsFloatFromYogaValue(YGNodeStyleGetMinHeight(yogaNode), 0.0)};
 
   if (!CGSizeEqualToSize(oldMinimumSize, minimumSize)) {
     YGNodeStyleSetMinWidth(yogaNode, RCTYogaFloatFromCoreGraphicsFloat(minimumSize.width));
@@ -738,7 +737,7 @@ RCT_STYLE_PROPERTY(AspectRatio, aspectRatio, AspectRatio, float)
 
 @end
 
-#else // RCT_FIT_RM_OLD_COMPONENT
+#else // RCT_REMOVE_LEGACY_ARCH
 @implementation RCTShadowView
 @synthesize reactTag = _reactTag;
 @synthesize rootTag = _rootTag;
@@ -826,4 +825,4 @@ RCT_STYLE_PROPERTY(AspectRatio, aspectRatio, AspectRatio, float)
 }
 
 @end
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH

package/React/Views/RCTSwitch.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <React/RCTComponent.h>
 
@@ -20,5 +20,5 @@ __attribute__((deprecated("This API will be removed along with the legacy archit
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH
 #endif // TARGET_OS_TV

package/React/Views/RCTSwitch.m

@@ -8,7 +8,7 @@
 
 #import "RCTSwitch.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import "UIView+React.h"
 
@@ -22,5 +22,5 @@
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH
 #endif // TARGET_OS_TV

package/React/Views/RCTSwitchManager.h

@@ -8,12 +8,12 @@
 
 #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 RCTSwitchManager : RCTViewManager
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH
 #endif // TARGET_OS_TV

package/React/Views/RCTSwitchManager.m

@@ -8,7 +8,7 @@
 
 #import "RCTSwitchManager.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <React/RCTUIManager.h>
 #import "RCTBridge.h"
@@ -68,5 +68,5 @@ RCT_REMAP_VIEW_PROPERTY(trackColorForTrue, onTintColor, UIColor);
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH
 #endif // TARGET_OS_TV

package/React/Views/RCTViewManager.m

@@ -141,8 +141,6 @@ RCT_EXPORT_MODULE()
 
 - (void)setBridge:(RCTBridge *)bridge
 {
-  RCTErrorNewArchitectureValidation(
-      RCTNotAllowedInBridgeless, self, @"RCTViewManager must not be initialized for the new architecture");
   _bridge = bridge;
 }
 
@@ -375,11 +373,13 @@ RCT_CUSTOM_VIEW_PROPERTY(pointerEvents, RCTPointerEvents, RCTView)
       // Unspecified values do not.
       // This wouldn't override a container view's `userInteractionEnabled = NO`
       view.userInteractionEnabled = YES;
+      break;
     case RCTPointerEventsNone:
       view.userInteractionEnabled = NO;
       break;
     default:
       RCTLogInfo(@"UIView base class does not support pointerEvent value: %@", json);
+      break;
   }
 }
 RCT_CUSTOM_VIEW_PROPERTY(removeClippedSubviews, BOOL, RCTView)

package/React/Views/RefreshControl/RCTRefreshControl.h

@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import <React/RCTComponent.h>
 #import <React/RCTScrollableProtocol.h>
@@ -22,5 +22,5 @@ __attribute__((deprecated("This API will be removed along with the legacy archit
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH
 #endif // TARGET_OS_TV

package/React/Views/RefreshControl/RCTRefreshControl.m

@@ -9,7 +9,7 @@
 #import "RCTRefreshControl.h"
 #import "RCTRefreshableProtocol.h"
 
-#ifndef RCT_FIT_RM_OLD_COMPONENT
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #import "RCTUtils.h"
 
@@ -228,5 +228,5 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
 @end
 
-#endif // RCT_FIT_RM_OLD_COMPONENT
+#endif // RCT_REMOVE_LEGACY_ARCH
 #endif // TARGET_OS_TV