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

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];
@@ -286,12 +288,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 +309,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 +385,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) {
@@ -833,4 +854,9 @@ static NSHashTable<RNGestureHandler *> *allGestureHandlers;
   return NO;
 }
 
+- (BOOL)isContinuous
+{
+  return NO;
+}
+
 @end

package/apple/RNGestureHandlerButton.h

@@ -49,6 +49,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

package/apple/RNGestureHandlerButton.mm

@@ -41,6 +41,7 @@
  */
 @implementation RNGestureHandlerButton {
   BOOL _isTouchInsideBounds;
+  BOOL _suppressSuperControlActionDispatch;
   CALayer *_underlayLayer;
   CGFloat _underlayCornerRadii[8]; // [tlH, tlV, trH, trV, blH, blV, brH, brV] outer radii in points
   UIEdgeInsets _underlayBorderInsets; // border widths for padding-box inset
@@ -79,7 +80,9 @@
 
 #if !TARGET_OS_TV && !TARGET_OS_OSX
   [self setExclusiveTouch:YES];
-  [self addTarget:self action:@selector(handleAnimatePressIn) forControlEvents:UIControlEventTouchDown];
+  [self addTarget:self
+                action:@selector(handleAnimatePressIn)
+      forControlEvents:UIControlEventTouchDown | UIControlEventTouchDragEnter];
   [self addTarget:self
                 action:@selector(handleAnimatePressOut)
       forControlEvents:UIControlEventTouchUpInside | UIControlEventTouchUpOutside | UIControlEventTouchDragExit |
@@ -114,6 +117,28 @@
   [_underlayLayer removeAllAnimations];
 }
 
+- (void)prepareForRecycle
+{
+  // Fabric reuses the same wrapper + button instance across mounts. Without
+  // this reset, residual press-in transform/alpha/underlay-opacity from a
+  // prior use leaks into the recycled view, and `updateProps:` won't undo it
+  // when defaults are unchanged between mounts.
+  [self cancelPendingPressOutAnimation];
+
+  RNGHUIView *target = self.animationTarget ?: self;
+  target.layer.transform = CATransform3DIdentity;
+#if !TARGET_OS_OSX
+  target.alpha = 1.0;
+#else
+  target.alphaValue = 1.0;
+#endif
+  _underlayLayer.opacity = 0;
+
+  _isTouchInsideBounds = NO;
+  _suppressSuperControlActionDispatch = NO;
+  _pressInTimestamp = 0;
+}
+
 #if TARGET_OS_OSX
 - (void)viewWillMoveToWindow:(RNGHWindow *)newWindow
 {
@@ -172,6 +197,17 @@
       _underlayLayer.presentationLayer ? [_underlayLayer.presentationLayer opacity] : _underlayLayer.opacity;
   [_underlayLayer removeAllAnimations];
 
+  // CABasicAnimation with duration 0 resolves to the current CATransaction's
+  // default duration (0.25s), not "no animation". Snap the value directly
+  // with implicit actions disabled to get a true instant update.
+  if (durationMs <= 0) {
+    [CATransaction begin];
+    [CATransaction setDisableActions:YES];
+    _underlayLayer.opacity = toOpacity;
+    [CATransaction commit];
+    return;
+  }
+
   CABasicAnimation *anim = [CABasicAnimation animationWithKeyPath:@"opacity"];
   anim.fromValue = @(_underlayLayer.opacity);
   anim.toValue = @(toOpacity);
@@ -554,6 +590,7 @@ static CATransform3D RNGHCenterScaleTransform(NSRect bounds, CGFloat scale)
 #if TARGET_OS_OSX
 - (void)mouseDown:(NSEvent *)event
 {
+  _isTouchInsideBounds = YES;
   [self handleAnimatePressIn];
   [super mouseDown:event];
 }
@@ -561,6 +598,7 @@ static CATransform3D RNGHCenterScaleTransform(NSRect bounds, CGFloat scale)
 - (void)mouseUp:(NSEvent *)event
 {
   [self handleAnimatePressOut];
+  _isTouchInsideBounds = NO;
   [super mouseUp:event];
 }
 
@@ -568,8 +606,13 @@ static CATransform3D RNGHCenterScaleTransform(NSRect bounds, CGFloat scale)
 {
   NSPoint locationInWindow = [event locationInWindow];
   NSPoint locationInView = [self convertPoint:locationInWindow fromView:nil];
+  BOOL currentlyInside = NSPointInRect(locationInView, self.bounds);
 
-  if (!NSPointInRect(locationInView, self.bounds)) {
+  if (currentlyInside && !_isTouchInsideBounds) {
+    _isTouchInsideBounds = YES;
+    [self handleAnimatePressIn];
+  } else if (!currentlyInside && _isTouchInsideBounds) {
+    _isTouchInsideBounds = NO;
     [self handleAnimatePressOut];
   }
 }
@@ -591,9 +634,52 @@ static CATransform3D RNGHCenterScaleTransform(NSRect bounds, CGFloat scale)
   return [super beginTrackingWithTouch:touch withEvent:event];
 }
 
+// Mirrors `sendActionsForControlEvents:` but preserves the real `UIEvent`
+// so target-actions with a `forEvent:` parameter receive the touches.
+// The public `sendActionsForControlEvents:` passes a nil event, which would
+// make handlers reading `event.allTouches.count` observe 0 pointers.
+- (void)rngh_sendActionsForControlEvents:(UIControlEvents)controlEvents withEvent:(UIEvent *)event
+{
+  for (id target in [self allTargets]) {
+    for (NSString *actionName in [self actionsForTarget:target forControlEvent:controlEvents]) {
+      [self sendAction:NSSelectorFromString(actionName) to:target forEvent:event];
+    }
+  }
+}
+
+// UIControl's default `touchesMoved:` / `touchesEnded:` invoke
+// `{continue|end}TrackingWithTouch:` and THEN dispatch their own Drag* / Up*
+// actions via `sendAction:to:forEvent:` using Apple's 70-point retention-offset
+// hit-test. That double-fires our handlers (once from our manual dispatch in
+// the tracking hooks, once from UIControl's retention-offset path). We swallow
+// UIControl's dispatch via this override; the flag is armed by our tracking
+// hooks only after our own dispatch has already run.
+- (void)sendAction:(SEL)action to:(id)target forEvent:(UIEvent *)event
+{
+  if (_suppressSuperControlActionDispatch) {
+    return;
+  }
+  [super sendAction:action to:target forEvent:event];
+}
+
+- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+  [super touchesMoved:touches withEvent:event];
+  _suppressSuperControlActionDispatch = NO;
+}
+
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+  [super touchesEnded:touches withEvent:event];
+  _suppressSuperControlActionDispatch = NO;
+}
+
 - (BOOL)continueTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)event
 {
-  // DO NOT call super. We are entirely taking over the drag event generation.
+  // We take over drag event generation to enforce strict hitslop bounds
+  // (bypassing Apple's retention offset). After our dispatch, set the
+  // suppress flag so UIControl's default post-tracking dispatch in
+  // `touchesMoved:` gets swallowed by our `sendAction:to:forEvent:` override.
 
   CGPoint location = [touch locationInView:self];
   CGRect hitFrame = UIEdgeInsetsInsetRect(self.bounds, self.hitTestEdgeInsets);
@@ -601,43 +687,48 @@ static CATransform3D RNGHCenterScaleTransform(NSRect bounds, CGFloat scale)
 
   if (currentlyInside) {
     if (!_isTouchInsideBounds) {
-      [self sendActionsForControlEvents:UIControlEventTouchDragEnter];
+      [self rngh_sendActionsForControlEvents:UIControlEventTouchDragEnter withEvent:event];
       _isTouchInsideBounds = YES;
     }
 
     // Targets may call `cancelTrackingWithEvent:` in response to DragEnter.
     if (self.tracking) {
-      [self sendActionsForControlEvents:UIControlEventTouchDragInside];
+      [self rngh_sendActionsForControlEvents:UIControlEventTouchDragInside withEvent:event];
     }
   } else {
     if (_isTouchInsideBounds) {
-      [self sendActionsForControlEvents:UIControlEventTouchDragExit];
+      [self rngh_sendActionsForControlEvents:UIControlEventTouchDragExit withEvent:event];
       _isTouchInsideBounds = NO;
     }
 
     // Targets may call `cancelTrackingWithEvent:` in response to DragExit.
     if (self.tracking) {
-      [self sendActionsForControlEvents:UIControlEventTouchDragOutside];
+      [self rngh_sendActionsForControlEvents:UIControlEventTouchDragOutside withEvent:event];
     }
   }
 
+  _suppressSuperControlActionDispatch = YES;
+
   // If `cancelTrackingWithEvent` was called, `self.tracking` will be NO.
   return self.tracking;
 }
 
 - (void)endTrackingWithTouch:(UITouch *)touch withEvent:(UIEvent *)event
 {
-  // Also bypass super here so that the final "up" event respects the
-  // strict bounds, rather than Apple's 70-point.
+  // Same rationale as `continueTrackingWithTouch:` — we dispatch the final
+  // Up* event ourselves using strict hitslop bounds, then set the suppress
+  // flag so UIControl's default dispatch in `touchesEnded:` gets swallowed.
 
   if (touch != nil) {
     CGPoint location = [touch locationInView:self];
     CGRect hitFrame = UIEdgeInsetsInsetRect(self.bounds, self.hitTestEdgeInsets);
     if (CGRectContainsPoint(hitFrame, location)) {
-      [self sendActionsForControlEvents:UIControlEventTouchUpInside];
+      [self rngh_sendActionsForControlEvents:UIControlEventTouchUpInside withEvent:event];
     } else {
-      [self sendActionsForControlEvents:UIControlEventTouchUpOutside];
+      [self rngh_sendActionsForControlEvents:UIControlEventTouchUpOutside withEvent:event];
     }
+
+    _suppressSuperControlActionDispatch = YES;
   }
 
   _isTouchInsideBounds = NO;

package/apple/RNGestureHandlerButtonComponentView.mm

@@ -34,6 +34,7 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
 
 @implementation RNGestureHandlerButtonComponentView {
   RNGestureHandlerButton *_buttonView;
+  BOOL _needsAnimationStateReset;
 }
 
 #if TARGET_OS_OSX
@@ -67,6 +68,20 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
   return self;
 }
 
