react-native-gesture-handler 3.0.0-beta.1 → 3.0.0-nightly-20260210-746564b1e

package/android/src/main/java/com/swmansion/gesturehandler/core/GestureHandlerOrchestrator.kt

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.EditText
 import com.facebook.react.uimanager.ReactCompoundView
 import com.facebook.react.uimanager.RootView
+import com.swmansion.gesturehandler.react.RNGestureHandlerDetectorView
 import com.swmansion.gesturehandler.react.RNGestureHandlerRootHelper
 import com.swmansion.gesturehandler.react.RNGestureHandlerRootView
 import com.swmansion.gesturehandler.react.isHoverAction
@@ -745,9 +746,12 @@ class GestureHandlerOrchestrator(
 
       // TODO: this is not an ideal solution as we only consider ViewGroups that has no background set
       // TODO: ideally we should determine the pixel color under the given coordinates and return
-      // false if the color is transparent
-      val isLeafOrTransparent = view !is ViewGroup || view.getBackground() != null
-      return isLeafOrTransparent && isTransformedTouchPointInView(coords[0], coords[1], view)
+      val isLeaf = view !is ViewGroup
+      val isNotTransparent = view.getBackground() != null
+      val isDirectDetectorChild = view.parent is RNGestureHandlerDetectorView
+      val isPointInView = isTransformedTouchPointInView(coords[0], coords[1], view)
+
+      return (isLeaf || isNotTransparent || isDirectDetectorChild) && isPointInView
     }
 
     fun transformPointToChildViewCoords(x: Float, y: Float, parent: ViewGroup, child: View, outLocalPoint: PointF) {

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

@@ -37,6 +37,43 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
     attachHandlers(newHandlers)
   }
 
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+
+    if (moduleId != -1) {
+      handlersToAttach?.let {
+        attachHandlers(it)
+      }
+
+      virtualChildrenToAttach?.let {
+        attachVirtualChildren(it)
+      }
+
+      handlersToAttach = null
+      virtualChildrenToAttach = null
+    }
+  }
+
+  override fun onDetachedFromWindow() {
+    if (attachedHandlers.isNotEmpty()) {
+      handlersToAttach = attachedHandlers.toMutableList().also {
+        it.addAll(handlersToAttach ?: emptyList())
+      }
+    }
+
+    if (attachedVirtualHandlers.isNotEmpty()) {
+      virtualChildrenToAttach = attachedVirtualHandlers.map {
+        VirtualChildren(it.value.toList(), it.key)
+      }.toMutableList().also {
+        it.addAll(virtualChildrenToAttach ?: emptyList())
+      }
+    }
+
+    detachAllHandlers()
+
+    super.onDetachedFromWindow()
+  }
+
   fun setModuleId(id: Int) {
     assert(this.moduleId == -1) { "Tried to change moduleId of a native detector" }
 
@@ -109,7 +146,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 +171,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 +219,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)
     }
   }
@@ -192,18 +229,18 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
     eventDispatcher?.dispatchEvent(event)
   }
 
