react-native-gesture-handler 3.0.0-beta.1 → 3.0.0-nightly-20260206-e99cf63a0

package/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerDetectorView.kt

@@ -109,7 +109,7 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
     }
 
     for (tag in handlersToDetach) {
-      registry.detachHandler(tag)
+      registry.detachHandlerFromHostDetector(tag, this)
       nativeHandlers.remove(tag)
       attachedHandlers.remove(tag)
     }
@@ -134,7 +134,7 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
 
     for (child in virtualChildrenToDetach) {
       for (tag in attachedVirtualHandlers[child]!!) {
-        registry.detachHandler(tag)
+        registry.detachHandlerFromHostDetector(tag, this)
       }
       attachedVirtualHandlers.remove(tag)
     }
@@ -182,7 +182,7 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
       ?: throw Exception("Tried to access a non-existent registry")
 
     for (tag in nativeHandlers) {
-      registry.detachHandler(tag)
+      registry.detachHandlerFromHostDetector(tag, this)
       attachedHandlers.remove(tag)
     }
   }
@@ -197,13 +197,13 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
       ?: throw Exception("Tried to access a non-existent registry")
 
     for (tag in attachedHandlers.toMutableSet()) {
-      registry.detachHandler(tag)
+      registry.detachHandlerFromHostDetector(tag, this)
       attachedHandlers.remove(tag)
     }
 
     for (child in attachedVirtualHandlers) {
       for (tag in child.value) {
-        registry.detachHandler(tag)
+        registry.detachHandlerFromHostDetector(tag, this)
       }
       child.value.clear()
     }

package/android/src/main/java/com/swmansion/gesturehandler/react/RNGestureHandlerRegistry.kt

@@ -78,8 +78,9 @@ class RNGestureHandlerRegistry : GestureHandlerRegistry {
   }
 
   @Synchronized
-  fun detachHandler(handlerTag: Int) {
+  fun detachHandlerFromHostDetector(handlerTag: Int, hostDetectorView: RNGestureHandlerDetectorView?) {
     handlers[handlerTag]?.let {
+      if (it.hostDetectorView != hostDetectorView) return
       detachHandlerInternal(it)
     }
   }

package/apple/RNGestureHandlerDetector.mm

@@ -47,16 +47,17 @@
 {
   if (newWindow == nil) {
     RNGestureHandlerManager *handlerManager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
-    react_native_assert(handlerManager != nullptr && "Tried to access a non-existent handler manager")
-        const auto &props = *std::static_pointer_cast<const RNGestureHandlerDetectorProps>(_props);
+    react_native_assert(handlerManager != nullptr && "Tried to access a non-existent handler manager");
+
+    const auto &props = *std::static_pointer_cast<const RNGestureHandlerDetectorProps>(_props);
 
     for (const auto handler : props.handlerTags) {
       NSNumber *handlerTag = [NSNumber numberWithInt:handler];
-      [handlerManager.registry detachHandlerWithTag:handlerTag];
+      [handlerManager.registry detachHandlerWithTag:handlerTag fromHostDetector:self];
     }
     for (const auto &child : _attachedVirtualHandlers) {
       for (id handlerTag : child.second) {
-        [handlerManager.registry detachHandlerWithTag:handlerTag];
+        [handlerManager.registry detachHandlerWithTag:handlerTag fromHostDetector:self];
       }
     }
     _attachedVirtualHandlers.clear();
@@ -190,9 +191,9 @@
       attachedHandlers:(NSMutableSet *)attachedHandlers
 {
   RNGestureHandlerManager *handlerManager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
-  react_native_assert(handlerManager != nullptr && "Tried to access a non-existent handler manager")
+  react_native_assert(handlerManager != nullptr && "Tried to access a non-existent handler manager");
 
-      NSMutableSet *handlersToDetach = [attachedHandlers mutableCopy];
+  NSMutableSet *handlersToDetach = [attachedHandlers mutableCopy];
 
   for (const int tag : handlerTags) {
     [handlersToDetach removeObject:@(tag)];
@@ -231,7 +232,7 @@
   }
 
   for (const id tag : handlersToDetach) {
-    [handlerManager.registry detachHandlerWithTag:tag];
+    [handlerManager.registry detachHandlerWithTag:tag fromHostDetector:self];
     [attachedHandlers removeObject:tag];
     [_nativeHandlers removeObject:tag];
   }
@@ -262,9 +263,9 @@
 - (void)updateVirtualChildren:(const std::vector<RNGestureHandlerDetectorVirtualChildrenStruct> &)virtualChildren
 {
   RNGestureHandlerManager *handlerManager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
-  react_native_assert(handlerManager != nullptr && "Tried to access a non-existent handler manager")
+  react_native_assert(handlerManager != nullptr && "Tried to access a non-existent handler manager");
 
-      NSMutableSet *virtualChildrenToDetach = [NSMutableSet set];
+  NSMutableSet *virtualChildrenToDetach = [NSMutableSet set];
   for (const auto &child : _attachedVirtualHandlers) {
     [virtualChildrenToDetach addObject:@(child.first)];
   }
@@ -275,7 +276,7 @@
 
   for (const NSNumber *tag : virtualChildrenToDetach) {
     for (id handlerTag : _attachedVirtualHandlers[tag.intValue]) {
-      [handlerManager.registry detachHandlerWithTag:handlerTag];
+      [handlerManager.registry detachHandlerWithTag:handlerTag fromHostDetector:self];
     }
     _attachedVirtualHandlers.erase(tag.intValue);
   }
@@ -325,7 +326,7 @@
   RNGestureHandlerManager *handlerManager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
 
   for (NSNumber *handlerTag in _nativeHandlers) {
-    [[handlerManager registry] detachHandlerWithTag:handlerTag];
+    [[handlerManager registry] detachHandlerWithTag:handlerTag fromHostDetector:self];
     [_attachedHandlers removeObject:handlerTag];
   }
 }

package/apple/RNGestureHandlerRegistry.h

@@ -17,6 +17,7 @@
               withActionType:(RNGestureHandlerActionType)actionType
             withHostDetector:(nullable RNGHUIView *)hostDetector;
 - (void)detachHandlerWithTag:(nonnull NSNumber *)handlerTag;
+- (void)detachHandlerWithTag:(nonnull NSNumber *)handlerTag fromHostDetector:(nonnull RNGHUIView *)hostDetectorView;
 - (void)dropHandlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)dropAllHandlers;
 

package/apple/RNGestureHandlerRegistry.m

@@ -48,9 +48,11 @@
   }
 }
 
-- (void)detachHandlerWithTag:(NSNumber *)handlerTag
+- (void)detachHandlerWithTag:(NSNumber *)handlerTag fromHostDetector:(RNGHUIView *)hostDetectorView
 {
   RNGestureHandler *handler = _handlers[handlerTag];
+  if (handler.hostDetectorView != hostDetectorView)
+    return;
   [handler unbindFromView];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gesture-handler",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-nightly-20260206-e99cf63a0",
   "description": "Declarative API exposing native platform touch and gesture system to React Native",
   "scripts": {
     "test": "jest",