react-native-gesture-handler 3.0.0-beta.3 → 3.0.0-beta.5

package/apple/Handlers/RNNativeViewHandler.mm

@@ -113,6 +113,8 @@
 @implementation RNNativeViewGestureHandler {
   BOOL _shouldActivateOnStart;
   BOOL _disallowInterruption;
+  BOOL _yieldsToContinuousGestures;
+  RNGestureHandlerEventExtraData *_lastActiveExtraData;
 }
 
 - (instancetype)initWithTag:(NSNumber *)tag
@@ -128,6 +130,7 @@
   [super updateConfig:config];
   _shouldActivateOnStart = [RCTConvert BOOL:config[@"shouldActivateOnStart"]];
   _disallowInterruption = [RCTConvert BOOL:config[@"disallowInterruption"]];
+  _yieldsToContinuousGestures = [RCTConvert BOOL:config[@"yieldsToContinuousGestures"]];
 }
 
 #if !TARGET_OS_OSX
@@ -138,22 +141,33 @@
   // for properties like `disallowInterruption` to work.
   if ([view isKindOfClass:[UIControl class]]) {
     UIControl *control = (UIControl *)view;
-    [control addTarget:self action:@selector(handleTouchDown:forEvent:) forControlEvents:UIControlEventTouchDown];
-    [control addTarget:self
-                  action:@selector(handleTouchUpOutside:forEvent:)
-        forControlEvents:UIControlEventTouchUpOutside];
-    [control addTarget:self
-                  action:@selector(handleTouchUpInside:forEvent:)
-        forControlEvents:UIControlEventTouchUpInside];
-    [control addTarget:self action:@selector(handleDragExit:forEvent:) forControlEvents:UIControlEventTouchDragExit];
-    [control addTarget:self
-                  action:@selector(handleDragInside:forEvent:)
-        forControlEvents:UIControlEventTouchDragInside];
-    [control addTarget:self
-                  action:@selector(handleDragOutside:forEvent:)
-        forControlEvents:UIControlEventTouchDragOutside];
-    [control addTarget:self action:@selector(handleDragEnter:forEvent:) forControlEvents:UIControlEventTouchDragEnter];
-    [control addTarget:self action:@selector(handleTouchCancel:forEvent:) forControlEvents:UIControlEventTouchCancel];
+
+    // Pressing UISwitch triggers only touchUp and valueChanged callbacks. In order to align its behavior
+    // with other UIControls, we have to dispatch full Gesture Handler events flow in one callback, as
+    // touchesDown is not executed.
+    if ([view isKindOfClass:[UISwitch class]]) {
+      _pointerType = RNGestureHandlerTouch;
+      [control addTarget:self action:@selector(handleSwitch:) forControlEvents:UIControlEventValueChanged];
+    } else {
+      [control addTarget:self action:@selector(handleTouchDown:forEvent:) forControlEvents:UIControlEventTouchDown];
+      [control addTarget:self
+                    action:@selector(handleTouchUpOutside:forEvent:)
+          forControlEvents:UIControlEventTouchUpOutside];
+      [control addTarget:self
+                    action:@selector(handleTouchUpInside:forEvent:)
+          forControlEvents:UIControlEventTouchUpInside];
+      [control addTarget:self action:@selector(handleDragExit:forEvent:) forControlEvents:UIControlEventTouchDragExit];
+      [control addTarget:self
+                    action:@selector(handleDragInside:forEvent:)
+          forControlEvents:UIControlEventTouchDragInside];
+      [control addTarget:self
+                    action:@selector(handleDragOutside:forEvent:)
+          forControlEvents:UIControlEventTouchDragOutside];
+      [control addTarget:self
+                    action:@selector(handleDragEnter:forEvent:)
+          forControlEvents:UIControlEventTouchDragEnter];
+      [control addTarget:self action:@selector(handleTouchCancel:forEvent:) forControlEvents:UIControlEventTouchCancel];
+    }
   } else {
     [super bindToView:view];
   }
@@ -180,6 +194,46 @@
   [super unbindFromView];
 }
 
