From 7c52285f57c0679c6020a1d613c4e024170e2780 Mon Sep 17 00:00:00 2001
From: Joel Arvidsson <joel@oblador.se>
Date: Tue, 21 Jan 2025 20:32:54 +0100
Subject: [PATCH 1/2] Call onReset before clearing view

---
 .../java/com/swmansion/gesturehandler/core/GestureHandler.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt b/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt
index a9082c2f49..25db9cf996 100644
--- a/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt
+++ b/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt
@@ -770,6 +770,7 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     }
   }
   fun reset() {
+    onReset()
     view = null
     orchestrator = null
     Arrays.fill(trackedPointerIDs, -1)
@@ -777,7 +778,6 @@ open class GestureHandler<ConcreteGestureHandlerT : GestureHandler<ConcreteGestu
     trackedPointersCount = 0
     trackedPointers.fill(null)
     touchEventType = RNGestureHandlerTouchEvent.EVENT_UNDETERMINED
-    onReset()
   }
 
   fun withMarkedAsInBounds(closure: () -> Unit) {

From 83f3a711ebdf489e89306036e677cf49d0586668 Mon Sep 17 00:00:00 2001
From: Joel Arvidsson <joel@oblador.se>
Date: Tue, 21 Jan 2025 20:37:16 +0100
Subject: [PATCH 2/2] Cancel failed buttons on reset

---
 .../swmansion/gesturehandler/core/NativeViewGestureHandler.kt  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/android/src/main/java/com/swmansion/gesturehandler/core/NativeViewGestureHandler.kt b/android/src/main/java/com/swmansion/gesturehandler/core/NativeViewGestureHandler.kt
index 1abcdc8c94..3f16ef70ab 100644
--- a/android/src/main/java/com/swmansion/gesturehandler/core/NativeViewGestureHandler.kt
+++ b/android/src/main/java/com/swmansion/gesturehandler/core/NativeViewGestureHandler.kt
@@ -161,6 +161,9 @@ class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
   }
 
   override fun onReset() {
+    if (state == STATE_FAILED && view != null) {
+      onCancel()
+    }
     this.hook = defaultHook
   }