react-native-gesture-handler 2.14.1 → 2.15.0

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

@@ -1,5 +1,7 @@
 #import "RNManualHandler.h"
 
+#if !TARGET_OS_OSX
+
 @interface RNManualRecognizer : UIGestureRecognizer
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
@@ -20,7 +22,7 @@
   return self;
 }
 
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesBegan:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
@@ -31,7 +33,7 @@
   }
 }
 
-- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesMoved:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesMoved:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesMoved:touches withEvent:event];
@@ -44,13 +46,13 @@
   }
 }
 
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesEnded:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesEnded:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesEnded:touches withEvent:event];
 }
 
-- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [super touchesCancelled:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
@@ -60,6 +62,7 @@
 {
   [_gestureHandler.pointerTracker reset];
   [super reset];
+  [_gestureHandler reset];
 
   _shouldSendBeginEvent = YES;
 }
@@ -86,3 +89,20 @@
 }
 
 @end
+
+#else
+
+@implementation RNManualGestureHandler
+
+- (instancetype)initWithTag:(NSNumber *)tag
+{
+  RCTLogWarn(@"ManualGestureHandler is not supported on macOS");
+  if ((self = [super initWithTag:tag])) {
+    _recognizer = [NSGestureRecognizer alloc];
+  }
+  return self;
+}
+
+@end
+
+#endif

package/{ios → apple}/Handlers/RNNativeViewHandler.mm

@@ -8,7 +8,9 @@
 
 #import "RNNativeViewHandler.h"
 
+#if !TARGET_OS_OSX
 #import <UIKit/UIGestureRecognizerSubclass.h>
+#endif
 
 #import <React/RCTConvert.h>
 #import <React/UIView+React.h>
@@ -19,6 +21,8 @@
 #import <React/RCTScrollView.h>
 #endif // RCT_NEW_ARCH_ENABLED
 
+#if !TARGET_OS_OSX
+
 #pragma mark RNDummyGestureRecognizer
 
 @implementation RNDummyGestureRecognizer {
@@ -33,24 +37,24 @@
   return self;
 }
 
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
 }
 
-- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesMoved:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler.pointerTracker touchesMoved:touches withEvent:event];
 }
 
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesEnded:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler.pointerTracker touchesEnded:touches withEvent:event];
   self.state = UIGestureRecognizerStateFailed;
   [self reset];
 }
 
-- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)touchesCancelled:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
   self.state = UIGestureRecognizerStateCancelled;
@@ -61,11 +65,12 @@
 {
   [_gestureHandler.pointerTracker reset];
   [super reset];
+  [_gestureHandler reset];
 }
 
 @end
 
