@amazon-devices/react-native-gesture-handler 2.0.1758683737 → 4.0.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,8 +62,10 @@
                            withTranslation:(CGPoint)translation
                               withVelocity:(CGPoint)velocity
                        withNumberOfTouches:(NSUInteger)numberOfTouches
+                           withPointerType:(NSInteger)pointerType
+                            withStylusData:(NSDictionary *)stylusData
 {
-  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+  NSMutableDictionary *data = [@{
     @"x" : @(position.x),
     @"y" : @(position.y),
     @"absoluteX" : @(absolutePosition.x),
@@ -65,14 +74,23 @@
     @"translationY" : @(translation.y),
     @"velocityX" : SAFE_VELOCITY(velocity.x),
     @"velocityY" : SAFE_VELOCITY(velocity.y),
-    @"numberOfPointers" : @(numberOfTouches)
-  }];
+    @"numberOfPointers" : @(numberOfTouches),
+    @"pointerType" : @(pointerType),
+  } mutableCopy];
+
+  // Add the stylusData to the dictionary only if necessary
+  if (stylusData != nil) {
+    data[@"stylusData"] = stylusData;
+  }
+
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:data];
 }
 
 + (RNGestureHandlerEventExtraData *)forForce:(CGFloat)force
                                  forPosition:(CGPoint)position
                         withAbsolutePosition:(CGPoint)absolutePosition
                          withNumberOfTouches:(NSUInteger)numberOfTouches
+                             withPointerType:(NSInteger)pointerType
 {
   return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
     @"x" : @(position.x),
@@ -80,7 +98,8 @@
     @"absoluteX" : @(absolutePosition.x),
     @"absoluteY" : @(absolutePosition.y),
     @"force" : @(force),
-    @"numberOfPointers" : @(numberOfTouches)
+    @"numberOfPointers" : @(numberOfTouches),
+    @"pointerType" : @(pointerType)
   }];
 }
 
@@ -88,13 +107,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 +123,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 +139,7 @@
                              withChangedPointers:(NSArray<NSDictionary *> *)changedPointers
                                  withAllPointers:(NSArray<NSDictionary *> *)allPointers
                              withNumberOfTouches:(NSUInteger)numberOfTouches
+                                 withPointerType:(NSInteger)pointerType
 {
   if (changedPointers == nil || allPointers == nil) {
     changedPointers = @[];
@@ -127,13 +151,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,61 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
 
 @implementation RNGestureHandlerManager {
   RNGestureHandlerRegistry *_registry;
-  RCTUIManager *_uiManager;
   NSHashTable<RNRootViewGestureRecognizer *> *_rootViewGestureRecognizers;
   NSMutableDictionary<NSNumber *, NSNumber *> *_attachRetryCounter;
-  RCTEventDispatcher *_eventDispatcher;
+  NSMutableSet *_droppedHandlers;
+#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];
+  _droppedHandlers = [NSMutableSet set];
+}
 
 - (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 +139,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) {
@@ -133,7 +170,9 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
       [_attachRetryCounter setObject:counter forKey:viewTag];
 
       dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-        [self attachGestureHandler:handlerTag toViewWithTag:viewTag withActionType:actionType];
+        if (![_droppedHandlers containsObject:handlerTag]) {
+          [self attachGestureHandler:handlerTag toViewWithTag:viewTag withActionType:actionType];
+        }
       });
     }
 
@@ -170,6 +209,7 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
 - (void)dropGestureHandler:(NSNumber *)handlerTag
 {
   [_registry dropHandlerWithTag:handlerTag];
+  [_droppedHandlers addObject:handlerTag];
 }
 
 - (void)dropAllGestureHandlers
@@ -177,9 +217,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 +238,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 +252,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 +271,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 +297,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 +318,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 +381,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