Virtual detector native gestures

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

@@ -103,7 +103,7 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
     for (tag in newHandlers) {
       handlersToDetach.remove(tag)
       if (!attachedHandlers.contains(tag)) {
-        if (shouldAttachGestureToChildView(tag)) {
+        if (shouldAttachGestureToChildView(tag) && actionType != GestureHandler.ACTION_TYPE_LOGIC_DETECTOR) {
           // 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.
           nativeHandlers.add(tag)

packages/react-native-gesture-handler/apple/RNGestureHandlerDetector.mm

@@ -160,11 +160,19 @@ - (void)attachHandlers:(const std::vector<int> &)handlerTags
   react_native_assert(handlerManager != nullptr && "Tried to access a non-existent handler manager")
 
       NSMutableSet *handlersToDetach = [attachedHandlers mutableCopy];
-
   for (const int tag : handlerTags) {
     [handlersToDetach removeObject:@(tag)];
+  }
+
+  for (const id tag : handlersToDetach) {
+    [handlerManager.registry detachHandlerWithTag:tag];
+    [attachedHandlers removeObject:tag];
+    [_nativeHandlers removeObject:tag];
+  }
+
+  for (const int tag : handlerTags) {
     if (![attachedHandlers containsObject:@(tag)]) {
-      if ([self shouldAttachGestureToSubview:@(tag)]) {
+      if ([self shouldAttachGestureToSubview:@(tag)] && actionType != RNGestureHandlerActionTypeLogicDetector) {
         // 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 `didAddSubview` method.
         [_nativeHandlers addObject:@(tag)];
@@ -180,12 +188,6 @@ - (void)attachHandlers:(const std::vector<int> &)handlerTags
     }
   }
 
-  for (const id tag : handlersToDetach) {
-    [handlerManager.registry detachHandlerWithTag:tag];
-    [attachedHandlers removeObject:tag];
-    [_nativeHandlers removeObject:tag];
-  }
-
   // This covers the case where `NativeViewGestureHandlers` are attached after child views were created.
   if (self.subviews[0]) {
     [self tryAttachNativeHandlersToChildView];
@@ -220,22 +222,24 @@ - (void)updateLogicChildren:(const std::vector<RNGestureHandlerDetectorLogicChil
   }
 
   for (const auto &child : logicChildren) {
-    if (_attachedLogicHandlers.find(child.viewTag) == _attachedLogicHandlers.end()) {
-      _attachedLogicHandlers[child.viewTag] = [NSMutableSet set];
-    }
-
     [logicChildrenToDetach removeObject:@(child.viewTag)];
-
-    [self attachHandlers:child.handlerTags
-              actionType:RNGestureHandlerActionTypeLogicDetector
-                 viewTag:child.viewTag
-        attachedHandlers:_attachedLogicHandlers[child.viewTag]];
   }
 
   for (const NSNumber *tag : logicChildrenToDetach) {
     for (id handlerTag : _attachedLogicHandlers[tag.intValue]) {
       [handlerManager.registry detachHandlerWithTag:handlerTag];
     }
+    _attachedLogicHandlers.erase(tag.intValue);
+  }
+
+  for (const auto &child : logicChildren) {
+    if (_attachedLogicHandlers.find(child.viewTag) == _attachedLogicHandlers.end()) {
+      _attachedLogicHandlers[child.viewTag] = [NSMutableSet set];
+    }
+    [self attachHandlers:child.handlerTags
+              actionType:RNGestureHandlerActionTypeLogicDetector
+                 viewTag:child.viewTag
+        attachedHandlers:_attachedLogicHandlers[child.viewTag]];
   }
 }
 

packages/react-native-gesture-handler/src/v3/LogicDetector.tsx

@@ -14,36 +14,38 @@ export function LogicDetector<THandlerData, TConfig>(
   const [viewTag, setViewTag] = useState<number>(-1);
   const logicMethods = useRef(props.gesture.detectorCallbacks);
 
-  const handleRef = useCallback((node: any) => {
-    viewRef.current = node;
-    if (!node) {
-      return;
-    }
+  const handleRef = useCallback(
+    (node: any) => {
+      viewRef.current = node;
+      if (!node) {
+        return;
+      }
+      let tag: number | null = null;
+      if (Platform.OS === 'web') {
+        tag = node;
+      } else {
+        tag = findNodeHandle(node);
+      }
 
-    if (Platform.OS === 'web') {
-      setViewTag(node);
-    } else {
-      const tag = findNodeHandle(node);
       if (tag != null) {
+        console.log('register ', tag);
         setViewTag(tag);
       }
-    }
-  }, []);
+
+      return () => {
+        if (tag != null) {
+          console.log('unregister ', tag);
+          unregister(viewTag);
+        }
+      };
+    },
+    [props.children]
+  );
 
   useEffect(() => {
     logicMethods.current = props.gesture.detectorCallbacks;
   }, [props.gesture.detectorCallbacks]);
 
-  useEffect(() => {
-    if (viewTag === -1) {
-      return;
-    }
-
-    // Native Detector differentiates Logic Children through a viewTag,
-    // thus if viewTag changes we have to reregister
-    unregister(viewTag);
-  }, [viewTag]);
-
   useEffect(() => {
     if (viewTag === -1) {
       return;

packages/react-native-gesture-handler/src/v3/NativeDetector/HostGestureDetector.web.tsx

@@ -53,7 +53,8 @@ const HostGestureDetector = (props: GestureHandlerDetectorProps) => {
       if (
         RNGestureHandlerModule.getGestureHandlerNode(
           tag
-        ).shouldAttachGestureToChildView()
+        ).shouldAttachGestureToChildView() &&
+        actionType !== ActionType.LOGIC_DETECTOR
       ) {
         RNGestureHandlerModule.attachGestureHandler(
           tag,