react-native 0.71.3 → 0.72.0-rc.0

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

@@ -132,7 +132,7 @@ using namespace facebook::react;
     return;
   }
 
-  if (@available(macOS 13.0, *)) {
+  if (@available(macCatalyst 13.1, *)) {
     _scrollViewComponentView.scrollView.refreshControl = _refreshControl;
   }
 }
@@ -146,7 +146,7 @@ using namespace facebook::react;
   // iOS requires to end refreshing before unmounting.
   [_refreshControl endRefreshing];
 
-  if (@available(macOS 13.0, *)) {
+  if (@available(macCatalyst 13.1, *)) {
     _scrollViewComponentView.scrollView.refreshControl = nil;
   }
   _scrollViewComponentView = nil;

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

@@ -18,9 +18,9 @@
 #import <react/renderer/components/scrollview/ScrollViewProps.h>
 #import <react/renderer/components/scrollview/ScrollViewState.h>
 #import <react/renderer/components/scrollview/conversions.h>
-#import <react/renderer/graphics/Geometry.h>
 
 #import "RCTConversions.h"
+#import "RCTCustomPullToRefreshViewProtocol.h"
 #import "RCTEnhancedScrollView.h"
 #import "RCTFabricComponentsPlugins.h"
 
@@ -100,6 +100,11 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
   BOOL _shouldUpdateContentInsetAdjustmentBehavior;
 
   CGPoint _contentOffsetWhenClipped;
+
+  __weak UIView *_contentView;
+
+  CGRect _prevFirstVisibleFrame;
+  __weak UIView *_firstVisibleView;
 }
 
 + (RCTScrollViewComponentView *_Nullable)findScrollViewComponentViewForView:(UIView *)view
@@ -149,10 +154,17 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
 
 #pragma mark - RCTMountingTransactionObserving
 
+- (void)mountingTransactionWillMount:(const facebook::react::MountingTransaction &)transaction
+                withSurfaceTelemetry:(const facebook::react::SurfaceTelemetry &)surfaceTelemetry
+{
+  [self _prepareForMaintainVisibleScrollPosition];
+}
+
 - (void)mountingTransactionDidMount:(MountingTransaction const &)transaction
                withSurfaceTelemetry:(facebook::react::SurfaceTelemetry const &)surfaceTelemetry
 {
   [self _remountChildren];
+  [self _adjustForMaintainVisibleContentPosition];
 }
 
 #pragma mark - RCTComponentViewProtocol
@@ -337,11 +349,18 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
   [_containerView insertSubview:childComponentView atIndex:index];
+  if (![childComponentView conformsToProtocol:@protocol(RCTCustomPullToRefreshViewProtocol)]) {
+    _contentView = childComponentView;
+  }
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
   [childComponentView removeFromSuperview];
