react-native-tvos 0.74.5-0 → 0.75.2-0rc0

package/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -49,6 +49,7 @@ using namespace facebook::react;
 @implementation RCTViewComponentView {
   UIColor *_backgroundColor;
   __weak CALayer *_borderLayer;
+  CALayer *_filterLayer;
   BOOL _needsInvalidateLayer;
   BOOL _isJSResponder;
   BOOL _removeClippedSubviews;
@@ -721,7 +722,7 @@ using namespace facebook::react;
   RCTAssert(
       propsRawPtr &&
           ([self class] == [RCTViewComponentView class] ||
-           typeid(*propsRawPtr).hash_code() != typeid(ViewProps const).hash_code()),
+           typeid(*propsRawPtr).hash_code() != typeid(const ViewProps).hash_code()),
       @"`RCTViewComponentView` subclasses (and `%@` particularly) must setup `_props`"
        " instance variable with a default value in the constructor.",
       NSStringFromClass([self class]));
@@ -914,6 +915,11 @@ using namespace facebook::react;
     self.accessibilityIdentifier = RCTNSStringFromString(newViewProps.testId);
   }
 
+  // `filter`
+  if (oldViewProps.filter != newViewProps.filter) {
+    _needsInvalidateLayer = YES;
+  }
+
 #if TARGET_OS_TV
   // `isTVSelectable`
   if (oldViewProps.isTVSelectable != newViewProps.isTVSelectable) {
@@ -1012,7 +1018,6 @@ using namespace facebook::react;
   _trapFocusRight = newViewProps.trapFocusRight;
 #endif
 
-
   _needsInvalidateLayer = _needsInvalidateLayer || needsInvalidateLayer;
 
   _props = std::static_pointer_cast<const ViewProps>(props);
@@ -1045,7 +1050,8 @@ using namespace facebook::react;
     _contentView.frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
   }
 
-  if (_props->transformOrigin.isSet()) {
+  if ((_props->transformOrigin.isSet() || _props->transform.operations.size() > 0) &&
+      layoutMetrics.frame.size != oldLayoutMetrics.frame.size) {
     auto newTransform = _props->resolveTransform(layoutMetrics);
     self.layer.transform = RCTCATransform3DFromTransformMatrix(newTransform);
   }
@@ -1372,6 +1378,33 @@ static RCTBorderStyle RCTBorderStyleFromBorderStyle(BorderStyle borderStyle)
     layer.cornerRadius = cornerRadius;
     layer.mask = maskLayer;
   }
+
+  [_filterLayer removeFromSuperlayer];
+  _filterLayer = nil;
+  self.layer.opacity = (float)_props->opacity;
+  if (!_props->filter.empty()) {
+    float multiplicativeBrightness = 1;
+    for (const auto &primitive : _props->filter) {
+      if (primitive.type == FilterType::Brightness) {
+        multiplicativeBrightness *= primitive.amount;
+      } else if (primitive.type == FilterType::Opacity) {
+        self.layer.opacity *= primitive.amount;
+      }
+    }
+
+    _filterLayer = [CALayer layer];
+    _filterLayer.frame = CGRectMake(0, 0, layer.frame.size.width, layer.frame.size.height);
+    _filterLayer.compositingFilter = @"multiplyBlendMode";
+    _filterLayer.backgroundColor = [UIColor colorWithRed:multiplicativeBrightness
+                                                   green:multiplicativeBrightness
+                                                    blue:multiplicativeBrightness
+                                                   alpha:self.layer.opacity]
+                                       .CGColor;
+    // So that this layer is always above any potential sublayers this view may
+    // add
+    _filterLayer.zPosition = CGFLOAT_MAX;
+    [self.layer addSublayer:_filterLayer];
+  }
 }
 
 #pragma mark - Accessibility
@@ -1409,6 +1442,15 @@ static NSString *RCTRecursiveAccessibilityLabel(UIView *view)
   return RCTRecursiveAccessibilityLabel(self);
 }
 
