react-native-tvos 0.76.5-0 → 0.77.0-0

package/React/Tests/Text/RCTAttributedTextUtilsTest.mm

@@ -0,0 +1,274 @@
+/*
+ * 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 <Foundation/Foundation.h>
+#import <XCTest/XCTest.h>
+
+#import <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
+
+using namespace facebook::react;
+
+@interface RCTAttributedTextUtilsTest : XCTestCase
+
+@end
+
+@implementation RCTAttributedTextUtilsTest
+
+- (void)testSamenessOfEmptyAttributedStrings
+{
+  NSAttributedString *attributedString1 = [[NSAttributedString alloc] initWithString:@""];
+  NSAttributedString *attributedString2 = [[NSAttributedString alloc] initWithString:@""];
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, TextAttributes{}));
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, TextAttributes{}));
+}
+
+- (void)testSamenessOfExactAttributedStrings
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, TextAttributes{}));
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, TextAttributes{}));
+}
+
+- (void)testDifferenceOfDifferentString
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"hello World!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, TextAttributes{}));
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, TextAttributes{}));
+}
+
+- (void)testDifferenceOfDifferentFragmentRanges
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 6)];
+
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, TextAttributes{}));
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, TextAttributes{}));
+}
+
+- (void)testDifferenceOfDifferentAttributes
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor blueColor] range:NSMakeRange(0, 5)];
+
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, TextAttributes{}));
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, TextAttributes{}));
+}
+
+- (void)testDifferenceOfExtraAttributes
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+  [attributedString1 addAttribute:NSBackgroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, TextAttributes{}));
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, TextAttributes{}));
+}
+
+- (void)testSamenessOfMissingInsensitiveAttributes
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+  [attributedString1 addAttribute:NSShadowAttributeName value:[NSShadow new] range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{
+    NSShadowAttributeName : [NSShadow new],
+  };
+
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, TextAttributes{}));
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, TextAttributes{}));
+}
+
+- (void)testSamenessOfResolvedParagraphStyleLtr
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+  [attributedString1 addAttribute:NSParagraphStyleAttributeName
+                            value:NSParagraphStyle.defaultParagraphStyle
+                            range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableParagraphStyle *str2ParagraphStyle = [NSMutableParagraphStyle new];
+  str2ParagraphStyle.alignment = NSTextAlignmentLeft;
+
+  // Base writing direction unless overriden by prop is determined by locale, and we assume this test runs in an LTR
+  // locale.
+  str2ParagraphStyle.baseWritingDirection = NSWritingDirectionLeftToRight;
+  [attributedString2 addAttribute:NSParagraphStyleAttributeName value:str2ParagraphStyle range:NSMakeRange(0, 5)];
+
+  TextAttributes textAttributes;
+  textAttributes.layoutDirection = LayoutDirection::LeftToRight;
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, textAttributes));
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, textAttributes));
+}
+
+- (void)testSamenessOfResolvedParagraphStyleRtl
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+  [attributedString1 addAttribute:NSParagraphStyleAttributeName
+                            value:NSParagraphStyle.defaultParagraphStyle
+                            range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableParagraphStyle *str2ParagraphStyle = [NSMutableParagraphStyle new];
+  str2ParagraphStyle.alignment = NSTextAlignmentRight;
+
+  // Base writing direction unless overriden by prop is determined by locale, and we assume this test runs in an LTR
+  // locale.
+  str2ParagraphStyle.baseWritingDirection = NSWritingDirectionLeftToRight;
+  [attributedString2 addAttribute:NSParagraphStyleAttributeName value:str2ParagraphStyle range:NSMakeRange(0, 5)];
+
+  TextAttributes textAttributes;
+  textAttributes.layoutDirection = LayoutDirection::RightToLeft;
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, textAttributes));
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, textAttributes));
+}
+
+- (void)testSamenessOfResolvedInsensitiveParagraphStyle
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableParagraphStyle *str2ParagraphStyle = [NSMutableParagraphStyle new];
+  str2ParagraphStyle.alignment = NSTextAlignmentLeft;
+
+  // Base writing direction unless overriden by prop is determined by locale, and we assume this test runs in an LTR
+  // locale.
+  str2ParagraphStyle.baseWritingDirection = NSWritingDirectionLeftToRight;
+  [attributedString2 addAttribute:NSParagraphStyleAttributeName value:str2ParagraphStyle range:NSMakeRange(0, 5)];
+
+  TextAttributes textAttributes;
+  textAttributes.layoutDirection = LayoutDirection::LeftToRight;
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{
+    NSParagraphStyleAttributeName : NSParagraphStyle.defaultParagraphStyle,
+  };
+
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, textAttributes));
+  XCTAssertTrue(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, textAttributes));
+}
+
+- (void)testDifferenceOfResolvedParagraphStyle
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+  [attributedString1 addAttribute:NSParagraphStyleAttributeName
+                            value:NSParagraphStyle.defaultParagraphStyle
+                            range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableParagraphStyle *str2ParagraphStyle = [NSMutableParagraphStyle new];
+  str2ParagraphStyle.alignment = NSTextAlignmentCenter;
+
+  // Base writing direction unless overriden by prop is determined by locale, and we assume this test runs in an LTR
+  // locale.
+  str2ParagraphStyle.baseWritingDirection = NSWritingDirectionLeftToRight;
+  [attributedString2 addAttribute:NSParagraphStyleAttributeName value:str2ParagraphStyle range:NSMakeRange(0, 5)];
+
+  TextAttributes textAttributes;
+  textAttributes.layoutDirection = LayoutDirection::LeftToRight;
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, textAttributes));
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, textAttributes));
+}
+
+- (void)testDifferenceOfMissingParagraphStyle
+{
+  NSMutableAttributedString *attributedString1 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString1 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableAttributedString *attributedString2 = [[NSMutableAttributedString alloc] initWithString:@"Hello world!"];
+  [attributedString2 addAttribute:NSForegroundColorAttributeName value:[UIColor redColor] range:NSMakeRange(0, 5)];
+
+  NSMutableParagraphStyle *str2ParagraphStyle = [NSMutableParagraphStyle new];
+  str2ParagraphStyle.alignment = NSTextAlignmentLeft;
+
+  // Base writing direction unless overriden by prop is determined by locale, and we assume this test runs in an LTR
+  // locale.
+  str2ParagraphStyle.baseWritingDirection = NSWritingDirectionLeftToRight;
+  [attributedString2 addAttribute:NSParagraphStyleAttributeName value:str2ParagraphStyle range:NSMakeRange(0, 5)];
+
+  TextAttributes textAttributes;
+  textAttributes.layoutDirection = LayoutDirection::LeftToRight;
+  NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes = @{};
+
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString1, attributedString2, insensitiveAttributes, textAttributes));
+  XCTAssertFalse(RCTIsAttributedStringEffectivelySame(
+      attributedString2, attributedString1, insensitiveAttributes, textAttributes));
+}
+
+@end

package/React/Tests/Text/RCTParagraphComponentViewTests.mm

@@ -121,8 +121,8 @@ using namespace facebook::react;
             auto &props = *sharedProps;
             props.layoutConstraints = LayoutConstraints{{0, 0}, {500, 500}};
             auto &yogaStyle = props.yogaStyle;
-            yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
-            yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(200));
+            yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
+            yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
             return sharedProps;
           })
           .children({
@@ -134,10 +134,10 @@ using namespace facebook::react;
                     props.accessible = true;
                     auto &yogaStyle = props.yogaStyle;
                     yogaStyle.setPositionType(yoga::PositionType::Absolute);
-                    yogaStyle.setPosition(yoga::Edge::Left, yoga::value::points(0));
-                    yogaStyle.setPosition(yoga::Edge::Top, yoga::value::points(0));
-                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
-                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(200));
+                    yogaStyle.setPosition(yoga::Edge::Left, yoga::StyleLength::points(0));
+                    yogaStyle.setPosition(yoga::Edge::Top, yoga::StyleLength::points(0));
+                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
+                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
                     return sharedProps;
                   })
                   .children({
@@ -214,10 +214,10 @@ using namespace facebook::react;
                     props.accessible = true;
                     auto &yogaStyle = props.yogaStyle;
                     yogaStyle.setPositionType(yoga::PositionType::Absolute);
-                    yogaStyle.setPosition(yoga::Edge::Left, yoga::value::points(0));
-                    yogaStyle.setPosition(yoga::Edge::Top, yoga::value::points(30));
-                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
-                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(50));
+                    yogaStyle.setPosition(yoga::Edge::Left, yoga::StyleLength::points(0));
+                    yogaStyle.setPosition(yoga::Edge::Top, yoga::StyleLength::points(30));
+                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
+                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(50));
                     return sharedProps;
                   })
                   .children({
@@ -258,10 +258,10 @@ using namespace facebook::react;
                     props.accessible = true;
                     auto &yogaStyle = props.yogaStyle;
                     yogaStyle.setPositionType(yoga::PositionType::Absolute);
-                    yogaStyle.setPosition(yoga::Edge::Left, yoga::value::points(0));
-                    yogaStyle.setPosition(yoga::Edge::Top, yoga::value::points(90));
-                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
-                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(50));
+                    yogaStyle.setPosition(yoga::Edge::Left, yoga::StyleLength::points(0));
+                    yogaStyle.setPosition(yoga::Edge::Top, yoga::StyleLength::points(90));
+                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
+                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(50));
                     return sharedProps;
                   })
                   .children({
@@ -418,8 +418,8 @@ static ParagraphShadowNode::ConcreteState::Shared stateWithShadowNode(
                        auto &props = *sharedProps;
                        props.layoutConstraints = LayoutConstraints{{0, 0}, {500, 500}};
                        auto &yogaStyle = props.yogaStyle;
-                       yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
-                       yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(200));
+                       yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
+                       yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
                        return sharedProps;
                      })
                      .children({
@@ -432,10 +432,10 @@ static ParagraphShadowNode::ConcreteState::Shared stateWithShadowNode(
                                props.accessibilityTraits = AccessibilityTraits::Link;
                                auto &yogaStyle = props.yogaStyle;
                                yogaStyle.setPositionType(yoga::PositionType::Absolute);
-                               yogaStyle.setPosition(yoga::Edge::Left, yoga::value::points(0));
-                               yogaStyle.setPosition(yoga::Edge::Top, yoga::value::points(90));
-                               yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
-                               yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(20));
+                               yogaStyle.setPosition(yoga::Edge::Left, yoga::StyleLength::points(0));
+                               yogaStyle.setPosition(yoga::Edge::Top, yoga::StyleLength::points(90));
+                               yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
+                               yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(20));
                                return sharedProps;
                              })
                              .children({

package/React/Tests/Text/RCTTextAttributesTest.mm

@@ -0,0 +1,49 @@
+/*
+ * 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 <Foundation/Foundation.h>
+#import <XCTest/XCTest.h>
+
+#import <React/RCTTextAttributes.h>
+
+@interface RCTTextAttributesTest : XCTestCase
+
+@end
+
+@implementation RCTTextAttributesTest
+
+- (void)testCapitalize
+{
+  RCTTextAttributes *attrs = [RCTTextAttributes new];
+  attrs.textTransform = RCTTextTransformCapitalize;
+
+  NSString *input = @"hello WORLD from ReAcT nAtIvE 2a !b c";
+  NSString *output = @"Hello WORLD From ReAcT NAtIvE 2a !B C";
+  XCTAssertEqualObjects([attrs applyTextAttributesToText:input], output);
+}
+
+- (void)testUppercase
+{
+  RCTTextAttributes *attrs = [RCTTextAttributes new];
+  attrs.textTransform = RCTTextTransformUppercase;
+
+  NSString *input = @"hello WORLD from ReAcT nAtIvE 2a !b c";
+  NSString *output = @"HELLO WORLD FROM REACT NATIVE 2A !B C";
+  XCTAssertEqualObjects([attrs applyTextAttributesToText:input], output);
+}
+
+- (void)testLowercase
+{
+  RCTTextAttributes *attrs = [RCTTextAttributes new];
+  attrs.textTransform = RCTTextTransformLowercase;
+
+  NSString *input = @"hello WORLD from ReAcT nAtIvE 2a !b c";
+  NSString *output = @"hello world from react native 2a !b c";
+  XCTAssertEqualObjects([attrs applyTextAttributesToText:input], output);
+}
+
+@end

package/React/Views/RCTBorderDrawing.h

@@ -29,10 +29,10 @@ typedef struct {
 } RCTCornerInsets;
 
 typedef struct {
-  CGColorRef top;
-  CGColorRef left;
-  CGColorRef bottom;
-  CGColorRef right;
+  UIColor *top;
+  UIColor *left;
+  UIColor *bottom;
+  UIColor *right;
 } RCTBorderColors;
 
 /**
@@ -67,5 +67,5 @@ RCT_EXTERN UIImage *RCTGetBorderImage(
     RCTCornerRadii cornerRadii,
     UIEdgeInsets borderInsets,
     RCTBorderColors borderColors,
-    CGColorRef backgroundColor,
+    UIColor *backgroundColor,
     BOOL drawToEdge);

package/React/Views/RCTBorderDrawing.m

@@ -19,7 +19,7 @@ BOOL RCTBorderInsetsAreEqual(UIEdgeInsets borderInsets)
 
 BOOL RCTCornerRadiiAreEqualAndSymmetrical(RCTCornerRadii cornerRadii)
 {
-  return cornerRadii.topLeftHorizontal == cornerRadii.topLeftHorizontal &&
+  return cornerRadii.topLeftHorizontal == cornerRadii.topLeftVertical &&
       cornerRadii.topRightHorizontal == cornerRadii.topRightVertical &&
       cornerRadii.bottomLeftHorizontal == cornerRadii.bottomLeftVertical &&
       cornerRadii.bottomRightHorizontal == cornerRadii.bottomRightVertical &&
@@ -30,9 +30,9 @@ BOOL RCTCornerRadiiAreEqualAndSymmetrical(RCTCornerRadii cornerRadii)
 
 BOOL RCTBorderColorsAreEqual(RCTBorderColors borderColors)
 {
-  return CGColorEqualToColor(borderColors.left, borderColors.right) &&
-      CGColorEqualToColor(borderColors.left, borderColors.top) &&
-      CGColorEqualToColor(borderColors.left, borderColors.bottom);
+  return CGColorEqualToColor(borderColors.left.CGColor, borderColors.right.CGColor) &&
+      CGColorEqualToColor(borderColors.left.CGColor, borderColors.top.CGColor) &&
+      CGColorEqualToColor(borderColors.left.CGColor, borderColors.bottom.CGColor);
 }
 
 RCTCornerInsets RCTGetCornerInsets(RCTCornerRadii cornerRadii, UIEdgeInsets edgeInsets)
@@ -182,9 +182,9 @@ static CGPathRef RCTPathCreateOuterOutline(BOOL drawToEdge, CGRect rect, RCTCorn
 }
 
 static UIGraphicsImageRenderer *
-RCTMakeUIGraphicsImageRenderer(CGSize size, CGColorRef backgroundColor, BOOL hasCornerRadii, BOOL drawToEdge)
+RCTMakeUIGraphicsImageRenderer(CGSize size, UIColor *backgroundColor, BOOL hasCornerRadii, BOOL drawToEdge)
 {
-  const CGFloat alpha = CGColorGetAlpha(backgroundColor);
+  const CGFloat alpha = CGColorGetAlpha(backgroundColor.CGColor);
   const BOOL opaque = (drawToEdge || !hasCornerRadii) && alpha == 1.0;
   UIGraphicsImageRendererFormat *const rendererFormat = [UIGraphicsImageRendererFormat defaultFormat];
   rendererFormat.opaque = opaque;
@@ -197,7 +197,7 @@ static UIImage *RCTGetSolidBorderImage(
     CGSize viewSize,
     UIEdgeInsets borderInsets,
     RCTBorderColors borderColors,
-    CGColorRef backgroundColor,
+    UIColor *backgroundColor,
     BOOL drawToEdge)
 {
   const BOOL hasCornerRadii = RCTCornerRadiiAreAboveThreshold(cornerRadii);
@@ -233,18 +233,16 @@ static UIImage *RCTGetSolidBorderImage(
   UIGraphicsImageRenderer *const imageRenderer =
       RCTMakeUIGraphicsImageRenderer(size, backgroundColor, hasCornerRadii, drawToEdge);
 
-  CGColorRetain(backgroundColor);
   UIImage *image = [imageRenderer imageWithActions:^(UIGraphicsImageRendererContext *_Nonnull rendererContext) {
     const CGContextRef context = rendererContext.CGContext;
     const CGRect rect = {.size = size};
     CGPathRef path = RCTPathCreateOuterOutline(drawToEdge, rect, cornerRadii);
 
     if (backgroundColor) {
-      CGContextSetFillColorWithColor(context, backgroundColor);
+      CGContextSetFillColorWithColor(context, backgroundColor.CGColor);
       CGContextAddPath(context, path);
       CGContextFillPath(context);
     }
-    CGColorRelease(backgroundColor);
 
     CGContextAddPath(context, path);
     CGPathRelease(path);
@@ -256,7 +254,7 @@ static UIImage *RCTGetSolidBorderImage(
 
     BOOL hasEqualColors = RCTBorderColorsAreEqual(borderColors);
     if ((drawToEdge || !hasCornerRadii) && hasEqualColors) {
-      CGContextSetFillColorWithColor(context, borderColors.left);
+      CGContextSetFillColorWithColor(context, borderColors.left.CGColor);
       CGContextAddRect(context, rect);
       CGContextAddPath(context, insetPath);
       CGContextEOFillPath(context);
@@ -321,7 +319,7 @@ static UIImage *RCTGetSolidBorderImage(
         }
       }
 
-      CGColorRef currentColor = NULL;
+      UIColor *currentColor = nil;
 
       // RIGHT
       if (borderInsets.right > 0) {
@@ -345,8 +343,8 @@ static UIImage *RCTGetSolidBorderImage(
             (CGPoint){size.width, size.height},
         };
 
-        if (!CGColorEqualToColor(currentColor, borderColors.bottom)) {
-          CGContextSetFillColorWithColor(context, currentColor);
+        if (!CGColorEqualToColor(currentColor.CGColor, borderColors.bottom.CGColor)) {
+          CGContextSetFillColorWithColor(context, currentColor.CGColor);
           CGContextFillPath(context);
           currentColor = borderColors.bottom;
         }
@@ -362,8 +360,8 @@ static UIImage *RCTGetSolidBorderImage(
             (CGPoint){0, size.height},
         };
 
-        if (!CGColorEqualToColor(currentColor, borderColors.left)) {
-          CGContextSetFillColorWithColor(context, currentColor);
+        if (!CGColorEqualToColor(currentColor.CGColor, borderColors.left.CGColor)) {
+          CGContextSetFillColorWithColor(context, currentColor.CGColor);
           CGContextFillPath(context);
           currentColor = borderColors.left;
         }
@@ -379,15 +377,15 @@ static UIImage *RCTGetSolidBorderImage(
             (CGPoint){size.width, 0},
         };
 
-        if (!CGColorEqualToColor(currentColor, borderColors.top)) {
-          CGContextSetFillColorWithColor(context, currentColor);
+        if (!CGColorEqualToColor(currentColor.CGColor, borderColors.top.CGColor)) {
+          CGContextSetFillColorWithColor(context, currentColor.CGColor);
           CGContextFillPath(context);
           currentColor = borderColors.top;
         }
         CGContextAddLines(context, points, sizeof(points) / sizeof(*points));
       }
 
-      CGContextSetFillColorWithColor(context, currentColor);
+      CGContextSetFillColorWithColor(context, currentColor.CGColor);
       CGContextFillPath(context);
     }
 
@@ -467,7 +465,7 @@ static UIImage *RCTGetDashedOrDottedBorderImage(
     CGSize viewSize,
     UIEdgeInsets borderInsets,
     RCTBorderColors borderColors,
-    CGColorRef backgroundColor,
+    UIColor *backgroundColor,
     BOOL drawToEdge)
 {
   NSCParameterAssert(borderStyle == RCTBorderStyleDashed || borderStyle == RCTBorderStyleDotted);
@@ -494,7 +492,7 @@ static UIImage *RCTGetDashedOrDottedBorderImage(
       CGContextAddPath(context, outerPath);
       CGPathRelease(outerPath);
 
-      CGContextSetFillColorWithColor(context, backgroundColor);
+      CGContextSetFillColorWithColor(context, backgroundColor.CGColor);
       CGContextFillPath(context);
     }
 
@@ -513,7 +511,7 @@ static UIImage *RCTGetDashedOrDottedBorderImage(
     CGContextSetStrokeColorWithColor(context, [UIColor yellowColor].CGColor);
 
     CGContextAddPath(context, path);
-    CGContextSetStrokeColorWithColor(context, borderColors.top);
+    CGContextSetStrokeColorWithColor(context, borderColors.top.CGColor);
     CGContextStrokePath(context);
 
     CGPathRelease(path);
@@ -526,7 +524,7 @@ UIImage *RCTGetBorderImage(
     RCTCornerRadii cornerRadii,
     UIEdgeInsets borderInsets,
     RCTBorderColors borderColors,
-    CGColorRef backgroundColor,
+    UIColor *backgroundColor,
     BOOL drawToEdge)
 {
   switch (borderStyle) {

package/React/Views/{RCTComponentData.m → RCTComponentData.mm}

@@ -8,6 +8,7 @@
 #import "RCTComponentData.h"
 
 #import <objc/message.h>
+#import <react/featureflags/ReactNativeFeatureFlags.h>
 
 #import "RCTBridge.h"
 #import "RCTBridgeModule.h"
@@ -290,9 +291,9 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
   case _value: {                                                      \
     __block BOOL setDefaultValue = NO;                                \
     __block _type defaultValue;                                       \
-    _type (*convert)(id, SEL, id) = (typeof(convert))objc_msgSend;    \
-    _type (*get)(id, SEL) = (typeof(get))objc_msgSend;                \
-    void (*set)(id, SEL, _type) = (typeof(set))objc_msgSend;          \
+    _type (*convert)(id, SEL, id) = (__typeof(convert))objc_msgSend;  \
+    _type (*get)(id, SEL) = (__typeof(get))objc_msgSend;              \
+    void (*set)(id, SEL, _type) = (__typeof(set))objc_msgSend;        \
     setterBlock = ^(id target, id json) {                             \
       if (json) {                                                     \
         if (!setDefaultValue && target) {                             \
@@ -524,7 +525,7 @@ static RCTPropBlock createNSInvocationSetter(NSMethodSignature *typeSignature, S
     @"baseModuleName" : superClass == [NSObject class] ? (id)kCFNull : RCTViewManagerModuleNameForClass(superClass),
   }];
 
-  if (RCTGetUseNativeViewConfigsInBridgelessMode()) {
+  if (facebook::react::ReactNativeFeatureFlags::useNativeViewConfigsInBridgelessMode()) {
     result[@"Commands"] = [self commandsForViewMangerClass:managerClass methods:methods methodCount:count];
     result[@"Constants"] = [self constantsForViewMangerClass:managerClass];
   }

package/React/Views/RCTLayout.m

@@ -132,5 +132,8 @@ RCTDisplayType RCTReactDisplayTypeFromYogaDisplayType(YGDisplay displayType)
       return RCTDisplayTypeFlex;
     case YGDisplayNone:
       return RCTDisplayTypeNone;
+    case YGDisplayContents:
+      RCTAssert(NO, @"YGDisplayContents cannot be converted to RCTDisplayType value.");
+      return RCTDisplayTypeNone;
   }
 }

package/React/Views/RCTModalHostViewController.m

@@ -81,7 +81,7 @@
   return _preferredStatusBarHidden;
 }
 
-#if RCT_DEV
+#if RCT_DEV && TARGET_OS_IOS
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
   UIInterfaceOrientationMask appSupportedOrientationsMask =