react-native-gesture-handler 2.14.0 → 2.15.0

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>
@@ -52,11 +52,12 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
   RCTUIManager *_uiManager;
   NSHashTable<RNRootViewGestureRecognizer *> *_rootViewGestureRecognizers;
   NSMutableDictionary<NSNumber *, NSNumber *> *_attachRetryCounter;
-  RCTEventDispatcher *_eventDispatcher;
+  id<RCTEventDispatcherProtocol> _eventDispatcher;
   id _reanimatedModule;
 }
 
-- (instancetype)initWithUIManager:(RCTUIManager *)uiManager eventDispatcher:(RCTEventDispatcher *)eventDispatcher
+- (instancetype)initWithUIManager:(RCTUIManager *)uiManager
+                  eventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher
 {
   if ((self = [super init])) {
     _uiManager = uiManager;
@@ -71,6 +72,14 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
 
 - (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 +115,7 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
                toViewWithTag:(nonnull NSNumber *)viewTag
               withActionType:(RNGestureHandlerActionType)actionType
 {
-  UIView *view = [_uiManager viewForReactTag:viewTag];
+  RNGHUIView *view = [_uiManager viewForReactTag:viewTag];
 
 #ifdef RCT_NEW_ARCH_ENABLED
   if (view == nil || view.superview == nil) {
@@ -177,9 +186,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 +207,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 +221,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 +240,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 +266,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 +287,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;
 

package/apple/RNGestureHandlerModule.h

@@ -0,0 +1,17 @@
+#import <React/RCTEventEmitter.h>
+#import <React/RCTUIManager.h>
+
+#ifdef RN_FABRIC_ENABLED
+#import <rngesturehandler_codegen/rngesturehandler_codegen.h>
+#else
+#import <React/RCTBridgeModule.h>
+#endif
+
+@interface RNGestureHandlerModule : RCTEventEmitter
+#ifdef RN_FABRIC_ENABLED
+                                    <NativeRNGestureHandlerModuleSpec>
+#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>
 
 @end
 #else
@@ -66,9 +67,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
 }
@@ -113,9 +112,7 @@ void decorateRuntime(jsi::Runtime &runtime)
                                                 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
 }
@@ -123,55 +120,55 @@ void decorateRuntime(jsi::Runtime &runtime)
 #ifdef RCT_NEW_ARCH_ENABLED
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install)
 {
-  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
-  auto runtime = (jsi::Runtime *)cxxBridge.runtime;
-  decorateRuntime(*runtime);
+  [self.bridge
+      dispatchBlock:^{
+        RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
+        auto runtime = (jsi::Runtime *)cxxBridge.runtime;
+        decorateRuntime(*runtime);
+      }
+              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];
   }];
 }
 
@@ -209,16 +206,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 +238,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 +256,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 +295,12 @@ RCT_EXPORT_METHOD(flushOperations)
   };
 }
 
+#if RN_FABRIC_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;
 

package/{ios → apple}/RNGestureHandlerPointerTracker.m

@@ -5,7 +5,7 @@
 
 @implementation RNGestureHandlerPointerTracker {
   __weak RNGestureHandler *_gestureHandler;
-  UITouch *_trackedPointers[MAX_POINTERS_COUNT];
+  RNGHUITouch *_trackedPointers[MAX_POINTERS_COUNT];
   int _trackedPointersCount;
 }
 
@@ -23,7 +23,7 @@
   return self;
 }
 
