react-native-gesture-handler 2.14.1 → 2.16.0-rc.0

package/{ios → apple}/RNGestureHandlerEvents.m

@@ -12,26 +12,31 @@
   return self;
 }
 
-+ (RNGestureHandlerEventExtraData *)forPosition:(CGPoint)position withAbsolutePosition:(CGPoint)absolutePosition
++ (RNGestureHandlerEventExtraData *)forPosition:(CGPoint)position
+                           withAbsolutePosition:(CGPoint)absolutePosition
+                                withPointerType:(NSInteger)pointerType
 {
   return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
     @"x" : @(position.x),
     @"y" : @(position.y),
     @"absoluteX" : @(absolutePosition.x),
-    @"absoluteY" : @(absolutePosition.y)
+    @"absoluteY" : @(absolutePosition.y),
+    @"pointerType" : @(pointerType)
   }];
 }
 
 + (RNGestureHandlerEventExtraData *)forPosition:(CGPoint)position
                            withAbsolutePosition:(CGPoint)absolutePosition
                             withNumberOfTouches:(NSUInteger)numberOfTouches
+                                withPointerType:(NSInteger)pointerType
 {
   return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
     @"x" : @(position.x),
     @"y" : @(position.y),
     @"absoluteX" : @(absolutePosition.x),
     @"absoluteY" : @(absolutePosition.y),
-    @"numberOfPointers" : @(numberOfTouches)
+    @"numberOfPointers" : @(numberOfTouches),
+    @"pointerType" : @(pointerType)
   }];
 }
 
@@ -39,6 +44,7 @@
                            withAbsolutePosition:(CGPoint)absolutePosition
                             withNumberOfTouches:(NSUInteger)numberOfTouches
                                    withDuration:(NSUInteger)duration
+                                withPointerType:(NSInteger)pointerType
 {
   return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
     @"x" : @(position.x),
@@ -46,7 +52,8 @@
     @"absoluteX" : @(absolutePosition.x),
     @"absoluteY" : @(absolutePosition.y),
     @"numberOfPointers" : @(numberOfTouches),
-    @"duration" : @(duration)
+    @"duration" : @(duration),
+    @"pointerType" : @(pointerType)
   }];
 }
 
@@ -55,6 +62,7 @@
                            withTranslation:(CGPoint)translation
                               withVelocity:(CGPoint)velocity
                        withNumberOfTouches:(NSUInteger)numberOfTouches
+                           withPointerType:(NSInteger)pointerType
 {
   return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
     @"x" : @(position.x),
@@ -65,7 +73,8 @@
     @"translationY" : @(translation.y),
     @"velocityX" : SAFE_VELOCITY(velocity.x),
     @"velocityY" : SAFE_VELOCITY(velocity.y),
-    @"numberOfPointers" : @(numberOfTouches)
+    @"numberOfPointers" : @(numberOfTouches),
+    @"pointerType" : @(pointerType)
   }];
 }
 
@@ -73,6 +82,7 @@
                                  forPosition:(CGPoint)position
                         withAbsolutePosition:(CGPoint)absolutePosition
                          withNumberOfTouches:(NSUInteger)numberOfTouches
+                             withPointerType:(NSInteger)pointerType
 {
   return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
     @"x" : @(position.x),
@@ -80,7 +90,8 @@
     @"absoluteX" : @(absolutePosition.x),
     @"absoluteY" : @(absolutePosition.y),
     @"force" : @(force),
-    @"numberOfPointers" : @(numberOfTouches)
+    @"numberOfPointers" : @(numberOfTouches),
+    @"pointerType" : @(pointerType)
   }];
 }
 
@@ -88,13 +99,15 @@
                               withFocalPoint:(CGPoint)focalPoint
                                 withVelocity:(CGFloat)velocity
                          withNumberOfTouches:(NSUInteger)numberOfTouches
+                             withPointerType:(NSInteger)pointerType
 {
   return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
     @"scale" : @(scale),
     @"focalX" : @(focalPoint.x),
     @"focalY" : @(focalPoint.y),
     @"velocity" : SAFE_VELOCITY(velocity),
-    @"numberOfPointers" : @(numberOfTouches)
+    @"numberOfPointers" : @(numberOfTouches),
+    @"pointerType" : @(pointerType)
   }];
 }
 
