react-native-tvos 0.68.2-7 → 0.69.5-0

package/React/CoreModules/RCTPlatform.mm

@@ -15,6 +15,8 @@
 
 #import "CoreModulesPlugins.h"
 
+#import <folly/Optional.h>
+
 using namespace facebook::react;
 
 static NSString *interfaceIdiom(UIUserInterfaceIdiom idiom)

package/React/CoreModules/RCTRedBox.mm

@@ -97,7 +97,7 @@
     const CGFloat buttonHeight = 60;
 
     CGRect detailsFrame = rootView.bounds;
-    detailsFrame.size.height -= buttonHeight + [self bottomSafeViewHeight];
+    detailsFrame.size.height -= buttonHeight + (double)[self bottomSafeViewHeight];
 
     _stackTraceTableView = [[UITableView alloc] initWithFrame:detailsFrame style:UITableViewStylePlain];
     _stackTraceTableView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
@@ -157,7 +157,7 @@
                     accessibilityIdentifier:@""
                                    selector:nil
                                       block:customButtonHandlers[i]];
-      button.frame = CGRectMake(buttonWidth * (4 + i), bottomButtonHeight, buttonWidth, buttonHeight);
+      button.frame = CGRectMake(buttonWidth * (double)(4 + i), bottomButtonHeight, buttonWidth, buttonHeight);
       [rootView addSubview:button];
     }
 

package/React/CoreModules/RCTStatusBarManager.mm

@@ -198,7 +198,7 @@ RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible)
   RCTUnsafeExecuteOnMainQueueSync(^{
     constants = facebook::react::typedConstants<JS::NativeStatusBarManagerIOS::Constants>({
         .HEIGHT = RCTSharedApplication().statusBarFrame.size.height,
-        .DEFAULT_BACKGROUND_COLOR = folly::none,
+        .DEFAULT_BACKGROUND_COLOR = std::nullopt,
     });
   });
 

package/React/CoreModules/React-CoreModules.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0", :tvos => "11.0" }
+  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "**/*.{c,m,mm,cpp}"
@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   s.header_dir             = "CoreModules"
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                                "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/React/CoreModules\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
 

package/React/CxxBridge/RCTCxxBridge.mm

@@ -13,6 +13,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTBridgeMethod.h>
 #import <React/RCTBridgeModule.h>
+#import <React/RCTBridgeModuleDecorator.h>
 #import <React/RCTConstants.h>
 #import <React/RCTConvert.h>
 #import <React/RCTCxxBridgeDelegate.h>
@@ -112,13 +113,6 @@ class GetDescAdapter : public JSExecutorFactory {
 
 }
 
-static bool isRAMBundle(NSData *script)
-{
-  BundleHeader header;
-  [script getBytes:&header length:sizeof(header)];
-  return parseTypeFromHeader(header) == ScriptTag::RAMBundle;
-}
-
 static void notifyAboutModuleSetup(RCTPerformanceLogger *performanceLogger, const char *tag)
 {
   NSString *moduleName = [[NSString alloc] initWithUTF8String:tag];
@@ -251,52 +245,12 @@ struct RCTInstanceCallback : public InstanceCallback {
 
 - (void)attachBridgeAPIsToTurboModule:(id<RCTTurboModule>)module
 {
-  id<RCTBridgeModule> bridgeModule = (id<RCTBridgeModule>)module;
-  /**
-   * Attach the RCTViewRegistry to this TurboModule, which allows this TurboModule
-   * To query a React component's UIView, given its reactTag.
-   *
-   * Usage: In the TurboModule @implementation, include:
-   *   `@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED`
-   */
-  if ([bridgeModule respondsToSelector:@selector(setViewRegistry_DEPRECATED:)]) {
-    bridgeModule.viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
-  }
-
-  /**
-   * Attach the RCTBundleManager to this TurboModule, which allows this TurboModule to
-   * read from/write to the app's bundle URL.
-   *
-   * Usage: In the TurboModule @implementation, include:
-   *   `@synthesize bundleManager = _bundleManager`
-   */
-  if ([bridgeModule respondsToSelector:@selector(setBundleManager:)]) {
-    bridgeModule.bundleManager = _bundleManager;
-  }
-
-  /**
-   * Attach the RCTCallableJSModules to this TurboModule, which allows this TurboModule
-   * to call JS Module methods.
-   *
-   * Usage: In the TurboModule @implementation, include:
-   *   `@synthesize callableJSModules = _callableJSModules`
-   */
-
-  if ([bridgeModule respondsToSelector:@selector(setCallableJSModules:)]) {
-    bridgeModule.callableJSModules = _callableJSModules;
-  }
-
-  /**
-   * Attach the RCTModuleRegistry to this TurboModule, which allows this TurboModule
-   * to require other TurboModules/NativeModules.
-   *
-   * Usage: In the TurboModule @implementation, include:
-   *   `@synthesize moduleRegistry = _moduleRegistry`
-   */
-
-  if ([bridgeModule respondsToSelector:@selector(setModuleRegistry:)]) {
-    bridgeModule.moduleRegistry = _objCModuleRegistry;
-  }
+  RCTBridgeModuleDecorator *bridgeModuleDecorator =
+      [[RCTBridgeModuleDecorator alloc] initWithViewRegistry:_viewRegistry_DEPRECATED
+                                              moduleRegistry:_objCModuleRegistry
+                                               bundleManager:_bundleManager
+                                           callableJSModules:_callableJSModules];
+  [bridgeModuleDecorator attachInteropAPIsToModule:(id<RCTBridgeModule>)module];
 }
 
 - (std::shared_ptr<MessageQueueThread>)jsMessageThread
@@ -348,6 +302,9 @@ struct RCTInstanceCallback : public InstanceCallback {
                                              selector:@selector(handleMemoryWarning)
                                                  name:UIApplicationDidReceiveMemoryWarningNotification
                                                object:nil];
+
+    RCTLogSetBridgeModuleRegistry(_objCModuleRegistry);
+    RCTLogSetBridgeCallableJSModules(_callableJSModules);
   }
   return self;
 }
