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

package/apple/Handlers/RNNativeViewHandler.mm

@@ -39,6 +39,7 @@
 
 - (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
+  [_gestureHandler setCurrentPointerType:event];
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
 }
 
@@ -133,6 +134,7 @@
 
 - (void)handleTouchDown:(UIView *)sender forEvent:(UIEvent *)event
 {
+  [self setCurrentPointerType:event];
   [self reset];
 
   if (_disallowInterruption) {
@@ -148,21 +150,21 @@
 
   [self sendEventsInState:RNGestureHandlerStateActive
            forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];
 }
 
 - (void)handleTouchUpOutside:(UIView *)sender forEvent:(UIEvent *)event
 {
   [self sendEventsInState:RNGestureHandlerStateEnd
            forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];
 }
 
 - (void)handleTouchUpInside:(UIView *)sender forEvent:(UIEvent *)event
 {
   [self sendEventsInState:RNGestureHandlerStateEnd
            forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];
 }
 
 - (void)handleDragExit:(UIView *)sender forEvent:(UIEvent *)event
@@ -173,11 +175,11 @@
     [control cancelTrackingWithEvent:event];
     [self sendEventsInState:RNGestureHandlerStateEnd
              forViewWithTag:sender.reactTag
-              withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO]];
+              withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];
   } else {
     [self sendEventsInState:RNGestureHandlerStateActive
              forViewWithTag:sender.reactTag
-              withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO]];
+              withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];
   }
 }
 
@@ -185,14 +187,14 @@
 {
   [self sendEventsInState:RNGestureHandlerStateActive
            forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];
 }
 
 - (void)handleTouchCancel:(UIView *)sender forEvent:(UIEvent *)event
 {
   [self sendEventsInState:RNGestureHandlerStateCancelled
            forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];
 }
 
 @end

package/apple/Handlers/RNPanHandler.m

@@ -9,6 +9,7 @@
 #import "RNPanHandler.h"
 
 #if TARGET_OS_OSX
+
 @interface RNBetterPanGestureRecognizer : NSPanGestureRecognizer
 #else
 #import <UIKit/UIGestureRecognizerSubclass.h>
@@ -166,6 +167,7 @@
 
 - (void)mouseDown:(NSEvent *)event
 {
+  [_gestureHandler setCurrentPointerTypeToMouse];
   // super call was moved to interactionsBegan method to keep the
   // original order of calls
   [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
@@ -187,6 +189,7 @@
 
 - (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
+  [_gestureHandler setCurrentPointerType:event];
   // super call was moved to interactionsBegan method to keep the
   // original order of calls
   [self interactionsBegan:touches withEvent:event];
@@ -400,7 +403,8 @@
                            withAbsolutePosition:[recognizer locationInView:recognizer.view.window.contentView]
                                 withTranslation:[recognizer translationInView:recognizer.view.window.contentView]
                                    withVelocity:[recognizer velocityInView:recognizer.view.window.contentView]
-                            withNumberOfTouches:1];
+                            withNumberOfTouches:1
+                                withPointerType:RNGestureHandlerMouse];
 }
 #else
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIPanGestureRecognizer *)recognizer
@@ -409,7 +413,8 @@
                            withAbsolutePosition:[recognizer locationInView:recognizer.view.window]
                                 withTranslation:[recognizer translationInView:recognizer.view.window]
                                    withVelocity:[recognizer velocityInView:recognizer.view.window]
-                            withNumberOfTouches:recognizer.numberOfTouches];
+                            withNumberOfTouches:recognizer.numberOfTouches
+                                withPointerType:_pointerType];
 }
 #endif
 

package/apple/Handlers/RNPinchHandler.m

@@ -13,7 +13,12 @@
 #if !TARGET_OS_TV
 
 #if TARGET_OS_OSX
-@interface RNBetterPinchRecognizer : NSMagnificationGestureRecognizer
+@interface RNBetterPinchRecognizer : NSMagnificationGestureRecognizer {
+  CGFloat prevMagnification;
+  NSTimeInterval prevTime;
+}
+
+@property (nonatomic, readonly) CGFloat velocity;
 #else
 @interface RNBetterPinchRecognizer : UIPinchGestureRecognizer
 #endif
@@ -31,6 +36,10 @@
   if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
   }
+#if TARGET_OS_OSX
+  prevMagnification = 0;
+  prevTime = 0;
+#endif
   return self;
 }
 
@@ -67,32 +76,34 @@
 }
 
 #if TARGET_OS_OSX
