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

package/{ios → apple}/Handlers/RNTapHandler.m

@@ -8,7 +8,9 @@
 
 #import "RNTapHandler.h"
 
+#if !TARGET_OS_OSX
 #import <UIKit/UIGestureRecognizerSubclass.h>
+#endif
 
 #import <React/RCTConvert.h>
 
@@ -69,9 +71,8 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
   self.enabled = NO;
 }
 
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)interactionsBegan:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  [super touchesBegan:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
 
   if (_tapsSoFar == 0) {
@@ -79,7 +80,11 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
     // is called (it resets the gesture handler), making it send whatever the last known state as oldState
     // in the event. If we reset it here it correctly sends UNDETERMINED as oldState.
     [_gestureHandler reset];
+#if TARGET_OS_OSX
+    _initPosition = [self locationInView:self.view.window.contentView];
+#else
     _initPosition = [self locationInView:self.view.window];
+#endif
   }
   _tapsSoFar++;
   if (_tapsSoFar) {
@@ -96,9 +101,8 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
   [self triggerAction];
 }
 
-- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)interactionsMoved:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  [super touchesMoved:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesMoved:touches withEvent:event];
 
   NSInteger numberOfTouches = [touches count];
@@ -121,9 +125,98 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
   [self triggerAction];
 }
 