+  if (![childComponentView conformsToProtocol:@protocol(RCTCustomPullToRefreshViewProtocol)] &&
+      _contentView == childComponentView) {
+    _contentView = nil;
+  }
 }
 
 /*
@@ -404,6 +423,9 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
   CGRect oldFrame = self.frame;
   self.frame = CGRectZero;
   self.frame = oldFrame;
+  _contentView = nil;
+  _prevFirstVisibleFrame = CGRectZero;
+  _firstVisibleView = nil;
   [super prepareForRecycle];
 }
 
@@ -684,6 +706,74 @@ static void RCTSendScrollEventForNativeAnimations_DEPRECATED(UIScrollView *scrol
   [self.scrollViewDelegateSplitter removeDelegate:scrollListener];
 }
 
+#pragma mark - Maintain visible content position
+
+- (void)_prepareForMaintainVisibleScrollPosition
+{
+  const auto &props = *std::static_pointer_cast<const ScrollViewProps>(_props);
+  if (!props.maintainVisibleContentPosition) {
+    return;
+  }
+
+  BOOL horizontal = _scrollView.contentSize.width > self.frame.size.width;
+  int minIdx = props.maintainVisibleContentPosition.value().minIndexForVisible;
+  for (NSUInteger ii = minIdx; ii < _contentView.subviews.count; ++ii) {
+    // Find the first entirely visible view.
+    UIView *subview = _contentView.subviews[ii];
+    BOOL hasNewView = NO;
+    if (horizontal) {
+      hasNewView = subview.frame.origin.x > _scrollView.contentOffset.x;
+    } else {
+      hasNewView = subview.frame.origin.y > _scrollView.contentOffset.y;
+    }
+    if (hasNewView || ii == _contentView.subviews.count - 1) {
+      _prevFirstVisibleFrame = subview.frame;
+      _firstVisibleView = subview;
+      break;
+    }
+  }
+}
+
+- (void)_adjustForMaintainVisibleContentPosition
+{
+  const auto &props = *std::static_pointer_cast<const ScrollViewProps>(_props);
+  if (!props.maintainVisibleContentPosition) {
+    return;
+  }
+
+  std::optional<int> autoscrollThreshold = props.maintainVisibleContentPosition.value().autoscrollToTopThreshold;
+  BOOL horizontal = _scrollView.contentSize.width > self.frame.size.width;
+  // TODO: detect and handle/ignore re-ordering
+  if (horizontal) {
+    CGFloat deltaX = _firstVisibleView.frame.origin.x - _prevFirstVisibleFrame.origin.x;
+    if (ABS(deltaX) > 0.5) {
+      CGFloat x = _scrollView.contentOffset.x;
+      [self _forceDispatchNextScrollEvent];
+      _scrollView.contentOffset = CGPointMake(_scrollView.contentOffset.x + deltaX, _scrollView.contentOffset.y);
+      if (autoscrollThreshold) {
+        // If the offset WAS within the threshold of the start, animate to the start.
+        if (x <= autoscrollThreshold.value()) {
+          [self scrollToOffset:CGPointMake(0, _scrollView.contentOffset.y) animated:YES];
+        }
+      }
+    }
+  } else {
+    CGRect newFrame = _firstVisibleView.frame;
+    CGFloat deltaY = newFrame.origin.y - _prevFirstVisibleFrame.origin.y;
+    if (ABS(deltaY) > 0.5) {
+      CGFloat y = _scrollView.contentOffset.y;
+      [self _forceDispatchNextScrollEvent];
+      _scrollView.contentOffset = CGPointMake(_scrollView.contentOffset.x, _scrollView.contentOffset.y + deltaY);
+      if (autoscrollThreshold) {
+        // If the offset WAS within the threshold of the start, animate to the start.
+        if (y <= autoscrollThreshold.value()) {
+          [self scrollToOffset:CGPointMake(_scrollView.contentOffset.x, 0) animated:YES];
+        }
+      }
+    }
+  }
+}
+
 @end
 
 Class<RCTComponentViewProtocol> RCTScrollViewCls(void)

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

@@ -14,7 +14,6 @@
 #import <react/renderer/components/text/ParagraphState.h>
 #import <react/renderer/components/text/RawTextComponentDescriptor.h>
 #import <react/renderer/components/text/TextComponentDescriptor.h>
-#import <react/renderer/graphics/Geometry.h>
 #import <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
 #import <react/renderer/textlayoutmanager/RCTTextLayoutManager.h>
 #import <react/renderer/textlayoutmanager/TextLayoutManager.h>
@@ -117,11 +116,8 @@ using namespace facebook::react;
     return;
   }
 
-  auto textLayoutManager = _state->getData().layoutManager.lock();
-
-  if (!textLayoutManager) {
-    return;
-  }
+  auto textLayoutManager = _state->getData().paragraphLayoutManager.getTextLayoutManager();
+  auto nsTextStorage = _state->getData().paragraphLayoutManager.getHostTextStorage();
 
   RCTTextLayoutManager *nativeTextLayoutManager =
       (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
@@ -130,7 +126,8 @@ using namespace facebook::react;
 
   [nativeTextLayoutManager drawAttributedString:_state->getData().attributedString
                             paragraphAttributes:_paragraphAttributes
-                                          frame:frame];
+                                          frame:frame
+                                    textStorage:unwrapManagedObject(nsTextStorage)];
 }
 
 #pragma mark - Accessibility
@@ -162,18 +159,15 @@ using namespace facebook::react;
   auto &data = _state->getData();
 
   if (![_accessibilityProvider isUpToDate:data.attributedString]) {
-    auto textLayoutManager = data.layoutManager.lock();
-    if (textLayoutManager) {
-      RCTTextLayoutManager *nativeTextLayoutManager =
-          (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
-      CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
-      _accessibilityProvider =
-          [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
-                                                               layoutManager:nativeTextLayoutManager
-                                                         paragraphAttributes:data.paragraphAttributes
-                                                                       frame:frame
-                                                                        view:self];
-    }
+    auto textLayoutManager = data.paragraphLayoutManager.getTextLayoutManager();
+    RCTTextLayoutManager *nativeTextLayoutManager =
+        (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
+    CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
+    _accessibilityProvider = [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
+                                                                                  layoutManager:nativeTextLayoutManager
+                                                                            paragraphAttributes:data.paragraphAttributes
+                                                                                          frame:frame
+                                                                                           view:self];
   }
 
   return _accessibilityProvider.accessibilityElements;
@@ -192,11 +186,7 @@ using namespace facebook::react;
     return _eventEmitter;
   }
 
-  auto textLayoutManager = _state->getData().layoutManager.lock();
-
-  if (!textLayoutManager) {
-    return _eventEmitter;
-  }
+  auto textLayoutManager = _state->getData().paragraphLayoutManager.getTextLayoutManager();
 
   RCTTextLayoutManager *nativeTextLayoutManager =
       (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());

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

@@ -8,7 +8,6 @@
 #import "RCTTextInputComponentView.h"
 
 #import <react/renderer/components/iostextinput/TextInputComponentDescriptor.h>
-#import <react/renderer/graphics/Geometry.h>
 #import <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
 #import <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
@@ -185,7 +184,7 @@ using namespace facebook::react;
     }
   }
 
-  // Traits `blurOnSubmit`, `clearTextOnFocus`, and `selectTextOnFocus` were omitted intentially here
+  // Traits `blurOnSubmit`, `clearTextOnFocus`, and `selectTextOnFocus` were omitted intentionally here
   // because they are being checked on-demand.
 
   // Other props:
@@ -246,6 +245,11 @@ using namespace facebook::react;
       UIEdgeInsetsInsetRect(self.bounds, RCTUIEdgeInsetsFromEdgeInsets(layoutMetrics.borderWidth));
   _backedTextInputView.textContainerInset =
       RCTUIEdgeInsetsFromEdgeInsets(layoutMetrics.contentInsets - layoutMetrics.borderWidth);
+
+  if (_eventEmitter) {
+    auto const &textInputEventEmitter = *std::static_pointer_cast<TextInputEventEmitter const>(_eventEmitter);
+    textInputEventEmitter.onContentSizeChange([self _textInputMetrics]);
+  }
 }
 
 - (void)prepareForRecycle
@@ -482,16 +486,16 @@ using namespace facebook::react;
 
   // These keyboard types (all are number pads) don't have a "Done" button by default,
   // so we create an `inputAccessoryView` with this button for them.
-  BOOL shouldHaveInputAccesoryView =
+  BOOL shouldHaveInputAccessoryView =
       (keyboardType == UIKeyboardTypeNumberPad || keyboardType == UIKeyboardTypePhonePad ||
        keyboardType == UIKeyboardTypeDecimalPad || keyboardType == UIKeyboardTypeASCIICapableNumberPad) &&
       _backedTextInputView.returnKeyType == UIReturnKeyDone;
 
-  if ((_backedTextInputView.inputAccessoryView != nil) == shouldHaveInputAccesoryView) {
+  if ((_backedTextInputView.inputAccessoryView != nil) == shouldHaveInputAccessoryView) {
     return;
   }
 
-  if (shouldHaveInputAccesoryView) {
+  if (shouldHaveInputAccessoryView) {
     UIToolbar *toolbarView = [UIToolbar new];
     [toolbarView sizeToFit];
     UIBarButtonItem *flexibleSpace =

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

@@ -35,10 +35,8 @@ UIKeyboardType RCTUIKeyboardTypeFromKeyboardType(facebook::react::KeyboardType k
 
 UIReturnKeyType RCTUIReturnKeyTypeFromReturnKeyType(facebook::react::ReturnKeyType returnKeyType);
 
-API_AVAILABLE(ios(10.0))
 UITextContentType RCTUITextContentTypeFromString(std::string const &contentType);
 
-API_AVAILABLE(ios(12.0))
 UITextInputPasswordRules *RCTUITextInputPasswordRulesFromString(std::string const &passwordRules);
 
 NS_ASSUME_NONNULL_END

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

@@ -177,7 +177,6 @@ UIReturnKeyType RCTUIReturnKeyTypeFromReturnKeyType(ReturnKeyType returnKeyType)
   }
 }
 
-API_AVAILABLE(ios(10.0))
 UITextContentType RCTUITextContentTypeFromString(std::string const &contentType)
 {
   static dispatch_once_t onceToken;
@@ -227,7 +226,6 @@ UITextContentType RCTUITextContentTypeFromString(std::string const &contentType)
   return contentTypeMap[RCTNSStringFromString(contentType)] ?: @"";
 }
 
-API_AVAILABLE(ios(12.0))
 UITextInputPasswordRules *RCTUITextInputPasswordRulesFromString(std::string const &passwordRules)
 {
   return [UITextInputPasswordRules passwordRulesWithDescriptor:RCTNSStringFromStringNilIfEmpty(passwordRules)];

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

@@ -69,12 +69,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
 
-/**
- * Flag indicating if subview clipping is enabled for the view.
- * If subview clipping is enabled, subviews that are outside of the viewport may be removed from the view hierachy.
- */
-@property (nonatomic, readonly) BOOL removeClippedSubviews;
-
 /**
  * Enforcing `call super` semantic for overridden methods from `RCTComponentViewProtocol`.
  * The methods update the instance variables.

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

@@ -8,6 +8,7 @@
 #import "RCTViewComponentView.h"
 
 #import <CoreGraphics/CoreGraphics.h>
+#import <QuartzCore/QuartzCore.h>
 #import <objc/runtime.h>
 
 #import <React/RCTAssert.h>
@@ -29,8 +30,6 @@ using namespace facebook::react;
   NSSet<NSString *> *_Nullable _propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN;
 }
 
-@synthesize removeClippedSubviews = _removeClippedSubviews;
-
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {

package/React/Fabric/Mounting/RCTComponentViewFactory.mm

@@ -11,8 +11,8 @@
 #import <React/RCTConversions.h>
 
 #import <butter/map.h>
-#import <butter/mutex.h>
 #import <butter/set.h>
+#import <shared_mutex>
 
 #import <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #import <react/renderer/componentregistry/componentNameByReactViewName.h>
@@ -23,19 +23,19 @@
 #ifdef RN_DISABLE_OSS_PLUGIN_HEADER
 #import <RCTFabricComponentPlugin/RCTFabricPluginProvider.h>
 #else
-#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTFabricComponentsPlugins.h>
 #endif
 
-#import "RCTComponentViewClassDescriptor.h"
-#import "RCTFabricComponentsPlugins.h"
-#import "RCTImageComponentView.h"
-#import "RCTLegacyViewManagerInteropComponentView.h"
-#import "RCTMountingTransactionObserving.h"
-#import "RCTParagraphComponentView.h"
-#import "RCTRootComponentView.h"
-#import "RCTTextInputComponentView.h"
-#import "RCTUnimplementedViewComponentView.h"
-#import "RCTViewComponentView.h"
+#import <React/RCTComponentViewClassDescriptor.h>
+#import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTImageComponentView.h>
+#import <React/RCTLegacyViewManagerInteropComponentView.h>
+#import <React/RCTMountingTransactionObserving.h>
+#import <React/RCTParagraphComponentView.h>
+#import <React/RCTRootComponentView.h>
+#import <React/RCTTextInputComponentView.h>
+#import <React/RCTUnimplementedViewComponentView.h>
+#import <React/RCTViewComponentView.h>
 
 #import <objc/runtime.h>
 
@@ -61,7 +61,7 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
   butter::map<ComponentHandle, RCTComponentViewClassDescriptor> _componentViewClasses;
   butter::set<std::string> _registeredComponentsNames;
   ComponentDescriptorProviderRegistry _providerRegistry;
-  butter::shared_mutex _mutex;
+  std::shared_mutex _mutex;
 }
 
 + (RCTComponentViewFactory *)currentComponentViewFactory
@@ -155,7 +155,7 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
 - (void)registerComponentViewClass:(Class<RCTComponentViewProtocol>)componentViewClass
 {
   RCTAssert(componentViewClass, @"RCTComponentViewFactory: Provided `componentViewClass` is `nil`.");
-  std::unique_lock<butter::shared_mutex> lock(_mutex);
+  std::unique_lock lock(_mutex);
 
   auto componentDescriptorProvider = [componentViewClass componentDescriptorProvider];
   _componentViewClasses[componentDescriptorProvider.handle] =
@@ -177,7 +177,7 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
 - (RCTComponentViewDescriptor)createComponentViewWithComponentHandle:(facebook::react::ComponentHandle)componentHandle
 {
   RCTAssertMainQueue();
-  std::shared_lock<butter::shared_mutex> lock(_mutex);
+  std::shared_lock lock(_mutex);
 
   auto iterator = _componentViewClasses.find(componentHandle);
   RCTAssert(
@@ -198,7 +198,7 @@ static Class<RCTComponentViewProtocol> RCTComponentViewClassWithName(const char
 - (facebook::react::ComponentDescriptorRegistry::Shared)createComponentDescriptorRegistryWithParameters:
     (facebook::react::ComponentDescriptorParameters)parameters
 {
-  std::shared_lock<butter::shared_mutex> lock(_mutex);
+  std::shared_lock lock(_mutex);
 
   return _providerRegistry.createComponentDescriptorRegistry(parameters);
 }

package/React/Fabric/Mounting/RCTComponentViewRegistry.mm

@@ -11,12 +11,13 @@
 #import <React/RCTAssert.h>
 #import <React/RCTConstants.h>
 
-#import "RCTImageComponentView.h"
-#import "RCTParagraphComponentView.h"
-#import "RCTViewComponentView.h"
+#import <React/RCTImageComponentView.h>
+#import <React/RCTParagraphComponentView.h>
+#import <React/RCTViewComponentView.h>
 
 #import <butter/map.h>
 
+using namespace facebook;
 using namespace facebook::react;
 
 const NSInteger RCTComponentViewRegistryRecyclePoolMaxSize = 1024;

package/React/Fabric/Mounting/RCTMountingManager.h

@@ -10,6 +10,7 @@
 #import <React/RCTMountingManagerDelegate.h>
 #import <React/RCTPrimitives.h>
 #import <react/renderer/core/ComponentDescriptor.h>
+#import <react/renderer/core/RawProps.h>
 #import <react/renderer/core/ReactPrimitives.h>
 #import <react/renderer/mounting/MountingCoordinator.h>
 #import <react/renderer/mounting/ShadowView.h>
@@ -47,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Schedule a mounting transaction to be performed on the main thread.
  * Can be called from any thread.
  */