-- (int)registerTouch:(UITouch *)touch
+- (int)registerTouch:(RNGHUITouch *)touch
 {
   for (int index = 0; index < MAX_POINTERS_COUNT; index++) {
     if (_trackedPointers[index] == nil) {
@@ -35,7 +35,7 @@
   return -1;
 }
 
-- (int)unregisterTouch:(UITouch *)touch
+- (int)unregisterTouch:(RNGHUITouch *)touch
 {
   for (int index = 0; index < MAX_POINTERS_COUNT; index++) {
     if (_trackedPointers[index] == touch) {
@@ -47,7 +47,7 @@
   return -1;
 }
 
-- (int)findTouchIndex:(UITouch *)touch
+- (int)findTouchIndex:(RNGHUITouch *)touch
 {
   for (int index = 0; index < MAX_POINTERS_COUNT; index++) {
     if (_trackedPointers[index] == touch) {
@@ -68,10 +68,15 @@
   return count;
 }
 
-- (NSDictionary *)extractPointerData:(int)index forTouch:(UITouch *)touch
+- (NSDictionary *)extractPointerData:(int)index forTouch:(RNGHUITouch *)touch
 {
+#if TARGET_OS_OSX
+  CGPoint absolutePos = [touch locationInWindow];
+  CGPoint relativePos = [touch.window.contentView convertPoint:absolutePos fromView:_gestureHandler.recognizer.view];
+#else
   CGPoint relativePos = [touch locationInView:_gestureHandler.recognizer.view];
   CGPoint absolutePos = [touch locationInView:_gestureHandler.recognizer.view.window];
+#endif
 
   return @{
     @"id" : @(index),
@@ -90,7 +95,7 @@
   int nextIndex = 0;
 
   for (int i = 0; i < MAX_POINTERS_COUNT; i++) {
-    UITouch *touch = _trackedPointers[i];
+    RNGHUITouch *touch = _trackedPointers[i];
     if (touch != nil) {
       data[nextIndex++] = [self extractPointerData:i forTouch:touch];
     }
@@ -99,7 +104,7 @@
   _allPointersData = [[NSArray alloc] initWithObjects:data count:registeredTouches];
 }
 
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   if (!_gestureHandler.needsPointerData) {
     return;
@@ -110,7 +115,7 @@
   NSDictionary *data[touches.count];
 
   for (int i = 0; i < [touches count]; i++) {
-    UITouch *touch = [[touches allObjects] objectAtIndex:i];
+    RNGHUITouch *touch = [[touches allObjects] objectAtIndex:i];
     int index = [self registerTouch:touch];
     if (index >= 0) {
       _trackedPointersCount++;
@@ -125,7 +130,7 @@
   [self sendEvent];
 }
 
-- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesMoved:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   if (!_gestureHandler.needsPointerData) {
     return;
@@ -136,7 +141,7 @@
   NSDictionary *data[touches.count];
 
   for (int i = 0; i < [touches count]; i++) {
-    UITouch *touch = [[touches allObjects] objectAtIndex:i];
+    RNGHUITouch *touch = [[touches allObjects] objectAtIndex:i];
     int index = [self findTouchIndex:touch];
     data[i] = [self extractPointerData:index forTouch:touch];
   }
@@ -146,7 +151,7 @@
   [self sendEvent];
 }
 
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesEnded:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   if (!_gestureHandler.needsPointerData) {
     return;
@@ -160,7 +165,7 @@
   NSDictionary *data[touches.count];
 
   for (int i = 0; i < [touches count]; i++) {
-    UITouch *touch = [[touches allObjects] objectAtIndex:i];
+    RNGHUITouch *touch = [[touches allObjects] objectAtIndex:i];
     int index = [self unregisterTouch:touch];
     if (index >= 0) {
       _trackedPointersCount--;
@@ -173,7 +178,7 @@
   [self sendEvent];
 }
 
-- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   if (!_gestureHandler.needsPointerData) {
     return;
@@ -213,7 +218,7 @@
     NSDictionary *data[registeredTouches];
 
     for (int i = 0; i < MAX_POINTERS_COUNT; i++) {
-      UITouch *touch = _trackedPointers[i];
+      RNGHUITouch *touch = _trackedPointers[i];
       if (touch != nil) {
         data[nextIndex++] = [self extractPointerData:i forTouch:touch];
         [self unregisterTouch:touch];

package/{ios → apple}/RNGestureHandlerRegistry.h

@@ -13,7 +13,7 @@
 - (nullable RNGestureHandler *)handlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)registerGestureHandler:(nonnull RNGestureHandler *)gestureHandler;
 - (void)attachHandlerWithTag:(nonnull NSNumber *)handlerTag
-                      toView:(nonnull UIView *)view
+                      toView:(nonnull RNGHUIView *)view
               withActionType:(RNGestureHandlerActionType)actionType;
 - (void)dropHandlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)dropAllHandlers;

package/{ios → apple}/RNGestureHandlerRegistry.m

@@ -33,7 +33,7 @@
 }
 
 - (void)attachHandlerWithTag:(NSNumber *)handlerTag
-                      toView:(UIView *)view
+                      toView:(RNGHUIView *)view
               withActionType:(RNGestureHandlerActionType)actionType
 {
   RNGestureHandler *handler = _handlers[handlerTag];

package/{ios → apple}/RNManualActivationRecognizer.h

@@ -1,8 +1,16 @@
+#if !TARGET_OS_OSX
 #import <UIKit/UIGestureRecognizerSubclass.h>
+#else
+#import <Appkit/NSGestureRecognizer.h>
+#endif
 
 @class RNGestureHandler;
 
+#if !TARGET_OS_OSX
 @interface RNManualActivationRecognizer : UIGestureRecognizer <UIGestureRecognizerDelegate>
+#else
+@interface RNManualActivationRecognizer : NSGestureRecognizer <NSGestureRecognizerDelegate>
+#endif
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
 - (void)fail;

package/{ios → apple}/RNManualActivationRecognizer.m

@@ -12,7 +12,9 @@
     _handler = gestureHandler;
     _activePointers = 0;
     self.delegate = self;
+#if !TARGET_OS_OSX
     self.cancelsTouchesInView = NO;
+#endif
   }
   return self;
 }
@@ -25,19 +27,35 @@
   }
 }
 
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+#if TARGET_OS_OSX
+- (void)mouseUp:(NSEvent *)event
 {
-  [super touchesBegan:touches withEvent:event];
+  [super mouseUp:event];
 
-  _activePointers += touches.count;
+  _activePointers -= 1;
 }
 
-- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)mouseDown:(NSEvent *)event
 {
-  [super touchesMoved:touches withEvent:event];
+  [super mouseDown:event];
+
+  _activePointers += 1;
+
+  if (_activePointers == 0) {
+    self.state = UIGestureRecognizerStateBegan;
+  }
 }
 
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+#else
+
+- (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
+{
+  [super touchesBegan:touches withEvent:event];
+
+  _activePointers += touches.count;
+}
+
+- (void)touchesEnded:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesEnded:touches withEvent:event];
 
@@ -48,7 +66,7 @@
   }
 }
 
-- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesCancelled:touches withEvent:event];
 
@@ -56,6 +74,8 @@
   [self reset];
 }
 
+#endif
+
 - (void)reset
 {
   self.enabled = YES;