@@ -102,13 +115,15 @@
                                 withAnchorPoint:(CGPoint)anchorPoint
                                    withVelocity:(CGFloat)velocity
                             withNumberOfTouches:(NSUInteger)numberOfTouches
+                                withPointerType:(NSInteger)pointerType
 {
   return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
     @"rotation" : @(rotation),
     @"anchorX" : @(anchorPoint.x),
     @"anchorY" : @(anchorPoint.y),
     @"velocity" : SAFE_VELOCITY(velocity),
-    @"numberOfPointers" : @(numberOfTouches)
+    @"numberOfPointers" : @(numberOfTouches),
+    @"pointerType" : @(pointerType)
   }];
 }
 
@@ -116,6 +131,7 @@
                              withChangedPointers:(NSArray<NSDictionary *> *)changedPointers
                                  withAllPointers:(NSArray<NSDictionary *> *)allPointers
                              withNumberOfTouches:(NSUInteger)numberOfTouches
+                                 withPointerType:(NSInteger)pointerType
 {
   if (changedPointers == nil || allPointers == nil) {
     changedPointers = @[];
@@ -127,13 +143,15 @@
     @"eventType" : @(eventType),
     @"changedTouches" : changedPointers,
     @"allTouches" : allPointers,
-    @"numberOfTouches" : @(numberOfTouches)
+    @"numberOfTouches" : @(numberOfTouches),
+    @"pointerType" : @(pointerType)
   }];
 }
 
-+ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside
++ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside withPointerType:(NSInteger)pointerType
 {
-  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{@"pointerInside" : @(pointerInside)}];
+  return [[RNGestureHandlerEventExtraData alloc]
+      initWithData:@{@"pointerInside" : @(pointerInside), @"pointerType" : @(pointerType)}];
 }
 
 @end

package/{ios → apple}/RNGestureHandlerManager.h

@@ -9,8 +9,13 @@
 
 @interface RNGestureHandlerManager : NSObject
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (nonnull instancetype)initWithModuleRegistry:(nonnull RCTModuleRegistry *)moduleRegistry
+                                  viewRegistry:(nonnull RCTViewRegistry *)viewRegistry;
+#else
 - (nonnull instancetype)initWithUIManager:(nonnull RCTUIManager *)uiManager
-                          eventDispatcher:(nonnull RCTEventDispatcher *)eventDispatcher;
+                          eventDispatcher:(nonnull id<RCTEventDispatcherProtocol>)eventDispatcher;
+#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)createGestureHandler:(nonnull NSString *)handlerName
                          tag:(nonnull NSNumber *)handlerTag
@@ -26,7 +31,7 @@
 
 - (void)dropAllGestureHandlers;
 
-- (void)handleSetJSResponder:(nonnull NSNumber *)viewTag blockNativeResponder:(nonnull NSNumber *)blockNativeResponder;
+- (void)handleSetJSResponder:(nonnull NSNumber *)viewTag blockNativeResponder:(BOOL)blockNativeResponder;
 
 - (void)handleClearJSResponder;
 

package/{ios → apple}/RNGestureHandlerManager.mm

@@ -1,7 +1,7 @@
 #import "RNGestureHandlerManager.h"
 
 #import <React/RCTComponent.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
 #import <React/RCTModalHostViewController.h>
 #import <React/RCTRootContentView.h>
@@ -49,28 +49,59 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
 
 @implementation RNGestureHandlerManager {
   RNGestureHandlerRegistry *_registry;
-  RCTUIManager *_uiManager;
   NSHashTable<RNRootViewGestureRecognizer *> *_rootViewGestureRecognizers;
   NSMutableDictionary<NSNumber *, NSNumber *> *_attachRetryCounter;
-  RCTEventDispatcher *_eventDispatcher;
+#ifdef RCT_NEW_ARCH_ENABLED
+  RCTModuleRegistry *_moduleRegistry;
+  RCTViewRegistry *_viewRegistry;
+#else
+  RCTUIManager *_uiManager;
+#endif // RCT_NEW_ARCH_ENABLED
+  id<RCTEventDispatcherProtocol> _eventDispatcher;
   id _reanimatedModule;
 }
 
