@amazon-devices/react-native-gesture-handler 2.0.1759135970 → 4.0.0-rn-83

package/apple/RNGHVector.h

@@ -0,0 +1,31 @@
+//
+//  RNGHVector.h
+//  Pods
+//
+//  Created by Michał Bert on 05/08/2024.
+//
+
+#import "RNGestureHandlerDirection.h"
+
+#ifndef RNGHVector_h
+#define RNGHVector_h
+
+@interface Vector : NSObject
+
+@property (atomic, readonly, assign) double x;
+@property (atomic, readonly, assign) double y;
+@property (atomic, readonly, assign) double unitX;
+@property (atomic, readonly, assign) double unitY;
+@property (atomic, readonly, assign) double magnitude;
+
++ (Vector *_Nonnull)fromDirection:(RNGestureHandlerDirection)direction;
++ (Vector *_Nonnull)fromVelocityX:(double)vx withVelocityY:(double)vy;
+- (nonnull instancetype)initWithX:(double)x withY:(double)y;
+- (double)computeSimilarity:(Vector *_Nonnull)other;
+- (BOOL)isSimilar:(Vector *_Nonnull)other withThreshold:(double)threshold;
+
+@end
+
+static double MINIMAL_RECOGNIZABLE_MAGNITUDE = 0.1;
+
+#endif /* RNGHVector_h */

package/apple/RNGHVector.m

@@ -0,0 +1,67 @@
+//
+//  RNGHVector.m
+//  DoubleConversion
+//
+//  Created by Michał Bert on 05/08/2024.
+//
+
+#import "RNGHVector.h"
+#import <Foundation/Foundation.h>
+
+@implementation Vector
+
+- (id)initWithX:(double)x withY:(double)y
+{
+  if (self = [super init]) {
+    _x = x;
+    _y = y;
+
+    _magnitude = hypot(x, y);
+
+    _unitX = self.magnitude > MINIMAL_RECOGNIZABLE_MAGNITUDE ? x / self.magnitude : 0;
+    _unitY = self.magnitude > MINIMAL_RECOGNIZABLE_MAGNITUDE ? y / self.magnitude : 0;
+  }
+
+  return self;
+}
+
++ (Vector *)fromDirection:(RNGestureHandlerDirection)direction
+{
+  switch (direction) {
+    case RNGestureHandlerDirectionRight:
+      return [[Vector alloc] initWithX:1 withY:0];
+    case RNGestureHandlerDirectionLeft:
+      return [[Vector alloc] initWithX:-1 withY:0];
+    case RNGestureHandlerDirectionUp:
+      return [[Vector alloc] initWithX:0 withY:1];
+    case RNGestureHandlerDirectionDown:
+      return [[Vector alloc] initWithX:0 withY:-1];
+    case RNGestureHandlerDirectionUpLeft:
+      return [[Vector alloc] initWithX:-1 withY:1];
+    case RNGestureHandlerDirectionUpRight:
+      return [[Vector alloc] initWithX:1 withY:1];
+    case RNGestureHandlerDirectionDownLeft:
+      return [[Vector alloc] initWithX:-1 withY:-1];
+    case RNGestureHandlerDirectionDownRight:
+      return [[Vector alloc] initWithX:1 withY:-1];
+    default:
+      return [[Vector alloc] initWithX:0 withY:0];
+  }
+}
+
++ (Vector *)fromVelocityX:(double)vx withVelocityY:(double)vy;
+{
+  return [[Vector alloc] initWithX:vx withY:vy];
+}
+
+- (double)computeSimilarity:(Vector *)other
+{
+  return self.unitX * other.unitX + self.unitY * other.unitY;
+}
+
+- (BOOL)isSimilar:(Vector *)other withThreshold:(double)threshold
+{
+  return [self computeSimilarity:other] > threshold;
+}
+
+@end

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,11 @@
 @property (nonatomic) BOOL needsPointerData;
 @property (nonatomic) BOOL manualActivation;
 
