Merge branch 'main' into @akwasniewski/remove-begin-from-sm

akwasniewski · web-flow · commit fd7bd8d10874 · 2026-03-13T16:34:20.000+01:00
diff --git a/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerInteractionManager.kt b/packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerInteractionManager.kt
@@ -14,6 +14,7 @@ class RNGestureHandlerInteractionManager : GestureHandlerInteractionController {
   fun dropRelationsForHandlerWithTag(handlerTag: Int) {
     waitForRelations.remove(handlerTag)
     simultaneousRelations.remove(handlerTag)
+    blockingRelations.remove(handlerTag)
   }
 
   private fun convertHandlerTagsArray(config: ReadableMap, key: String): IntArray {
@@ -64,6 +65,7 @@ class RNGestureHandlerInteractionManager : GestureHandlerInteractionController {
   fun reset() {
     waitForRelations.clear()
     simultaneousRelations.clear()
+    blockingRelations.clear()
   }
 
   companion object {
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNHoverHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNHoverHandler.m
@@ -220,21 +220,29 @@ - (void)mouseEntered:(NSEvent *)event
 {
   [self sendEventsInState:RNGestureHandlerStateBegan
            forViewWithTag:_view.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                       withNumberOfTouches:1
+                                                           withPointerType:_pointerType]];
   [self sendEventsInState:RNGestureHandlerStateActive
            forViewWithTag:_view.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                       withNumberOfTouches:1
+                                                           withPointerType:_pointerType]];
 }
 
 - (void)mouseExited:(NSEvent *)theEvent
 {
   [self sendEventsInState:RNGestureHandlerStateEnd
            forViewWithTag:_view.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO
+                                                       withNumberOfTouches:1
+                                                           withPointerType:_pointerType]];
 
   [self sendEventsInState:RNGestureHandlerStateUndetermined
            forViewWithTag:_view.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO
+                                                       withNumberOfTouches:1
+                                                           withPointerType:_pointerType]];
 }
 
 @end
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNLongPressHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNLongPressHandler.m
@@ -34,10 +34,14 @@ - (NSUInteger)getDuration;
 
 #if !TARGET_OS_OSX
 - (void)handleGesture:(UIGestureRecognizer *)recognizer;
-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset fromManualStateChange:(BOOL)fromManualStateChange;
+- (void)handleGesture:(UIGestureRecognizer *)recognizer
+                fromReset:(BOOL)fromReset
+    fromManualStateChange:(BOOL)fromManualStateChange;
 #else
 - (void)handleGesture:(NSGestureRecognizer *)recognizer;
-- (void)handleGesture:(NSGestureRecognizer *)recognizer fromReset:(BOOL)fromReset fromManualStateChange:(BOOL)fromManualStateChange;
+- (void)handleGesture:(NSGestureRecognizer *)recognizer
+                fromReset:(BOOL)fromReset
+    fromManualStateChange:(BOOL)fromManualStateChange;
 #endif
 
 @end
@@ -60,7 +64,9 @@ - (void)handleGesture:(UIGestureRecognizer *)recognizer
   [self handleGesture:recognizer fromReset:NO fromManualStateChange:NO];
 }
 
-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset fromManualStateChange:(BOOL)fromManualStateChange
+- (void)handleGesture:(UIGestureRecognizer *)recognizer
+                fromReset:(BOOL)fromReset
+    fromManualStateChange:(BOOL)fromManualStateChange
 {
   previousTime = CACurrentMediaTime();
   [_gestureHandler handleGesture:recognizer fromReset:fromReset fromManualStateChange:fromManualStateChange];
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNNativeViewHandler.mm b/packages/react-native-gesture-handler/apple/Handlers/RNNativeViewHandler.mm
@@ -186,21 +186,27 @@ - (void)handleTouchDown:(UIView *)sender forEvent:(UIEvent *)event
 
   [self sendEventsInState:RNGestureHandlerStateActive
            forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                       withNumberOfTouches:event.allTouches.count
+                                                           withPointerType:_pointerType]];
 }
 
 - (void)handleTouchUpOutside:(UIView *)sender forEvent:(UIEvent *)event
 {
   [self sendEventsInState:RNGestureHandlerStateEnd
            forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO
+                                                       withNumberOfTouches:event.allTouches.count
+                                                           withPointerType:_pointerType]];
 }
 
 - (void)handleTouchUpInside:(UIView *)sender forEvent:(UIEvent *)event
 {
   [self sendEventsInState:RNGestureHandlerStateEnd
            forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                       withNumberOfTouches:event.allTouches.count
+                                                           withPointerType:_pointerType]];
 }
 
 - (void)handleDragExit:(UIView *)sender forEvent:(UIEvent *)event