+- (BOOL)shouldSuppressActiveEvent:(RNGestureHandlerEventExtraData *)extraData
+{
+  if (_lastActiveExtraData != nil && [_lastActiveExtraData.data isEqualToDictionary:extraData.data]) {
+    return YES;
+  }
+
+  _lastActiveExtraData = extraData;
+  return NO;
+}
+
+- (void)sendActiveStateEventIfChangedForView:(UIView *)sender extraData:(RNGestureHandlerEventExtraData *)extraData
+{
+  if ([self shouldSuppressActiveEvent:extraData]) {
+    return;
+  }
+
+  [self sendEventsInState:RNGestureHandlerStateActive forViewWithTag:sender.reactTag withExtraData:extraData];
+}
+
+- (void)handleSwitch:(UIView *)sender
+{
+  [self sendEventsInState:RNGestureHandlerStateBegan
+           forViewWithTag:sender.reactTag
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                       withNumberOfTouches:1
+                                                           withPointerType:_pointerType]];
+  [self sendEventsInState:RNGestureHandlerStateActive
+           forViewWithTag:sender.reactTag
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                       withNumberOfTouches:1
+                                                           withPointerType:_pointerType]];
+  [self sendEventsInState:RNGestureHandlerStateEnd
+           forViewWithTag:sender.reactTag
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                       withNumberOfTouches:1
+                                                           withPointerType:_pointerType]];
+
+  [self reset];
+}
+
 - (void)handleTouchDown:(UIView *)sender forEvent:(UIEvent *)event
 {
   [self setCurrentPointerTypeForEvent:event];
@@ -187,11 +241,18 @@
 
   if (_disallowInterruption) {
     // When `disallowInterruption` is set we cancel all gesture handlers when this UIControl
-    // gets DOWN event
+    // gets DOWN event. When `yieldsToContinuousGestures` is also set we leave alone:
+    //   - non-RNGH recognizers (e.g. UIScrollView's pan), so native containers can take over
+    //   - continuous RNGH recognizers, so other continuous gestures wrapping the touchable can still take over
     for (RNGHUITouch *touch in [event allTouches]) {
-      for (UIGestureRecognizer *recogn in [touch gestureRecognizers]) {
-        recogn.enabled = NO;
-        recogn.enabled = YES;
+      for (UIGestureRecognizer *recognizer in [touch gestureRecognizers]) {
+        if (_yieldsToContinuousGestures &&
+            (recognizer.gestureHandler == nil || [recognizer.gestureHandler isContinuous])) {
+          continue;
+        }
+
+        recognizer.enabled = NO;
+        recognizer.enabled = YES;
       }
     }
   }
@@ -201,12 +262,6 @@
             withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
                                                        withNumberOfTouches:event.allTouches.count
                                                            withPointerType:_pointerType]];
-
-  [self sendEventsInState:RNGestureHandlerStateActive
-           forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
-                                                       withNumberOfTouches:event.allTouches.count
-                                                           withPointerType:_pointerType]];
 }
 
 - (void)handleTouchUpOutside:(UIView *)sender forEvent:(UIEvent *)event
@@ -224,11 +279,12 @@
 
 - (void)handleTouchUpInside:(UIView *)sender forEvent:(UIEvent *)event
 {
-  [self sendEventsInState:RNGestureHandlerStateEnd
-           forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
-                                                       withNumberOfTouches:event.allTouches.count
-                                                           withPointerType:_pointerType]];
+  RNGestureHandlerEventExtraData *extraData = [RNGestureHandlerEventExtraData forPointerInside:YES
+                                                                           withNumberOfTouches:event.allTouches.count
+                                                                               withPointerType:_pointerType];
+
+  [self sendActiveStateEventIfChangedForView:sender extraData:extraData];
+  [self sendEventsInState:RNGestureHandlerStateEnd forViewWithTag:sender.reactTag withExtraData:extraData];
 }
 
 - (void)handleDragExit:(UIView *)sender forEvent:(UIEvent *)event