-- (void)bindToView:(nonnull UIView *)view;
+#if RCT_NEW_ARCH_ENABLED
+- (BOOL)isViewParagraphComponent:(nullable RNGHUIView *)view;
+#endif
+- (nonnull RNGHUIView *)chooseViewForInteraction:(nonnull UIGestureRecognizer *)recognizer;
+- (void)bindToView:(nonnull RNGHUIView *)view;
 - (void)unbindFromView;
 - (void)resetConfig NS_REQUIRES_SUPER;
 - (void)configure:(nullable NSDictionary *)config NS_REQUIRES_SUPER;
@@ -86,5 +93,18 @@
             withExtraData:(nonnull RNGestureHandlerEventExtraData *)extraData;
 - (void)sendEvent:(nonnull RNGestureHandlerStateChange *)event;
 - (void)sendTouchEventInState:(RNGestureHandlerState)state forViewWithTag:(nonnull NSNumber *)reactTag;
+- (nullable RNGHUIScrollView *)retrieveScrollView:(nonnull RNGHUIView *)view;
+
+#if !TARGET_OS_OSX
+- (BOOL)isUIScrollViewPanGestureRecognizer:(nonnull UIGestureRecognizer *)gestureRecognizer;
+#else
+- (BOOL)isUIScrollViewPanGestureRecognizer:(nonnull NSGestureRecognizer *)gestureRecognizer;
+#endif
+
+#if !TARGET_OS_OSX
+- (void)setCurrentPointerType:(nonnull UIEvent *)event;
+#else
+- (void)setCurrentPointerTypeToMouse;
+#endif
 
 @end

package/{ios/RNGestureHandler.m → apple/RNGestureHandler.mm}

@@ -3,10 +3,20 @@
 
 #import "Handlers/RNNativeViewHandler.h"
 
+#if !TARGET_OS_OSX
 #import <UIKit/UIGestureRecognizerSubclass.h>
+#import <UIKit/UIPanGestureRecognizer.h>
+#endif
 
 #import <React/UIView+React.h>
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTParagraphComponentView.h>
+#import <React/RCTScrollViewComponentView.h>
+#else
+#import <React/RCTScrollView.h>
+#endif
+
 @interface UIGestureRecognizer (GestureHandler)
 @property (nonatomic, readonly) RNGestureHandler *gestureHandler;
 @end
@@ -66,6 +76,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   RNGestureHandlerState _state;
   RNManualActivationRecognizer *_manualActivationRecognizer;
   NSArray<NSNumber *> *_handlersToWaitFor;
+  NSArray<NSNumber *> *_handlersThatShouldWait;
   NSArray<NSNumber *> *_simultaneousHandlers;
   RNGHHitSlop _hitSlop;
   uint16_t _eventCoalescingKey;
@@ -98,10 +109,12 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   _shouldCancelWhenOutside = NO;
   _handlersToWaitFor = nil;
   _simultaneousHandlers = nil;
+  _handlersThatShouldWait = nil;
   _hitSlop = RNGHHitSlopEmpty;
   _needsPointerData = NO;
-
+#if !TARGET_OS_OSX
   _recognizer.cancelsTouchesInView = YES;
+#endif
 }
 
 - (void)configure:(NSDictionary *)config
@@ -109,6 +122,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   [self resetConfig];
   _handlersToWaitFor = [RCTConvert NSNumberArray:config[@"waitFor"]];
   _simultaneousHandlers = [RCTConvert NSNumberArray:config[@"simultaneousHandlers"]];
