Cleaning manually activated handlers

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandler.kt

@@ -763,6 +763,10 @@ open class GestureHandler {
   protected open fun onCancel() {}
   protected open fun onFail() {}
 
+  fun recordHandlerIfNotPresent() {
+    hostDetectorView?.recordHandlerIfNotPresent(this)
+  }
+
   private fun isButtonInConfig(clickedButton: Int): Boolean {
     if (mouseButton == 0) {
       return clickedButton == MotionEvent.BUTTON_PRIMARY

packages/react-native-gesture-handler/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerModule.kt

@@ -155,6 +155,10 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?) :
         }
       }
 
+      if (newState == GestureHandler.STATE_ACTIVE || newState == GestureHandler.STATE_BEGAN) {
+        handler.recordHandlerIfNotPresent()
+      }
+
       when (newState) {
         GestureHandler.STATE_ACTIVE -> handler.activate(force = true)
         GestureHandler.STATE_BEGAN -> handler.begin()

packages/react-native-gesture-handler/src/v3/gestureStateManager.web.ts

@@ -1,6 +1,7 @@
 import { State } from '../State';
 import { tagMessage } from '../utils';
 import IGestureHandler from '../web/handlers/IGestureHandler';
+import GestureHandlerOrchestrator from '../web/tools/GestureHandlerOrchestrator';
 import NodeManager from '../web/tools/NodeManager';
 import { GestureStateManagerType } from './gestureStateManager';
 
@@ -20,6 +21,7 @@ export const GestureStateManager: GestureStateManagerType = {
     const handler = NodeManager.getHandler(handlerTag);
     ensureHandlerAttached(handler);
 
+    GestureHandlerOrchestrator.instance.recordHandlerIfNotPresent(handler);
     handler.begin();
   },
 
@@ -33,6 +35,7 @@ export const GestureStateManager: GestureStateManagerType = {
       handler.begin();
     }
 
+    GestureHandlerOrchestrator.instance.recordHandlerIfNotPresent(handler);
     handler.activate(true);
   },