fixed native gesture

Author: akwasniewski

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

@@ -13,7 +13,7 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
   private val reactContext: ThemedReactContext
     get() = context as ThemedReactContext
   private var handlersToAttach: List<Int>? = null
-  private var nativeHandlersToAttach: MutableSet<Int> = mutableSetOf()
+  private var nativeHandlers: MutableSet<Int> = mutableSetOf()
   private var attachedHandlers: MutableSet<Int> = mutableSetOf()
   private var moduleId: Int = -1
 
@@ -40,7 +40,6 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
   private fun shouldAttachGestureToChildView(tag: Int): Boolean {
     val registry = RNGestureHandlerModule.registries[moduleId]
       ?: throw Exception("Tried to access a non-existent registry")
-
     return registry.getHandler(tag)?.wantsToAttachDirectlyToView() ?: false
   }
 
@@ -77,14 +76,15 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
         // It might happen that `attachHandlers` will be called before children are added into view hierarchy. In that case we cannot
         // attach `NativeViewGestureHandlers` here and we have to do it in `addView` method.
         if (shouldAttachGestureToChildView(tag)) {
-          nativeHandlersToAttach.add(tag)
+          nativeHandlers.add(tag)
         } else {
           registry.attachHandlerToView(tag, this.id, GestureHandler.ACTION_TYPE_NATIVE_DETECTOR)
 
           attachedHandlers.add(tag)
         }
       } else if (entry.value == GestureHandlerMutation.Detach) {
         registry.detachHandler(tag)
+        nativeHandlers.remove(tag)
         attachedHandlers.remove(tag)
       }
     }
@@ -101,24 +101,20 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
     val registry = RNGestureHandlerModule.registries[moduleId]
       ?: throw Exception("Tried to access a non-existent registry")
 
-    for (tag in nativeHandlersToAttach) {
+    for (tag in nativeHandlers) {
       registry.attachHandlerToView(tag, childId, GestureHandler.ACTION_TYPE_NATIVE_DETECTOR)
 
       attachedHandlers.add(tag)
     }
-
-    nativeHandlersToAttach.clear()
   }
 
   private fun detachNativeGestureHandlers() {
     val registry = RNGestureHandlerModule.registries[moduleId]
       ?: throw Exception("Tried to access a non-existent registry")
 
-    for (tag in attachedHandlers) {
-      if (shouldAttachGestureToChildView(tag)) {
-        registry.detachHandler(tag)
-        attachedHandlers.remove(tag)
-      }
+    for (tag in nativeHandlers) {
+      registry.detachHandler(tag)
+      attachedHandlers.remove(tag)
     }
   }