@@ -238,30 +294,27 @@
     UIControl *control = (UIControl *)sender;
     [control cancelTrackingWithEvent:event];
   } else {
-    [self sendEventsInState:RNGestureHandlerStateActive
-             forViewWithTag:sender.reactTag
-              withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO
-                                                         withNumberOfTouches:event.allTouches.count
-                                                             withPointerType:_pointerType]];
+    [self sendActiveStateEventIfChangedForView:sender
+                                     extraData:[RNGestureHandlerEventExtraData forPointerInside:NO
+                                                                            withNumberOfTouches:event.allTouches.count
+                                                                                withPointerType:_pointerType]];
   }
 }
 
 - (void)handleDragEnter:(UIView *)sender forEvent:(UIEvent *)event
 {
-  [self sendEventsInState:RNGestureHandlerStateActive
-           forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
-                                                       withNumberOfTouches:event.allTouches.count
-                                                           withPointerType:_pointerType]];
+  [self sendActiveStateEventIfChangedForView:sender
+                                   extraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                                          withNumberOfTouches:event.allTouches.count
+                                                                              withPointerType:_pointerType]];
 }
 
 - (void)handleDragInside:(UIView *)sender forEvent:(UIEvent *)event
 {
-  [self sendEventsInState:RNGestureHandlerStateActive
-           forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
-                                                       withNumberOfTouches:event.allTouches.count
-                                                           withPointerType:_pointerType]];
+  [self sendActiveStateEventIfChangedForView:sender
+                                   extraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                                          withNumberOfTouches:event.allTouches.count
+                                                                              withPointerType:_pointerType]];
 }
 
 - (void)handleDragOutside:(UIView *)sender forEvent:(UIEvent *)event
@@ -270,11 +323,10 @@
     return;
   }
 
-  [self sendEventsInState:RNGestureHandlerStateActive
-           forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO
-                                                       withNumberOfTouches:event.allTouches.count
-                                                           withPointerType:_pointerType]];
+  [self sendActiveStateEventIfChangedForView:sender
+                                   extraData:[RNGestureHandlerEventExtraData forPointerInside:NO
+                                                                          withNumberOfTouches:event.allTouches.count
+                                                                              withPointerType:_pointerType]];
 }
 
 - (void)handleTouchCancel:(UIView *)sender forEvent:(UIEvent *)event
@@ -291,7 +343,13 @@
   return YES;
 }
 
-#else
+- (void)reset
+{
+  [super reset];
+  _lastActiveExtraData = nil;
+}
+
+#endif
 
 - (RNGestureHandlerEventExtraData *)eventExtraData:(RNDummyGestureRecognizer *)recognizer
 {
@@ -300,6 +358,9 @@
                                           withPointerType:RNGestureHandlerMouse];
 }
 
-#endif
+- (BOOL)isContinuous
+{
+  return YES;
+}
 
 @end

package/apple/Handlers/RNPanHandler.m

@@ -269,7 +269,6 @@
   [self triggerActionFromReset];
   [_gestureHandler.pointerTracker reset];
   [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(activateAfterLongPress) object:nil];
-  self.enabled = YES;
   [super reset];
   [_gestureHandler reset];
 
@@ -363,6 +362,11 @@
   return self;
 }
 