-- (instancetype)initWithUIManager:(RCTUIManager *)uiManager eventDispatcher:(RCTEventDispatcher *)eventDispatcher
+#ifdef RCT_NEW_ARCH_ENABLED
+- (instancetype)initWithModuleRegistry:(RCTModuleRegistry *)moduleRegistry viewRegistry:(RCTViewRegistry *)viewRegistry
+{
+  if ((self = [super init])) {
+    _moduleRegistry = moduleRegistry;
+    _viewRegistry = viewRegistry;
+    _eventDispatcher = [_moduleRegistry moduleForName:"EventDispatcher"];
+    [self initCommonProps];
+  }
+  return self;
+}
+#else
+- (instancetype)initWithUIManager:(RCTUIManager *)uiManager
+                  eventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher
 {
   if ((self = [super init])) {
     _uiManager = uiManager;
     _eventDispatcher = eventDispatcher;
-    _registry = [RNGestureHandlerRegistry new];
-    _rootViewGestureRecognizers = [NSHashTable hashTableWithOptions:NSPointerFunctionsWeakMemory];
-    _attachRetryCounter = [[NSMutableDictionary alloc] init];
-    _reanimatedModule = nil;
+    [self initCommonProps];
   }
   return self;
 }
+#endif // RCT_NEW_ARCH_ENABLED
+
+- (void)initCommonProps
+{
+  _registry = [RNGestureHandlerRegistry new];
+  _rootViewGestureRecognizers = [NSHashTable hashTableWithOptions:NSPointerFunctionsWeakMemory];
+  _attachRetryCounter = [[NSMutableDictionary alloc] init];
+}
 
 - (void)createGestureHandler:(NSString *)handlerName tag:(NSNumber *)handlerTag config:(NSDictionary *)config
 {
+  if ([_registry handlerWithTag:handlerTag] != nullptr) {
+    NSString *errorMessage = [NSString
+        stringWithFormat:
+            @"Handler with tag %@ already exists. Please ensure that no Gesture instance is used across multiple GestureDetectors.",
+            handlerTag];
+    @throw [NSException exceptionWithName:@"HandlerAlreadyRegistered" reason:errorMessage userInfo:nil];
+  }
+
   static NSDictionary *map;
   static dispatch_once_t mapToken;
   dispatch_once(&mapToken, ^{
@@ -106,7 +137,11 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
                toViewWithTag:(nonnull NSNumber *)viewTag
               withActionType:(RNGestureHandlerActionType)actionType
 {
-  UIView *view = [_uiManager viewForReactTag:viewTag];
+#ifdef RCT_NEW_ARCH_ENABLED
+  RNGHUIView *view = [_viewRegistry viewForReactTag:viewTag];
+#else
+  RNGHUIView *view = [_uiManager viewForReactTag:viewTag];
+#endif // RCT_NEW_ARCH_ENABLED
 
 #ifdef RCT_NEW_ARCH_ENABLED
   if (view == nil || view.superview == nil) {
@@ -177,9 +212,9 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
   [_registry dropAllHandlers];
 }
 
-- (void)handleSetJSResponder:(NSNumber *)viewTag blockNativeResponder:(NSNumber *)blockNativeResponder
+- (void)handleSetJSResponder:(NSNumber *)viewTag blockNativeResponder:(BOOL)blockNativeResponder
 {
-  if ([blockNativeResponder boolValue]) {
+  if (blockNativeResponder) {
     for (RNRootViewGestureRecognizer *recognizer in _rootViewGestureRecognizers) {
       [recognizer blockOtherRecognizers];
     }
@@ -198,11 +233,12 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
 
 #pragma mark Root Views Management
 
-- (void)registerViewWithGestureRecognizerAttachedIfNeeded:(UIView *)childView
+- (void)registerViewWithGestureRecognizerAttachedIfNeeded:(RNGHUIView *)childView
 {
 #ifdef RCT_NEW_ARCH_ENABLED
-  UIView *touchHandlerView = childView;
+  RNGHUIView *touchHandlerView = childView;
 
+#if !TARGET_OS_OSX
   if ([[childView reactViewController] isKindOfClass:[RCTFabricModalHostViewController class]]) {
     touchHandlerView = [childView reactViewController].view;
   } else {
@@ -211,8 +247,15 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
     }
   }
 #else
-  UIView *touchHandlerView = nil;
+  while (touchHandlerView != nil && ![touchHandlerView isKindOfClass:[RCTSurfaceView class]]) {
+    touchHandlerView = touchHandlerView.superview;
+  }
+#endif // !TARGET_OS_OSX
+
+#else
+  RNGHUIView *touchHandlerView = nil;
 
+#if !TARGET_OS_OSX
   if ([[childView reactViewController] isKindOfClass:[RCTModalHostViewController class]]) {
     touchHandlerView = [childView reactViewController].view.subviews[0];
   } else {
@@ -223,6 +266,15 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
 
     touchHandlerView = [[parent performSelector:@selector(touchHandler)] view];
   }
+#else
+  NSView *parent = childView;
+  while (parent != nil && ![parent respondsToSelector:@selector(touchHandler)]) {
+    parent = parent.superview;
+  }
+
+  touchHandlerView = [[parent performSelector:@selector(touchHandler)] view];
+#endif // !TARGET_OS_OSX
+
 #endif // RCT_NEW_ARCH_ENABLED
 
   if (touchHandlerView == nil) {
@@ -240,13 +292,15 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
   RCTLifecycleLog(@"[GESTURE HANDLER] Initialize gesture handler for view %@", touchHandlerView);
   RNRootViewGestureRecognizer *recognizer = [RNRootViewGestureRecognizer new];
   recognizer.delegate = self;
+#if !TARGET_OS_OSX
   touchHandlerView.userInteractionEnabled = YES;
+#endif
   [touchHandlerView addGestureRecognizer:recognizer];
   [_rootViewGestureRecognizers addObject:recognizer];
 }
 
 - (void)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
-    didActivateInViewWithTouchHandler:(UIView *)viewWithTouchHandler
+    didActivateInViewWithTouchHandler:(RNGHUIView *)viewWithTouchHandler
 {
   // Cancel touches in RN's root view in order to cancel all in-js recognizers
 
@@ -259,8 +313,15 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
   // particular if we have one PanHandler and ScrollView that can work simultaniously then when
   // the Pan handler activates it would still tigger cancel events.
   // Once the upstream fix lands the line below along with this comment can be removed
-  if ([gestureRecognizer.view isKindOfClass:[UIScrollView class]])
+#if TARGET_OS_OSX
+  if ([gestureRecognizer.view isKindOfClass:[NSScrollView class]]) {
     return;
+  }
+#else
+  if ([gestureRecognizer.view isKindOfClass:[UIScrollView class]]) {
+    return;
+  }
+#endif
 
   UIGestureRecognizer *touchHandler = nil;
 
@@ -315,7 +376,7 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
 #ifdef RCT_NEW_ARCH_ENABLED
   // Send event directly to Reanimated
   if (_reanimatedModule == nil) {
-    _reanimatedModule = [_uiManager.bridge moduleForName:@"ReanimatedModule"];
+    _reanimatedModule = [_moduleRegistry moduleForName:"ReanimatedModule"];
   }
 
   [_reanimatedModule eventDispatcherWillDispatchEvent:event];

package/apple/RNGestureHandlerModule.h

@@ -0,0 +1,19 @@
+#import <React/RCTEventEmitter.h>
+#import <React/RCTUIManager.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTEventDispatcherProtocol.h>
+#import <React/RCTInitializing.h>
+#import <rngesturehandler_codegen/rngesturehandler_codegen.h>
+#else
+#import <React/RCTBridgeModule.h>
+#endif
+
+@interface RNGestureHandlerModule : RCTEventEmitter
+#ifdef RCT_NEW_ARCH_ENABLED
+                                    <NativeRNGestureHandlerModuleSpec, RCTJSDispatcherModule, RCTInitializing>
+#else
+                                    <RCTBridgeModule>
+#endif
+
+@end

package/{ios → 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>
@@ -26,13 +25,15 @@
 #import "RNGestureHandlerButton.h"
 #import "RNGestureHandlerStateManager.h"
 
+#import <React/RCTJSThread.h>
+
 #ifdef RCT_NEW_ARCH_ENABLED
 using namespace facebook;
 using namespace react;
 #endif // RCT_NEW_ARCH_ENABLED
 
 #ifdef RCT_NEW_ARCH_ENABLED
-@interface RNGestureHandlerModule () <RCTSurfacePresenterObserver, RNGestureHandlerStateManager>
+@interface RNGestureHandlerModule () <RNGestureHandlerStateManager, RCTTurboModule>
 
 @end
 #else
@@ -50,6 +51,12 @@ typedef void (^GestureHandlerOperation)(RNGestureHandlerManager *manager);
   NSMutableArray<GestureHandlerOperation> *_operations;
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
+@synthesize bridge = _bridge;
+@synthesize dispatchToJSThread = _dispatchToJSThread;
+#endif // RCT_NEW_ARCH_ENABLED
+
 RCT_EXPORT_MODULE()
 
 + (BOOL)requiresMainQueueSetup
@@ -66,9 +73,7 @@ RCT_EXPORT_MODULE()
 
   _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
 }
@@ -95,8 +100,7 @@ void decorateRuntime(jsi::Runtime &runtime)
         if (!arguments[0].isObject()) {
           return jsi::Value::null();
         }
-
-        auto shadowNode = arguments[0].asObject(runtime).getHostObject<ShadowNodeWrapper>(runtime)->shadowNode;
+        auto shadowNode = arguments[0].asObject(runtime).getNativeState<ShadowNode>(runtime);
         bool isFormsStackingContext = shadowNode->getTraits().check(ShadowNodeTraits::FormsStackingContext);
 
         return jsi::Value(isFormsStackingContext);
@@ -105,6 +109,14 @@ void decorateRuntime(jsi::Runtime &runtime)
 }
 #endif // RCT_NEW_ARCH_ENABLED
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)initialize
+{
+  _manager = [[RNGestureHandlerManager alloc] initWithModuleRegistry:self.moduleRegistry
+                                                        viewRegistry:_viewRegistry_DEPRECATED];
+  _operations = [NSMutableArray new];
+}
+#else
 - (void)setBridge:(RCTBridge *)bridge
 {
   [super setBridge:bridge];
@@ -113,65 +125,65 @@ void decorateRuntime(jsi::Runtime &runtime)
                                                 eventDispatcher:bridge.eventDispatcher];
   _operations = [NSMutableArray new];
 
-#ifdef RCT_NEW_ARCH_ENABLED
-  [bridge.surfacePresenter addObserver:self];
-#else
   [bridge.uiManager.observerCoordinator addObserver:self];
-#endif // RCT_NEW_ARCH_ENABLED
 }
+#endif // RCT_NEW_ARCH_ENABLED
 
 #ifdef RCT_NEW_ARCH_ENABLED
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
-  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
-  auto runtime = (jsi::Runtime *)cxxBridge.runtime;
-  decorateRuntime(*runtime);
+  dispatch_block_t block = ^{
+    RCTCxxBridge *cxxBridge = (RCTCxxBridge *)[RCTBridge currentBridge];
+    auto runtime = (jsi::Runtime *)cxxBridge.runtime;
+    decorateRuntime(*runtime);
+  };
+  if (_dispatchToJSThread) {
+    _dispatchToJSThread(block);
+  } else {
+    [[RCTBridge currentBridge] dispatchBlock:block queue:RCTJSThread];
+  }
+
   return @true;
 }
 #endif // RCT_NEW_ARCH_ENABLED
 
 RCT_EXPORT_METHOD(createGestureHandler
-                  : (nonnull NSString *)handlerName tag
-                  : (nonnull NSNumber *)handlerTag config
+                  : (nonnull NSString *)handlerName handlerTag
+                  : (double)handlerTag config
                   : (NSDictionary *)config)
 {
   [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-    [manager createGestureHandler:handlerName tag:handlerTag config:config];
+    [manager createGestureHandler:handlerName tag:[NSNumber numberWithDouble:handlerTag] config:config];
   }];
 }
 
-RCT_EXPORT_METHOD(attachGestureHandler
-                  : (nonnull NSNumber *)handlerTag toViewWithTag
-                  : (nonnull NSNumber *)viewTag actionType
-                  : (nonnull NSNumber *)actionType)
+RCT_EXPORT_METHOD(attachGestureHandler : (double)handlerTag newView : (double)viewTag actionType : (double)actionType)
 {
   [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-    [manager attachGestureHandler:handlerTag
-                    toViewWithTag:viewTag
-                   withActionType:(RNGestureHandlerActionType)[actionType integerValue]];
+    [manager attachGestureHandler:[NSNumber numberWithDouble:handlerTag]
+                    toViewWithTag:[NSNumber numberWithDouble:viewTag]
+                   withActionType:(RNGestureHandlerActionType)[[NSNumber numberWithDouble:actionType] integerValue]];
   }];
 }
 
-RCT_EXPORT_METHOD(updateGestureHandler : (nonnull NSNumber *)handlerTag config : (NSDictionary *)config)
+RCT_EXPORT_METHOD(updateGestureHandler : (double)handlerTag newConfig : (NSDictionary *)config)
 {
   [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-    [manager updateGestureHandler:handlerTag config:config];
+    [manager updateGestureHandler:[NSNumber numberWithDouble:handlerTag] config:config];
   }];
 }
 
-RCT_EXPORT_METHOD(dropGestureHandler : (nonnull NSNumber *)handlerTag)
+RCT_EXPORT_METHOD(dropGestureHandler : (double)handlerTag)
 {
   [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-    [manager dropGestureHandler:handlerTag];
+    [manager dropGestureHandler:[NSNumber numberWithDouble:handlerTag]];
   }];
 }
 
