[iOS] Add wrapper for handleGesture:fromReset: (#3983)

m-bert · web-flow · commit 74cfcd63ece9 · 2026-02-19T13:33:57.000+01:00
## Description `Pinch` and `Rotation` are broken because they fail on [this line](https://github.com/software-mansion/react-native-gesture-handler/blob/0e74233db6a30dee547c3782aefc4f90f0551141/packages/react-native-gesture-handler/apple/RNGestureHandler.mm#L306). This happens because `handleGesture:fromReset` is called automatically via [`action` property](https://github.com/software-mansion/react-native-gesture-handler/blob/0e74233db6a30dee547c3782aefc4f90f0551141/packages/react-native-gesture-handler/apple/Handlers/RNPinchHandler.m#L36), but when UIKit calls it, it only passes `recognizer` as first parameter - `fromReset` is some garbage from memory. It gets treated as truthy value, even though it shouldn't be. Now, `handleGesture:fromRecognizer` will not be called automatically when recognizer resets its state, so it should be safe to assume that default `fromReset` value is `NO`. ## Test plan Tested on the **transformations** example and example code from #3855 on both, iOS 18.5 and iOS 26.0
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNFlingHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNFlingHandler.m
@@ -16,7 +16,7 @@ @implementation RNBetterSwipeGestureRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
     _lastPoint = CGPointZero;
     _hasBegan = NO;
@@ -125,7 +125,7 @@ @implementation RNBetterSwipeGestureRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:self action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
 
     maxDuration = 1.0;
@@ -138,9 +138,9 @@ - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
   return self;
 }
 
-- (void)handleGesture:(NSPanGestureRecognizer *)gestureRecognizer fromReset:(BOOL)fromReset
+- (void)handleGesture:(NSPanGestureRecognizer *)gestureRecognizer
 {
-  [_gestureHandler handleGesture:self fromReset:fromReset];
+  [_gestureHandler handleGesture:self];
 }
 
 - (void)mouseDown:(NSEvent *)event
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNForceTouchHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNForceTouchHandler.m
@@ -28,7 +28,7 @@ @implementation RNForceTouchGestureRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
     _force = defaultForce;
     _minForce = defaultMinForce;
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNHoverHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNHoverHandler.m
@@ -40,7 +40,7 @@ @implementation RNBetterHoverGestureRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
     _hoverEffect = RNGestureHandlerHoverEffectNone;
   }
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNLongPressHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNLongPressHandler.m
@@ -33,8 +33,10 @@ - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler;
 - (NSUInteger)getDuration;
 
 #if !TARGET_OS_OSX
+- (void)handleGesture:(UIGestureRecognizer *)recognizer;
 - (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset;
 #else
+- (void)handleGesture:(NSGestureRecognizer *)recognizer;
 - (void)handleGesture:(NSGestureRecognizer *)recognizer fromReset:(BOOL)fromReset;
 #endif
 
@@ -47,12 +49,18 @@ @implementation RNBetterLongPressGestureRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:self action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
   }
   return self;
 }
 
+- (void)handleGesture:(UIGestureRecognizer *)recognizer
+{
+  previousTime = CACurrentMediaTime();
+  [_gestureHandler handleGesture:recognizer fromReset:NO];
+}
+
 - (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset
 {
   previousTime = CACurrentMediaTime();
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNManualHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNManualHandler.m
@@ -16,7 +16,7 @@ @implementation RNManualRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
     _shouldSendBeginEvent = YES;
   }
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNNativeViewHandler.mm b/packages/react-native-gesture-handler/apple/Handlers/RNNativeViewHandler.mm
@@ -24,7 +24,7 @@ @implementation RNDummyGestureRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
   }
   return self;
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNPanHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNPanHandler.m
@@ -50,7 +50,7 @@ @implementation RNBetterPanGestureRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
     _minDistSq = NAN;
     _minVelocityX = NAN;
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNPinchHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNPinchHandler.m
@@ -33,7 +33,7 @@ @implementation RNBetterPinchRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:self action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
   }
 #if TARGET_OS_OSX
@@ -43,7 +43,7 @@ - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
   return self;
 }
 
