[Release] 2.33.1 Cherry-pick thread (#4597)

## Description

Cherry pick thread for release 2.33.1

## List of PRs

| PR | Original commit | Picked commit | Without conflict | Notes |
|:----------:|:-------------:|:------:|:--------:|:------:|
| [[iOS] Skip hidden and transparent buttons in hit
testing](#4512)
|
[162c21d](162c21d)
|
[720a9b3](720a9b3)
| ✅ | |
| [[Android] Align the alpha traversal gate with
iOS](#4513)
|
[a2e0430](a2e0430)
|
[aad1f45](aad1f45)
| ❌ | `RNGestureHandlerRootHelper` hunk only; dropped the v3 detector
box-none hunk. Behavior change: Android alpha gate lowered from 0.1 to
0.01 |
| [[iOS] Fix `manualActivation` being ignored after a config update
mid-gesture](#4520)
|
[186eb6b](186eb6b)
|
[96f5112](96f5112)
| ❌ | `syncManualActivationRecognizer` called at the end of 2.x
`configure:` (no `setConfig:` / `updateConfig:` split); dropped `testID`
reset |
| [[Web] Introduce key pointer in
KeyboardEventManager](#4519)
|
[5d1c171](5d1c171)
|
[f0004f0](f0004f0)
| ✅ | |
| [Scan mount relations directly instead of rebuilding tag
arrays](#4546)
|
[590518c](590518c)
|
[774b459](774b459)
| ❌ | Import-order conflict only; dropped absent test file |
| [[Web] Fix view relative coordinates of trackpad pan
events](#4531)
|
[bb62b06](bb62b06)
|
[7adbee7](7adbee7)
| ❌ | `getBoundingClientRect` in place of v3 `getEffectiveBoundingRect`;
dropped absent test file |
| [[Web] Register the wheel listener as passive and only for
Pan](#4583)
|
[117c98a](117c98a)
|
[05e06ca](05e06ca)
| ❌ | `instanceof PanGestureHandler` in place of `handler.name` (absent
on 2.x); dropped `ScrollEventManager` context and absent test file |
| [[Android] Fix NPE when a touch cancel callback finishes the handler
mid-transition](#4584)
|
[52a9c06](52a9c06)
|
[e53f926](e53f926)
| ✅ | |
| [[General] Link late-mounted gesture objects and skip mount reactions
without external
relations](#4562)
|
[34efb3d](34efb3d)
|
[c424f80](c424f80)
| ❌ | Import conflicts only; dropped absent test file |
| [fix(android): respect pointer events on gesture root
views](#4565)
|
[d30f463](d30f463)
|
[c3b7245](c3b7245)
| ❌ | Dropped `moduleId` from the spec |
| [Expose animatable ref from legacy `GestureDetector`
`Wrap`](#4554)
|
[b5730d0](b5730d0)
|
[6f72f2e](6f72f2e)
| ❌ | Import/export conflicts only (2.x exports no `Worklets`); existing
test file updated |
| [[Android] Clear the pending HOVER_EXIT finish when the hover handler
is
reset](#4593)
|
[cdb3c9d](cdb3c9d)
|
[4ab9fb5](4ab9fb5)
| ✅ | Amended: safe call, 2.x `handler` is nullable |
| [[Android] Stop nested scroll when the root starts
intercepting](#4592)
|
[6c2a8df](6c2a8df)
|
[558bcaa](558bcaa)
| ✅ | |
| [Fix gesture relations after
`freeze`](#4244)
|
[6ba9d63](6ba9d63)
|
[5ed131a](5ed131a)
| ✅ | Missed in the 2.32/2.33 threads; required for #4546/#4562 mount
reactions on 2.x (CodeRabbit finding), also fixes #4238 |


## Test plan

Tested that example apps are built correctly

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Author: m-bert

packages/react-native-gesture-handler/android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerDelegate.java

@@ -23,6 +23,9 @@ public RNGestureHandlerRootViewManagerDelegate(U viewManager) {
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "pointerEvents":
+        mViewManager.setPointerEvents(view, (String) value);
+        break;
       case "unstable_forceActive":
         mViewManager.setUnstable_forceActive(view, value == null ? false : (boolean) value);
         break;

packages/react-native-gesture-handler/android/paper/src/main/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerInterface.java

@@ -10,8 +10,10 @@
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
+import androidx.annotation.Nullable;
 import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
 public interface RNGestureHandlerRootViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
+  void setPointerEvents(T view, @Nullable String value);
   void setUnstable_forceActive(T view, boolean value);
 }

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

@@ -568,10 +568,14 @@ open class GestureHandler {
     }
 
     // if there are tracked pointers and the gesture is about to end, send event cancelling all pointers
-    if (trackedPointersCount > 0 &&
-      (newState == STATE_END || newState == STATE_CANCELLED || newState == STATE_FAILED)
-    ) {
+    if (trackedPointersCount > 0 && isFinished(newState)) {
       cancelPointers()
+
+      // `cancelPointers` dispatches the event synchronously and its callback may change the state
+      // (e.g. via `GestureStateManager.fail`), in which case the transition is already complete.
+      if (isFinished(state)) {
+        return
+      }
     }
 
     val oldState = state
@@ -951,6 +955,8 @@ open class GestureHandler {
   }
 
   companion object {
+    fun isFinished(state: Int) = state == STATE_CANCELLED || state == STATE_FAILED || state == STATE_END
+
     private const val DEFAULT_NEEDS_POINTER_DATA = false
     private const val DEFAULT_MANUAL_ACTIVATION = false
     private const val DEFAULT_SHOULD_CANCEL_WHEN_OUTSIDE = false

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

@@ -97,7 +97,7 @@ class GestureHandlerOrchestrator(
 
   private fun cleanupFinishedHandlers() {
     for (handler in gestureHandlers.asReversed()) {
-      if (isFinished(handler.state) && !handler.isAwaiting) {
+      if (GestureHandler.isFinished(handler.state) && !handler.isAwaiting) {
         handler.reset()
         handler.apply {
           isActive = false
@@ -107,13 +107,13 @@ class GestureHandlerOrchestrator(
       }
     }
 
-    gestureHandlers.removeAll { isFinished(it.state) && !it.isAwaiting }
+    gestureHandlers.removeAll { GestureHandler.isFinished(it.state) && !it.isAwaiting }
 
     finishedHandlersCleanupScheduled = false
   }
 
   private fun hasOtherHandlerToWaitFor(handler: GestureHandler) =
-    gestureHandlers.any { !isFinished(it.state) && shouldHandlerWaitForOther(handler, it) }
+    gestureHandlers.any { !GestureHandler.isFinished(it.state) && shouldHandlerWaitForOther(handler, it) }
 
   private fun shouldBeCancelledByFinishedHandler(handler: GestureHandler) =
     gestureHandlers.any { shouldHandlerWaitForOther(handler, it) && it.state == GestureHandler.STATE_END }
@@ -163,7 +163,7 @@ class GestureHandlerOrchestrator(
       handler.isAwaiting = false
     }
 
-    if (isFinished(newState)) {
+    if (GestureHandler.isFinished(newState)) {
       // We have to loop through copy in order to avoid modifying collection
       // while iterating over its elements
       val currentlyAwaitingHandlers = awaitingHandlers.toList()
@@ -678,6 +678,7 @@ class GestureHandlerOrchestrator(
         continue
       }
       view.onTouchEvent(cancelEvent)
+      view.stopNestedScroll()
     }
 
     cancelEvent.recycle()
@@ -927,9 +928,5 @@ class GestureHandlerOrchestrator(
         true
       }
     }
-
-    private fun isFinished(state: Int) = state == GestureHandler.STATE_CANCELLED ||
-      state == GestureHandler.STATE_FAILED ||
-      state == GestureHandler.STATE_END
   }
 }

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

@@ -124,6 +124,7 @@ class HoverGestureHandler : GestureHandler() {
   override fun onReset() {
     super.onReset()
     stylusData = StylusData()
+    handler?.removeCallbacksAndMessages(null)
   }
 
   private fun finish() {

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

@@ -155,7 +155,8 @@ class RNGestureHandlerRootHelper(private val context: ReactContext, wrappedView:
   }
 
   companion object {
-    private const val MIN_ALPHA_FOR_TOUCH = 0.1f
+    // Same threshold as UIKit / RCTViewComponentView hit testing on iOS.
+    private const val MIN_ALPHA_FOR_TOUCH = 0.01f
     private fun findRootViewTag(viewGroup: ViewGroup): ViewGroup {
       UiThreadUtil.assertOnUiThread()
       var parent: ViewParent? = viewGroup

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

@@ -1,6 +1,7 @@
 package com.swmansion.gesturehandler.react
 
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.PointerEvents.Companion.parsePointerEvents
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
@@ -33,6 +34,11 @@ class RNGestureHandlerRootViewManager :
     view.tearDown()
   }
 
+  @ReactProp(name = "pointerEvents")
+  override fun setPointerEvents(view: RNGestureHandlerRootView, pointerEventsStr: String?) {
+    view.pointerEvents = parsePointerEvents(pointerEventsStr)
+  }
+
   @ReactProp(name = "unstable_forceActive")
   override fun setUnstable_forceActive(view: RNGestureHandlerRootView, active: Boolean) {
     view.setUnstableForceActive(active)

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

@@ -105,7 +105,7 @@ - (instancetype)initWithTag:(NSNumber *)tag
 - (void)resetConfig
 {
   self.enabled = YES;
-  self.manualActivation = NO;
+  _manualActivation = NO;
   _shouldCancelWhenOutside = NO;
   _handlersToWaitFor = nil;
   _simultaneousHandlers = nil;
@@ -176,6 +176,8 @@ - (void)configure:(NSDictionary *)config
       RCTLogError(@"Cannot have all of top, bottom and height defined");
     }
   }
+
+  [self syncManualActivationRecognizer];
 }
 
 - (void)setEnabled:(BOOL)enabled
@@ -480,14 +482,24 @@ - (void)stopActivationBlocker
 - (void)setManualActivation:(BOOL)manualActivation
 {
   _manualActivation = manualActivation;
+  [self syncManualActivationRecognizer];
+}
+
+- (void)syncManualActivationRecognizer
+{
+  BOOL hasRecognizer = _manualActivationRecognizer != nil;
 
-  if (manualActivation) {
+  if (hasRecognizer == _manualActivation) {
+    return;
+  }
+
+  if (_manualActivation) {
     _manualActivationRecognizer = [[RNManualActivationRecognizer alloc] initWithGestureHandler:self];
 
     if (_recognizer.view != nil) {
       [_recognizer.view addGestureRecognizer:_manualActivationRecognizer];
     }
-  } else if (_manualActivationRecognizer != nil) {
+  } else {
     [_manualActivationRecognizer.view removeGestureRecognizer:_manualActivationRecognizer];
     _manualActivationRecognizer = nil;
   }

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

@@ -259,8 +259,14 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
 // This is necessary because RCTViewComponentView's hitTest might handle pointerEvents
 // from ViewProps and prevent touches from reaching _buttonView (which is the contentView).
 // Since _buttonView has its own pointerEvents handling, we always forward to it.
+// Keep the visibility checks RCTViewComponentView applies, so a hidden or
+// (nearly) transparent button is skipped like any other RN view.
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
+  if (!self.userInteractionEnabled || self.hidden || self.alpha < 0.01) {
+    return nil;
+  }
+
   if (![self pointInside:point withEvent:event]) {
     return nil;
   }

packages/react-native-gesture-handler/src/__tests__/legacyWrapRef.test.tsx

@@ -2,6 +2,8 @@ import { cleanup, render } from '@testing-library/react-native';
 import React from 'react';
 import { findNodeHandle, View } from 'react-native';
 
+import { Wrap } from '../handlers/gestures/GestureDetector/Wrap';
+import * as reanimatedWrapper from '../handlers/gestures/reanimatedWrapper';
 import { Gesture, GestureDetector, GestureHandlerRootView } from '../index';
 import RNGestureHandlerModule from '../RNGestureHandlerModule';
 
@@ -132,6 +134,65 @@ describe('Legacy GestureDetector ref forwarding', () => {
     expect(secondRef).toHaveBeenCalledWith(childInstance);
   });
 
+  describe('animatable ref for Reanimated', () => {
+    let refreshSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+      refreshSpy = jest.spyOn(
+        reanimatedWrapper,
+        'reanimatedRefreshesAnimatableRef'
+      );
+    });
+
+    afterEach(() => {
+      refreshSpy.mockRestore();
+    });
+
+    test('exposes the child host instance when Reanimated re-resolves it on update', () => {
+      refreshSpy.mockReturnValue(true);
+      const wrapRef = React.createRef<Wrap>();
+      const childRef = React.createRef<ChildWithHostInstance>();
+
+      render(
+        <Wrap ref={wrapRef}>
+          <ChildWithHostInstance ref={childRef} />
+        </Wrap>
+      );
+
+      expect(childRef.current).not.toBeNull();
+      expect(wrapRef.current?.getAnimatableRef()).toBe(childRef.current);
+    });
+
+    test('falls back to itself without a host instance', () => {
+      refreshSpy.mockReturnValue(true);
+      const wrapRef = React.createRef<Wrap>();
+
+      render(
+        <Wrap ref={wrapRef}>
+          <ChildIgnoringRef />
+        </Wrap>
+      );
+
+      expect(wrapRef.current).not.toBeNull();
+      expect(wrapRef.current?.getAnimatableRef()).toBe(wrapRef.current);
+    });
+
+    test('returns itself when Reanimated caches the animatable ref', () => {
+      refreshSpy.mockReturnValue(false);
+      const wrapRef = React.createRef<Wrap>();
+      const childRef = React.createRef<ChildWithHostInstance>();
+
+      render(
+        <Wrap ref={wrapRef}>
+          <ChildWithHostInstance ref={childRef} />
+        </Wrap>
+      );
+
+      expect(childRef.current).not.toBeNull();
+      expect(wrapRef.current?.getAnimatableRef()).toBe(wrapRef.current);
+    });
+  });
+
   test('does not reattach gestures on re-render', () => {
     const gesture = Gesture.Tap();