+- (void)interactionsEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  [_gestureHandler.pointerTracker touchesEnded:touches withEvent:event];
+
+  if (_numberOfTaps == _tapsSoFar && _maxNumberOfTouches >= _minPointers) {
+    self.state = UIGestureRecognizerStateEnded;
+    [self reset];
+  } else {
+    [self performSelector:@selector(cancel) withObject:nil afterDelay:_maxDelay];
+  }
+}
+
+- (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
+  self.state = UIGestureRecognizerStateCancelled;
+  [self reset];
+}
+
+#if TARGET_OS_OSX
+- (void)mouseDown:(NSEvent *)event
+{
+  [_gestureHandler setCurrentPointerTypeToMouse];
+  [super mouseDown:event];
+  [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
+}
+
+- (void)rightMouseDown:(NSEvent *)event
+{
+  [super rightMouseDown:event];
+  [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
+}
+
+- (void)mouseDragged:(NSEvent *)event
+{
+  [super mouseDragged:event];
+  [self interactionsMoved:[NSSet setWithObject:event] withEvent:event];
+}
+
+- (void)rightMouseDragged:(NSEvent *)event
+{
+  [super rightMouseDragged:event];
+  [self interactionsMoved:[NSSet setWithObject:event] withEvent:event];
+}
+
+- (void)mouseUp:(NSEvent *)event
+{
+  [super mouseUp:event];
+  [self interactionsEnded:[NSSet setWithObject:event] withEvent:event];
+}
+
+- (void)rightMouseUp:(NSEvent *)event
+{
+  [super rightMouseUp:event];
+  [self interactionsEnded:[NSSet setWithObject:event] withEvent:event];
+}
+#else
+
+- (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
+{
+  [_gestureHandler setCurrentPointerType:event];
+  [super touchesBegan:touches withEvent:event];
+  [self interactionsBegan:touches withEvent:event];
+}
+
+- (void)touchesMoved:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
+{
+  [super touchesMoved:touches withEvent:event];
+  [self interactionsMoved:touches withEvent:event];
+}
+
+- (void)touchesEnded:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
+{
+  [super touchesEnded:touches withEvent:event];
+  [self interactionsEnded:touches withEvent:event];
+}
+
+- (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
+{
+  [super touchesCancelled:touches withEvent:event];
+  [self interactionsCancelled:touches withEvent:event];
+}
+
+#endif
+
 - (CGPoint)translationInView
 {
+#if TARGET_OS_OSX
+  CGPoint currentPosition = [self locationInView:self.view.window.contentView];
+#else
   CGPoint currentPosition = [self locationInView:self.view.window];
+#endif
   return CGPointMake(currentPosition.x - _initPosition.x, currentPosition.y - _initPosition.y);
 }
 
@@ -148,28 +241,6 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
   return NO;
 }
 
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
-{
-  [super touchesEnded:touches withEvent:event];
-  [_gestureHandler.pointerTracker touchesEnded:touches withEvent:event];
-
-  if (_numberOfTaps == _tapsSoFar && _maxNumberOfTouches >= _minPointers) {
-    self.state = UIGestureRecognizerStateEnded;
-    [self reset];
-  } else {
-    [self performSelector:@selector(cancel) withObject:nil afterDelay:_maxDelay];
-  }
-}
-
-- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
-{
-  [super touchesCancelled:touches withEvent:event];
-  [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
-
-  self.state = UIGestureRecognizerStateCancelled;
-  [self reset];
-}
-
 - (void)reset
 {
   if (self.state == UIGestureRecognizerStateFailed) {
@@ -182,6 +253,7 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
   _maxNumberOfTouches = 0;
   self.enabled = YES;
   [super reset];
+  [_gestureHandler reset];
 }
 
 @end

package/apple/RNGHUIKit.h

@@ -0,0 +1,27 @@
+#if !TARGET_OS_OSX
+
+#import <UIKit/UIKit.h>
+
+typedef UIView RNGHUIView;
+typedef UITouch RNGHUITouch;
+
+#define RNGHGestureRecognizerStateFailed UIGestureRecognizerStateFailed;
+#define RNGHGestureRecognizerStatePossible UIGestureRecognizerStatePossible;
+#define RNGHGestureRecognizerStateCancelled UIGestureRecognizerStateCancelled;
+#define RNGHGestureRecognizerStateBegan UIGestureRecognizerStateBegan;
+#define RNGHGestureRecognizerStateEnded UIGestureRecognizerStateEnded;
+
+#else // TARGET_OS_OSX [
+
+#import <React/RCTUIKit.h>
+
+typedef RCTUIView RNGHUIView;
+typedef RCTUITouch RNGHUITouch;
+
+#define RNGHGestureRecognizerStateFailed NSGestureRecognizerStateFailed;
+#define RNGHGestureRecognizerStatePossible NSGestureRecognizerStatePossible;
+#define RNGHGestureRecognizerStateCancelled NSGestureRecognizerStateCancelled;
+#define RNGHGestureRecognizerStateBegan NSGestureRecognizerStateBegan;
+#define RNGHGestureRecognizerStateEnded NSGestureRecognizerStateEnded;
+
+#endif // ] TARGET_OS_OSX

package/{ios → apple}/RNGestureHandler.h

@@ -1,12 +1,13 @@
+#import "RNGHUIKit.h"
 #import "RNGestureHandlerActionType.h"
 #import "RNGestureHandlerDirection.h"
 #import "RNGestureHandlerEvents.h"
 #import "RNGestureHandlerPointerTracker.h"
+#import "RNGestureHandlerPointerType.h"
 #import "RNGestureHandlerState.h"
 
 #import <Foundation/Foundation.h>
 #import <React/RCTConvert.h>
-#import <UIKit/UIKit.h>
 
 #define VEC_LEN_SQ(pt) (pt.x * pt.x + pt.y * pt.y)
 #define TEST_MIN_IF_NOT_NAN(value, limit) \
@@ -44,7 +45,7 @@
 @protocol RNRootViewGestureRecognizerDelegate <UIGestureRecognizerDelegate>
 
 - (void)gestureRecognizer:(nullable UIGestureRecognizer *)gestureRecognizer
-    didActivateInViewWithTouchHandler:(nullable UIView *)viewWithTouchHandler;
+    didActivateInViewWithTouchHandler:(nullable RNGHUIView *)viewWithTouchHandler;
 
 @end
 
@@ -53,6 +54,8 @@
   UIGestureRecognizer *_recognizer;
  @protected
   RNGestureHandlerState _lastState;
+ @protected
+  NSInteger _pointerType;
 }
 
 + (nullable RNGestureHandler *)findGestureHandlerByRecognizer:(nonnull UIGestureRecognizer *)recognizer;
@@ -69,7 +72,7 @@
 @property (nonatomic) BOOL needsPointerData;
 @property (nonatomic) BOOL manualActivation;
 
-- (void)bindToView:(nonnull UIView *)view;
+- (void)bindToView:(nonnull RNGHUIView *)view;
 - (void)unbindFromView;
 - (void)resetConfig NS_REQUIRES_SUPER;
 - (void)configure:(nullable NSDictionary *)config NS_REQUIRES_SUPER;
@@ -87,4 +90,10 @@
 - (void)sendEvent:(nonnull RNGestureHandlerStateChange *)event;
 - (void)sendTouchEventInState:(RNGestureHandlerState)state forViewWithTag:(nonnull NSNumber *)reactTag;
 
+#if !TARGET_OS_OSX
+- (void)setCurrentPointerType:(nonnull UIEvent *)event;
+#else
+- (void)setCurrentPointerTypeToMouse;
+#endif
+
 @end

package/{ios → apple}/RNGestureHandler.m

@@ -3,7 +3,9 @@
 
 #import "Handlers/RNNativeViewHandler.h"
 
+#if !TARGET_OS_OSX
 #import <UIKit/UIGestureRecognizerSubclass.h>
+#endif
 
 #import <React/UIView+React.h>
 
@@ -102,8 +104,9 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   _handlersThatShouldWait = nil;
   _hitSlop = RNGHHitSlopEmpty;
   _needsPointerData = NO;
-
+#if !TARGET_OS_OSX
   _recognizer.cancelsTouchesInView = YES;
+#endif
 }
 
 - (void)configure:(NSDictionary *)config
@@ -123,10 +126,12 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
     _shouldCancelWhenOutside = [RCTConvert BOOL:prop];
   }
 
+#if !TARGET_OS_OSX
   prop = config[@"cancelsTouchesInView"];
   if (prop != nil) {
     _recognizer.cancelsTouchesInView = [RCTConvert BOOL:prop];
   }
+#endif
 
   prop = config[@"needsPointerData"];
   if (prop != nil) {
@@ -171,9 +176,43 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   self.recognizer.enabled = enabled;
 }
 
-- (void)bindToView:(UIView *)view
+#if !TARGET_OS_OSX
+- (void)setCurrentPointerType:(UIEvent *)event
+{
+  UITouch *touch = [[event allTouches] anyObject];
+
+  switch (touch.type) {
+    case UITouchTypeDirect:
+      _pointerType = RNGestureHandlerTouch;
+      break;
+    case UITouchTypePencil:
+      _pointerType = RNGestureHandlerStylus;
+      break;
+    case UITouchTypeIndirectPointer:
+      _pointerType = RNGestureHandlerMouse;
+      break;
+    default:
+      _pointerType = RNGestureHandlerOtherPointer;
+      break;
+  }
+}
+#else
+- (void)setCurrentPointerTypeToMouse
+{
+  _pointerType = RNGestureHandlerMouse;
+}
+#endif
+
+- (UITouchType)getPointerType
 {
+  return _pointerType;
+}
+
+- (void)bindToView:(RNGHUIView *)view
+{
+#if !TARGET_OS_OSX
   view.userInteractionEnabled = YES;
+#endif
   self.recognizer.delegate = self;
   [view addGestureRecognizer:self.recognizer];
 
@@ -190,9 +229,17 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIGestureRecognizer *)recognizer
 {
+#if TARGET_OS_OSX
+  return [RNGestureHandlerEventExtraData forPosition:[recognizer locationInView:recognizer.view]
+                                withAbsolutePosition:[recognizer locationInView:recognizer.view.window.contentView]
+                                 withNumberOfTouches:1
+                                     withPointerType:RNGestureHandlerMouse];
+#else
   return [RNGestureHandlerEventExtraData forPosition:[recognizer locationInView:recognizer.view]
                                 withAbsolutePosition:[recognizer locationInView:recognizer.view.window]
-                                 withNumberOfTouches:recognizer.numberOfTouches];
+                                 withNumberOfTouches:recognizer.numberOfTouches
+                                     withPointerType:_pointerType];
+#endif
 }
 
 - (void)handleGesture:(UIGestureRecognizer *)recognizer
@@ -227,6 +274,15 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
       return;
     }
 