@@ -211,26 +217,34 @@ - (void)handleDragExit:(UIView *)sender forEvent:(UIEvent *)event
     [control cancelTrackingWithEvent:event];
     [self sendEventsInState:RNGestureHandlerStateEnd
              forViewWithTag:sender.reactTag
-              withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];
+              withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO
+                                                         withNumberOfTouches:event.allTouches.count
+                                                             withPointerType:_pointerType]];
   } else {
     [self sendEventsInState:RNGestureHandlerStateActive
              forViewWithTag:sender.reactTag
-              withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];
+              withExtraData:[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 withPointerType:_pointerType]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES
+                                                       withNumberOfTouches:event.allTouches.count
+                                                           withPointerType:_pointerType]];
 }
 
 - (void)handleTouchCancel:(UIView *)sender forEvent:(UIEvent *)event
 {
   [self sendEventsInState:RNGestureHandlerStateCancelled
            forViewWithTag:sender.reactTag
-            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];
+            withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO
+                                                       withNumberOfTouches:event.allTouches.count
+                                                           withPointerType:_pointerType]];
 }
 
 - (BOOL)wantsToAttachDirectlyToView
@@ -243,6 +257,7 @@ - (BOOL)wantsToAttachDirectlyToView
 - (RNGestureHandlerEventExtraData *)eventExtraData:(RNDummyGestureRecognizer *)recognizer
 {
   return [RNGestureHandlerEventExtraData forPointerInside:[self containsPointInView]
+                                      withNumberOfTouches:1
                                           withPointerType:RNGestureHandlerMouse];
 }
 
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNPinchHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNPinchHandler.m
@@ -48,7 +48,9 @@ - (void)handleGesture:(UIGestureRecognizer *)recognizer
   [self handleGesture:recognizer fromReset:NO fromManualStateChange:NO];
 }
 
-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset fromManualStateChange:(BOOL)fromManualStateChange
+- (void)handleGesture:(UIGestureRecognizer *)recognizer
+                fromReset:(BOOL)fromReset
+    fromManualStateChange:(BOOL)fromManualStateChange
 {
   if (self.state == UIGestureRecognizerStateBegan) {
 #if TARGET_OS_OSX
diff --git a/packages/react-native-gesture-handler/apple/Handlers/RNRotationHandler.m b/packages/react-native-gesture-handler/apple/Handlers/RNRotationHandler.m
@@ -46,7 +46,9 @@ - (void)handleGesture:(UIGestureRecognizer *)recognizer
   [self handleGesture:recognizer fromReset:NO fromManualStateChange:NO];
 }
 
-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset fromManualStateChange:(BOOL)fromManualStateChange
+- (void)handleGesture:(UIGestureRecognizer *)recognizer
+                fromReset:(BOOL)fromReset
+    fromManualStateChange:(BOOL)fromManualStateChange
 {
   if (self.state == UIGestureRecognizerStateBegan) {
     self.rotation = 0;
diff --git a/packages/react-native-gesture-handler/apple/RNGestureHandlerEvents.h b/packages/react-native-gesture-handler/apple/RNGestureHandlerEvents.h
@@ -54,7 +54,9 @@
                                  withAllPointers:(NSArray<NSDictionary *> *)allPointers
                              withNumberOfTouches:(NSUInteger)numberOfTouches
                                  withPointerType:(NSInteger)pointerType;
-+ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside withPointerType:(NSInteger)pointerType;
++ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside
+                                 withNumberOfTouches:(NSUInteger)numberOfTouches
+                                     withPointerType:(NSInteger)pointerType;
 @end
 
 @interface RNGestureHandlerEvent : NSObject <RCTEvent>
diff --git a/packages/react-native-gesture-handler/apple/RNGestureHandlerEvents.mm b/packages/react-native-gesture-handler/apple/RNGestureHandlerEvents.mm
@@ -156,10 +156,15 @@ + (RNGestureHandlerEventExtraData *)forEventType:(RNGHTouchEventType)eventType
   }];
 }
 