+- (BOOL)isAccessibilityElement
+{
+  if (self.contentView != nil) {
+    return self.contentView.isAccessibilityElement;
+  }
+
+  return [super isAccessibilityElement];
+}
+
 - (NSString *)accessibilityValue
 {
   const auto &props = static_cast<const ViewProps &>(*_props);

package/React/Fabric/Mounting/RCTComponentViewFactory.mm

@@ -145,7 +145,7 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
                 @"Legacy ViewManagers should be migrated to Fabric ComponentViews in the new architecture to reduce risk. Component using interop layer: %@",
                 componentNameString]);
 
-    auto flavor = std::make_shared<std::string const>(name);
+    auto flavor = std::make_shared<const std::string>(name);
     auto componentName = ComponentName{flavor->c_str()};
     auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
     auto constructor = [RCTLegacyViewManagerInteropComponentView componentDescriptorProvider].constructor;
@@ -159,7 +159,7 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
   }
 
   // Fallback 4: use <UnimplementedView> if component doesn't exist.
-  auto flavor = std::make_shared<std::string const>(name);
+  auto flavor = std::make_shared<const std::string>(name);
   auto componentName = ComponentName{flavor->c_str()};
   auto componentHandle = reinterpret_cast<ComponentHandle>(componentName);
   auto constructor = [RCTUnimplementedViewComponentView componentDescriptorProvider].constructor;

package/React/Fabric/Mounting/RCTMountingManager.mm

@@ -14,11 +14,11 @@
 #import <React/RCTFollyConvert.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
+#import <cxxreact/SystraceSection.h>
 #import <react/config/ReactNativeConfig.h>
 #import <react/renderer/components/root/RootShadowNode.h>
 #import <react/renderer/core/LayoutableShadowNode.h>
 #import <react/renderer/core/RawProps.h>
-#import <react/renderer/debug/SystraceSection.h>
 #import <react/renderer/mounting/TelemetryController.h>
 #import <react/utils/CoreFeatures.h>
 

package/React/Fabric/RCTImageResponseDelegate.h

@@ -12,8 +12,11 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol RCTImageResponseDelegate <NSObject>
 
 - (void)didReceiveImage:(UIImage *)image metadata:(id)metadata fromObserver:(const void *)observer;
-- (void)didReceiveProgress:(float)progress fromObserver:(const void *)observer;
-- (void)didReceiveFailureFromObserver:(const void *)observer;
+- (void)didReceiveProgress:(float)progress
+                    loaded:(int64_t)loaded
+                     total:(int64_t)total
+              fromObserver:(const void *)observer;
+- (void)didReceiveFailure:(NSError *)error fromObserver:(const void *)observer;
 
 @end
 

package/React/Fabric/RCTImageResponseObserverProxy.h

@@ -19,9 +19,9 @@ class RCTImageResponseObserverProxy final : public ImageResponseObserver {
  public:
   RCTImageResponseObserverProxy(id<RCTImageResponseDelegate> delegate = nil);
 
-  void didReceiveImage(const ImageResponse& imageResponse) const override;
-  void didReceiveProgress(float progress) const override;
-  void didReceiveFailure() const override;
+  void didReceiveImage(const ImageResponse &imageResponse) const override;
+  void didReceiveProgress(float progress, int64_t loaded, int64_t total) const override;
+  void didReceiveFailure(const ImageLoadError &error) const override;
 
  private:
   __weak id<RCTImageResponseDelegate> delegate_;

package/React/Fabric/RCTImageResponseObserverProxy.mm

@@ -30,21 +30,22 @@ void RCTImageResponseObserverProxy::didReceiveImage(const ImageResponse &imageRe
   });
 }
 
-void RCTImageResponseObserverProxy::didReceiveProgress(float progress) const
+void RCTImageResponseObserverProxy::didReceiveProgress(float progress, int64_t loaded, int64_t total) const
 {
   auto this_ = this;
   id<RCTImageResponseDelegate> delegate = delegate_;
   RCTExecuteOnMainQueue(^{
-    [delegate didReceiveProgress:progress fromObserver:this_];
+    [delegate didReceiveProgress:progress loaded:loaded total:total fromObserver:this_];
   });
 }
 
-void RCTImageResponseObserverProxy::didReceiveFailure() const
+void RCTImageResponseObserverProxy::didReceiveFailure(const ImageLoadError &errorResponse) const
 {
   auto this_ = this;
+  NSError *error = (NSError *)unwrapManagedObject(errorResponse.getError());
   id<RCTImageResponseDelegate> delegate = delegate_;
   RCTExecuteOnMainQueue(^{
-    [delegate didReceiveFailureFromObserver:this_];
+    [delegate didReceiveFailure:error fromObserver:this_];
   });
 }
 