-#pragma mark RNNativeViewgestureHandler
+#pragma mark RNNativeViewGestureHandler
 
 @implementation RNNativeViewGestureHandler {
   BOOL _shouldActivateOnStart;
@@ -133,7 +138,7 @@
   if (_disallowInterruption) {
     // When `disallowInterruption` is set we cancel all gesture handlers when this UIControl
     // gets DOWN event
-    for (UITouch *touch in [event allTouches]) {
+    for (RNGHUITouch *touch in [event allTouches]) {
       for (UIGestureRecognizer *recogn in [touch gestureRecognizers]) {
         recogn.enabled = NO;
         recogn.enabled = YES;
@@ -191,3 +196,34 @@
 }
 
 @end
+
+#else
+
+#pragma mark RNDummyGestureRecognizer
+
+@implementation RNDummyGestureRecognizer
+
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
+{
+  self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)];
+  return self;
+}
+
+@end
+
+#pragma mark RNNativeViewGestureHandler
+
+@implementation RNNativeViewGestureHandler
+
+- (instancetype)initWithTag:(NSNumber *)tag
+{
+  RCTLogWarn(@"NativeViewGestureHandler is not supported on macOS");
+  if ((self = [super initWithTag:tag])) {
+    _recognizer = [NSGestureRecognizer alloc];
+  }
+  return self;
+}
+
+@end
+
+#endif

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

@@ -8,9 +8,13 @@
 
 #import "RNPanHandler.h"
 
+#if TARGET_OS_OSX
+@interface RNBetterPanGestureRecognizer : NSPanGestureRecognizer
+#else
 #import <UIKit/UIGestureRecognizerSubclass.h>
 
 @interface RNBetterPanGestureRecognizer : UIPanGestureRecognizer
+#endif
 
 @property (nonatomic) CGFloat minDistSq;
 @property (nonatomic) CGFloat minVelocityX;
@@ -32,7 +36,9 @@
 
 @implementation RNBetterPanGestureRecognizer {
   __weak RNGestureHandler *_gestureHandler;
+#if !TARGET_OS_OSX
   NSUInteger _realMinimumNumberOfTouches;
+#endif
   BOOL _hasCustomActivationCriteria;
 }
 
@@ -54,7 +60,7 @@
     _failOffsetYEnd = NAN;
     _activateAfterLongPress = NAN;
     _hasCustomActivationCriteria = NO;
-#if !TARGET_OS_TV
+#if !TARGET_OS_TV && !TARGET_OS_OSX
     _realMinimumNumberOfTouches = self.minimumNumberOfTouches;
 #endif
   }
@@ -66,10 +72,12 @@
   [_gestureHandler handleGesture:self];
 }
 
+#if !TARGET_OS_OSX
 - (void)setMinimumNumberOfTouches:(NSUInteger)minimumNumberOfTouches
 {
   _realMinimumNumberOfTouches = minimumNumberOfTouches;
 }
+#endif
 
 - (void)activateAfterLongPress
 {
@@ -78,12 +86,13 @@
   [_gestureHandler handleGesture:self inState:RNGestureHandlerStateActive];
 }
 
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)interactionsBegan:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  if ([self numberOfTouches] == 0) {
+  if (touches.count == 0) {
     [_gestureHandler reset];
   }
-#if !TARGET_OS_TV
+
+#if !TARGET_OS_TV && !TARGET_OS_OSX
   if (_hasCustomActivationCriteria) {
     // We use "minimumNumberOfTouches" property to prevent pan handler from recognizing
     // the gesture too early before we are sure that all criteria (e.g. minimum distance
@@ -93,7 +102,13 @@
     super.minimumNumberOfTouches = _realMinimumNumberOfTouches;
   }
 #endif
+
+#if TARGET_OS_OSX
+  [super mouseDown:event];
+#else
   [super touchesBegan:touches withEvent:event];
+#endif
+
   [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
   [self triggerAction];
 
@@ -102,15 +117,16 @@
   }
 }
 
-- (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];
 
   if (self.state == UIGestureRecognizerStatePossible && [self shouldFailUnderCustomCriteria]) {
     self.state = UIGestureRecognizerStateFailed;
+    [self triggerAction];
     return;
   }
+
   if ((self.state == UIGestureRecognizerStatePossible || self.state == UIGestureRecognizerStateChanged)) {
     if (_gestureHandler.shouldCancelWhenOutside && ![_gestureHandler containsPointInView]) {
       // If the previous recognizer state is UIGestureRecognizerStateChanged
@@ -123,30 +139,79 @@
       return;
     }
   }
+
+#if !TARGET_OS_TV && !TARGET_OS_OSX
   if (_hasCustomActivationCriteria && self.state == UIGestureRecognizerStatePossible &&
       [self shouldActivateUnderCustomCriteria]) {
-#if !TARGET_OS_TV
     super.minimumNumberOfTouches = _realMinimumNumberOfTouches;
     if ([self numberOfTouches] >= _realMinimumNumberOfTouches) {
       self.state = UIGestureRecognizerStateBegan;
       [self setTranslation:CGPointMake(0, 0) inView:self.view];
     }
-#endif
   }