-+ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside withPointerType:(NSInteger)pointerType
++ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside
+                                 withNumberOfTouches:(NSUInteger)numberOfTouches
+                                     withPointerType:(NSInteger)pointerType
 {
-  return [[RNGestureHandlerEventExtraData alloc]
-      initWithData:@{@"pointerInside" : @(pointerInside), @"pointerType" : @(pointerType)}];
+  return [[RNGestureHandlerEventExtraData alloc] initWithData:@{
+    @"pointerInside" : @(pointerInside),
+    @"numberOfPointers" : @(numberOfTouches),
+    @"pointerType" : @(pointerType)
+  }];
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ class RNGestureHandlerInteractionManager : GestureHandlerInteractionController {`
`14`	`14`	`fun dropRelationsForHandlerWithTag(handlerTag: Int) {`
`15`	`15`	`waitForRelations.remove(handlerTag)`
`16`	`16`	`simultaneousRelations.remove(handlerTag)`
	`17`	`+ blockingRelations.remove(handlerTag)`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`private fun convertHandlerTagsArray(config: ReadableMap, key: String): IntArray {`
`@@ -64,6 +65,7 @@ class RNGestureHandlerInteractionManager : GestureHandlerInteractionController {`
`64`	`65`	`fun reset() {`
`65`	`66`	`waitForRelations.clear()`
`66`	`67`	`simultaneousRelations.clear()`
	`68`	`+ blockingRelations.clear()`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`companion object {`
Original file line number	Diff line number	Diff line change
`@@ -186,21 +186,27 @@ - (void)handleTouchDown:(UIView )sender forEvent:(UIEvent )event`
`186`	`186`
`187`	`187`	`[self sendEventsInState:RNGestureHandlerStateActive`
`188`	`188`	`forViewWithTag:sender.reactTag`
`189`		`- withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];`
	`189`	`+ withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES`
	`190`	`+ withNumberOfTouches:event.allTouches.count`
	`191`	`+ withPointerType:_pointerType]];`
`190`	`192`	`}`
`191`	`193`
`192`	`194`	`- (void)handleTouchUpOutside:(UIView )sender forEvent:(UIEvent )event`
`193`	`195`	`{`
`194`	`196`	`[self sendEventsInState:RNGestureHandlerStateEnd`
`195`	`197`	`forViewWithTag:sender.reactTag`
`196`		`- withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];`
	`198`	`+ withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO`
	`199`	`+ withNumberOfTouches:event.allTouches.count`
	`200`	`+ withPointerType:_pointerType]];`
`197`	`201`	`}`
`198`	`202`
`199`	`203`	`- (void)handleTouchUpInside:(UIView )sender forEvent:(UIEvent )event`
`200`	`204`	`{`
`201`	`205`	`[self sendEventsInState:RNGestureHandlerStateEnd`
`202`	`206`	`forViewWithTag:sender.reactTag`
`203`		`- withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];`
	`207`	`+ withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES`
	`208`	`+ withNumberOfTouches:event.allTouches.count`
	`209`	`+ withPointerType:_pointerType]];`
`204`	`210`	`}`
`205`	`211`
`206`	`212`	`- (void)handleDragExit:(UIView )sender forEvent:(UIEvent )event`
`@@ -211,26 +217,34 @@ - (void)handleDragExit:(UIView )sender forEvent:(UIEvent )event`
`211`	`217`	`[control cancelTrackingWithEvent:event];`
`212`	`218`	`[self sendEventsInState:RNGestureHandlerStateEnd`
`213`	`219`	`forViewWithTag:sender.reactTag`
`214`		`- withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];`
	`220`	`+ withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO`
	`221`	`+ withNumberOfTouches:event.allTouches.count`
	`222`	`+ withPointerType:_pointerType]];`
`215`	`223`	`} else {`
`216`	`224`	`[self sendEventsInState:RNGestureHandlerStateActive`
`217`	`225`	`forViewWithTag:sender.reactTag`
`218`		`- withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];`
	`226`	`+ withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO`
	`227`	`+ withNumberOfTouches:event.allTouches.count`
	`228`	`+ withPointerType:_pointerType]];`
`219`	`229`	`}`
`220`	`230`	`}`
`221`	`231`
`222`	`232`	`- (void)handleDragEnter:(UIView )sender forEvent:(UIEvent )event`
`223`	`233`	`{`
`224`	`234`	`[self sendEventsInState:RNGestureHandlerStateActive`
`225`	`235`	`forViewWithTag:sender.reactTag`
`226`		`- withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES withPointerType:_pointerType]];`
	`236`	`+ withExtraData:[RNGestureHandlerEventExtraData forPointerInside:YES`
	`237`	`+ withNumberOfTouches:event.allTouches.count`
	`238`	`+ withPointerType:_pointerType]];`
`227`	`239`	`}`
`228`	`240`
`229`	`241`	`- (void)handleTouchCancel:(UIView )sender forEvent:(UIEvent )event`
`230`	`242`	`{`
`231`	`243`	`[self sendEventsInState:RNGestureHandlerStateCancelled`
`232`	`244`	`forViewWithTag:sender.reactTag`
`233`		`- withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];`
	`245`	`+ withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO`
	`246`	`+ withNumberOfTouches:event.allTouches.count`
	`247`	`+ withPointerType:_pointerType]];`
`234`	`248`	`}`
`235`	`249`
`236`	`250`	`- (BOOL)wantsToAttachDirectlyToView`
`@@ -243,6 +257,7 @@ - (BOOL)wantsToAttachDirectlyToView`
`243`	`257`	`- (RNGestureHandlerEventExtraData )eventExtraData:(RNDummyGestureRecognizer )recognizer`
`244`	`258`	`{`
`245`	`259`	`return [RNGestureHandlerEventExtraData forPointerInside:[self containsPointInView]`
	`260`	`+ withNumberOfTouches:1`
`246`	`261`	`withPointerType:RNGestureHandlerMouse];`
`247`	`262`	`}`
`248`	`263`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ - (void)handleGesture:(UIGestureRecognizer *)recognizer`
`48`	`48`	`[self handleGesture:recognizer fromReset:NO fromManualStateChange:NO];`
`49`	`49`	`}`
`50`	`50`
`51`		`-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset fromManualStateChange:(BOOL)fromManualStateChange`
	`51`	`+- (void)handleGesture:(UIGestureRecognizer *)recognizer`
	`52`	`+ fromReset:(BOOL)fromReset`
	`53`	`+ fromManualStateChange:(BOOL)fromManualStateChange`