-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset
+- (void)handleGesture:(UIGestureRecognizer *)recognizer
 {
   if (self.state == UIGestureRecognizerStateBegan) {
 #if TARGET_OS_OSX
@@ -52,7 +52,8 @@ - (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromRese
     self.scale = 1;
 #endif
   }
-  [_gestureHandler handleGesture:recognizer fromReset:fromReset];
+
+  [_gestureHandler handleGesture:recognizer fromReset:NO];
 }
 
 - (void)interactionsBegan:(NSSet *)touches withEvent:(UIEvent *)event
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNRotationHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNRotationHandler.m
@@ -31,7 +31,7 @@ @implementation RNBetterRotationRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:self action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
   }
 #if TARGET_OS_OSX
@@ -41,12 +41,12 @@ - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
   return self;
 }
 
-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset
+- (void)handleGesture:(UIGestureRecognizer *)recognizer
 {
   if (self.state == UIGestureRecognizerStateBegan) {
     self.rotation = 0;
   }
-  [_gestureHandler handleGesture:recognizer fromReset:fromReset];
+  [_gestureHandler handleGesture:recognizer fromReset:NO];
 }
 
 - (void)interactionsBegan:(NSSet *)touches withEvent:(UIEvent *)event
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNTapHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNTapHandler.m
@@ -47,7 +47,7 @@ @implementation RNBetterTapGestureRecognizer {
 
 - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
 {
-  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {
+  if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {
     _gestureHandler = gestureHandler;
     _tapsSoFar = 0;
     _numberOfTaps = defaultNumberOfTaps;
diff --git a/packages/react-native-gesture-handler/apple/RNGestureHandler.h b/packages/react-native-gesture-handler/apple/RNGestureHandler.h
@@ -95,6 +95,7 @@
 - (void)setConfig:(nullable NSDictionary *)config NS_REQUIRES_SUPER;
 - (void)updateConfig:(nullable NSDictionary *)config NS_REQUIRES_SUPER;
 - (void)updateRelations:(nonnull NSDictionary *)relations;
+- (void)handleGesture:(nonnull id)recognizer;
 - (void)handleGesture:(nonnull id)recognizer fromReset:(BOOL)fromReset;
 - (void)handleGesture:(nonnull id)recognizer inState:(RNGestureHandlerState)state;
 - (BOOL)containsPointInView;
diff --git a/packages/react-native-gesture-handler/apple/RNGestureHandler.mm b/packages/react-native-gesture-handler/apple/RNGestureHandler.mm
@@ -302,6 +302,11 @@ - (RNGHUIView *)chooseViewForInteraction:(UIGestureRecognizer *)recognizer
   return [self isViewParagraphComponent:recognizer.view] ? recognizer.view.subviews[0] : recognizer.view;
 }
 
+- (void)handleGesture:(UIGestureRecognizer *)recognizer
+{
+  [self handleGesture:recognizer fromReset:NO];
+}
+
 - (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset
 {
   // Don't dispatch state changes from undetermined when resetting handler. There will be no follow-up

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ @implementation RNBetterSwipeGestureRecognizer {`
`16`	`16`
`17`	`17`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`18`	`18`	`{`
`19`		`- if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {`
	`19`	`+ if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {`
`20`	`20`	`_gestureHandler = gestureHandler;`
`21`	`21`	`_lastPoint = CGPointZero;`
`22`	`22`	`_hasBegan = NO;`
`@@ -125,7 +125,7 @@ @implementation RNBetterSwipeGestureRecognizer {`
`125`	`125`
`126`	`126`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`127`	`127`	`{`
`128`		`- if ((self = [super initWithTarget:self action:@selector(handleGesture:fromReset:)])) {`
	`128`	`+ if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {`
`129`	`129`	`_gestureHandler = gestureHandler;`
`130`	`130`
`131`	`131`	`maxDuration = 1.0;`
`@@ -138,9 +138,9 @@ - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`138`	`138`	`return self;`
`139`	`139`	`}`
`140`	`140`
`141`		`-- (void)handleGesture:(NSPanGestureRecognizer *)gestureRecognizer fromReset:(BOOL)fromReset`
	`141`	`+- (void)handleGesture:(NSPanGestureRecognizer *)gestureRecognizer`
`142`	`142`	`{`
`143`		`- [_gestureHandler handleGesture:self fromReset:fromReset];`
	`143`	`+ [_gestureHandler handleGesture:self];`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`- (void)mouseDown:(NSEvent *)event`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ @implementation RNForceTouchGestureRecognizer {`
`28`	`28`
`29`	`29`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`30`	`30`	`{`
`31`		`- if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {`
	`31`	`+ if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {`
`32`	`32`	`_gestureHandler = gestureHandler;`
`33`	`33`	`_force = defaultForce;`
`34`	`34`	`_minForce = defaultMinForce;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ @implementation RNBetterHoverGestureRecognizer {`
`40`	`40`
`41`	`41`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`42`	`42`	`{`
`43`		`- if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {`
	`43`	`+ if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {`
`44`	`44`	`_gestureHandler = gestureHandler;`
`45`	`45`	`_hoverEffect = RNGestureHandlerHoverEffectNone;`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ @implementation RNManualRecognizer {`
`16`	`16`
`17`	`17`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`18`	`18`	`{`
`19`		`- if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {`
	`19`	`+ if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {`
`20`	`20`	`_gestureHandler = gestureHandler;`
`21`	`21`	`_shouldSendBeginEvent = YES;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ @implementation RNDummyGestureRecognizer {`
`24`	`24`
`25`	`25`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`26`	`26`	`{`
`27`		`- if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {`
	`27`	`+ if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {`
`28`	`28`	`_gestureHandler = gestureHandler;`
`29`	`29`	`}`
`30`	`30`	`return self;`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ @implementation RNBetterPanGestureRecognizer {`
`50`	`50`
`51`	`51`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`52`	`52`	`{`
`53`		`- if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {`
	`53`	`+ if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {`
`54`	`54`	`_gestureHandler = gestureHandler;`
`55`	`55`	`_minDistSq = NAN;`
`56`	`56`	`_minVelocityX = NAN;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ @implementation RNBetterPinchRecognizer {`
`33`	`33`
`34`	`34`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`35`	`35`	`{`
`36`		`- if ((self = [super initWithTarget:self action:@selector(handleGesture:fromReset:)])) {`
	`36`	`+ if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {`
`37`	`37`	`_gestureHandler = gestureHandler;`
`38`	`38`	`}`
`39`	`39`	`#if TARGET_OS_OSX`
`@@ -43,7 +43,7 @@ - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`43`	`43`	`return self;`
`44`	`44`	`}`
`45`	`45`
`46`		`-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset`
	`46`	`+- (void)handleGesture:(UIGestureRecognizer *)recognizer`
`47`	`47`	`{`
`48`	`48`	`if (self.state == UIGestureRecognizerStateBegan) {`
`49`	`49`	`#if TARGET_OS_OSX`
`@@ -52,7 +52,8 @@ - (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromRese`
`52`	`52`	`self.scale = 1;`
`53`	`53`	`#endif`
`54`	`54`	`}`
`55`		`- [_gestureHandler handleGesture:recognizer fromReset:fromReset];`
	`55`	`+`
	`56`	`+ [_gestureHandler handleGesture:recognizer fromReset:NO];`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`- (void)interactionsBegan:(NSSet )touches withEvent:(UIEvent )event`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ @implementation RNBetterRotationRecognizer {`
`31`	`31`
`32`	`32`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`33`	`33`	`{`
`34`		`- if ((self = [super initWithTarget:self action:@selector(handleGesture:fromReset:)])) {`
	`34`	`+ if ((self = [super initWithTarget:self action:@selector(handleGesture:)])) {`
`35`	`35`	`_gestureHandler = gestureHandler;`
`36`	`36`	`}`
`37`	`37`	`#if TARGET_OS_OSX`
`@@ -41,12 +41,12 @@ - (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`41`	`41`	`return self;`
`42`	`42`	`}`
`43`	`43`
`44`		`-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset`
	`44`	`+- (void)handleGesture:(UIGestureRecognizer *)recognizer`
`45`	`45`	`{`
`46`	`46`	`if (self.state == UIGestureRecognizerStateBegan) {`
`47`	`47`	`self.rotation = 0;`
`48`	`48`	`}`
`49`		`- [_gestureHandler handleGesture:recognizer fromReset:fromReset];`
	`49`	`+ [_gestureHandler handleGesture:recognizer fromReset:NO];`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`- (void)interactionsBegan:(NSSet )touches withEvent:(UIEvent )event`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ @implementation RNBetterTapGestureRecognizer {`
`47`	`47`
`48`	`48`	`- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler`
`49`	`49`	`{`
`50`		`- if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:fromReset:)])) {`
	`50`	`+ if ((self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)])) {`
`51`	`51`	`_gestureHandler = gestureHandler;`
`52`	`52`	`_tapsSoFar = 0;`
`53`	`53`	`_numberOfTaps = defaultNumberOfTaps;`