+- (void)prepareForRecycle
+{
+  [self.layer removeAnimationForKey:@"transform"];
+  self.layer.transform = CATransform3DIdentity;
+
+  [_buttonView prepareForRecycle];
+
+  // Force the next updateProps: to re-run applyStartAnimationState even if
+  // the new mount's defaults match the previous mount's.
+  _needsAnimationStateReset = YES;
+
+  [super prepareForRecycle];
+}
+
 - (void)mountChildComponentView:(RNGHUIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
   [_buttonView mountChildComponentView:childComponentView index:index];
@@ -111,14 +126,65 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
   const LayoutMetrics buttonMetrics = [self buildButtonMetrics:layoutMetrics];
   const LayoutMetrics oldbuttonMetrics = [self buildButtonMetrics:oldLayoutMetrics];
 
+  // The press-in animation sets a scale transform on `self.layer` (animationTarget
+  // is this wrapper). RN's layout path sets `self.frame = frame`, which is undefined
+  // behavior when the layer's transform is non-identity, so mid-press child re-layouts
+  // get squished against the old bounds before snapping to the new ones. Neutralize
+  // the transform and any in-flight animation around super's frame update, then
+  // restore both atomically within the same transaction.
+  CATransform3D savedTransform = self.layer.transform;
+  CAAnimation *savedTransformAnimation = [[self.layer animationForKey:@"transform"] copy];
+  BOOL hasPendingTransform = !CATransform3DIsIdentity(savedTransform) || savedTransformAnimation != nil;
+
+  if (hasPendingTransform) {
+    [CATransaction begin];
+    [CATransaction setDisableActions:YES];
+    [self.layer removeAnimationForKey:@"transform"];
+    self.layer.transform = CATransform3DIdentity;
+  }
+
   [super updateLayoutMetrics:wrapperMetrics oldLayoutMetrics:oldWrapperMetrics];
+
+  if (hasPendingTransform) {
+    self.layer.transform = savedTransform;
+    if (savedTransformAnimation) {
+      [self.layer addAnimation:savedTransformAnimation forKey:@"transform"];
+    }
+    [CATransaction commit];
+  }
+
   [_buttonView updateLayoutMetrics:buttonMetrics oldLayoutMetrics:oldbuttonMetrics];
 }
 
 - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
 {
+  // super's invalidateLayer (called via finalizeUpdates) unconditionally sets
+  // self.layer.opacity to the React style.opacity, overwriting our
+  // applyStartAnimationState alpha and interrupting in-flight press
+  // animations. Save/restore around super, but only touch what super actually
+  // disturbed — re-adding an unchanged animation resets its progress.
+  float savedOpacity = self.layer.opacity;
+  CAAnimation *savedOpacityAnimation = [self.layer animationForKey:@"opacity"];
+
   [super finalizeUpdates:updateMask];
 
+  BOOL opacityChanged = savedOpacity != self.layer.opacity;
+  BOOL animationChanged = savedOpacityAnimation != [self.layer animationForKey:@"opacity"];
+  if (opacityChanged || animationChanged) {
+    [CATransaction begin];
+    [CATransaction setDisableActions:YES];
+    if (animationChanged) {
+      [self.layer removeAnimationForKey:@"opacity"];
+      if (savedOpacityAnimation) {
+        [self.layer addAnimation:savedOpacityAnimation forKey:@"opacity"];
+      }
+    }
+    if (opacityChanged) {
+      self.layer.opacity = savedOpacity;
+    }
+    [CATransaction commit];
+  }
+
   // Resolve per-corner border radii from props and forward to the button
   // so its underlay CALayer gets the matching shape.
   const auto borderMetrics = _props->resolveBorderMetrics(_layoutMetrics);
@@ -134,8 +200,6 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
                                         right:borderMetrics.borderWidths.right
                                        bottom:borderMetrics.borderWidths.bottom
                                          left:borderMetrics.borderWidths.left];