@@ -402,7 +359,8 @@ struct RCTInstanceCallback : public InstanceCallback {
   // in case if some other tread resets it.
   auto reactInstance = _reactInstance;
   if (reactInstance) {
-    reactInstance->handleMemoryPressure(15 /* TRIM_MEMORY_RUNNING_CRITICAL */);
+    int unloadLevel = RCTGetMemoryPressureUnloadLevel();
+    reactInstance->handleMemoryPressure(unloadLevel);
   }
 }
 
@@ -1534,6 +1492,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithBundleURL
   [self executeApplicationScript:script url:url async:NO];
 }
 
+static uint32_t RCTReadUInt32LE(NSData *script, uint32_t offset)
+{
+  return [script length] < offset + 4 ? 0 : CFSwapInt32LittleToHost(*(((uint32_t *)[script bytes]) + offset / 4));
+}
+
 - (void)executeApplicationScript:(NSData *)script url:(NSURL *)url async:(BOOL)async
 {
   [self _tryAndHandleError:^{
@@ -1542,18 +1505,22 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithBundleURL
                                                         object:self->_parentBridge
                                                       userInfo:@{@"bridge" : self}];
 
+    BundleHeader header;
+    [script getBytes:&header length:sizeof(header)];
+    ScriptTag scriptType = parseTypeFromHeader(header);
+
     // hold a local reference to reactInstance in case a parallel thread
     // resets it between null check and usage
     auto reactInstance = self->_reactInstance;
-    if (reactInstance && RCTIsBytecodeBundle(script)) {
-      UInt32 offset = 8;
+    if (reactInstance && scriptType == ScriptTag::MetroHBCBundle) {
+      uint32_t offset = 8;
       while (offset < script.length) {
-        UInt32 fileLength = RCTReadUInt32LE(script, offset);
+        uint32_t fileLength = RCTReadUInt32LE(script, offset);
         NSData *unit = [script subdataWithRange:NSMakeRange(offset + 4, fileLength)];
         reactInstance->loadScriptFromString(std::make_unique<NSDataBigString>(unit), sourceUrlStr.UTF8String, false);
         offset += ((fileLength + RCT_BYTECODE_ALIGNMENT - 1) & ~(RCT_BYTECODE_ALIGNMENT - 1)) + 4;
       }
-    } else if (isRAMBundle(script)) {
+    } else if (scriptType == ScriptTag::RAMBundle) {
       [self->_performanceLogger markStartForTag:RCTPLRAMBundleLoad];
       auto ramBundle = std::make_unique<JSIndexedRAMBundle>(sourceUrlStr.UTF8String);
       std::unique_ptr<const JSBigString> scriptStr = ramBundle->getStartupCode();

package/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.mm

@@ -22,8 +22,14 @@ JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(JSIExecutor::Runtim
     bindNativeLogger(runtime, iosLoggingBinder);
 
     PerformanceNow iosPerformanceNowBinder = []() {
-      auto time = std::chrono::system_clock::now().time_since_epoch();
-      return std::chrono::duration_cast<std::chrono::milliseconds>(time).count();
+      auto time = std::chrono::steady_clock::now();
+      auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(
+                          time.time_since_epoch())
+                          .count();
+
+      constexpr double NANOSECONDS_IN_MILLISECOND = 1000000.0;
+
+      return duration / NANOSECONDS_IN_MILLISECOND;
     };
     bindNativePerformanceNow(runtime, iosPerformanceNowBinder);
 

package/React/FBReactNativeSpec/FBReactNativeSpec.podspec

@@ -29,7 +29,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0", :tvos => "11.0" }
+  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   # This podspec is used to trigger the codegen, and built files are generated in a different location.
@@ -38,7 +38,7 @@ Pod::Spec.new do |s|
 
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                                "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\""
                              }
 

package/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.h

@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (BOOL)isSupported:(NSString *)componentName;
 
 + (void)supportLegacyViewManagerWithName:(NSString *)componentName;
++ (void)supportLegacyViewManagersWithPrefix:(NSString *)prefix;
 
 @end
 

package/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm

@@ -8,6 +8,7 @@
 #import "RCTLegacyViewManagerInteropComponentView.h"
 
 #import <React/RCTAssert.h>
+#import <React/RCTConstants.h>
 #import <React/UIView+React.h>
 #import <react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h>
 #import <react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h>
@@ -24,17 +25,17 @@ static NSString *const kRCTLegacyInteropChildIndexKey = @"index";
   NSMutableArray<UIView *> *_viewsToBeUnmounted;
   RCTLegacyViewManagerInteropCoordinatorAdapter *_adapter;
   LegacyViewManagerInteropShadowNode::ConcreteState::Shared _state;
+  BOOL _hasInvokedForwardingWarning;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
-    RCTWarnNotAllowedForNewArchitecture(
-        self, @"ViewManager with interop layer is not allowed in the new architecture.");
     static const auto defaultProps = std::make_shared<const LegacyViewManagerInteropViewProps>();
     _props = defaultProps;
     _viewsToBeMounted = [NSMutableArray new];
     _viewsToBeUnmounted = [NSMutableArray new];
+    _hasInvokedForwardingWarning = NO;
   }
 
   return self;
@@ -51,6 +52,41 @@ static NSString *const kRCTLegacyInteropChildIndexKey = @"index";
   return result;
 }
 
+- (RCTLegacyViewManagerInteropCoordinator *)_coordinator
+{
+  if (_state != nullptr) {
+    const auto &state = _state->getData();
+    return unwrapManagedObject(state.coordinator);
+  } else {
+    return nil;
+  }
+}
+
+- (NSString *)componentViewName_DO_NOT_USE_THIS_IS_BROKEN
+{
+  const auto &state = _state->getData();
+  RCTLegacyViewManagerInteropCoordinator *coordinator = unwrapManagedObject(state.coordinator);
+  return coordinator.componentViewName;
+}
+
+#pragma mark - Method forwarding
+
+- (void)forwardInvocation:(NSInvocation *)anInvocation
+{
+  if (!_hasInvokedForwardingWarning) {
+    _hasInvokedForwardingWarning = YES;
+    NSLog(
+        @"Invoked unsupported method on RCTLegacyViewManagerInteropComponentView. Resulting to noop instead of a crash.");
+  }
+}
+
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector
+{
+  return [super methodSignatureForSelector:aSelector] ?: [self.contentView methodSignatureForSelector:aSelector];
+}
+
+#pragma mark - Supported ViewManagers
+
 + (NSMutableSet<NSString *> *)supportedViewManagers
 {
   static NSMutableSet<NSString *> *supported = [NSMutableSet setWithObjects:@"DatePicker",
@@ -65,31 +101,47 @@ static NSString *const kRCTLegacyInteropChildIndexKey = @"index";
   return supported;
 }
 
-+ (BOOL)isSupported:(NSString *)componentName
++ (NSMutableSet<NSString *> *)supportedViewManagersPrefixes
 {
-  return [[RCTLegacyViewManagerInteropComponentView supportedViewManagers] containsObject:componentName];
+  static NSMutableSet<NSString *> *supported = [NSMutableSet new];
+  return supported;
 }
 
-+ (void)supportLegacyViewManagerWithName:(NSString *)componentName
++ (BOOL)isSupported:(NSString *)componentName
 {
-  [[RCTLegacyViewManagerInteropComponentView supportedViewManagers] addObject:componentName];
+  RCTLogNewArchitectureValidation(
+      RCTNotAllowedInBridgeless,
+      self,
+      [NSString
+          stringWithFormat:
+              @"Legacy ViewManagers should be migrated to Fabric ComponentViews in the new architecture to reduce risk. Component using interop layer: %@",
+              componentName]);
+
+  // Step 1: check if ViewManager with specified name is supported.
+  BOOL isComponentNameSupported =
+      [[RCTLegacyViewManagerInteropComponentView supportedViewManagers] containsObject:componentName];
+  if (isComponentNameSupported) {
+    return YES;
+  }
+
+  // Step 2: check if component has supported prefix.
+  for (NSString *item in [RCTLegacyViewManagerInteropComponentView supportedViewManagersPrefixes]) {
+    if ([componentName hasPrefix:item]) {
+      return YES;
+    }
+  }
+
+  return NO;
 }
 
-- (RCTLegacyViewManagerInteropCoordinator *)coordinator
++ (void)supportLegacyViewManagersWithPrefix:(NSString *)prefix
 {
-  if (_state != nullptr) {
-    const auto &state = _state->getData();
-    return unwrapManagedObject(state.coordinator);
-  } else {
-    return nil;
-  }
+  [[RCTLegacyViewManagerInteropComponentView supportedViewManagersPrefixes] addObject:prefix];
 }
 
-- (NSString *)componentViewName_DO_NOT_USE_THIS_IS_BROKEN
++ (void)supportLegacyViewManagerWithName:(NSString *)componentName
 {
-  const auto &state = _state->getData();
-  RCTLegacyViewManagerInteropCoordinator *coordinator = unwrapManagedObject(state.coordinator);
-  return coordinator.componentViewName;
+  [[RCTLegacyViewManagerInteropComponentView supportedViewManagers] addObject:componentName];
 }
 
 #pragma mark - RCTComponentViewProtocol
@@ -101,6 +153,7 @@ static NSString *const kRCTLegacyInteropChildIndexKey = @"index";
   [_viewsToBeUnmounted removeAllObjects];
   _state.reset();
   self.contentView = nil;
+  _hasInvokedForwardingWarning = NO;
   [super prepareForRecycle];
 }
 
@@ -136,7 +189,7 @@ static NSString *const kRCTLegacyInteropChildIndexKey = @"index";
   [super finalizeUpdates:updateMask];
 
   if (!_adapter) {
-    _adapter = [[RCTLegacyViewManagerInteropCoordinatorAdapter alloc] initWithCoordinator:self.coordinator
+    _adapter = [[RCTLegacyViewManagerInteropCoordinatorAdapter alloc] initWithCoordinator:[self _coordinator]
                                                                                  reactTag:self.tag];
     __weak __typeof(self) weakSelf = self;
     _adapter.eventInterceptor = ^(std::string eventName, folly::dynamic event) {
@@ -153,7 +206,12 @@ static NSString *const kRCTLegacyInteropChildIndexKey = @"index";
   for (NSDictionary *mountInstruction in _viewsToBeMounted) {
     NSNumber *index = mountInstruction[kRCTLegacyInteropChildIndexKey];
     UIView *childView = mountInstruction[kRCTLegacyInteropChildComponentKey];
-    [_adapter.paperView insertReactSubview:childView atIndex:index.integerValue];
+    if ([childView isKindOfClass:[RCTLegacyViewManagerInteropComponentView class]]) {
+      UIView *target = ((RCTLegacyViewManagerInteropComponentView *)childView).contentView;
+      [_adapter.paperView insertReactSubview:target atIndex:index.integerValue];
+    } else {
+      [_adapter.paperView insertReactSubview:childView atIndex:index.integerValue];
+    }
   }
 
   [_viewsToBeMounted removeAllObjects];

package/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -202,7 +202,8 @@ static ModalHostViewEventEmitter::OnOrientationChange onOrientationChangeStruct(
 
 #pragma mark - RCTMountingTransactionObserving
 
-- (void)mountingTransactionWillMountWithMetadata:(MountingTransactionMetadata const &)metadata
+- (void)mountingTransactionWillMount:(MountingTransaction const &)transaction
+                withSurfaceTelemetry:(facebook::react::SurfaceTelemetry const &)surfaceTelemetry
 {
   _modalContentsSnapshot = [self.viewController.view snapshotViewAfterScreenUpdates:NO];
 }

package/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -52,7 +52,11 @@ static UIScrollViewIndicatorStyle RCTUIScrollViewIndicatorStyleFromProps(ScrollV
   }
 }
 
-static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteger tag)
+// Once Fabric implements proper NativeAnimationDriver, this should be removed.
+// This is just a workaround to allow animations based on onScroll event.
+// This is only used to animate sticky headers in ScrollViews, and only the contentOffset and tag is used.
+// TODO: T116850910 [Fabric][iOS] Make Fabric not use legacy RCTEventDispatcher for native-driven AnimatedEvents
+static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrollView, NSInteger tag)
 {
   static uint16_t coalescingKey = 0;
   RCTScrollEvent *scrollEvent = [[RCTScrollEvent alloc] initWithEventName:@"onScroll"
@@ -64,7 +68,15 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
                                                       scrollViewZoomScale:scrollView.zoomScale
                                                                  userData:nil
                                                             coalescingKey:coalescingKey];
-  [[RCTBridge currentBridge].eventDispatcher sendEvent:scrollEvent];
+  RCTBridge *bridge = [RCTBridge currentBridge];
+  if (bridge) {
+    [bridge.eventDispatcher sendEvent:scrollEvent];
+  } else {
+    NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:scrollEvent, @"event", nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"RCTSendEventToLegacyEventDispatcher"
+                                                        object:nil
+                                                      userInfo:userInfo];
+  }
 }
 
 @interface RCTScrollViewComponentView () <
@@ -85,6 +97,7 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
   // This helps to only update state from `scrollViewDidScroll` in case
   // some other part of the system scrolls scroll view.
   BOOL _isUserTriggeredScrolling;
+  BOOL _shouldUpdateContentInsetAdjustmentBehavior;
 
   CGPoint _contentOffsetWhenClipped;
 }
@@ -108,6 +121,7 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
     _scrollView.delaysContentTouches = NO;
     ((RCTEnhancedScrollView *)_scrollView).overridingDelegate = self;
     _isUserTriggeredScrolling = NO;
+    _shouldUpdateContentInsetAdjustmentBehavior = YES;
     [self addSubview:_scrollView];
 
     _containerView = [[UIView alloc] initWithFrame:CGRectZero];
@@ -135,7 +149,8 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
 
 #pragma mark - RCTMountingTransactionObserving
 
-- (void)mountingTransactionDidMountWithMetadata:(MountingTransactionMetadata const &)metadata
+- (void)mountingTransactionDidMount:(MountingTransaction const &)transaction
+               withSurfaceTelemetry:(facebook::react::SurfaceTelemetry const &)surfaceTelemetry
 {
   [self _remountChildren];
 }
@@ -255,7 +270,8 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
     }
   }
 
