Merge branch 'main' into @akwasniewski/android-unresponsive-pressable

Author: akwasniewski

packages/react-native-gesture-handler/android/build.gradle

@@ -151,7 +151,6 @@ android {
         buildConfigField "int", "REACT_NATIVE_MINOR_VERSION", REACT_NATIVE_MINOR_VERSION.toString()
 
         if (isNewArchitectureEnabled()) {
-            var appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
             externalNativeBuild {
                 cmake {
                     cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++20", "-DANDROID"
@@ -215,7 +214,7 @@ android {
     }
 
     if (isGHExampleApp()) {
-        tasks.withType(ExternalNativeBuildJsonTask) {
+        tasks.withType(ExternalNativeBuildJsonTask).configureEach {
             compileTask ->
                 compileTask.doLast {
                     def rootDir = new File("${project.projectDir}/..")

packages/react-native-gesture-handler/src/handlers/gestures/GestureDetector/useAnimatedGesture.ts

@@ -163,7 +163,10 @@ export function useAnimatedGesture(
           runWorklet(CALLBACK_TYPE.FINALIZE, gesture, event, false);
         }
       } else if (isTouchEvent(event)) {
-        if (!stateControllers[i]) {
+        if (
+          !stateControllers[i] ||
+          stateControllers[i].handlerTag !== event.handlerTag
+        ) {
           stateControllers[i] = GestureStateManager.create(event.handlerTag);
         }
 

packages/react-native-gesture-handler/src/handlers/gestures/gestureStateManager.ts

@@ -7,6 +7,8 @@ export interface GestureStateManagerType {
   activate: () => void;
   fail: () => void;
   end: () => void;
+  /** @internal */
+  handlerTag: number;
 }
 
 const warningMessage = tagMessage(
@@ -21,6 +23,8 @@ const setGestureState = Reanimated?.setGestureState;
 function create(handlerTag: number): GestureStateManagerType {
   'worklet';
   return {
+    handlerTag,
+
     begin: () => {
       'worklet';
       if (REANIMATED_AVAILABLE) {

packages/react-native-gesture-handler/src/handlers/gestures/gestureStateManager.web.ts

@@ -4,6 +4,8 @@ import { GestureStateManagerType } from './gestureStateManager';
 export const GestureStateManager = {
   create(handlerTag: number): GestureStateManagerType {
     return {
+      handlerTag,
+
       begin: () => {
         NodeManager.getHandler(handlerTag).begin();
       },