-RCT_EXPORT_METHOD(handleSetJSResponder
-                  : (nonnull NSNumber *)viewTag blockNativeResponder
-                  : (nonnull NSNumber *)blockNativeResponder)
+RCT_EXPORT_METHOD(handleSetJSResponder : (double)viewTag blockNativeResponder : (BOOL)blockNativeResponder)
 {
   [self addOperationBlock:^(RNGestureHandlerManager *manager) {
-    [manager handleSetJSResponder:viewTag blockNativeResponder:blockNativeResponder];
+    [manager handleSetJSResponder:[NSNumber numberWithDouble:viewTag] blockNativeResponder:blockNativeResponder];
   }];
 }
 
@@ -194,12 +206,11 @@ RCT_EXPORT_METHOD(flushOperations)
   NSArray<GestureHandlerOperation> *operations = _operations;
   _operations = [NSMutableArray new];
 
-  [self.bridge.uiManager
-      addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-        for (GestureHandlerOperation operation in operations) {
-          operation(self->_manager);
-        }
-      }];
+  [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
+    for (GestureHandlerOperation operation in operations) {
+      operation(self->_manager);
+    }
+  }];
 #endif // RCT_NEW_ARCH_ENABLED
 }
 
@@ -209,16 +220,16 @@ RCT_EXPORT_METHOD(flushOperations)
 
   if (handler != nil) {
     if (state == 1) { // FAILED
-      handler.recognizer.state = UIGestureRecognizerStateFailed;
+      handler.recognizer.state = RNGHGestureRecognizerStateFailed;
     } else if (state == 2) { // BEGAN
-      handler.recognizer.state = UIGestureRecognizerStatePossible;
+      handler.recognizer.state = RNGHGestureRecognizerStatePossible;
     } else if (state == 3) { // CANCELLED
-      handler.recognizer.state = UIGestureRecognizerStateCancelled;
+      handler.recognizer.state = RNGHGestureRecognizerStateCancelled;
     } else if (state == 4) { // ACTIVE
       [handler stopActivationBlocker];
-      handler.recognizer.state = UIGestureRecognizerStateBegan;
+      handler.recognizer.state = RNGHGestureRecognizerStateBegan;
     } else if (state == 5) { // ENDED
-      handler.recognizer.state = UIGestureRecognizerStateEnded;
+      handler.recognizer.state = RNGHGestureRecognizerStateEnded;
     }
   }
 