+  _handlersThatShouldWait = [RCTConvert NSNumberArray:config[@"blocksHandlers"]];
 
   id prop = config[@"enabled"];
   if (prop != nil) {
@@ -120,10 +134,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) {
@@ -168,13 +184,64 @@ 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 (UITouchType)_pointerType;
+}
+
+#if RCT_NEW_ARCH_ENABLED
+- (BOOL)isViewParagraphComponent:(RNGHUIView *)view
+{
+  return [view isKindOfClass:[RCTParagraphComponentView class]];
+}
+#endif
+
+- (void)bindToView:(RNGHUIView *)view
 {
-  view.userInteractionEnabled = YES;
   self.recognizer.delegate = self;
-  [view addGestureRecognizer:self.recognizer];
 
-  [self bindManualActivationToView:view];
+#if RCT_NEW_ARCH_ENABLED
+  // Starting from react-native 0.79 `RCTParagraphTextView` overrides `hitTest` method to return `nil`. This results in
+  // native `UIGestureRecognizer` not responding to gestures. To fix this issue, we attach recognizer to its parent,
+  // i.e. `RCTParagraphComponentView`.
+  RNGHUIView *recognizerView = [self isViewParagraphComponent:view.superview] ? view.superview : view;
+#else
+  RNGHUIView *recognizerView = view;
+#endif
+
+#if !TARGET_OS_OSX
+  recognizerView.userInteractionEnabled = YES;
+#endif
+
+  [recognizerView addGestureRecognizer:self.recognizer];
+  [self bindManualActivationToView:recognizerView];
 }
 
 - (void)unbindFromView
@@ -187,17 +254,40 @@ 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
+}
+
+/**
+ This method is used in `handleGesture` to choose appropriate view. `reactTag` in `RCTParagraphComponentView`
+ is `nil`, therefore we want to use `reactTag` from `RCTParagraphTextView`.
+ */
+- (RNGHUIView *)chooseViewForInteraction:(UIGestureRecognizer *)recognizer
+{
+#if RCT_NEW_ARCH_ENABLED
+  return [self isViewParagraphComponent:recognizer.view] ? recognizer.view.subviews[0] : recognizer.view;
+#else
+  return recognizer.view;
+#endif
 }
 
 - (void)handleGesture:(UIGestureRecognizer *)recognizer
 {
+  RNGHUIView *view = [self chooseViewForInteraction:recognizer];
+
   // it may happen that the gesture recognizer is reset after it's been unbound from the view,
   // it that recognizer tried to send event, the app would crash because the target of the event
   // would be nil.
-  if (recognizer.view.reactTag == nil) {
+  if (view.reactTag == nil) {
     return;
   }
 
@@ -209,7 +299,9 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 {
   _state = state;
   RNGestureHandlerEventExtraData *eventData = [self eventExtraData:recognizer];
-  [self sendEventsInState:self.state forViewWithTag:recognizer.view.reactTag withExtraData:eventData];
+  RNGHUIView *view = [self chooseViewForInteraction:recognizer];
+
+  [self sendEventsInState:self.state forViewWithTag:view.reactTag withExtraData:eventData];
 }
 
 - (void)sendEventsInState:(RNGestureHandlerState)state
@@ -224,6 +316,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
@@ -269,7 +370,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
@@ -329,7 +431,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   }
 }
 
-- (void)bindManualActivationToView:(UIView *)view
+- (void)bindManualActivationToView:(RNGHUIView *)view
 {
   if (_manualActivationRecognizer != nil) {
     [view addGestureRecognizer:_manualActivationRecognizer];
@@ -354,7 +456,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;
   }
@@ -380,22 +482,37 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
     }
   }
 
+  if (handler != nil) {
+    for (NSNumber *handlerTag in _handlersThatShouldWait) {
+      if ([handler.tag isEqual:handlerTag]) {
+        return YES;
+      }
+    }
+  }
+
   return NO;
 }
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
     shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
-  if ([_handlersToWaitFor count]) {
-    RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
-    if (handler != nil) {
-      for (NSNumber *handlerTag in _handlersToWaitFor) {
-        if ([handler.tag isEqual:handlerTag]) {
-          return YES;
-        }
-      }
+  RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
+  if (handler == nil) {
+    return NO;
+  }
+
+  for (NSNumber *handlerTag in _handlersToWaitFor) {
+    if ([handler.tag isEqual:handlerTag]) {
+      return YES;
+    }
+  }
+
+  for (NSNumber *handlerTag in handler->_handlersThatShouldWait) {
+    if ([_tag isEqual:handlerTag]) {
+      return YES;
     }
   }
+
   return NO;
 }
 
@@ -406,6 +523,10 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
     return YES;
   }
 