-- (void)touchesBeganWithEvent:(NSEvent *)event
-{
-  [super touchesBeganWithEvent:event];
-  [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
-}
-
-- (void)touchesMovedWithEvent:(NSEvent *)event
-{
-  [super touchesMovedWithEvent:event];
-  [self interactionsMoved:[NSSet setWithObject:event] withEvent:event];
-}
-
-- (void)touchesEndedWithEvent:(NSEvent *)event
-{
-  [super touchesEndedWithEvent:event];
-  [self interactionsEnded:[NSSet setWithObject:event] withEvent:event];
-}
+- (void)magnifyWithEvent:(NSEvent *)event
+{
+  [super magnifyWithEvent:event];
+
+  switch (self.state) {
+    case NSGestureRecognizerStateBegan:
+      [_gestureHandler setCurrentPointerTypeToMouse];
+      [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
+      break;
+    case NSGestureRecognizerStateChanged:
+      [self interactionsMoved:[NSSet setWithObject:event] withEvent:event];
+      break;
+    case NSGestureRecognizerStateEnded:
+      [self interactionsEnded:[NSSet setWithObject:event] withEvent:event];
+      break;
+    case NSGestureRecognizerStateCancelled:
+      [self interactionsCancelled:[NSSet setWithObject:event] withEvent:event];
+      break;
+  }
 
-- (void)touchesCancelledWithEvent:(NSEvent *)event
-{
-  [super touchesCancelledWithEvent:event];
-  [self interactionsCancelled:[NSSet setWithObject:event] withEvent:event];
+  _velocity = (self.magnification - prevMagnification) / ((event.timestamp - prevTime) * 1000);
+  prevMagnification = self.magnification;
+  prevTime = event.timestamp;
 }
 #else
 - (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
+  [_gestureHandler setCurrentPointerType:event];
   [super touchesBegan:touches withEvent:event];
   [self interactionsBegan:touches withEvent:event];
 }
@@ -145,8 +156,9 @@
 {
   return [RNGestureHandlerEventExtraData forPinch:recognizer.magnification
                                    withFocalPoint:[recognizer locationInView:recognizer.view]
-                                     withVelocity:1
-                              withNumberOfTouches:2];
+                                     withVelocity:((RNBetterPinchRecognizer *)recognizer).velocity
+                              withNumberOfTouches:2
+                                  withPointerType:RNGestureHandlerMouse];
 }
 #else
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIPinchGestureRecognizer *)recognizer
@@ -154,7 +166,8 @@
   return [RNGestureHandlerEventExtraData forPinch:recognizer.scale
                                    withFocalPoint:[recognizer locationInView:recognizer.view]
                                      withVelocity:recognizer.velocity
-                              withNumberOfTouches:recognizer.numberOfTouches];
+                              withNumberOfTouches:recognizer.numberOfTouches
+                                  withPointerType:_pointerType];
 }
 #endif
 #endif // !TARGET_OS_TV

package/apple/Handlers/RNRotationHandler.m

@@ -11,10 +11,16 @@
 #if !TARGET_OS_TV
 
 #if TARGET_OS_OSX
-@interface RNBetterRotationRecognizer : NSRotationGestureRecognizer
+@interface RNBetterRotationRecognizer : NSRotationGestureRecognizer {
+  CGFloat prevRotation;
+  NSTimeInterval prevTime;
+}
+
+@property (nonatomic, readonly) CGFloat velocity;
 #else
 @interface RNBetterRotationRecognizer : UIRotationGestureRecognizer
 #endif
+
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
 
 @end
@@ -28,6 +34,10 @@
   if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
   }
+#if TARGET_OS_OSX
+  prevRotation = 0;
+  prevTime = 0;
+#endif
   return self;
 }
 
@@ -60,52 +70,54 @@
 }
 
 #if TARGET_OS_OSX
-- (void)touchesBeganWithEvent:(NSEvent *)event
-{
-  [super touchesBeganWithEvent:event];
-  [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
-}
-
-- (void)touchesMovedWithEvent:(NSEvent *)event
-{
-  [super touchesMovedWithEvent:event];
-  [self interactionsMoved:[NSSet setWithObject:event] withEvent:event];
-}
-
-- (void)touchesEndedWithEvent:(NSEvent *)event
-{
-  [super touchesEndedWithEvent:event];
-  [self interactionsEnded:[NSSet setWithObject:event] withEvent:event];
-}
+- (void)rotateWithEvent:(NSEvent *)event
+{
+  [super rotateWithEvent:event];
+
+  switch (self.state) {
+    case NSGestureRecognizerStateBegan:
+      [_gestureHandler setCurrentPointerTypeToMouse];
+      [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
+      break;
+    case NSGestureRecognizerStateChanged:
+      [self interactionsMoved:[NSSet setWithObject:event] withEvent:event];
+      break;
+    case NSGestureRecognizerStateEnded:
+      [self interactionsEnded:[NSSet setWithObject:event] withEvent:event];
+      break;
+    case NSGestureRecognizerStateCancelled:
+      [self interactionsCancelled:[NSSet setWithObject:event] withEvent:event];
+      break;
+  }
 
-- (void)touchesCancelledWithEvent:(NSEvent *)event
-{
-  [super touchesCancelledWithEvent:event];
-  [self interactionsCancelled:[NSSet setWithObject:event] withEvent:event];
+  _velocity = (self.rotation - prevRotation) / ((event.timestamp - prevTime) * 1000);
+  prevRotation = self.rotation;
+  prevTime = event.timestamp;
 }
 #else
 - (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
+  [_gestureHandler setCurrentPointerType:event];
   [super touchesBegan:touches withEvent:event];
-  [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
+  [self interactionsBegan:touches withEvent:event];
 }
 
 - (void)touchesMoved:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesMoved:touches withEvent:event];
-  [self interactionsMoved:[NSSet setWithObject:event] withEvent:event];
+  [self interactionsMoved:touches withEvent:event];
 }
 
 - (void)touchesEnded:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesEnded:touches withEvent:event];
-  [self interactionsEnded:[NSSet setWithObject:event] withEvent:event];
+  [self interactionsEnded:touches withEvent:event];
 }
 
 - (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesCancelled:touches withEvent:event];
