From 6e5f3f20af9981f4646a58ffbeba285da4ca218e Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <jakub.piasecki@swmansion.com>
Date: Mon, 4 Dec 2023 12:10:16 +0100
Subject: [PATCH 1/2] Remove `didMountComponentsWithRootTag` on the new arch

---
 ios/RNGestureHandlerModule.mm | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/ios/RNGestureHandlerModule.mm b/ios/RNGestureHandlerModule.mm
index b999c2c72a..d7913855af 100644
--- a/ios/RNGestureHandlerModule.mm
+++ b/ios/RNGestureHandlerModule.mm
@@ -243,25 +243,7 @@ - (void)addOperationBlock:(GestureHandlerOperation)operation
 
 #pragma mark - RCTSurfacePresenterObserver
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
-- (void)didMountComponentsWithRootTag:(NSInteger)rootTag
-{
-  RCTAssertMainQueue();
-
-  if (_operations.count == 0) {
-    return;
-  }
-
-  NSArray<GestureHandlerOperation> *operations = _operations;
-  _operations = [NSMutableArray new];
-
-  for (GestureHandlerOperation operation in operations) {
-    operation(self->_manager);
-  }
-}
-
-#else
+#ifndef RCT_NEW_ARCH_ENABLED
 
 #pragma mark - RCTUIManagerObserver
 

From 93e73007576e3019797b3732377cce2a2f2bd309 Mon Sep 17 00:00:00 2001
From: Jakub Piasecki <jakub.piasecki@swmansion.com>
Date: Wed, 10 Jan 2024 13:22:20 +0100
Subject: [PATCH 2/2] Remove references to `RCTSurfacePresenter`

---
 apple/RNGestureHandlerModule.mm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/apple/RNGestureHandlerModule.mm b/apple/RNGestureHandlerModule.mm
index d6c9bbc5b7..2d93938aea 100644
--- a/apple/RNGestureHandlerModule.mm
+++ b/apple/RNGestureHandlerModule.mm
@@ -10,7 +10,6 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
-#import <React/RCTSurfacePresenter.h>
 #import <React/RCTUtils.h>
 #import <ReactCommon/CallInvoker.h>
 #import <ReactCommon/RCTTurboModule.h>
@@ -34,7 +33,7 @@
 #endif // RCT_NEW_ARCH_ENABLED
 
 #ifdef RCT_NEW_ARCH_ENABLED
-@interface RNGestureHandlerModule () <RCTSurfacePresenterObserver, RNGestureHandlerStateManager>
+@interface RNGestureHandlerModule () <RNGestureHandlerStateManager>
 
 @end
 #else
@@ -68,9 +67,7 @@ - (void)invalidate
 
   _manager = nil;
 
-#ifdef RCT_NEW_ARCH_ENABLED
-  [self.bridge.surfacePresenter removeObserver:self];
-#else
+#ifndef RCT_NEW_ARCH_ENABLED
   [self.bridge.uiManager.observerCoordinator removeObserver:self];
 #endif // RCT_NEW_ARCH_ENABLED
 }
@@ -115,9 +112,7 @@ - (void)setBridge:(RCTBridge *)bridge
                                                 eventDispatcher:bridge.eventDispatcher];
   _operations = [NSMutableArray new];
 
-#ifdef RCT_NEW_ARCH_ENABLED
-  [bridge.surfacePresenter addObserver:self];
-#else
+#ifndef RCT_NEW_ARCH_ENABLED
   [bridge.uiManager.observerCoordinator addObserver:self];
 #endif // RCT_NEW_ARCH_ENABLED
 }
@@ -243,8 +238,6 @@ - (void)addOperationBlock:(GestureHandlerOperation)operation
   [_operations addObject:operation];
 }
 
-#pragma mark - RCTSurfacePresenterObserver
-
 #ifndef RCT_NEW_ARCH_ENABLED
 
 #pragma mark - RCTUIManagerObserver