+    // Recognizers don't respect manually changing their state (that happens when we are activating handler
+    // under custom conditions). If we send a custom event in state ACTIVE and the recognizer will later update its
+    // state, we will end up sending ACTIVE->BEGAN and BEGAN->ACTIVE chain. To prevent this, we simply detect the first
+    // weird state change and stop it (then we don't update _lastState), so the second call ends up without state change
+    // and is fine.
+    if (state == RNGestureHandlerStateBegan && _lastState == RNGestureHandlerStateActive) {
+      return;
+    }
+
     if (state == RNGestureHandlerStateActive) {
       // Generate a unique coalescing-key each time the gesture-handler becomes active. All events will have
       // the same coalescing-key allowing RCTEventDispatcher to coalesce RNGestureHandlerEvents when events are
@@ -272,7 +328,8 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   id extraData = [RNGestureHandlerEventExtraData forEventType:_pointerTracker.eventType
                                           withChangedPointers:_pointerTracker.changedPointersData
                                               withAllPointers:_pointerTracker.allPointersData
-                                          withNumberOfTouches:_pointerTracker.trackedPointersCount];
+                                          withNumberOfTouches:_pointerTracker.trackedPointersCount
+                                              withPointerType:_pointerType];
   id event = [[RNGestureHandlerEvent alloc] initWithReactTag:reactTag
                                                   handlerTag:_tag
                                                        state:state
@@ -332,7 +389,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   }
 }
 