-  [self interactionsCancelled:[NSSet setWithObject:event] withEvent:event];
+  [self interactionsCancelled:touches withEvent:event];
 }
 #endif
 
@@ -138,8 +150,9 @@
 {
   return [RNGestureHandlerEventExtraData forRotation:recognizer.rotation
                                      withAnchorPoint:[recognizer locationInView:recognizer.view]
-                                        withVelocity:1
-                                 withNumberOfTouches:2];
+                                        withVelocity:((RNBetterRotationRecognizer *)recognizer).velocity
+                                 withNumberOfTouches:2
+                                     withPointerType:RNGestureHandlerMouse];
 }
 #else
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIRotationGestureRecognizer *)recognizer
@@ -147,7 +160,8 @@
   return [RNGestureHandlerEventExtraData forRotation:recognizer.rotation
                                      withAnchorPoint:[recognizer locationInView:recognizer.view]
                                         withVelocity:recognizer.velocity
-                                 withNumberOfTouches:recognizer.numberOfTouches];
+                                 withNumberOfTouches:recognizer.numberOfTouches
+                                     withPointerType:_pointerType];
 }
 #endif
 #endif // !TARGET_OS_TV

package/apple/Handlers/RNTapHandler.m

@@ -147,6 +147,7 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
 #if TARGET_OS_OSX
 - (void)mouseDown:(NSEvent *)event
 {
+  [_gestureHandler setCurrentPointerTypeToMouse];
   [super mouseDown:event];
   [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
 }
@@ -184,26 +185,27 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
 
 - (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
+  [_gestureHandler setCurrentPointerType:event];
   [super touchesBegan:touches withEvent:event];
-  [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
+  [self interactionsBegan:touches withEvent:event];
 }
 
 - (void)touchesMoved:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesMoved:touches withEvent:event];
-  [self interactionsMoved:[NSSet setWithObject:event] withEvent:event];
+  [self interactionsMoved:touches withEvent:event];
 }
 
 - (void)touchesEnded:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesEnded:touches withEvent:event];
-  [self interactionsEnded:[NSSet setWithObject:event] withEvent:event];
+  [self interactionsEnded:touches withEvent:event];
 }
 
 - (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesCancelled:touches withEvent:event];
-  [self interactionsCancelled:[NSSet setWithObject:event] withEvent:event];
+  [self interactionsCancelled:touches withEvent:event];
 }
 
 #endif

package/apple/RNGestureHandler.h

@@ -3,6 +3,7 @@
 #import "RNGestureHandlerDirection.h"
 #import "RNGestureHandlerEvents.h"
 #import "RNGestureHandlerPointerTracker.h"
+#import "RNGestureHandlerPointerType.h"
 #import "RNGestureHandlerState.h"
 
 #import <Foundation/Foundation.h>
@@ -53,6 +54,8 @@
   UIGestureRecognizer *_recognizer;
  @protected
   RNGestureHandlerState _lastState;
+ @protected
+  NSInteger _pointerType;
 }
 
 + (nullable RNGestureHandler *)findGestureHandlerByRecognizer:(nonnull UIGestureRecognizer *)recognizer;
@@ -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/apple/RNGestureHandler.m

@@ -176,6 +176,38 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   self.recognizer.enabled = enabled;
 }
 
+#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
@@ -200,11 +232,13 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 #if TARGET_OS_OSX
   return [RNGestureHandlerEventExtraData forPosition:[recognizer locationInView:recognizer.view]
                                 withAbsolutePosition:[recognizer locationInView:recognizer.view.window.contentView]
-                                 withNumberOfTouches:1];
+                                 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
 }
 
@@ -294,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

package/apple/RNGestureHandlerEvents.h

@@ -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>