Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP Staging] Backport a fix for react-native-gesture-handler #45918

Merged
merged 2 commits into from
Jul 22, 2024
Merged

[CP Staging] Backport a fix for react-native-gesture-handler #45918

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88cb34e
Add rngh patch
j-piasecki Jul 22, 2024
c81c90c
Fix patch
j-piasecki Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions patches/react-native-gesture-handler+2.14.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
diff --git a/node_modules/react-native-gesture-handler/ios/RNGestureHandlerModule.mm b/node_modules/react-native-gesture-handler/ios/RNGestureHandlerModule.mm
index b999c2c..583a5d2 100644
--- a/node_modules/react-native-gesture-handler/ios/RNGestureHandlerModule.mm
+++ b/node_modules/react-native-gesture-handler/ios/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>
@@ -32,7 +31,7 @@
#endif // RCT_NEW_ARCH_ENABLED

#ifdef RCT_NEW_ARCH_ENABLED
-@interface RNGestureHandlerModule () <RCTSurfacePresenterObserver, RNGestureHandlerStateManager>
+@interface RNGestureHandlerModule () <RNGestureHandlerStateManager>

@end
#else
@@ -66,9 +65,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
}
@@ -113,9 +110,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
}
@@ -241,27 +236,7 @@ - (void)addOperationBlock:(GestureHandlerOperation)operation
[_operations addObject: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

Loading