-- (void)bindManualActivationToView:(UIView *)view
+- (void)bindManualActivationToView:(RNGHUIView *)view
 {
   if (_manualActivationRecognizer != nil) {
     [view addGestureRecognizer:_manualActivationRecognizer];
@@ -357,7 +414,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 
   // We may try to extract "DummyGestureHandler" in case when "otherGestureRecognizer" belongs to
   // a native view being wrapped with "NativeViewGestureHandler"
-  UIView *reactView = recognizer.view;
+  RNGHUIView *reactView = recognizer.view;
   while (reactView != nil && reactView.reactTag == nil) {
     reactView = reactView.superview;
   }
@@ -475,7 +532,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   return YES;
 }
 
-- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(RNGHUITouch *)touch
 {
   // If hitSlop is set we use it to determine if a given gesture recognizer should start processing
   // touch stream. This only works for negative values of hitSlop as this method won't be triggered
@@ -483,7 +540,11 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   // values of hitSlop one should set hitSlop for the underlying view. This limitation is due to the
   // fact that hitTest method is only available at the level of UIView
   if (RNGH_HIT_SLOP_IS_SET(_hitSlop)) {
+#if TARGET_OS_OSX
+    CGPoint location = [gestureRecognizer.view convertPoint:touch.locationInWindow fromView:nil];
+#else
     CGPoint location = [touch locationInView:gestureRecognizer.view];
+#endif
     CGRect hitFrame = RNGHHitSlopInsetRect(gestureRecognizer.view.bounds, _hitSlop);
     return CGRectContainsPoint(hitFrame, location);
   }

package/{ios → apple}/RNGestureHandlerButton.h

@@ -8,8 +8,11 @@
 
 #import "RNGestureHandler.h"
 
+#if TARGET_OS_OSX
+@interface RNGestureHandlerButton : NSControl
+#else
 @interface RNGestureHandlerButton : UIControl
-
+#endif
 /**
  *  Insets used when hit testing inside this view.
  */

package/{ios → apple}/RNGestureHandlerButton.m

@@ -8,7 +8,9 @@
 
 #import "RNGestureHandlerButton.h"
 
+#if !TARGET_OS_OSX
 #import <UIKit/UIKit.h>
+#endif
 
 /**
  * Gesture Handler Button components overrides standard mechanism used by RN
@@ -39,23 +41,28 @@
   if (self) {
     _hitTestEdgeInsets = UIEdgeInsetsZero;
     _userEnabled = YES;
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_OSX
     [self setExclusiveTouch:YES];
 #endif
   }
   return self;
 }
 
-- (BOOL)shouldHandleTouch:(UIView *)view
+- (BOOL)shouldHandleTouch:(RNGHUIView *)view
 {
   if ([view isKindOfClass:[RNGestureHandlerButton class]]) {
     RNGestureHandlerButton *button = (RNGestureHandlerButton *)view;
     return button.userEnabled;
   }
 
+#if !TARGET_OS_OSX
   return [view isKindOfClass:[UIControl class]] || [view.gestureRecognizers count] > 0;
+#else
+  return [view isKindOfClass:[NSControl class]] || [view.gestureRecognizers count] > 0;
+#endif
 }
 
+#if !TARGET_OS_OSX
 - (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
 {
   if (UIEdgeInsetsEqualToEdgeInsets(self.hitTestEdgeInsets, UIEdgeInsetsZero)) {
@@ -65,13 +72,14 @@
   return CGRectContainsPoint(hitFrame, point);
 }
 
-- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
+- (RNGHUIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
-  UIView *inner = [super hitTest:point withEvent:event];
+  RNGHUIView *inner = [super hitTest:point withEvent:event];
   while (inner && ![self shouldHandleTouch:inner]) {
     inner = inner.superview;
   }
   return inner;
 }
+#endif
 
 @end

package/{ios → apple}/RNGestureHandlerButtonManager.m

@@ -9,12 +9,14 @@ RCT_CUSTOM_VIEW_PROPERTY(enabled, BOOL, RNGestureHandlerButton)
 {
   view.userEnabled = json == nil ? YES : [RCTConvert BOOL:json];
 }
-#if !TARGET_OS_TV
+
+#if !TARGET_OS_TV && !TARGET_OS_OSX
 RCT_CUSTOM_VIEW_PROPERTY(exclusive, BOOL, RNGestureHandlerButton)
 {
   [view setExclusiveTouch:json == nil ? YES : [RCTConvert BOOL:json]];
 }
 #endif
+
 RCT_CUSTOM_VIEW_PROPERTY(hitSlop, UIEdgeInsets, RNGestureHandlerButton)
 {
   if (json) {
@@ -26,7 +28,7 @@ RCT_CUSTOM_VIEW_PROPERTY(hitSlop, UIEdgeInsets, RNGestureHandlerButton)
   }
 }
 
-- (UIView *)view
+- (RNGHUIView *)view
 {
   return [RNGestureHandlerButton new];
 }

package/{ios → apple}/RNGestureHandlerEvents.h

@@ -1,9 +1,9 @@
 #import <React/RCTEventDispatcher.h>
 
 #import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 
 #import "RNGHTouchEventType.h"
+#import "RNGHUIKit.h"
 #import "RNGestureHandlerState.h"
 
 @interface RNGestureHandlerEventExtraData : NSObject
@@ -12,36 +12,45 @@
 
 - (instancetype)initWithData:(NSDictionary *)data;
 
-+ (RNGestureHandlerEventExtraData *)forPosition:(CGPoint)position withAbsolutePosition:(CGPoint)absolutePosition;
 + (RNGestureHandlerEventExtraData *)forPosition:(CGPoint)position
                            withAbsolutePosition:(CGPoint)absolutePosition
-                            withNumberOfTouches:(NSUInteger)numberOfTouches;
+                                withPointerType:(NSInteger)pointerType;
 + (RNGestureHandlerEventExtraData *)forPosition:(CGPoint)position
                            withAbsolutePosition:(CGPoint)absolutePosition
                             withNumberOfTouches:(NSUInteger)numberOfTouches
-                                   withDuration:(NSUInteger)duration;
+                                withPointerType:(NSInteger)pointerType;
++ (RNGestureHandlerEventExtraData *)forPosition:(CGPoint)position
+                           withAbsolutePosition:(CGPoint)absolutePosition
+                            withNumberOfTouches:(NSUInteger)numberOfTouches
+                                   withDuration:(NSUInteger)duration
+                                withPointerType:(NSInteger)pointerType;
 + (RNGestureHandlerEventExtraData *)forPan:(CGPoint)position
                       withAbsolutePosition:(CGPoint)absolutePosition
                            withTranslation:(CGPoint)translation
                               withVelocity:(CGPoint)velocity
-                       withNumberOfTouches:(NSUInteger)numberOfTouches;
+                       withNumberOfTouches:(NSUInteger)numberOfTouches
+                           withPointerType:(NSInteger)pointerType;
 + (RNGestureHandlerEventExtraData *)forForce:(CGFloat)force
                                  forPosition:(CGPoint)position
                         withAbsolutePosition:(CGPoint)absolutePosition
-                         withNumberOfTouches:(NSUInteger)numberOfTouches;
+                         withNumberOfTouches:(NSUInteger)numberOfTouches
+                             withPointerType:(NSInteger)pointerType;
 + (RNGestureHandlerEventExtraData *)forPinch:(CGFloat)scale
                               withFocalPoint:(CGPoint)focalPoint
                                 withVelocity:(CGFloat)velocity
-                         withNumberOfTouches:(NSUInteger)numberOfTouches;
+                         withNumberOfTouches:(NSUInteger)numberOfTouches
+                             withPointerType:(NSInteger)pointerType;
 + (RNGestureHandlerEventExtraData *)forRotation:(CGFloat)rotation
                                 withAnchorPoint:(CGPoint)anchorPoint
                                    withVelocity:(CGFloat)velocity
-                            withNumberOfTouches:(NSUInteger)numberOfTouches;
+                            withNumberOfTouches:(NSUInteger)numberOfTouches
+                                withPointerType:(NSInteger)pointerType;
 + (RNGestureHandlerEventExtraData *)forEventType:(RNGHTouchEventType)eventType
                              withChangedPointers:(NSArray<NSDictionary *> *)changedPointers
                                  withAllPointers:(NSArray<NSDictionary *> *)allPointers
-                             withNumberOfTouches:(NSUInteger)numberOfTouches;
-+ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside;
+                             withNumberOfTouches:(NSUInteger)numberOfTouches
+                                 withPointerType:(NSInteger)pointerType;
++ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside withPointerType:(NSInteger)pointerType;
 @end
 
 @interface RNGestureHandlerEvent : NSObject <RCTEvent>