@@ -241,27 +252,7 @@ RCT_EXPORT_METHOD(flushOperations)
   [_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
 
@@ -279,11 +270,12 @@ RCT_EXPORT_METHOD(flushOperations)
   NSArray<GestureHandlerOperation> *operations = _operations;
   _operations = [NSMutableArray new];
 
-  [uiManager addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    for (GestureHandlerOperation operation in operations) {
-      operation(self->_manager);
-    }
-  }];
+  [uiManager
+      addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, RNGHUIView *> *viewRegistry) {
+        for (GestureHandlerOperation operation in operations) {
+          operation(self->_manager);
+        }
+      }];
 }
 
 #endif // RCT_NEW_ARCH_ENABLED
@@ -317,4 +309,12 @@ RCT_EXPORT_METHOD(flushOperations)
   };
 }
 
+#if RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return std::make_shared<facebook::react::NativeRNGestureHandlerModuleSpecJSI>(params);
+}
+#endif
+
 @end

package/{ios → apple}/RNGestureHandlerPointerTracker.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
-
 #import "RNGHTouchEventType.h"
+#import "RNGHUIKit.h"
 
 #define MAX_POINTERS_COUNT 12
 
@@ -15,10 +15,10 @@
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
 
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
-- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
-- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event;
+- (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event;
+- (void)touchesMoved:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event;
+- (void)touchesEnded:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event;
+- (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event;
 - (void)reset;
 - (void)cancelPointers;