react-native-gesture-handler 3.0.0 → 3.0.2

package/README.md

@@ -1,5 +1,9 @@
 <img src="https://user-images.githubusercontent.com/16062886/117444014-2d1ffd80-af39-11eb-9bbb-33c320599d93.png" width="100%" alt="React Native Gesture Handler by Software Mansion">
 
+[![Ad](https://swm-delivery.com/www/images/zone-gh-react-native-gesture-handler-1?n=1)](https://swm-delivery.com/www/delivery/ck-slug.php?zoneid=zone-gh-react-native-gesture-handler-1&n=1)
+[![Ad](https://swm-delivery.com/www/images/zone-gh-react-native-gesture-handler-2?n=1)](https://swm-delivery.com/www/delivery/ck-slug.php?zoneid=zone-gh-react-native-gesture-handler-2&n=1)
+[![Ad](https://swm-delivery.com/www/images/zone-gh-react-native-gesture-handler-3?n=1)](https://swm-delivery.com/www/delivery/ck-slug.php?zoneid=zone-gh-react-native-gesture-handler-3&n=1)
+
 ### Declarative API exposing platform native touch and gesture system to React Native.
 
 React Native Gesture Handler provides native-driven gesture management APIs for building best possible touch-based experiences in React Native.

package/RNGestureHandler.podspec

@@ -5,7 +5,7 @@ is_gh_example_app = ENV["GH_EXAMPLE_APP_NAME"] != nil
 
 compilation_metadata_dir = "CompilationDatabase"
 compilation_metadata_generation_flag = is_gh_example_app ? '-gen-cdb-fragment-path ' + compilation_metadata_dir : ''
-version_flag = "-DREACT_NATIVE_MINOR_VERSION=#{get_react_native_minor_version()}"
+version_flag = "-DREACT_NATIVE_MINOR_VERSION=#{GestureHandlerUtils.get_react_native_minor_version()}"
 
 Pod::Spec.new do |s|
   # NPM package specification

package/android/build.gradle

@@ -2,17 +2,18 @@ import groovy.json.JsonSlurper
 import com.android.build.gradle.tasks.ExternalNativeBuildJsonTask
 
 buildscript {
-    def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion']
-
     repositories {
         mavenCentral()
         google()
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
-        classpath("com.android.tools.build:gradle:8.10.1")
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
+        if (project == rootProject) {
+            def kotlin_version = project.properties['RNGH_kotlinVersion']
+            classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+            classpath("com.android.tools.build:gradle:8.10.1")
+            classpath("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
+        }
     }
 }
 

package/android/gradle.properties

@@ -16,4 +16,4 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemor
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-RNGH_kotlinVersion=2.0.21
+RNGH_kotlinVersion=2.2.0

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

@@ -88,7 +88,7 @@ class FlingGestureHandler : GestureHandler() {
   }
 
   override fun onHandle(event: MotionEvent, sourceEvent: MotionEvent) {
-    if (!shouldActivateWithMouse(sourceEvent)) {
+    if (shouldSkipEvent(sourceEvent)) {
       return
     }
 

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

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.ContextWrapper
 import android.graphics.PointF
-import android.os.Build
 import android.view.MotionEvent
 import android.view.MotionEvent.PointerCoords
 import android.view.MotionEvent.PointerProperties
@@ -411,7 +410,10 @@ open class GestureHandler {
       }
     }
 
-    numberOfPointers = adaptedTransformedEvent.pointerCount
+    numberOfPointers = when (adaptedTransformedEvent.actionMasked) {
+      MotionEvent.ACTION_POINTER_UP -> adaptedTransformedEvent.pointerCount - 1
+      else -> adaptedTransformedEvent.pointerCount
+    }
 
     x = adaptedTransformedEvent.x
     y = adaptedTransformedEvent.y
@@ -820,44 +822,38 @@ open class GestureHandler {
     return clickedButton and mouseButton != 0
   }
 
-  protected fun shouldActivateWithMouse(sourceEvent: MotionEvent): Boolean {
-    // While using mouse, we get both sets of events, for example ACTION_DOWN and ACTION_BUTTON_PRESS. That's why we want to take actions to only one of them.
-    // On API >= 23, we will use events with infix BUTTON, otherwise we use standard action events (like ACTION_DOWN).
+  // Decides whether the gesture should ignore this event. While using a mouse we receive both the
+  // touch-compatible stream (ACTION_DOWN/UP/...) and the BUTTON_* events, so we act on only the
+  // latter, and we drop events coming from a button other than the configured `mouseButton`.
+  // Non-mouse input is never skipped here.
+  protected fun shouldSkipEvent(sourceEvent: MotionEvent): Boolean {
+    if (sourceEvent.getToolType(0) != MotionEvent.TOOL_TYPE_MOUSE) {
+      return false
+    }
 
     with(sourceEvent) {
-      // To use actionButton, we need API >= 23.
-      if (getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE &&
-        Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+      // While using mouse, we want to ignore default events for touch.
+      if (actionMasked == MotionEvent.ACTION_DOWN ||
+        actionMasked == MotionEvent.ACTION_UP ||
+        actionMasked == MotionEvent.ACTION_POINTER_UP ||
+        actionMasked == MotionEvent.ACTION_POINTER_DOWN
       ) {
-        // While using mouse, we want to ignore default events for touch.
-        if (action == MotionEvent.ACTION_DOWN ||
-          action == MotionEvent.ACTION_UP ||
-          action == MotionEvent.ACTION_POINTER_UP ||
-          action == MotionEvent.ACTION_POINTER_DOWN
-        ) {
-          return@shouldActivateWithMouse false
-        }
+        return@shouldSkipEvent true
+      }
 
-        // We don't want to do anything if wrong button was clicked. If we received event for BUTTON, we have to use actionButton to get which one was clicked.
-        if (action != MotionEvent.ACTION_MOVE && !isButtonInConfig(actionButton)) {
-          return@shouldActivateWithMouse false
-        }
+      // Skip events from a button other than the configured one. For BUTTON_* events the clicked
+      // button is read from `actionButton`.
+      if (actionMasked != MotionEvent.ACTION_MOVE && !isButtonInConfig(actionButton)) {
+        return@shouldSkipEvent true
+      }
 
-        // When we receive ACTION_MOVE, we have to check buttonState field.
-        if (action == MotionEvent.ACTION_MOVE && !isButtonInConfig(buttonState)) {
-          return@shouldActivateWithMouse false
-        }
-      } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-        // We do not fully support mouse below API 23, so we will ignore BUTTON events.
-        if (action == MotionEvent.ACTION_BUTTON_PRESS ||
-          action == MotionEvent.ACTION_BUTTON_RELEASE
-        ) {
-          return@shouldActivateWithMouse false
-        }
+      // For ACTION_MOVE the pressed button is read from `buttonState`.
+      if (actionMasked == MotionEvent.ACTION_MOVE && !isButtonInConfig(buttonState)) {
+        return@shouldSkipEvent true
       }
     }
 
-    return true
+    return false
   }
 
   /**

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

@@ -492,7 +492,7 @@ class GestureHandlerOrchestrator(
       top + view.height > parent.height
   }
 
-  private fun extractAncestorHandlers(view: View, coords: FloatArray, pointerId: Int): Boolean {
+  private fun extractAncestorHandlers(view: View, coords: FloatArray, pointerId: Int, event: MotionEvent): Boolean {
     var found = false
     var parent = view.parent
 
@@ -509,6 +509,10 @@ class GestureHandlerOrchestrator(
         handlerRegistry.getHandlersForView(parent)?.let {
           synchronized(it) {
             for (handler in it) {
+              if (shouldHandlerSkipHoverEvents(handler, event)) {
+                continue
+              }
+
               if (handler.isEnabled && handler.isWithinBounds(view, coords[0], coords[1])) {
                 found = true
                 recordHandlerIfNotPresent(handler, parentViewGroup)
@@ -542,13 +546,33 @@ class GestureHandlerOrchestrator(
     coords: FloatArray,
     pointerId: Int,
     event: MotionEvent,
+    useChildBounds: Boolean = false,
   ): Boolean {
+    var boundsView = view
+    var boundsX = coords[0]
+    var boundsY = coords[1]
+
+    // When `useChildBounds` is set, handler bounds are checked in the coordinate space of the view's
+    // single child instead of against the view itself. The caller only sets this for a native detector
+    // with exactly one child, so its interactive area follows the child's transforms (e.g. `translateX`)
+    // rather than the detector's transform-agnostic frame. For an identity transform the child fills the
+    // detector, so this matches the detector's own frame and `hitSlop` expansion (#4049) keeps working;
+    // for a translated child the area follows the content.
+    if (useChildBounds) {
+      val child = (view as RNGestureHandlerDetectorView).getChildAt(0)
+      val childPoint = tempPoint
+      transformPointToChildViewCoords(coords[0], coords[1], view, child, childPoint)
+      boundsView = child
+      boundsX = childPoint.x
+      boundsY = childPoint.y
+    }
+
     var found = false
     handlerRegistry.getHandlersForView(view)?.let {
       synchronized(it) {
         for (handler in it) {
           // skip disabled and out-of-bounds handlers
-          if (!handler.isEnabled || !handler.isWithinBounds(view, coords[0], coords[1])) {
+          if (!handler.isEnabled || !handler.isWithinBounds(boundsView, boundsX, boundsY)) {
             continue
           }
 
@@ -568,15 +592,21 @@ class GestureHandlerOrchestrator(
     if (coords[0] in 0f..view.width.toFloat() &&
       coords[1] in 0f..view.height.toFloat() &&
       isViewOverflowingParent(view) &&
-      extractAncestorHandlers(view, coords, pointerId)
+      extractAncestorHandlers(view, coords, pointerId, event)
     ) {
       found = true
     }
 
     if (view is ReactCompoundView) {
-      val tagForCoords = view.reactTagForTouch(coords[0], coords[1])
+      // Some implementations (e.g. RNScreens' DimmingView) intentionally throw from `reactTagForTouch`
+      val tagForCoords =
+        try {
+          view.reactTagForTouch(coords[0], coords[1])
+        } catch (e: IllegalStateException) {
+          null
+        }
 
-      if (tagForCoords != view.id) {
+      if (tagForCoords != null && tagForCoords != view.id) {
         handlerRegistry.getHandlersForViewWithTag(tagForCoords)?.let {
           synchronized(it) {
             for (handler in it) {
@@ -680,8 +710,16 @@ class GestureHandlerOrchestrator(
             is ViewGroup -> {
               extractGestureHandlers(view, coords, pointerId, event).also { found ->
                 // A child view is handling touch, also extract handlers attached to this view
-                if (found || view is RNGestureHandlerDetectorView) {
+                if (found) {
                   recordViewHandlersForPointer(view, coords, pointerId, event)
+                } else if (view is RNGestureHandlerDetectorView) {
+                  // No child consumed the touch, but we still record the detector's own handlers so
+                  // that `hitSlop` expansion keeps working. The detector's frame ignores
+                  // child transforms, so for a single-child detector we check bounds in the child's
+                  // transform-aware coordinate space - otherwise the detector would steal presses over
+                  // areas its content has been moved away from.
+                  val useChildBounds = view.childCount == 1
+                  recordViewHandlersForPointer(view, coords, pointerId, event, useChildBounds)
                 }
               }
             }

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

@@ -71,7 +71,7 @@ class LongPressGestureHandler(context: Context) : GestureHandler() {
   }
 
   override fun onHandle(event: MotionEvent, sourceEvent: MotionEvent) {
-    if (!shouldActivateWithMouse(sourceEvent)) {
+    if (shouldSkipEvent(sourceEvent)) {
       return
     }
 
@@ -108,7 +108,8 @@ class LongPressGestureHandler(context: Context) : GestureHandler() {
       currentPointers == numberOfPointersRequired &&
       (
         sourceEvent.actionMasked == MotionEvent.ACTION_DOWN ||
-          sourceEvent.actionMasked == MotionEvent.ACTION_POINTER_DOWN
+          sourceEvent.actionMasked == MotionEvent.ACTION_POINTER_DOWN ||
+          sourceEvent.actionMasked == MotionEvent.ACTION_BUTTON_PRESS
         )
     ) {
       handler = Handler(Looper.getMainLooper())
@@ -199,7 +200,7 @@ class LongPressGestureHandler(context: Context) : GestureHandler() {
         handler.maxDist = PixelUtil.toPixelFromDIP(config.getDouble(KEY_MAX_DIST))
       }
       if (config.hasKey(KEY_NUMBER_OF_POINTERS)) {
-        handler.numberOfPointers = config.getInt(KEY_NUMBER_OF_POINTERS)
+        handler.numberOfPointersRequired = config.getInt(KEY_NUMBER_OF_POINTERS)
       }
     }
 

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

@@ -14,10 +14,8 @@ import com.facebook.react.views.swiperefresh.ReactSwipeRefreshLayout
 import com.facebook.react.views.text.ReactTextView
 import com.facebook.react.views.textinput.ReactEditText
 import com.facebook.react.views.view.ReactViewGroup
-import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager
 import com.swmansion.gesturehandler.react.RNGestureHandlerRootHelper
 import com.swmansion.gesturehandler.react.events.eventbuilders.NativeGestureHandlerEventDataBuilder
-import com.swmansion.gesturehandler.react.isScreenReaderOn
 
 class NativeViewGestureHandler : GestureHandler() {
   override val isContinuous = true
@@ -121,17 +119,6 @@ class NativeViewGestureHandler : GestureHandler() {
 
   override fun onHandle(event: MotionEvent, sourceEvent: MotionEvent) {
     val view = view!!
-
-    val isTouchExplorationEnabled = view.context.isScreenReaderOn()
-
-    if (view is RNGestureHandlerButtonViewManager.ButtonViewGroup && isTouchExplorationEnabled) {
-      // Fix for: https://github.com/software-mansion/react-native-gesture-handler/issues/2808
-      // When TalkBack is enabled, events are often not being sent to the orchestrator for processing.
-      // Instead, states will be changed directly by an alternative mechanism added in this PR:
-      // https://github.com/software-mansion/react-native-gesture-handler/pull/2234
-      return
-    }
-
     if (event.actionMasked == MotionEvent.ACTION_UP) {
       if (state == STATE_UNDETERMINED && !hook.canBegin(event)) {
         cancel()

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

@@ -160,7 +160,7 @@ class PanGestureHandler(context: Context?) : GestureHandler() {
   }
 
   override fun onHandle(event: MotionEvent, sourceEvent: MotionEvent) {
-    if (!shouldActivateWithMouse(sourceEvent)) {
+    if (shouldSkipEvent(sourceEvent)) {
       return
     }
 

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

@@ -89,7 +89,7 @@ class TapGestureHandler : GestureHandler() {
   }
 
   override fun onHandle(event: MotionEvent, sourceEvent: MotionEvent) {
-    if (!shouldActivateWithMouse(sourceEvent)) {
+    if (shouldSkipEvent(sourceEvent)) {
       return
     }
 

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

@@ -17,6 +17,9 @@ fun MotionEvent.isHoverAction(): Boolean = action == MotionEvent.ACTION_HOVER_MO
   action == MotionEvent.ACTION_HOVER_ENTER ||
   action == MotionEvent.ACTION_HOVER_EXIT
 
+fun MotionEvent.isButtonAction(): Boolean = actionMasked == MotionEvent.ACTION_BUTTON_PRESS ||
+  actionMasked == MotionEvent.ACTION_BUTTON_RELEASE
+
 val Display.minimumFrameTime: Float
   get() {
     val supportedModes = this.supportedModes

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

@@ -27,6 +27,7 @@ import androidx.core.view.children
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import com.facebook.react.R
 import com.facebook.react.bridge.Dynamic
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.BackgroundStyleApplicator
 import com.facebook.react.uimanager.LengthPercentage
@@ -347,6 +348,7 @@ class RNGestureHandlerButtonViewManager :
     super.onAfterUpdateTransaction(view)
 
     view.updateBackground()
+    view.updateLongPressAccessibility()
   }
 
   override fun getDelegate(): ViewManagerDelegate<ButtonViewGroup>? = mDelegate
@@ -434,6 +436,23 @@ class RNGestureHandlerButtonViewManager :
       invalidate()
     }
 
+    fun updateLongPressAccessibility() {
+      val hasLongPress = hasLongPressAccessibilityAction()
+      setOnLongClickListener(if (hasLongPress) dummyLongClickListener else null)
+      isLongClickable = hasLongPress
+    }
+
+    private fun hasLongPressAccessibilityAction(): Boolean {
+      val actions = getTag(R.id.accessibility_actions) as? ReadableArray ?: return false
+      for (i in 0 until actions.size()) {
+        if (actions.getMap(i)?.getString("name") == "longpress") {
+          return true
+        }
+      }
+
+      return false
+    }
+
     override fun setBackgroundColor(color: Int) {
       BackgroundStyleApplicator.setBackgroundColor(this, color)
     }
@@ -876,10 +895,11 @@ class RNGestureHandlerButtonViewManager :
     }
 
     override fun performClick(): Boolean {
-      // don't preform click when a child button is pressed (mainly to prevent sound effect of
+      // don't perform click when a child button is pressed (mainly to prevent sound effect of
       // a parent button from playing)
       return if (!isChildTouched()) {
-        if (context.isScreenReaderOn()) {
+        // Don't activate native handlers when isPressed is true (motion events are passing through)
+        if (context.isScreenReaderOn() && !isPressed) {
           RNGestureHandlerRootView.findGestureHandlerRootView(this)?.activateNativeHandlers(this)
         } else if (receivedKeyEvent) {
           RNGestureHandlerRootView.findGestureHandlerRootView(this)?.activateNativeHandlers(this)
@@ -936,7 +956,14 @@ class RNGestureHandlerButtonViewManager :
       var resolveOutValue = TypedValue()
       var touchResponder: ButtonViewGroup? = null
       var soundResponder: ButtonViewGroup? = null
-      var dummyClickListener = OnClickListener { }
+      val dummyClickListener = OnClickListener { }
+      val dummyLongClickListener = OnLongClickListener { view ->
+        if (view.context.isScreenReaderOn()) {
+          view.performAccessibilityAction(AccessibilityNodeInfo.ACTION_LONG_CLICK, null)
+        } else {
+          false
+        }
+      }
     }
   }
 

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

@@ -47,6 +47,10 @@ class RNGestureHandlerDetectorView(context: Context) : ReactViewGroup(context) {
   }
 
   fun setModuleId(id: Int) {
+    if (this.moduleId == id) {
+      return
+    }
+
     assert(this.moduleId == -1) { "Tried to change moduleId of a native detector" }
 
     this.moduleId = id

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

@@ -62,12 +62,14 @@ class RNGestureHandlerRootView(context: Context?) : ReactViewGroup(context) {
     }
   }
 
-  override fun dispatchGenericMotionEvent(ev: MotionEvent) =
-    if (rootViewEnabled && ev.isHoverAction() && rootHelper!!.dispatchTouchEvent(ev)) {
-      true
-    } else {
-      super.dispatchGenericMotionEvent(ev)
-    }
+  override fun dispatchGenericMotionEvent(ev: MotionEvent) = if (rootViewEnabled &&
+    (ev.isHoverAction() || ev.isButtonAction()) &&
+    rootHelper!!.dispatchTouchEvent(ev)
+  ) {
+    true
+  } else {
+    super.dispatchGenericMotionEvent(ev)
+  }
 
   override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
     if (rootViewEnabled) {

package/apple/Handlers/RNNativeViewHandler.mm

@@ -145,10 +145,13 @@
     // Pressing UISwitch triggers only touchUp and valueChanged callbacks. In order to align its behavior
     // with other UIControls, we have to dispatch full Gesture Handler events flow in one callback, as
     // touchesDown is not executed.
+#if !TARGET_OS_TV
     if ([view isKindOfClass:[UISwitch class]]) {
       _pointerType = RNGestureHandlerTouch;
       [control addTarget:self action:@selector(handleSwitch:) forControlEvents:UIControlEventValueChanged];
-    } else {
+    } else
+#endif // !TARGET_OS_TV
+    {
       [control addTarget:self action:@selector(handleTouchDown:forEvent:) forControlEvents:UIControlEventTouchDown];
       [control addTarget:self
                     action:@selector(handleTouchUpOutside:forEvent:)

package/apple/RNGestureHandlerButton.h

@@ -51,6 +51,11 @@
  */
 - (void)applyStartAnimationState;
 
+#if TARGET_OS_TV
+- (void)handleAnimatePressIn;
+- (void)handleAnimatePressOut;
+#endif // TARGET_OS_TV
+
 /**
  * Resets all transient press/animation state so the button can be safely reused
  * by Fabric view recycling. Cancels pending press-out blocks, removes in-flight

package/apple/RNGestureHandlerButtonComponentView.mm

@@ -68,6 +68,44 @@ static RNGestureHandlerPointerEvents RCTPointerEventsToEnum(facebook::react::Poi
   return self;
 }
 
+#if TARGET_OS_TV
+- (void)emitPressInEvent
+{
+  if (!_buttonView.userEnabled) {
+    return;
+  }
+
+  [_buttonView sendActionsForControlEvents:UIControlEventTouchDown];
+}
+
+- (void)emitPressOutEvent
+{
+  if (!_buttonView.userEnabled) {
+    return;
+  }
+
+  [_buttonView sendActionsForControlEvents:UIControlEventTouchUpInside];
+}
+
+- (void)animatePressIn
+{
+  if (!_buttonView.userEnabled) {
+    return;
+  }
+
+  [_buttonView handleAnimatePressIn];
+}
+
+- (void)animatePressOut
+{
+  if (!_buttonView.userEnabled) {
+    return;
+  }
+
+  [_buttonView handleAnimatePressOut];
+}
+#endif // TARGET_OS_TV
+
 - (void)prepareForRecycle
 {
   [self.layer removeAnimationForKey:@"transform"];

package/apple/RNGestureHandlerDetector.h

@@ -33,8 +33,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)detachNativeGestureHandlers;
 
-- (BOOL)shouldAttachGestureToSubview:(nonnull NSNumber *)handlerTag;
-
 @end
 
 NS_ASSUME_NONNULL_END

package/apple/RNGestureHandlerDetector.mm

@@ -254,14 +254,14 @@
                    withHostDetector:self];
     } else {
       // Hierarchy was folded into a single UIView.
-      [manager.registry attachHandlerWithTag:handler.tag toView:self withActionType:actionType withHostDetector:self];
+      [manager attachHandlerForDetectorWithTag:handler.tag toView:self withActionType:actionType withHostDetector:self];
       handler.virtualViewTag = @(viewTag);
     }
     [_attachedHandlers addObject:handler.tag];
     return;
   }
 
-  [manager.registry attachHandlerWithTag:handler.tag toView:self withActionType:actionType withHostDetector:self];
+  [manager attachHandlerForDetectorWithTag:handler.tag toView:self withActionType:actionType withHostDetector:self];
   [_attachedHandlers addObject:handler.tag];
 }
 
@@ -351,10 +351,10 @@
     if ([handlerManager.registry handlerWithTag:handlerTag] == nil) {
       continue;
     }
-    [handlerManager.registry attachHandlerWithTag:handlerTag
-                                           toView:view
-                                   withActionType:RNGestureHandlerActionTypeNativeDetector
-                                 withHostDetector:self];
+    [handlerManager attachHandlerForDetectorWithTag:handlerTag
+                                             toView:view
+                                     withActionType:RNGestureHandlerActionTypeNativeDetector
+                                   withHostDetector:self];
     [_attachedHandlers addObject:handlerTag];
   }
 }

package/apple/RNGestureHandlerManager.h

@@ -29,6 +29,11 @@
               withActionType:(RNGestureHandlerActionType)actionType
             withHostDetector:(nullable RNGHUIView *)hostDetector;
 
+- (void)attachHandlerForDetectorWithTag:(nonnull NSNumber *)handlerTag
+                                 toView:(nonnull RNGHUIView *)view
+                         withActionType:(RNGestureHandlerActionType)actionType
+                       withHostDetector:(nullable RNGHUIView *)hostDetector;
+
 - (void)setGestureHandlerConfig:(nonnull NSNumber *)handlerTag config:(nonnull NSDictionary *)config;
 
 - (void)updateGestureHandlerConfig:(nonnull NSNumber *)handlerTag config:(nonnull NSDictionary *)config;

package/apple/RNGestureHandlerManager.mm

@@ -4,7 +4,6 @@
 #import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
 #import <React/RCTModalHostViewController.h>
-#import <React/RCTRootContentView.h>
 #import <React/RCTRootView.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTViewManager.h>
@@ -210,6 +209,15 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
   [self registerViewWithGestureRecognizerAttachedIfNeeded:view];
 }
 
+- (void)attachHandlerForDetectorWithTag:(nonnull NSNumber *)handlerTag
+                                 toView:(nonnull RNGHUIView *)view
+                         withActionType:(RNGestureHandlerActionType)actionType
+                       withHostDetector:(nullable RNGHUIView *)hostDetector
+{
+  [_registry attachHandlerWithTag:handlerTag toView:view withActionType:actionType withHostDetector:hostDetector];
+  [self registerViewWithGestureRecognizerAttachedIfNeeded:view];
+}
+
 - (void)setGestureHandlerConfig:(NSNumber *)handlerTag config:(NSDictionary *)config
 {
   RNGestureHandler *handler = [_registry handlerWithTag:handlerTag];
@@ -472,11 +480,11 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
 
 - (void)sendEventForNativeAnimatedEvent:(RNGestureHandlerStateChange *)event
 {
-  // Delivers the event to NativeAnimatedModule.
-  // Currently, NativeAnimated[Turbo]Module is RCTEventDispatcherObserver so we can
-  // simply send a direct event which is handled by the observer but ignored on JS side.
-  // TODO: send event directly to NativeAnimated[Turbo]Module
-  [self sendEventForDirectEvent:event];
+  // Delivers the event to NativeAnimated[Turbo]Module via the dispatcher's
+  // observer mechanism. We don't go through sendEvent: because that also
+  // dispatches the event to JS via RCTEventEmitter.receiveEvent, which is no
+  // longer a registered callable module in RN 0.86+ (Fabric-only).
+  [_eventDispatcher notifyObserversOfEvent:event];
 }
 
 - (void)sendEventForJSFunctionOldAPI:(RNGestureHandlerStateChange *)event
@@ -491,12 +499,6 @@ constexpr int NEW_ARCH_NUMBER_OF_ATTACH_RETRIES = 25;
   [self sendEventForDeviceEvent:event];
 }
 
-- (void)sendEventForDirectEvent:(RNGestureHandlerStateChange *)event
-{
-  // Delivers the event to JS as a direct event.
-  [_eventDispatcher sendEvent:event];
-}
-
 - (void)sendEventForDeviceEvent:(RNGestureHandlerStateChange *)event
 {
   // Delivers the event to JS as a device event.