-  fun onViewDrop() {
+  fun detachAllHandlers() {
     val registry = RNGestureHandlerModule.registries[moduleId]
       ?: 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/RNGestureHandlerDetectorViewManager.kt

@@ -43,7 +43,7 @@ class RNGestureHandlerDetectorViewManager :
   }
 
   override fun onDropViewInstance(view: RNGestureHandlerDetectorView) {
-    view.onViewDrop()
+    view.detachAllHandlers()
     super.onDropViewInstance(view)
   }
 

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/lib/commonjs/v3/hooks/useGesture.js

@@ -60,6 +60,10 @@ function useGesture(type, config) {
   }), [handlerTag, type, config, jsEventHandler, reanimatedEventHandler, animatedEventHandler, gestureRelations]);
   (0, _react.useEffect)(() => {
     return () => {
+      currentGestureRef.current = {
+        type: '',
+        handlerTag: -1
+      };
       _NativeProxy.NativeProxy.dropGestureHandler(handlerTag);
       (0, _utils3.scheduleFlushOperations)();
     };

package/lib/commonjs/v3/hooks/useGesture.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_getNextHandlerTag","_useGestureCallbacks","_utils","_utils2","_utils3","_handlersRegistry","_NativeProxy","useGesture","type","config","handlerTag","useMemo","getNextHandlerTag","disableReanimated","Error","tagMessage","prepareConfig","jsEventHandler","reanimatedEventHandler","animatedEventHandler","useGestureCallbacks","shouldUseReanimatedDetector","gestureRelations","prepareRelations","simultaneousWith","requireToFail","block","currentGestureRef","useRef","current","NativeProxy","createGestureHandler","gesture","detectorCallbacks","useEffect","dropGestureHandler","scheduleFlushOperations","preparedConfig","prepareConfigForNativeSide","setGestureHandlerConfig","bindSharedValues","registerGesture","unbindSharedValues","unregisterGesture"],"sourceRoot":"../../../../src","sources":["v3/hooks/useGesture.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_getNextHandlerTag","_useGestureCallbacks","_utils","_utils2","_utils3","_handlersRegistry","_NativeProxy","useGesture","type","config","handlerTag","useMemo","getNextHandlerTag","disableReanimated","Error","tagMessage","prepareConfig","jsEventHandler","reanimatedEventHandler","animatedEventHandler","useGestureCallbacks","shouldUseReanimatedDetector","gestureRelations","prepareRelations","simultaneousWith","requireToFail","block","currentGestureRef","useRef","current","NativeProxy","createGestureHandler","gesture","detectorCallbacks","useEffect","dropGestureHandler","scheduleFlushOperations","preparedConfig","prepareConfigForNativeSide","setGestureHandlerConfig","bindSharedValues","registerGesture","unbindSharedValues","unregisterGesture"],"sourceRoot":"../../../../src","sources":["v3/hooks/useGesture.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/v3/hooks/useGesture.js

@@ -56,6 +56,10 @@ export function useGesture(type, config) {
   }), [handlerTag, type, config, jsEventHandler, reanimatedEventHandler, animatedEventHandler, gestureRelations]);
   useEffect(() => {
     return () => {
+      currentGestureRef.current = {
+        type: '',
+        handlerTag: -1
+      };
       NativeProxy.dropGestureHandler(handlerTag);
       scheduleFlushOperations();
     };

package/lib/module/v3/hooks/useGesture.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useMemo","useRef","getNextHandlerTag","useGestureCallbacks","prepareConfig","prepareRelations","bindSharedValues","unbindSharedValues","prepareConfigForNativeSide","tagMessage","scheduleFlushOperations","registerGesture","unregisterGesture","NativeProxy","useGesture","type","config","handlerTag","disableReanimated","Error","jsEventHandler","reanimatedEventHandler","animatedEventHandler","shouldUseReanimatedDetector","gestureRelations","simultaneousWith","requireToFail","block","currentGestureRef","current","createGestureHandler","gesture","detectorCallbacks","dropGestureHandler","preparedConfig","setGestureHandlerConfig"],"sourceRoot":"../../../../src","sources":["v3/hooks/useGesture.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","useMemo","useRef","getNextHandlerTag","useGestureCallbacks","prepareConfig","prepareRelations","bindSharedValues","unbindSharedValues","prepareConfigForNativeSide","tagMessage","scheduleFlushOperations","registerGesture","unregisterGesture","NativeProxy","useGesture","type","config","handlerTag","disableReanimated","Error","jsEventHandler","reanimatedEventHandler","animatedEventHandler","shouldUseReanimatedDetector","gestureRelations","simultaneousWith","requireToFail","block","currentGestureRef","current","createGestureHandler","gesture","detectorCallbacks","dropGestureHandler","preparedConfig","setGestureHandlerConfig"],"sourceRoot":"../../../../src","sources":["v3/hooks/useGesture.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/v3/hooks/useGesture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGesture.d.ts","sourceRoot":"","sources":["../../../../src/v3/hooks/useGesture.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAQ/E,wBAAgB,UAAU,CAAC,YAAY,EAAE,OAAO,EAC9C,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,GAC/C,aAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CA0FtC"}
+{"version":3,"file":"useGesture.d.ts","sourceRoot":"","sources":["../../../../src/v3/hooks/useGesture.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAQ/E,wBAAgB,UAAU,CAAC,YAAY,EAAE,OAAO,EAC9C,IAAI,EAAE,iBAAiB,EACvB,MAAM,EAAE,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,GAC/C,aAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CA2FtC"}

package/package.json

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

package/shared/shadowNodes/react/renderer/components/rngesturehandler_codegen/RNGestureHandlerDetectorShadowNode.cpp

@@ -28,11 +28,24 @@ void RNGestureHandlerDetectorShadowNode::initialize() {
         children.size() == 1 &&
         "RNGestureHandlerDetector received more than one child");
 
-    const auto clonedChild = children[0]->clone({});
-    replaceChild(*children[0], clonedChild);
+    // Will clone the child and ensure it's not flattened
+    replaceChild(*children[0], children[0], 0);
   }
 }
 
+void RNGestureHandlerDetectorShadowNode::appendChild(
+    const std::shared_ptr<const ShadowNode> &child) {
+  YogaLayoutableShadowNode::appendChild(unflattenNode(child));
+}
+
+void RNGestureHandlerDetectorShadowNode::replaceChild(
+    const ShadowNode &oldChild,
+    const std::shared_ptr<const ShadowNode> &newChild,
+    size_t suggestedIndex) {
+  YogaLayoutableShadowNode::replaceChild(
+      oldChild, unflattenNode(newChild), suggestedIndex);
+}
+
 void RNGestureHandlerDetectorShadowNode::layout(LayoutContext layoutContext) {
   // TODO: consider allowing more than one child and doing bounding box
   react_native_assert(getChildren().size() == 1);
@@ -69,4 +82,18 @@ void RNGestureHandlerDetectorShadowNode::layout(LayoutContext layoutContext) {
   mutableChild->setLayoutMetrics(childmetrics);
 }
 
+std::shared_ptr<const ShadowNode>
+RNGestureHandlerDetectorShadowNode::unflattenNode(
+    const std::shared_ptr<const ShadowNode> &node) {
+  auto clonedNode = node->clone({});
+  auto clonedNodeWithProtectedAccess =
+      std::static_pointer_cast<RNGestureHandlerDetectorShadowNode>(clonedNode);
+
+  clonedNodeWithProtectedAccess->traits_.set(ShadowNodeTraits::FormsView);
+  clonedNodeWithProtectedAccess->traits_.set(
+      ShadowNodeTraits::FormsStackingContext);
+
+  return clonedNode;
+}
+
 } // namespace facebook::react

package/shared/shadowNodes/react/renderer/components/rngesturehandler_codegen/RNGestureHandlerDetectorShadowNode.h

@@ -53,9 +53,17 @@ class RNGestureHandlerDetectorShadowNode final
     initialize();
   }
 
+  void appendChild(const std::shared_ptr<const ShadowNode> &child) override;
+  void replaceChild(
+      const ShadowNode &oldChild,
+      const std::shared_ptr<const ShadowNode> &newChild,
+      size_t suggestedIndex = SIZE_MAX) override;
+
   void layout(LayoutContext layoutContext) override;
 
  private:
+  std::shared_ptr<const ShadowNode> unflattenNode(
+      const std::shared_ptr<const ShadowNode> &node);
   void initialize();
 
   std::optional<LayoutMetrics> previousLayoutMetrics_;

package/src/v3/hooks/useGesture.ts

@@ -90,6 +90,7 @@ export function useGesture<THandlerData, TConfig>(
 
   useEffect(() => {
     return () => {
+      currentGestureRef.current = { type: '', handlerTag: -1 };
       NativeProxy.dropGestureHandler(handlerTag);
       scheduleFlushOperations();
     };