package/React/Fabric/RCTScheduler.h

@@ -21,8 +21,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class RCTMountingManager;
-
 /**
  * Exactly same semantic as `facebook::react::SchedulerDelegate`.
  */

package/React/Fabric/RCTScheduler.mm

@@ -7,15 +7,16 @@
 
 #import "RCTScheduler.h"
 
+#import <cxxreact/SystraceSection.h>
 #import <react/renderer/animations/LayoutAnimationDriver.h>
 #import <react/renderer/componentregistry/ComponentDescriptorFactory.h>
-#import <react/renderer/debug/SystraceSection.h>
 #import <react/renderer/scheduler/Scheduler.h>
 #import <react/renderer/scheduler/SchedulerDelegate.h>
 #import <react/utils/RunLoopObserver.h>
 
 #import <React/RCTFollyConvert.h>
 
+#import "PlatformRunLoopObserver.h"
 #import "RCTConversions.h"
 
 using namespace facebook::react;
@@ -36,7 +37,7 @@ class SchedulerDelegateProxy : public SchedulerDelegate {
     [scheduler.delegate schedulerShouldRenderTransactions:mountingCoordinator];
   }
 
-  void schedulerDidRequestPreliminaryViewAllocation(SurfaceId surfaceId, const ShadowNode &shadowNode) override
+  void schedulerDidRequestPreliminaryViewAllocation(const ShadowNode &shadowNode) override
   {
     // Does nothing.
     // This delegate method is not currently used on iOS.
@@ -121,8 +122,10 @@ class LayoutAnimationDelegateProxy : public LayoutAnimationStatusDelegate, publi
       _layoutAnimationDelegateProxy = std::make_shared<LayoutAnimationDelegateProxy>((__bridge void *)self);
       _animationDriver = std::make_shared<LayoutAnimationDriver>(
           toolbox.runtimeExecutor, toolbox.contextContainer, _layoutAnimationDelegateProxy.get());
-      _uiRunLoopObserver =
-          toolbox.mainRunLoopObserverFactory(RunLoopObserver::Activity::BeforeWaiting, _layoutAnimationDelegateProxy);
+
+      _uiRunLoopObserver = std::make_unique<MainRunLoopObserver>(
+          RunLoopObserver::Activity::BeforeWaiting, _layoutAnimationDelegateProxy);
+
       _uiRunLoopObserver->setDelegate(_layoutAnimationDelegateProxy.get());
     }
 

package/React/Fabric/RCTSurfacePresenter.mm

@@ -33,7 +33,6 @@
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/scheduler/AsynchronousEventBeat.h>
 #import <react/renderer/scheduler/SchedulerToolbox.h>
-#import <react/renderer/scheduler/SynchronousEventBeat.h>
 #import <react/utils/ContextContainer.h>
 #import <react/utils/CoreFeatures.h>
 #import <react/utils/ManagedObjectWrapper.h>
@@ -265,14 +264,6 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
     CoreFeatures::enableGranularScrollViewStateUpdatesIOS = true;
   }
 