+#endif
 }
 
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)interactionsEnded:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  [super touchesEnded:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesEnded:touches withEvent:event];
 }
 
-- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+- (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  [super touchesCancelled:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
 }
 
+#if TARGET_OS_OSX
+
+- (void)mouseDown:(NSEvent *)event
+{
+  // super call was moved to interactionsBegan method to keep the
+  // original order of calls
+  [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
+}
+
+- (void)mouseDragged:(NSEvent *)event
+{
+  [super mouseDragged:event];
+  [self interactionsMoved:[NSSet setWithObject:event] withEvent:event];
+}
+
+- (void)mouseUp:(NSEvent *)event
+{
+  [super mouseUp:event];
+  [self interactionsEnded:[NSSet setWithObject:event] withEvent:event];
+}
+
+#else
+
+- (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
+{
+  // super call was moved to interactionsBegan method to keep the
+  // original order of calls
+  [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
+
 - (void)reset
 {
   [self triggerAction];
@@ -154,6 +219,7 @@
   [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(activateAfterLongPress) object:nil];
   self.enabled = YES;
   [super reset];
+  [_gestureHandler reset];
 }
 
 - (void)updateHasCustomActivationCriteria
@@ -165,7 +231,11 @@
 
 - (BOOL)shouldFailUnderCustomCriteria
 {
+#if TARGET_OS_OSX
+  CGPoint trans = [self translationInView:self.view.window.contentView];
+#else
   CGPoint trans = [self translationInView:self.view.window];
+#endif
   // Apple docs say that 10 units is the default allowable movement for UILongPressGestureRecognizer
   if (!isnan(_activateAfterLongPress) && trans.x * trans.x + trans.y * trans.y > 100) {
     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(activateAfterLongPress) object:nil];
@@ -189,7 +259,11 @@
 
 - (BOOL)shouldActivateUnderCustomCriteria
 {
+#if TARGET_OS_OSX
+  CGPoint trans = [self translationInView:self.view.window.contentView];
+#else
   CGPoint trans = [self translationInView:self.view.window];
+#endif
   if (!isnan(_activeOffsetXStart) && trans.x < _activeOffsetXStart) {
     return YES;
   }
@@ -248,12 +322,12 @@
   recognizer.failOffsetYStart = NAN;
   recognizer.failOffsetYStart = NAN;
   recognizer.failOffsetYEnd = NAN;
-#if !TARGET_OS_TV && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130400
+#if !TARGET_OS_OSX && !TARGET_OS_TV && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130400
   if (@available(iOS 13.4, *)) {
     recognizer.allowedScrollTypesMask = 0;
   }
 #endif
-#if !TARGET_OS_TV
+#if !TARGET_OS_OSX && !TARGET_OS_TV
   recognizer.minimumNumberOfTouches = 1;
   recognizer.maximumNumberOfTouches = NSUIntegerMax;
 #endif
@@ -278,7 +352,7 @@
   APPLY_FLOAT_PROP(failOffsetYStart);
   APPLY_FLOAT_PROP(failOffsetYEnd);
 
-#if !TARGET_OS_TV && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130400
+#if !TARGET_OS_OSX && !TARGET_OS_TV && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130400
   if (@available(iOS 13.4, *)) {
     bool enableTrackpadTwoFingerGesture = [RCTConvert BOOL:config[@"enableTrackpadTwoFingerGesture"]];
     if (enableTrackpadTwoFingerGesture) {
@@ -319,6 +393,16 @@
   return shouldBegin;
 }
 
+#if TARGET_OS_OSX
+- (RNGestureHandlerEventExtraData *)eventExtraData:(NSPanGestureRecognizer *)recognizer
+{
+  return [RNGestureHandlerEventExtraData forPan:[recognizer locationInView:recognizer.view]
+                           withAbsolutePosition:[recognizer locationInView:recognizer.view.window.contentView]
+                                withTranslation:[recognizer translationInView:recognizer.view.window.contentView]
+                                   withVelocity:[recognizer velocityInView:recognizer.view.window.contentView]
+                            withNumberOfTouches:1];
+}
+#else
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIPanGestureRecognizer *)recognizer
 {
   return [RNGestureHandlerEventExtraData forPan:[recognizer locationInView:recognizer.view]
@@ -327,5 +411,6 @@
                                    withVelocity:[recognizer velocityInView:recognizer.view.window]
                             withNumberOfTouches:recognizer.numberOfTouches];
 }
+#endif
 
 @end

package/apple/Handlers/RNPinchHandler.m

@@ -0,0 +1,162 @@
+
+
+//
+//  RNPinchHandler.m
+//  RNGestureHandler
+//
+//  Created by Krzysztof Magiera on 12/10/2017.
+//  Copyright © 2017 Software Mansion. All rights reserved.
+//
+
+#import "RNPinchHandler.h"
+
+#if !TARGET_OS_TV
+
+#if TARGET_OS_OSX
+@interface RNBetterPinchRecognizer : NSMagnificationGestureRecognizer
+#else
+@interface RNBetterPinchRecognizer : UIPinchGestureRecognizer
+#endif
+
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
+
+@end
+
+@implementation RNBetterPinchRecognizer {
+  __weak RNGestureHandler *_gestureHandler;
+}
+
+- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
+{
+  if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {
+    _gestureHandler = gestureHandler;
+  }
+  return self;
+}
+
+- (void)handleGesture:(UIGestureRecognizer *)recognizer
+{
+  if (self.state == UIGestureRecognizerStateBegan) {
+#if TARGET_OS_OSX
+    self.magnification = 1;
+#else
+    self.scale = 1;
+#endif
+  }
+  [_gestureHandler handleGesture:recognizer];
+}
+
+- (void)interactionsBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  [_gestureHandler.pointerTracker touchesBegan:touches withEvent:event];
+}
+
+- (void)interactionsMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  [_gestureHandler.pointerTracker touchesMoved:touches withEvent:event];
+}
+
+- (void)interactionsEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  [_gestureHandler.pointerTracker touchesEnded:touches withEvent:event];
+}
+
+- (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+{
+  [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
+}
+
+#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)touchesCancelledWithEvent:(NSEvent *)event
+{
+  [super touchesCancelledWithEvent:event];
+  [self interactionsCancelled:[NSSet setWithObject:event] withEvent:event];
+}
+#else
+- (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)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
+
+- (void)reset
+{
+  [_gestureHandler.pointerTracker reset];
+  [super reset];
+  [_gestureHandler reset];
+}
+
+@end
+#endif
+
+@implementation RNPinchGestureHandler
+
+- (instancetype)initWithTag:(NSNumber *)tag
+{
+  if ((self = [super initWithTag:tag])) {
+#if !TARGET_OS_TV
+    _recognizer = [[RNBetterPinchRecognizer alloc] initWithGestureHandler:self];
+#endif
+  }
+  return self;
+}
+
+#if !TARGET_OS_TV
+
+#if TARGET_OS_OSX
+- (RNGestureHandlerEventExtraData *)eventExtraData:(NSMagnificationGestureRecognizer *)recognizer
+{
+  return [RNGestureHandlerEventExtraData forPinch:recognizer.magnification
+                                   withFocalPoint:[recognizer locationInView:recognizer.view]
+                                     withVelocity:1
+                              withNumberOfTouches:2];
+}
+#else
+- (RNGestureHandlerEventExtraData *)eventExtraData:(UIPinchGestureRecognizer *)recognizer
+{
+  return [RNGestureHandlerEventExtraData forPinch:recognizer.scale
+                                   withFocalPoint:[recognizer locationInView:recognizer.view]
+                                     withVelocity:recognizer.velocity
+                              withNumberOfTouches:recognizer.numberOfTouches];
+}
+#endif
+#endif // !TARGET_OS_TV
+
+@end