`52`	`54`	`{`
`53`	`55`	`if (self.state == UIGestureRecognizerStateBegan) {`
`54`	`56`	`#if TARGET_OS_OSX`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,9 @@ - (void)handleGesture:(UIGestureRecognizer *)recognizer`
`46`	`46`	`[self handleGesture:recognizer fromReset:NO fromManualStateChange:NO];`
`47`	`47`	`}`
`48`	`48`
`49`		`-- (void)handleGesture:(UIGestureRecognizer *)recognizer fromReset:(BOOL)fromReset fromManualStateChange:(BOOL)fromManualStateChange`
	`49`	`+- (void)handleGesture:(UIGestureRecognizer *)recognizer`
	`50`	`+ fromReset:(BOOL)fromReset`
	`51`	`+ fromManualStateChange:(BOOL)fromManualStateChange`
`50`	`52`	`{`
`51`	`53`	`if (self.state == UIGestureRecognizerStateBegan) {`
`52`	`54`	`self.rotation = 0;`
Original file line number	Diff line number	Diff line change
`@@ -156,10 +156,15 @@ + (RNGestureHandlerEventExtraData *)forEventType:(RNGHTouchEventType)eventType`
`156`	`156`	`}];`
`157`	`157`	`}`
`158`	`158`
`159`		`-+ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside withPointerType:(NSInteger)pointerType`
	`159`	`++ (RNGestureHandlerEventExtraData *)forPointerInside:(BOOL)pointerInside`
	`160`	`+ withNumberOfTouches:(NSUInteger)numberOfTouches`
	`161`	`+ withPointerType:(NSInteger)pointerType`
`160`	`162`	`{`
`161`		`- return [[RNGestureHandlerEventExtraData alloc]`
`162`		`- initWithData:@{@"pointerInside" : @(pointerInside), @"pointerType" : @(pointerType)}];`
	`163`	`+ return [[RNGestureHandlerEventExtraData alloc] initWithData:@{`
	`164`	`+ @"pointerInside" : @(pointerInside),`
	`165`	`+ @"numberOfPointers" : @(numberOfTouches),`
	`166`	`+ @"pointerType" : @(pointerType)`
	`167`	`+ }];`
`163`	`168`	`}`
`164`	`169`
`165`	`170`	`@end`