-  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:enable_mount_hooks_ios")) {
-    CoreFeatures::enableMountHooks = true;
-  }
-
-  if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:enable_cloneless_state_progression")) {
-    CoreFeatures::enableClonelessStateProgression = true;
-  }
-
   auto componentRegistryFactory =
       [factory = wrapManagedObject(_mountingManager.componentViewRegistry.componentViewFactory)](
           const EventDispatcher::Weak &eventDispatcher, const ContextContainer::Shared &contextContainer) {
@@ -297,26 +288,14 @@ static BackgroundExecutor RCTGetBackgroundExecutor()
   toolbox.runtimeExecutor = runtimeExecutor;
   toolbox.bridgelessBindingsExecutor = _bridgelessBindingsExecutor;
 
-  toolbox.mainRunLoopObserverFactory = [](RunLoopObserver::Activity activities,
-                                          const RunLoopObserver::WeakOwner &owner) {
-    return std::make_unique<MainRunLoopObserver>(activities, owner);
-  };
-
   if (ReactNativeFeatureFlags::enableBackgroundExecutor()) {
     toolbox.backgroundExecutor = RCTGetBackgroundExecutor();
   }
 
-  toolbox.synchronousEventBeatFactory =
-      [runtimeExecutor, runtimeScheduler = runtimeScheduler](const EventBeat::SharedOwnerBox &ownerBox) {
-        auto runLoopObserver =
-            std::make_unique<MainRunLoopObserver const>(RunLoopObserver::Activity::BeforeWaiting, ownerBox->owner);
-        return std::make_unique<SynchronousEventBeat>(std::move(runLoopObserver), runtimeExecutor, runtimeScheduler);
-      };
-
   toolbox.asynchronousEventBeatFactory =
       [runtimeExecutor](const EventBeat::SharedOwnerBox &ownerBox) -> std::unique_ptr<EventBeat> {
     auto runLoopObserver =
-        std::make_unique<MainRunLoopObserver const>(RunLoopObserver::Activity::BeforeWaiting, ownerBox->owner);
+        std::make_unique<const MainRunLoopObserver>(RunLoopObserver::Activity::BeforeWaiting, ownerBox->owner);
     return std::make_unique<AsynchronousEventBeat>(std::move(runLoopObserver), runtimeExecutor);
   };
 

package/React/Fabric/Utils/RCTColorSpaceUtils.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.
+ */
+
+#pragma once
+
+#import <React/RCTConvert.h>
+
+@interface RCTColorSpaceUtils : NSObject
+
++ (void)applyDefaultColorSpace:(RCTColorSpace)colorSpace;
+
+@end

package/React/Fabric/Utils/RCTColorSpaceUtils.mm

@@ -0,0 +1,23 @@
+/*
+ * 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 "RCTColorSpaceUtils.h"
+
+#import <react/renderer/graphics/ColorComponents.h>
+
+@implementation RCTColorSpaceUtils
+
++ (void)applyDefaultColorSpace:(RCTColorSpace)colorSpace
+{
+  facebook::react::ColorSpace cxxColorSpace =
+      colorSpace == RCTColorSpaceSRGB ? facebook::react::ColorSpace::sRGB : facebook::react::ColorSpace::DisplayP3;
+
+  RCTSetDefaultColorSpace(colorSpace);
+  facebook::react::setDefaultColorSpace(cxxColorSpace);
+}
+
+@end

package/React/Inspector/RCTCxxInspectorWebSocketAdapter.mm

@@ -24,7 +24,7 @@ NSString *NSStringFromUTF8StringView(std::string_view view)
 {
   return [[NSString alloc] initWithBytes:(const char *)view.data() length:view.size() encoding:NSUTF8StringEncoding];
 }
-}
+} // namespace
 @interface RCTCxxInspectorWebSocketAdapter () <SRWebSocketDelegate> {
   std::weak_ptr<IWebSocketDelegate> _delegate;
   SRWebSocket *_webSocket;

package/React/Modules/RCTUIManager.m

@@ -1388,24 +1388,6 @@ RCT_EXPORT_METHOD(measureLayout
   RCTMeasureLayout(shadowView, ancestorShadowView, callback);
 }
 
-/**
- * Returns the computed recursive offset layout in a dictionary form. The
- * returned values are relative to the `ancestor` shadow view. Returns `nil`, if
- * the `ancestor` shadow view is not actually an `ancestor`. Does not touch
- * anything on the main UI thread. Invokes supplied callback with (x, y, width,
- * height).
- */
-RCT_EXPORT_METHOD(measureLayoutRelativeToParent
-                  : (nonnull NSNumber *)reactTag errorCallback
-                  : (__unused RCTResponseSenderBlock)errorCallback callback
-                  : (RCTResponseSenderBlock)callback)
-{
-  RCTLogWarn(
-      @"RCTUIManager.measureLayoutRelativeToParent method is deprecated and it will not be implemented in newer versions of RN (Fabric) - T47686450");
-  RCTShadowView *shadowView = _shadowViewRegistry[reactTag];
-  RCTMeasureLayout(shadowView, shadowView.reactSuperview, callback);
-}
-
 /**
  * JS sets what *it* considers to be the responder. Later, scroll views can use
  * this in order to determine if scrolling is appropriate.

package/React/Modules/RCTUIManagerUtils.m

@@ -97,7 +97,8 @@ void RCTUnsafeExecuteOnUIManagerQueueSync(dispatch_block_t block)
 
 NSNumber *RCTAllocateRootViewTag(void)
 {
-  // Numbering of these tags goes from 1, 11, 21, 31, ..., 100501, ...
+  // Keep in sync with ReactRootViewTagGenerator.h - see that file for an explanation on why the
+  // increment here is 10.
   static _Atomic int64_t rootViewTagCounter = 0;
   return @(atomic_fetch_add_explicit(&rootViewTagCounter, 1, memory_order_relaxed) * 10 + 1);
 }

package/React/React-RCTFabric.podspec

@@ -30,7 +30,7 @@ header_search_paths = [
   "\"$(PODS_ROOT)/RCT-Folly\"",
   "\"$(PODS_ROOT)/Headers/Private/React-Core\"",
   "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
-  "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"",
+  "\"$(PODS_ROOT)/Headers/Public/ReactCodegen\"",
 ]
 
 if ENV['USE_FRAMEWORKS']
@@ -79,18 +79,23 @@ Pod::Spec.new do |s|
 
   add_dependency(s, "React-FabricImage")
   add_dependency(s, "React-Fabric", :additional_framework_paths => [
-    "react/renderer/textlayoutmanager/platform/ios",
-    "react/renderer/components/textinput/platform/ios",
     "react/renderer/components/view/platform/cxx",
     "react/renderer/imagemanager/platform/ios",
   ])
+  add_dependency(s, "React-FabricComponents", :additional_framework_paths => [
+    "react/renderer/textlayoutmanager/platform/ios",
+    "react/renderer/components/textinput/platform/ios",
+  ]);
+
   add_dependency(s, "React-nativeconfig")
   add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
   add_dependency(s, "React-ImageManager")
   add_dependency(s, "React-featureflags")
   add_dependency(s, "React-debug")
   add_dependency(s, "React-utils")
+  add_dependency(s, "React-performancetimeline")
   add_dependency(s, "React-rendererdebug")
+  add_dependency(s, "React-rendererconsistency")
   add_dependency(s, "React-runtimescheduler")
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
 

package/React/Resources/PrivacyInfo.xcprivacy

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>

package/React/Tests/Text/RCTParagraphComponentViewTests.mm

@@ -35,50 +35,50 @@
 using namespace facebook;
 using namespace facebook::react;
 
-//┌──    RootShadowNode    ─────────────────────────────┐
-//│                                                     │
-//│┌─── ParagraphShadowNodeA ─────────────────────────┐ │
-//││ ┌─AA(AAA) ─────────┐ ┌─AB(ABA) ─┐ ┌─AC(ACA)────┐ │ │
-//││ │ Please check out │ │ Facebook │ │    and     │ │ │
-//││ └──────────────────┘ └──────────┘ └────────────┘ │ │
-//││ ┌─AD(ADA) ──┐ ┌──AE(AEA) ──────────────────────┐ │ │
-//││ │ Instagram │ │    for a full description.     │ │ │
-//││ └───────────┘ └────────────────────────────────┘ │ │
-//│└──────────────────────────────────────────────────┘ │
-//│                                                     │
-//│                                                     │
-//│┌── ParagraphShadowNodeB ──────────────────────────┐ │
-//││ ┌───BA(BAA) ───────────────────────────────────┐ │ │
-//││ │   Lorem ipsum dolor sit amet, consectetur    │ │ │
-//││ │ adipiscing elit. Maecenas ut risus et sapien │ │ │
-//││ │   bibendum volutpat. Nulla facilisi. Cras    │ │ │
-//││ │         imperdiet gravida tincidunt.         │ │ │
-//││ └──────────────────────────────────────────────┘ │ │
-//││ ┌─BB(BBA) ─────────────────────────────────────┐ │ │
-//││ │  In tempor, tellus et vestibulum venenatis,  │ │ │
-//││ │  lorem nunc eleifend lectus, a consectetur   │ │ │
-//││ │             magna augue at arcu.             │ │ │
-//││ └──────────────────────────────────────────────┘ │ │
-//│└──────────────────────────────────────────────────┘ │
-//│                                                     │
-//│┌── ParagraphShadowNodeC ──────────────────────────┐ │
-//││  ┌─CA(CAA) ────────┐                             │ │
-//││  │   Lorem ipsum   │                             │ │
-//││  └─────────────────┘                             │ │
-//││ ┌─CB(CBA) ─────────────────────────────────────┐ │ │
-//││ │ dolor sit amet, consectetur adipiscing elit. │ │ │
-//││ │Maecenas ut risus et sapien bibendum volutpat.│ │ │
-//││ │    Nulla facilisi. Cras imperdiet gravida    │ │ │
-//││ │  tincidunt. In tempor, tellus et vestibulum  │ │ │
-//││ │   venenatis, lorem nunc eleifend lectus, a   │ │ │
-//││ │       consectetur magna augue at arcu.       │ │ │
-//││ └──────────────────────────────────────────────┘ │ │
-//││ ┌─CC(CCA) ────────┐                              │ │
-//││ │    See Less     │                              │ │
-//││ └─────────────────┘                              │ │
-//│└──────────────────────────────────────────────────┘ │
-//│                                                     │
-//└─────────────────────────────────────────────────────┘
+// ┌──    RootShadowNode    ─────────────────────────────┐
+// │                                                     │
+// │┌─── ParagraphShadowNodeA ─────────────────────────┐ │
+// ││ ┌─AA(AAA) ─────────┐ ┌─AB(ABA) ─┐ ┌─AC(ACA)────┐ │ │
+// ││ │ Please check out │ │ Facebook │ │    and     │ │ │
+// ││ └──────────────────┘ └──────────┘ └────────────┘ │ │
+// ││ ┌─AD(ADA) ──┐ ┌──AE(AEA) ──────────────────────┐ │ │
+// ││ │ Instagram │ │    for a full description.     │ │ │
+// ││ └───────────┘ └────────────────────────────────┘ │ │
+// │└──────────────────────────────────────────────────┘ │
+// │                                                     │
+// │                                                     │
+// │┌── ParagraphShadowNodeB ──────────────────────────┐ │
+// ││ ┌───BA(BAA) ───────────────────────────────────┐ │ │
+// ││ │   Lorem ipsum dolor sit amet, consectetur    │ │ │
+// ││ │ adipiscing elit. Maecenas ut risus et sapien │ │ │
+// ││ │   bibendum volutpat. Nulla facilisi. Cras    │ │ │
+// ││ │         imperdiet gravida tincidunt.         │ │ │
+// ││ └──────────────────────────────────────────────┘ │ │
+// ││ ┌─BB(BBA) ─────────────────────────────────────┐ │ │
+// ││ │  In tempor, tellus et vestibulum venenatis,  │ │ │
+// ││ │  lorem nunc eleifend lectus, a consectetur   │ │ │
+// ││ │             magna augue at arcu.             │ │ │
+// ││ └──────────────────────────────────────────────┘ │ │
+// │└──────────────────────────────────────────────────┘ │
+// │                                                     │
+// │┌── ParagraphShadowNodeC ──────────────────────────┐ │
+// ││  ┌─CA(CAA) ────────┐                             │ │
+// ││  │   Lorem ipsum   │                             │ │
+// ││  └─────────────────┘                             │ │
+// ││ ┌─CB(CBA) ─────────────────────────────────────┐ │ │
+// ││ │ dolor sit amet, consectetur adipiscing elit. │ │ │
+// ││ │Maecenas ut risus et sapien bibendum volutpat.│ │ │
+// ││ │    Nulla facilisi. Cras imperdiet gravida    │ │ │
+// ││ │  tincidunt. In tempor, tellus et vestibulum  │ │ │
+// ││ │   venenatis, lorem nunc eleifend lectus, a   │ │ │
+// ││ │       consectetur magna augue at arcu.       │ │ │
+// ││ └──────────────────────────────────────────────┘ │ │
+// ││ ┌─CC(CCA) ────────┐                              │ │
+// ││ │    See Less     │                              │ │
+// ││ └─────────────────┘                              │ │
+// │└──────────────────────────────────────────────────┘ │
+// │                                                     │
+// └─────────────────────────────────────────────────────┘
 
 @implementation RCTParagraphComponentAccessibilityProviderTests {
   std::shared_ptr<ComponentBuilder> builder_;
@@ -316,7 +316,7 @@ static ParagraphShadowNode::ConcreteState::Shared stateWithShadowNode(
     std::shared_ptr<ParagraphShadowNode> paragraphShadowNode)
 {
   auto sharedState =
-      std::static_pointer_cast<ParagraphShadowNode::ConcreteState const>(paragraphShadowNode->getState());
+      std::static_pointer_cast<const ParagraphShadowNode::ConcreteState>(paragraphShadowNode->getState());
   return sharedState;
 }
 

package/React/Views/RCTActivityIndicatorViewManager.m

@@ -12,9 +12,6 @@
 
 @implementation RCTConvert (UIActivityIndicatorView)
 
-// NOTE: It's pointless to support UIActivityIndicatorViewStyleGray
-// as we can set the color to any arbitrary value that we want to
-
 RCT_ENUM_CONVERTER(
     UIActivityIndicatorViewStyle,
     (@{

package/React/Views/RCTBorderDrawing.m

@@ -215,16 +215,6 @@ static UIImage *RCTGetSolidBorderImage(
       borderInsets.bottom + MAX(cornerInsets.bottomLeft.height, cornerInsets.bottomRight.height),
       borderInsets.right + MAX(cornerInsets.bottomRight.width, cornerInsets.topRight.width)};
 
-  if (hasCornerRadii) {
-    // Asymmetrical edgeInsets cause strange artifacting on iOS 10 and earlier.
-    edgeInsets = (UIEdgeInsets){
-        MAX(edgeInsets.top, edgeInsets.bottom),
-        MAX(edgeInsets.left, edgeInsets.right),
-        MAX(edgeInsets.top, edgeInsets.bottom),
-        MAX(edgeInsets.left, edgeInsets.right),
-    };
-  }
-
   const CGSize size = makeStretchable ? (CGSize){
     // 1pt for the middle stretchable area along each axis
     edgeInsets.left + 1 + edgeInsets.right,

package/React/Views/RCTFont.mm

@@ -418,12 +418,14 @@ RCT_ARRAY_CONVERTER(RCTFontVariantDescriptor)
   familyName = [RCTConvert NSString:family] ?: familyName;
   isItalic = style ? [RCTConvert RCTFontStyle:style] : isItalic;
   fontWeight = weight ? [RCTConvert RCTFontWeight:weight] : fontWeight;
+  isCondensed = isCondensed || [familyName isEqualToString:@"SystemCondensed"];
 
   BOOL didFindFont = NO;
 
   // Handle system font as special case. This ensures that we preserve
   // the specific metrics of the standard system font as closely as possible.
-  if ([familyName isEqual:defaultFontFamily] || [familyName isEqualToString:@"System"]) {
+  if ([familyName isEqual:defaultFontFamily] || [familyName isEqualToString:@"System"] ||
+      [familyName isEqualToString:@"SystemCondensed"]) {
     font = cachedSystemFont(fontSize, fontWeight);
     if (font) {
       didFindFont = YES;

package/React/Views/RCTModalHostViewManager.h

@@ -9,12 +9,6 @@
 #import <React/RCTInvalidating.h>
 #import <React/RCTViewManager.h>
 
-@interface RCTConvert (RCTModalHostView)
-
-+ (UIModalPresentationStyle)UIModalPresentationStyle:(id)json;
-
-@end
-
 typedef void (^RCTModalViewInteractionBlock)(
     UIViewController *reactViewController,
     UIViewController *viewController,

package/React/Views/RCTModalHostViewManager.m

@@ -14,23 +14,6 @@
 #import "RCTShadowView.h"
 #import "RCTUtils.h"
 
-@implementation RCTConvert (RCTModalHostView)
-
-RCT_ENUM_CONVERTER(
-    UIModalPresentationStyle,
-    (@{
-      @"fullScreen" : @(UIModalPresentationFullScreen),
-#if !TARGET_OS_TV
-      @"pageSheet" : @(UIModalPresentationPageSheet),
-      @"formSheet" : @(UIModalPresentationFormSheet),
-#endif
-      @"overFullScreen" : @(UIModalPresentationOverFullScreen),
-    }),
-    UIModalPresentationFullScreen,
-    integerValue)
-
-@end
-
 @interface RCTModalHostShadowView : RCTShadowView
 
 @end