+- (BOOL)isContinuous
+{
+  return YES;
+}
+
 - (void)resetConfig
 {
   [super resetConfig];
@@ -452,7 +456,7 @@
 #if TARGET_OS_OSX
 - (RNGestureHandlerEventExtraData *)eventExtraData:(NSPanGestureRecognizer *)recognizer
 {
-  return [RNGestureHandlerEventExtraData forPan:[recognizer locationInView:recognizer.view]
+  return [RNGestureHandlerEventExtraData forPan:[recognizer locationInView:self.coordinateView]
                            withAbsolutePosition:[recognizer locationInView:recognizer.view.window.contentView]
                                 withTranslation:[recognizer translationInView:recognizer.view.window.contentView]
                                    withVelocity:[recognizer velocityInView:recognizer.view.window.contentView]
@@ -466,7 +470,7 @@
   RNBetterPanGestureRecognizer *panRecognizer = (RNBetterPanGestureRecognizer *)recognizer;
 
   return [RNGestureHandlerEventExtraData
-                    forPan:[recognizer locationInView:recognizer.view]
+                    forPan:[recognizer locationInView:self.coordinateView]
       withAbsolutePosition:[recognizer locationInView:recognizer.view.window]
            withTranslation:[recognizer translationInView:recognizer.view.window]
               withVelocity:[recognizer velocityInView:recognizer.view.window]

package/apple/Handlers/RNPinchHandler.m

@@ -161,13 +161,18 @@
   return self;
 }
 
+- (BOOL)isContinuous
+{
+  return YES;
+}
+
 #if !TARGET_OS_TV
 
 #if TARGET_OS_OSX
 - (RNGestureHandlerEventExtraData *)eventExtraData:(NSMagnificationGestureRecognizer *)recognizer
 {
   return [RNGestureHandlerEventExtraData forPinch:recognizer.magnification
-                                   withFocalPoint:[recognizer locationInView:recognizer.view]
+                                   withFocalPoint:[recognizer locationInView:self.coordinateView]
                                      withVelocity:((RNBetterPinchRecognizer *)recognizer).velocity
                               withNumberOfTouches:2
                                   withPointerType:RNGestureHandlerMouse];
@@ -177,12 +182,13 @@
 {
   CGPoint focalPoint;
   NSUInteger numberOfTouches = recognizer.numberOfTouches;
+  RNGHUIView *coordinateView = self.coordinateView;
 
   if (numberOfTouches > 0) {
     CGPoint accumulatedPoint = CGPointZero;
 
     for (int i = 0; i < numberOfTouches; i++) {
-      CGPoint location = [recognizer locationOfTouch:i inView:recognizer.view];
+      CGPoint location = [recognizer locationOfTouch:i inView:coordinateView];
       accumulatedPoint.x += location.x;
       accumulatedPoint.y += location.y;
     }
@@ -190,7 +196,7 @@
     focalPoint = CGPointMake(accumulatedPoint.x / numberOfTouches, accumulatedPoint.y / numberOfTouches);
   } else {
     // Trackpad pinch gestures may report 0 touches - use the recognizer's location instead
-    focalPoint = [recognizer locationInView:recognizer.view];
+    focalPoint = [recognizer locationInView:coordinateView];
   }
 
   return [RNGestureHandlerEventExtraData forPinch:recognizer.scale

package/apple/Handlers/RNRotationHandler.m

@@ -155,13 +155,18 @@
   return self;
 }
 
+- (BOOL)isContinuous
+{
+  return YES;
+}
+
 #if !TARGET_OS_TV
 
 #if TARGET_OS_OSX
 - (RNGestureHandlerEventExtraData *)eventExtraData:(NSRotationGestureRecognizer *)recognizer
 {
   return [RNGestureHandlerEventExtraData forRotation:-recognizer.rotation
-                                     withAnchorPoint:[recognizer locationInView:recognizer.view]
+                                     withAnchorPoint:[recognizer locationInView:self.coordinateView]
                                         withVelocity:((RNBetterRotationRecognizer *)recognizer).velocity
                                  withNumberOfTouches:2
                                      withPointerType:RNGestureHandlerMouse];
@@ -170,7 +175,7 @@
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIRotationGestureRecognizer *)recognizer
 {
   return [RNGestureHandlerEventExtraData forRotation:recognizer.rotation
-                                     withAnchorPoint:[recognizer locationInView:recognizer.view]
+                                     withAnchorPoint:[recognizer locationInView:self.coordinateView]
                                         withVelocity:recognizer.velocity
                                  withNumberOfTouches:recognizer.numberOfTouches
                                      withPointerType:_pointerType];

package/apple/Handlers/RNTapHandler.m

@@ -258,7 +258,7 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
   [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(cancel) object:nil];
   _tapsSoFar = 0;
   _maxNumberOfTouches = 0;
-  self.enabled = YES;
+  self.enabled = _gestureHandler.enabled;
   [super reset];
   [_gestureHandler reset];
 }

package/apple/RNGestureHandler.h

@@ -81,6 +81,7 @@
 @property (nonatomic) BOOL shouldCancelWhenOutside;
 @property (nonatomic) BOOL needsPointerData;
 @property (nonatomic) BOOL manualActivation;
+@property (nonatomic) BOOL cancelsJSResponder;
 @property (nonatomic) BOOL dispatchesAnimatedEvents;
 @property (nonatomic) BOOL dispatchesReanimatedEvents;
 @property (nonatomic, weak, nullable) RNGHUIView *hostDetectorView;
@@ -88,6 +89,17 @@
 @property (nonatomic, copy, nullable) NSNumber *viewTag;
 @property (nonatomic, readonly) RNGestureHandlerState lastState;
 
+/**
+ The view whose coordinate space should be used when reporting event positions to JS.
+ Handlers attached via the V3 NativeDetector are bound to the `RNGestureHandlerDetector` wrapper,
+ which never carries user-applied transforms — those live on its child. When the detector has
+ exactly one subview we descend into it so reported coordinates match the visible (transformed)
+ view, the same coordinate space V2 and the V3 VirtualGestureDetector report in. With multiple
+ subviews there is no JS-side way to disambiguate which child caught the pointer, so we keep
+ the detector itself as the reference frame.
+ */
+@property (nonatomic, readonly, nullable) RNGHUIView *coordinateView;
+
 - (BOOL)isViewParagraphComponent:(nullable RNGHUIView *)view;
 - (nonnull RNGHUIView *)chooseViewForInteraction:(nonnull UIGestureRecognizer *)recognizer;
 - (void)bindToView:(nonnull RNGHUIView *)view;
@@ -96,6 +108,7 @@
 - (void)setConfig:(nullable NSDictionary *)config NS_REQUIRES_SUPER;
 - (void)updateConfig:(nullable NSDictionary *)config NS_REQUIRES_SUPER;
 - (void)updateRelations:(nonnull NSDictionary *)relations;
+- (BOOL)shouldSuppressActiveEvent:(nonnull RNGestureHandlerEventExtraData *)extraData;
 - (void)handleGesture:(nonnull id)recognizer;
 - (void)handleGesture:(nonnull id)recognizer fromReset:(BOOL)fromReset;
 - (void)handleGesture:(nonnull id)recognizer
@@ -125,6 +138,7 @@
 - (nonnull RNGHUIView *)findViewForEvents;
 - (BOOL)wantsToAttachDirectlyToView;
 - (BOOL)usesNativeOrVirtualDetector;
+- (BOOL)isContinuous;
 
 #if !TARGET_OS_OSX
 - (BOOL)isUIScrollViewPanGestureRecognizer:(nonnull UIGestureRecognizer *)gestureRecognizer;
@@ -140,3 +154,7 @@
 #endif
 
 @end
+
+@interface UIGestureRecognizer (GestureHandler)
+@property (nonatomic, readonly, nullable) RNGestureHandler *gestureHandler;
+@end

package/apple/RNGestureHandler.mm

@@ -14,10 +14,6 @@
 #import <React/RCTParagraphComponentView.h>
 #import <React/RCTScrollViewComponentView.h>
 
-@interface UIGestureRecognizer (GestureHandler)
-@property (nonatomic, readonly) RNGestureHandler *gestureHandler;
-@end
-
 @implementation UIGestureRecognizer (GestureHandler)
 
 - (RNGestureHandler *)gestureHandler
@@ -105,6 +101,7 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   self.testID = nil;
   self.manualActivation = NO;
   _shouldCancelWhenOutside = NO;
+  _cancelsJSResponder = YES;
   _hitSlop = RNGHHitSlopEmpty;
   _needsPointerData = NO;
   _dispatchesAnimatedEvents = NO;
@@ -164,6 +161,11 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
     self.manualActivation = [RCTConvert BOOL:prop];
   }
 
+  prop = config[@"cancelsJSResponder"];
+  if (prop != nil) {
+    _cancelsJSResponder = [RCTConvert BOOL:prop];
+  }
+
   prop = config[@"hitSlop"];
   if ([prop isKindOfClass:[NSNumber class]]) {
     _hitSlop.left = _hitSlop.right = _hitSlop.top = _hitSlop.bottom = [prop doubleValue];
@@ -252,6 +254,43 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   return [view isKindOfClass:[RCTParagraphComponentView class]];
 }
 
+/**
+ * Recursively searches the view subtree rooted at `view` for any descendant whose
+ * `touchEventEmitterAtPoint:` returns an emitter tag matching `virtualViewTag`.
+ * `point` must be in `view`'s coordinate space.
+ *
+ * Most Fabric views inherit a base `touchEventEmitterAtPoint:` that returns their own emitter
+ * (tag == their own reactTag). Views that render multiple logical children — like
+ * `RCTParagraphComponentView` for inline text spans — override the method to return
+ * per-child emitters, making them distinguishable by tag. This helper exploits that
+ * property without hardcoding any specific view class.
+ */
+- (BOOL)isVirtualViewTag:(NSNumber *)virtualViewTag touchedAtPoint:(CGPoint)point inView:(RNGHUIView *)view
+{
+  if (!CGRectContainsPoint(view.bounds, point)) {
+    return NO;
+  }
+
+  if ([view respondsToSelector:@selector(touchEventEmitterAtPoint:)]) {
+    auto emitter = [(id<RCTTouchableComponentViewProtocol>)view touchEventEmitterAtPoint:point];
+    if (emitter) {
+      auto eventTarget = emitter->getEventTarget();
+      if (eventTarget != nullptr && eventTarget->getTag() == [virtualViewTag intValue]) {
+        return YES;
+      }
+    }
+  }
+
+  for (RNGHUIView *subview in view.subviews) {
+    CGPoint pointInSubview = [view convertPoint:point toView:subview];
+    if ([self isVirtualViewTag:virtualViewTag touchedAtPoint:pointInSubview inView:subview]) {
+      return YES;
+    }
+  }
+
+  return NO;
+}
+
 - (void)bindToView:(RNGHUIView *)view
 {
   self.recognizer.delegate = self;
@@ -286,12 +325,12 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 - (RNGestureHandlerEventExtraData *)eventExtraData:(UIGestureRecognizer *)recognizer
 {
 #if TARGET_OS_OSX
-  return [RNGestureHandlerEventExtraData forPosition:[recognizer locationInView:recognizer.view]
+  return [RNGestureHandlerEventExtraData forPosition:[recognizer locationInView:self.coordinateView]
                                 withAbsolutePosition:[recognizer locationInView:recognizer.view.window.contentView]
                                  withNumberOfTouches:1
                                      withPointerType:RNGestureHandlerMouse];
 #else
-  return [RNGestureHandlerEventExtraData forPosition:[recognizer locationInView:recognizer.view]
+  return [RNGestureHandlerEventExtraData forPosition:[recognizer locationInView:self.coordinateView]
                                 withAbsolutePosition:[recognizer locationInView:recognizer.view.window]
                                  withNumberOfTouches:recognizer.numberOfTouches
                                      withPointerType:_pointerType];
@@ -307,6 +346,21 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   return [self isViewParagraphComponent:recognizer.view] ? recognizer.view.subviews[0] : recognizer.view;
 }
 
+- (RNGHUIView *)coordinateView
+{
+  RNGHUIView *recognizerView = _recognizer.view;
+  if ([self usesNativeOrVirtualDetector] && recognizerView == self.hostDetectorView &&
+      recognizerView.subviews.count == 1) {
+    return recognizerView.subviews[0];
+  }
+  return recognizerView;
+}
+
+- (BOOL)shouldSuppressActiveEvent:(RNGestureHandlerEventExtraData *)extraData
+{
+  return NO;
+}
+
 - (void)handleGesture:(UIGestureRecognizer *)recognizer
 {
   [self handleGesture:recognizer fromReset:NO];
@@ -368,6 +422,10 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 
   RNGestureHandlerEventExtraData *eventData = [self eventExtraData:recognizer];
 
+  if (state == RNGestureHandlerStateActive && [self shouldSuppressActiveEvent:eventData]) {
+    return;
+  }
+
   NSNumber *tag = [self chooseViewForInteraction:recognizer].reactTag;
 
   if (tag == nil && _actionType == RNGestureHandlerActionTypeNativeDetector) {
@@ -732,6 +790,11 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 
 - (BOOL)containsPointInView
 {
+  if (_actionType == RNGestureHandlerActionTypeVirtualDetector && _virtualViewTag != nil) {
+    CGPoint point = [_recognizer locationInView:_recognizer.view];
+    return [self isVirtualViewTag:_virtualViewTag touchedAtPoint:point inView:_recognizer.view];
+  }
+
   RNGHUIView *viewToHitTest = _recognizer.view;
 
   if (_shouldCancelWhenOutside && [self usesNativeOrVirtualDetector] && [_recognizer.view.subviews count] > 0) {
@@ -746,6 +809,11 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 
 - (BOOL)wantsToHandleEventsAtPoint:(CGPoint)point
 {
+  if (_actionType == RNGestureHandlerActionTypeVirtualDetector && _virtualViewTag != nil) {
+    // point is in _recognizer.view (detector) coordinate space; search the whole subtree
+    return [self isVirtualViewTag:_virtualViewTag touchedAtPoint:point inView:_recognizer.view];
+  }
+
   RNGHUIView *viewToHitTest = _recognizer.view;
 
   if ([self usesNativeOrVirtualDetector] && [_recognizer.view.subviews count] > 0) {
@@ -753,20 +821,6 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
     point = [_recognizer.view convertPoint:point toView:viewToHitTest];
   }
 
-  if (_actionType == RNGestureHandlerActionTypeVirtualDetector && _virtualViewTag != nil) {
-    // In this case, logic detector is attached to the DetectorView, which has a single subview representing
-    // the actual target view in the RN hierarchy
-    if ([viewToHitTest respondsToSelector:@selector(touchEventEmitterAtPoint:)]) {
-      // If the view has touchEventEmitterAtPoint: method, it can be used to determine the viewtag
-      // of the view under the touch point
-      facebook::react::SharedTouchEventEmitter eventEmitter =
-          [(id<RCTTouchableComponentViewProtocol>)viewToHitTest touchEventEmitterAtPoint:point];
-      auto viewUnderTouch = eventEmitter->getEventTarget()->getTag();
-
-      return viewUnderTouch == [_virtualViewTag intValue];
-    }
-  }
-
   CGRect hitFrame = RNGHHitSlopInsetRect(viewToHitTest.bounds, _hitSlop);
   return CGRectContainsPoint(hitFrame, point);
 }
@@ -789,19 +843,9 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
 
   // Logic detector has a virtual view tag set only if the real hierarchy was folded into a single View
   if (_actionType == RNGestureHandlerActionTypeVirtualDetector && _virtualViewTag != nil) {
-    // In this case, logic detector is attached to the DetectorView, which has a single subview representing
-    // the actual target view in the RN hierarchy
-    RNGHUIView *view = _recognizer.view.subviews[0];
-    if ([view respondsToSelector:@selector(touchEventEmitterAtPoint:)]) {
-      // If the view has touchEventEmitterAtPoint: method, it can be used to determine the viewtag
-      // of the view under the touch point
-      facebook::react::SharedTouchEventEmitter eventEmitter =
-          [(id<RCTTouchableComponentViewProtocol>)view touchEventEmitterAtPoint:[_recognizer locationInView:view]];
-      auto viewUnderTouch = eventEmitter->getEventTarget()->getTag();
-
-      if (viewUnderTouch != [_virtualViewTag intValue]) {
-        return NO;
-      }
+    CGPoint point = [_recognizer locationInView:_recognizer.view];
+    if (![self isVirtualViewTag:_virtualViewTag touchedAtPoint:point inView:_recognizer.view]) {
+      return NO;
     }
   }
 
@@ -833,4 +877,9 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   return NO;
 }
 
+- (BOOL)isContinuous
+{
+  return NO;
+}
+
 @end

package/apple/RNGestureHandlerButton.h

@@ -27,8 +27,10 @@
 @property (nonatomic) BOOL userEnabled;
 @property (nonatomic, assign) RNGestureHandlerPointerEvents pointerEvents;
 
-@property (nonatomic, assign) NSInteger pressAndHoldAnimationDuration;
-@property (nonatomic, assign) NSInteger tapAnimationDuration;
+@property (nonatomic, assign) NSInteger tapAnimationInDuration;
+@property (nonatomic, assign) NSInteger tapAnimationOutDuration;
+@property (nonatomic, assign) NSInteger longPressDuration;
+@property (nonatomic, assign) NSInteger longPressAnimationOutDuration;
 @property (nonatomic, assign) CGFloat activeOpacity;
 @property (nonatomic, assign) CGFloat defaultOpacity;
 @property (nonatomic, assign) CGFloat activeScale;
@@ -49,6 +51,14 @@
  */
 - (void)applyStartAnimationState;
 
+/**
+ * Resets all transient press/animation state so the button can be safely reused
+ * by Fabric view recycling. Cancels pending press-out blocks, removes in-flight
+ * animations, and unconditionally restores the animation target's transform/alpha
+ * and the underlay opacity to neutral values.
+ */
+- (void)prepareForRecycle;
+
 /**
  * Updates the underlay layer's corner radii with separate horizontal/vertical
  * components per corner, supporting elliptical inner corners when border widths