+  if ([self areScrollViewRecognizersCompatible:gestureRecognizer otherRecognizer:otherGestureRecognizer]) {
+    return YES;
+  }
+
   RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
   if (handler != nil) {
     if ([_simultaneousHandlers count]) {
@@ -414,7 +535,9 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
           return YES;
         }
       }
-    } else if (handler->_simultaneousHandlers) {
+    }
+
+    if (handler->_simultaneousHandlers) {
       for (NSNumber *handlerTag in handler->_simultaneousHandlers) {
         if ([self.tag isEqual:handlerTag]) {
           return YES;
@@ -425,6 +548,57 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   return NO;
 }
 
+- (BOOL)areScrollViewRecognizersCompatible:(UIGestureRecognizer *)gestureRecognizer
+                           otherRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+  if ([self isUIScrollViewPanGestureRecognizer:otherGestureRecognizer] &&
+      [gestureRecognizer isKindOfClass:[RNDummyGestureRecognizer class]]) {
+    RNGHUIScrollView *scrollView = [self retrieveScrollView:gestureRecognizer.view];
+    if (scrollView && scrollView == otherGestureRecognizer.view) {
+      return YES;
+    }
+  }
+
+  return NO;
+}
+
+#if !TARGET_OS_OSX
+// is UIPanGestureRecognizer and has scrollView property
+- (BOOL)isUIScrollViewPanGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+{
+  return [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] &&
+      [gestureRecognizer respondsToSelector:@selector(scrollView)];
+}
+
+#else
+
+- (BOOL)isUIScrollViewPanGestureRecognizer:(NSGestureRecognizer *)gestureRecognizer
+{
+  return NO;
+}
+
+#endif
+
+- (RNGHUIScrollView *)retrieveScrollView:(RNGHUIView *)view
+{
+#ifdef RCT_NEW_ARCH_ENABLED
+  if ([view isKindOfClass:[RCTScrollViewComponentView class]]) {
+    RNGHUIScrollView *scrollView = ((RCTScrollViewComponentView *)view).scrollView;
+    return scrollView;
+  }
+#else
+  if ([view isKindOfClass:[RCTScrollView class]]) {
+    // This part of the code is coupled with RN implementation of ScrollView native wrapper and
+    // we expect for RCTScrollView component to contain a subclass of UIScrollview as the only
+    // subview
+    RNGHUIScrollView *scrollView = [view.subviews objectAtIndex:0];
+    return scrollView;
+  }
+#endif
+
+  return nil;
+}
+
 - (void)reset
 {
   // do not reset states while gesture is tracking pointers, as gestureRecognizerShouldBegin
@@ -464,7 +638,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
@@ -472,7 +646,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/apple/RNGestureHandlerButton.h

@@ -0,0 +1,39 @@
+//
+//  RNGestureHandlerButton.h
+//  RNGestureHandler
+//
+//  Created by Krzysztof Magiera on 12/10/2017.
+//  Copyright © 2017 Software Mansion. All rights reserved.
+//
+
+#import "RNGestureHandler.h"
+
+#if TARGET_OS_OSX
+
+#if RCT_NEW_ARCH_ENABLED
+
+#include <react/renderer/core/LayoutMetrics.h>
+
+@protocol RCTComponentViewProtocol;
+
+#endif // RCT_NEW_ARCH_ENABLED
+
+@interface RNGestureHandlerButton : NSControl
+#else
+@interface RNGestureHandlerButton : UIControl
+#endif // TARGET_OS_OSX
+/**
+ *  Insets used when hit testing inside this view.
+ */
+@property (nonatomic, assign) UIEdgeInsets hitTestEdgeInsets;
+@property (nonatomic, assign) CGFloat borderRadius;
+@property (nonatomic) BOOL userEnabled;
+
+#if TARGET_OS_OSX && RCT_NEW_ARCH_ENABLED
+- (void)mountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index;
+- (void)unmountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index;
+- (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
+           oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics;
+#endif
+
+@end