-  if (oldScrollViewProps.contentInsetAdjustmentBehavior != newScrollViewProps.contentInsetAdjustmentBehavior) {
+  if ((oldScrollViewProps.contentInsetAdjustmentBehavior != newScrollViewProps.contentInsetAdjustmentBehavior) ||
+      _shouldUpdateContentInsetAdjustmentBehavior) {
     auto const contentInsetAdjustmentBehavior = newScrollViewProps.contentInsetAdjustmentBehavior;
     if (contentInsetAdjustmentBehavior == ContentInsetAdjustmentBehavior::Never) {
       scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -266,6 +282,7 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
     } else if (contentInsetAdjustmentBehavior == ContentInsetAdjustmentBehavior::Always) {
       scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAlways;
     }
+    _shouldUpdateContentInsetAdjustmentBehavior = NO;
   }
 
   MAP_SCROLL_VIEW_PROP(disableIntervalMomentum);
@@ -379,6 +396,11 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
 {
   const auto &props = *std::static_pointer_cast<const ScrollViewProps>(_props);
   _scrollView.contentOffset = RCTCGPointFromPoint(props.contentOffset);
+  // We set the default behavior to "never" so that iOS
+  // doesn't do weird things to UIScrollView insets automatically
+  // and keeps it as an opt-in behavior.
+  _scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+  _shouldUpdateContentInsetAdjustmentBehavior = YES;
   _state.reset();
   _isUserTriggeredScrolling = NO;
   [super prepareForRecycle];
@@ -405,9 +427,8 @@ static void RCTSendPaperScrollEvent_DEPRECATED(UIScrollView *scrollView, NSInteg
     if (_eventEmitter) {
       std::static_pointer_cast<ScrollViewEventEmitter const>(_eventEmitter)->onScroll([self _scrollViewMetrics]);
     }
-    // Once Fabric implements proper NativeAnimationDriver, this should be removed.
-    // This is just a workaround to allow animations based on onScroll event.
-    RCTSendPaperScrollEvent_DEPRECATED(scrollView, self.tag);
+
+    RCTSendScrollEventForNativeAnimations_DEPRECATED(scrollView, self.tag);
   }
 
   [self _remountChildrenIfNeeded];

package/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm

@@ -67,6 +67,7 @@ using namespace facebook::react;
   firstElement.isAccessibilityElement = YES;
   firstElement.accessibilityTraits = _view.accessibilityTraits;
   firstElement.accessibilityLabel = accessibilityLabel;
+  firstElement.accessibilityLanguage = _view.accessibilityLanguage;
   firstElement.accessibilityFrame = UIAccessibilityConvertFrameToScreenCoordinates(_view.bounds, _view);
   [firstElement setAccessibilityActivationPoint:CGPointMake(
                                                     firstElement.accessibilityFrame.origin.x + 1.0,

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -569,8 +569,8 @@ using namespace facebook::react;
 
 - (void)_restoreTextSelection
 {
-  const auto selection = std::dynamic_pointer_cast<TextInputProps const>(_props)->selection.get_pointer();
-  if (selection == nullptr) {
+  auto const selection = std::dynamic_pointer_cast<TextInputProps const>(_props)->selection;
+  if (!selection.has_value()) {
     return;
   }
   auto start = [_backedTextInputView positionFromPosition:_backedTextInputView.beginningOfDocument

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h

@@ -7,8 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
+#import <optional>
+
 #import <React/RCTBackedTextInputViewProtocol.h>
-#import <butter/optional.h>
 #import <react/renderer/components/iostextinput/primitives.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -17,7 +18,7 @@ void RCTCopyBackedTextInput(
     UIView<RCTBackedTextInputViewProtocol> *fromTextInput,
     UIView<RCTBackedTextInputViewProtocol> *toTextInput);
 
-UITextAutocorrectionType RCTUITextAutocorrectionTypeFromOptionalBool(facebook::butter::optional<bool> autoCorrect);
+UITextAutocorrectionType RCTUITextAutocorrectionTypeFromOptionalBool(std::optional<bool> autoCorrect);
 
 UITextAutocapitalizationType RCTUITextAutocapitalizationTypeFromAutocapitalizationType(
     facebook::react::AutocapitalizationType autocapitalizationType);
@@ -25,7 +26,7 @@ UITextAutocapitalizationType RCTUITextAutocapitalizationTypeFromAutocapitalizati
 UIKeyboardAppearance RCTUIKeyboardAppearanceFromKeyboardAppearance(
     facebook::react::KeyboardAppearance keyboardAppearance);
 
-UITextSpellCheckingType RCTUITextSpellCheckingTypeFromOptionalBool(facebook::butter::optional<bool> spellCheck);
+UITextSpellCheckingType RCTUITextSpellCheckingTypeFromOptionalBool(std::optional<bool> spellCheck);
 
 UITextFieldViewMode RCTUITextFieldViewModeFromTextInputAccessoryVisibilityMode(
     facebook::react::TextInputAccessoryVisibilityMode mode);

package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.mm

@@ -51,7 +51,7 @@ void RCTCopyBackedTextInput(
   [toTextInput setSelectedTextRange:fromTextInput.selectedTextRange notifyDelegate:NO];
 }
 
-UITextAutocorrectionType RCTUITextAutocorrectionTypeFromOptionalBool(facebook::butter::optional<bool> autoCorrect)
+UITextAutocorrectionType RCTUITextAutocorrectionTypeFromOptionalBool(std::optional<bool> autoCorrect)
 {
   return autoCorrect.has_value() ? (*autoCorrect ? UITextAutocorrectionTypeYes : UITextAutocorrectionTypeNo)
                                  : UITextAutocorrectionTypeDefault;
@@ -84,7 +84,7 @@ UIKeyboardAppearance RCTUIKeyboardAppearanceFromKeyboardAppearance(KeyboardAppea
   }
 }
 
-UITextSpellCheckingType RCTUITextSpellCheckingTypeFromOptionalBool(facebook::butter::optional<bool> spellCheck)
+UITextSpellCheckingType RCTUITextSpellCheckingTypeFromOptionalBool(std::optional<bool> spellCheck)
 {
   return spellCheck.has_value() ? (*spellCheck ? UITextSpellCheckingTypeYes : UITextSpellCheckingTypeNo)
                                 : UITextSpellCheckingTypeDefault;