-
-  [_buttonView applyStartAnimationState];
 }
 
 #pragma mark - RCTComponentViewProtocol
@@ -243,6 +307,21 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
 {
   const auto &newProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(props);
 
+  // After recycling, treat diffing branches as a fresh mount so values that
+  // survived recycling on _buttonView (e.g. pointerEvents) get re-applied.
+  BOOL treatAsFirstMount = !oldProps || _needsAnimationStateReset;
+  _needsAnimationStateReset = NO;
+
+  // Avoid re-running applyStartAnimationState on every commit — it would
+  // interrupt in-flight press animations during mid-press re-renders.
+  BOOL shouldApplyStartAnimationState = treatAsFirstMount;
+  if (!treatAsFirstMount) {
+    const auto &oldButtonProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(oldProps);
+    shouldApplyStartAnimationState = oldButtonProps.defaultOpacity != newProps.defaultOpacity ||
+        oldButtonProps.defaultScale != newProps.defaultScale ||
+        oldButtonProps.defaultUnderlayOpacity != newProps.defaultUnderlayOpacity;
+  }
+
   _buttonView.userEnabled = newProps.enabled;
   _buttonView.pressAndHoldAnimationDuration = newProps.pressAndHoldAnimationDuration;
   _buttonView.tapAnimationDuration = newProps.tapAnimationDuration > 0 ? newProps.tapAnimationDuration : 0;
@@ -268,7 +347,7 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
   // This is necessary because pointerEvents is redefined in the spec,
   // which shadows the base property with a different, incompatible type.
   const auto &newViewProps = static_cast<const ViewProps &>(newProps);
-  if (!oldProps) {
+  if (treatAsFirstMount) {
     _buttonView.pointerEvents = RCTPointerEventsToEnum(newViewProps.pointerEvents);
   } else {
     const auto &oldButtonProps = *std::static_pointer_cast<const RNGestureHandlerButtonProps>(oldProps);
@@ -279,7 +358,9 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
   }
 
   [super updateProps:props oldProps:oldProps];
-  [_buttonView applyStartAnimationState];
+  if (shouldApplyStartAnimationState) {
+    [_buttonView applyStartAnimationState];
+  }
 }
 
 #if !TARGET_OS_OSX

package/apple/RNGestureHandlerRegistry.h

@@ -16,7 +16,6 @@
                       toView:(nonnull RNGHUIView *)view
               withActionType:(RNGestureHandlerActionType)actionType
             withHostDetector:(nullable RNGHUIView *)hostDetector;
-- (void)detachHandlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)detachHandlerWithTag:(nonnull NSNumber *)handlerTag fromHostDetector:(nonnull RNGHUIView *)hostDetectorView;
 - (void)dropHandlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)dropAllHandlers;