-- (void)scheduleTransaction:(facebook::react::MountingCoordinator::Shared const &)mountingCoordinator;
+- (void)scheduleTransaction:(facebook::react::MountingCoordinator::Shared)mountingCoordinator;
 
 /**
  * Dispatch a command to be performed on the main thread.

package/React/Fabric/Mounting/RCTMountingManager.mm

@@ -7,6 +7,7 @@
 
 #import "RCTMountingManager.h"
 
+#import <QuartzCore/QuartzCore.h>
 #import <butter/map.h>
 
 #import <React/RCTAssert.h>
@@ -21,10 +22,10 @@
 #import <react/renderer/debug/SystraceSection.h>
 #import <react/renderer/mounting/TelemetryController.h>
 
-#import "RCTComponentViewProtocol.h"
-#import "RCTComponentViewRegistry.h"
-#import "RCTConversions.h"
-#import "RCTMountingTransactionObserverCoordinator.h"
+#import <React/RCTComponentViewProtocol.h>
+#import <React/RCTComponentViewRegistry.h>
+#import <React/RCTConversions.h>
+#import <React/RCTMountingTransactionObserverCoordinator.h>
 
 using namespace facebook::react;
 
@@ -195,21 +196,20 @@ static void RCTPerformMountInstructions(
                                           componentViewDescriptor:rootViewDescriptor];
 }
 
-- (void)scheduleTransaction:(MountingCoordinator::Shared const &)mountingCoordinator
+- (void)scheduleTransaction:(MountingCoordinator::Shared)mountingCoordinator
 {
   if (RCTIsMainQueue()) {
     // Already on the proper thread, so:
     // * No need to do a thread jump;
     // * No need to do expensive copy of all mutations;
     // * No need to allocate a block.
-    [self initiateTransaction:mountingCoordinator];
+    [self initiateTransaction:*mountingCoordinator];
     return;
   }
 
-  auto mountingCoordinatorCopy = mountingCoordinator;
   RCTExecuteOnMainQueue(^{
     RCTAssertMainQueue();
-    [self initiateTransaction:mountingCoordinatorCopy];
+    [self initiateTransaction:*mountingCoordinator];
   });
 }
 
@@ -224,7 +224,6 @@ static void RCTPerformMountInstructions(
   }
 
   RCTExecuteOnMainQueue(^{
-    RCTAssertMainQueue();
     [self synchronouslyDispatchCommandOnUIThread:reactTag commandName:commandName args:args];
   });
 }
@@ -240,12 +239,11 @@ static void RCTPerformMountInstructions(
   }
 
   RCTExecuteOnMainQueue(^{
-    RCTAssertMainQueue();
     [self synchronouslyDispatchAccessbilityEventOnUIThread:reactTag eventType:eventType];
   });
 }
 
-- (void)initiateTransaction:(MountingCoordinator::Shared const &)mountingCoordinator
+- (void)initiateTransaction:(MountingCoordinator const &)mountingCoordinator
 {
   SystraceSection s("-[RCTMountingManager initiateTransaction:]");
   RCTAssertMainQueue();
@@ -263,14 +261,14 @@ static void RCTPerformMountInstructions(
   } while (_followUpTransactionRequired);
 }
 
-- (void)performTransaction:(MountingCoordinator::Shared const &)mountingCoordinator
+- (void)performTransaction:(MountingCoordinator const &)mountingCoordinator
 {
   SystraceSection s("-[RCTMountingManager performTransaction:]");
   RCTAssertMainQueue();
 
-  auto surfaceId = mountingCoordinator->getSurfaceId();
+  auto surfaceId = mountingCoordinator.getSurfaceId();
 
-  mountingCoordinator->getTelemetryController().pullTransaction(
+  mountingCoordinator.getTelemetryController().pullTransaction(
       [&](MountingTransaction const &transaction, SurfaceTelemetry const &surfaceTelemetry) {
         [self.delegate mountingManager:self willMountComponentsWithRootTag:surfaceId];
         _observerCoordinator.notifyObserversMountingTransactionWillMount(transaction, surfaceTelemetry);

package/React/Fabric/RCTConversions.h

@@ -11,7 +11,6 @@
 #import <react/renderer/components/view/primitives.h>
 #import <react/renderer/core/LayoutPrimitives.h>
 #import <react/renderer/graphics/Color.h>
-#import <react/renderer/graphics/Geometry.h>
 #import <react/renderer/graphics/Transform.h>
 
 NS_ASSUME_NONNULL_BEGIN

package/React/Fabric/RCTScheduler.h

@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @protocol RCTSchedulerDelegate
 
-- (void)schedulerDidFinishTransaction:(facebook::react::MountingCoordinator::Shared const &)mountingCoordinator;
+- (void)schedulerDidFinishTransaction:(facebook::react::MountingCoordinator::Shared)mountingCoordinator;
 
 - (void)schedulerDidDispatchCommand:(facebook::react::ShadowView const &)shadowView
                         commandName:(std::string const &)commandName

package/React/Fabric/RCTScheduler.mm

@@ -24,10 +24,10 @@ class SchedulerDelegateProxy : public SchedulerDelegate {
  public:
   SchedulerDelegateProxy(void *scheduler) : scheduler_(scheduler) {}
 
-  void schedulerDidFinishTransaction(MountingCoordinator::Shared const &mountingCoordinator) override
+  void schedulerDidFinishTransaction(MountingCoordinator::Shared mountingCoordinator) override
   {
     RCTScheduler *scheduler = (__bridge RCTScheduler *)scheduler_;
-    [scheduler.delegate schedulerDidFinishTransaction:mountingCoordinator];
+    [scheduler.delegate schedulerDidFinishTransaction:std::move(mountingCoordinator)];
   }
 
   void schedulerDidRequestPreliminaryViewAllocation(SurfaceId surfaceId, const ShadowNode &shadowNode) override
@@ -115,15 +115,6 @@ class LayoutAnimationDelegateProxy : public LayoutAnimationStatusDelegate, publi
       _layoutAnimationDelegateProxy = std::make_shared<LayoutAnimationDelegateProxy>((__bridge void *)self);
       _animationDriver = std::make_shared<LayoutAnimationDriver>(
           toolbox.runtimeExecutor, toolbox.contextContainer, _layoutAnimationDelegateProxy.get());
-      if (reactNativeConfig->getBool("react_fabric:enabled_skip_invalidated_key_frames_ios")) {
-        _animationDriver->enableSkipInvalidatedKeyFrames();
-      }
-      if (reactNativeConfig->getBool("react_fabric:enable_crash_on_missing_component_descriptor")) {
-        _animationDriver->enableCrashOnMissingComponentDescriptor();
-      }
-      if (reactNativeConfig->getBool("react_fabric:enable_simulate_image_props_memory_access")) {
-        _animationDriver->enableSimulateImagePropsMemoryAccess();
-      }
       _uiRunLoopObserver =
           toolbox.mainRunLoopObserverFactory(RunLoopObserver::Activity::BeforeWaiting, _layoutAnimationDelegateProxy);
       _uiRunLoopObserver->setDelegate(_layoutAnimationDelegateProxy.get());

package/React/Fabric/RCTSurfacePointerHandler.h

@@ -0,0 +1,28 @@
+/*
+ * 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>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTSurfacePointerHandler : UIGestureRecognizer
+
+/*
+ * Attaches (and detaches) a view to the touch handler.
+ * The receiver does not retain the provided view.
+ */
+- (void)attachToView:(UIView *)view;
+- (void)detachFromView:(UIView *)view;
+
+/*
+ * Offset of the attached view relative to the root component in points.
+ */
+@property (nonatomic, assign) CGPoint viewOriginOffset;
+
+@end
+
+NS_ASSUME_NONNULL_END