package/apple/RNRootViewGestureRecognizer.m

@@ -33,18 +33,6 @@
   return self;
 }
 
-- (BOOL)shouldBeRequiredToFailByGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
-{
-  // This method is used to implement "enabled" feature for gesture handlers. We enforce gesture
-  // recognizers that are connected with "disabled" handlers to wait for the root gesture
-  // recognizer to fail and this way we block them from acting.
-  RNGestureHandler *otherHandler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
-  if (otherHandler != nil && otherHandler.enabled == NO) {
-    return YES;
-  }
-  return NO;
-}
-
 - (BOOL)canPreventGestureRecognizer:(UIGestureRecognizer *)preventedGestureRecognizer
 {
   return ![preventedGestureRecognizer isKindOfClass:[RCTSurfaceTouchHandler class]];
@@ -53,10 +41,11 @@
 - (BOOL)canBePreventedByGestureRecognizer:(UIGestureRecognizer *)preventingGestureRecognizer
 {
   // When this method is called it means that one of handlers has activated, in this case we want
-  // to send an info to JS so that it cancells all JS responders, as long as the preventing
-  // recognizer is from Gesture Handler, otherwise we might break some interactions
+  // to send an info to JS so that it cancels all JS responders, as long as the preventing
+  // recognizer is from Gesture Handler and it has "cancelsJSResponder" property set to
+  // true, otherwise we might break some interactions
   RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:preventingGestureRecognizer];
-  if (handler != nil) {
+  if (handler != nil && handler.cancelsJSResponder) {
     [self.delegate gestureRecognizer:preventingGestureRecognizer didActivateInViewWithTouchHandler:self.view];
   }
 

package/lib/module/components/GestureButtons.js

@@ -12,7 +12,7 @@ import GestureHandlerButton from './GestureHandlerButton';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export const LegacyRawButton = createNativeWrapper(GestureHandlerButton, {
   shouldCancelWhenOutside: false,
-  shouldActivateOnStart: false
+  shouldActivateOnStart: Platform.OS === 'web'
 });
 class InnerBaseButton extends React.Component {
   static defaultProps = {
@@ -20,7 +20,7 @@ class InnerBaseButton extends React.Component {
   };
   constructor(props) {
     super(props);
-    this.lastActive = false;
+    this.lastIsPressed = false;
     this.longPressDetected = false;
   }
   handleEvent = ({
@@ -31,14 +31,14 @@ class InnerBaseButton extends React.Component {
       oldState,
       pointerInside
     } = nativeEvent;
-    const active = pointerInside && state === State.ACTIVE;
-    if (active !== this.lastActive && this.props.onActiveStateChange) {
-      this.props.onActiveStateChange(active);
+    const isPressed = pointerInside && (state === State.BEGAN || state === State.ACTIVE);
+    if (isPressed !== this.lastIsPressed && this.props.onActiveStateChange) {
+      this.props.onActiveStateChange(isPressed);
     }
-    if (!this.longPressDetected && oldState === State.ACTIVE && state !== State.CANCELLED && this.lastActive && this.props.onPress) {
+    if (!this.longPressDetected && oldState === State.ACTIVE && state !== State.CANCELLED && this.lastIsPressed && this.props.onPress) {
       this.props.onPress(pointerInside);
     }
-    if (!this.lastActive && state === State.BEGAN && pointerInside) {
+    if (!this.lastIsPressed && state === State.BEGAN && pointerInside) {
       this.longPressDetected = false;
       if (this.props.onLongPress) {
         this.longPressTimeout = setTimeout(this.onLongPress, this.props.delayLongPress);
@@ -54,7 +54,7 @@ class InnerBaseButton extends React.Component {
       clearTimeout(this.longPressTimeout);
       this.longPressTimeout = undefined;
     }
-    this.lastActive = active;
+    this.lastIsPressed = isPressed;
   };
   onLongPress = () => {
     this.longPressDetected = true;

package/lib/module/components/GestureButtons.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Animated","Platform","StyleSheet","createNativeWrapper","State","GestureHandlerButton","jsx","_jsx","jsxs","_jsxs","LegacyRawButton","shouldCancelWhenOutside","shouldActivateOnStart","InnerBaseButton","Component","defaultProps","delayLongPress","constructor","props","lastActive","longPressDetected","handleEvent","nativeEvent","state","oldState","pointerInside","active","ACTIVE","onActiveStateChange","CANCELLED","onPress","BEGAN","onLongPress","longPressTimeout","setTimeout","undefined","clearTimeout","END","FAILED","onHandlerStateChange","e","onGestureEvent","render","rippleColor","style","rest","ref","innerRef","OS","cursor","AnimatedInnerBaseButton","createAnimatedComponent","LegacyBaseButton","AnimatedBaseButton","btnStyles","create","underlay","position","left","right","bottom","top","InnerRectButton","activeOpacity","underlayColor","opacity","Value","setValue","children","resolvedStyle","flatten","View","backgroundColor","borderRadius","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","LegacyRectButton","InnerBorderlessButton","borderless","LegacyBorderlessButton","default","LegacyPureNativeButton"],"sourceRoot":"../../../src","sources":["components/GestureButtons.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","Animated","Platform","StyleSheet","createNativeWrapper","State","GestureHandlerButton","jsx","_jsx","jsxs","_jsxs","LegacyRawButton","shouldCancelWhenOutside","shouldActivateOnStart","OS","InnerBaseButton","Component","defaultProps","delayLongPress","constructor","props","lastIsPressed","longPressDetected","handleEvent","nativeEvent","state","oldState","pointerInside","isPressed","BEGAN","ACTIVE","onActiveStateChange","CANCELLED","onPress","onLongPress","longPressTimeout","setTimeout","undefined","clearTimeout","END","FAILED","onHandlerStateChange","e","onGestureEvent","render","rippleColor","style","rest","ref","innerRef","cursor","AnimatedInnerBaseButton","createAnimatedComponent","LegacyBaseButton","AnimatedBaseButton","btnStyles","create","underlay","position","left","right","bottom","top","InnerRectButton","activeOpacity","underlayColor","opacity","Value","active","setValue","children","resolvedStyle","flatten","View","backgroundColor","borderRadius","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","LegacyRectButton","InnerBorderlessButton","borderless","LegacyBorderlessButton","default","LegacyPureNativeButton"],"sourceRoot":"../../../src","sources":["components/GestureButtons.tsx"],"mappings":"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","ignoreList":[]}