react-native-gesture-handler 2.17.0 → 2.18.0

package/ReanimatedSwipeable/package.json

@@ -0,0 +1,6 @@
+{
+  "main": "../lib/commonjs/components/ReanimatedSwipeable",
+  "module": "../lib/module/components/ReanimatedSwipeable",
+  "react-native": "../src/components/ReanimatedSwipeable",
+  "types": "../lib/typescript/components/ReanimatedSwipeable.d.ts"
+}

package/android/build.gradle

@@ -207,108 +207,3 @@ dependencies {
     implementation "androidx.core:core-ktx:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
-
-def isGHExampleApp() {
-    return project.hasProperty('isGHExampleApp') && project.property('isGHExampleApp') == "true"
-}
-
-def getAbsoluteCodegenArtifactsPaperDestination() {
-    if (!project.hasProperty('codegenArtifactsPaperDestination')) {
-        throw new Exception('[react-native-gesture-handler] Please fill codegenArtifactsPaperDestination variable in android/gradle.properties to point to the correct path to generated specs for paper')
-    }
-
-    return "${project.rootDir}/../../${project.property('codegenArtifactsPaperDestination')}"
-}
-
-def getAbsoluteCodegenArtifactsSource() {
-    if (!project.hasProperty('codegenArtifactsSource')) {
-        throw new Exception('[react-native-gesture-handler] Please fill codegenArtifactsSource variable in android/gradle.properties to point to the correct path to codegenerated artifacts')
-    }
-
-    return "${project.rootDir}/../../${project.property('codegenArtifactsSource')}"
-}
-
-
-tasks.register('copyCodegenArtifacts') {
-    group 'After build tasks'
-    description 'Task which copies codegen artifacts to paper architecture'
-    
-    if (!isGHExampleApp() || !isNewArchitectureEnabled()) {
-        return
-    }
-
-    dependsOn tasks.generateCodegenArtifactsFromSchema
-
-    doLast {
-
-        def absoluteCodegenArtifactsPaperDestination = getAbsoluteCodegenArtifactsPaperDestination()
-        def absoluteCodegenArtifactsSource = getAbsoluteCodegenArtifactsSource()
-
-        def existingFiles = fileTree(absoluteCodegenArtifactsPaperDestination).matching {
-            include '**/*.java'
-        }
-
-        def generatedFiles = fileTree(absoluteCodegenArtifactsSource).matching {
-            include '**/*.java'
-        }
-
-        def existingFilesMap = [:]
-
-        existingFiles.forEach { existingFile ->
-            println existingFile
-            existingFilesMap[existingFile.name] = 1
-        }
-
-        generatedFiles.forEach { generatedFile -> 
-            if (!existingFilesMap.containsKey(generatedFile.name)) {
-                logger.warn("[react-native-gesture-handler] ${generatedFile.name} not found in paper dir, if it's used on Android you need to copy it manually and implement yourself before using auto-copy feature.")
-            }
-        }
-
-        if (existingFiles.size() == 0) {
-            logger.warn("[react-native-gesture-handler] Paper destination with codegen interfaces is empty. This might be okay if you don't have any interfaces/delegates used on Android, but if that's not the case please check if codegenArtifactsPaperDestination property in android/gradle.properties is correct.")
-        }
-
-        existingFiles.forEach { existingFile -> 
-            def generatedFile = new File("${absoluteCodegenArtifactsSource}/${existingFile.name}")
-
-            if (!generatedFile.exists()) {
-                logger.warn("[react-native-gesture-handler] ${existingFile.name} file does not exist in codegen artifacts source destination. Please check if you still need this interface/delagete.")
-            }
-        }
-
-        copy {
-            from absoluteCodegenArtifactsSource
-            include existingFiles.collect { it.name }
-            into absoluteCodegenArtifactsPaperDestination
-        }
-    }
-}
-
-if (isGHExampleApp() && isNewArchitectureEnabled() && !project.hasProperty('skipCodegenCopyTask')) {
-    tasks.generateCodegenArtifactsFromSchema.finalizedBy('copyCodegenArtifacts')
-}
-
-tasks.register('checkIntegrityBetweenArchitectures') {
-    group 'Verification tasks'
-    description 'Task to check integrity between fabric and paper architecture in terms of codegen generated interfaces/delegates'
-
-    if (isGHExampleApp()) {
-        return
-    }
-
-    def absoluteCodegenArtifactsPaperDestination = "../${project.property('codegenArtifactsPaperDestination')}"
-    def absoluteCodegenArtifactsSource = "../${project.property('codegenArtifactsSource')}"
-
-    def existingFiles = fileTree(absoluteCodegenArtifactsPaperDestination).matching {
-        include '**/*.java'
-    }
-
-    existingFiles.forEach { existingFile -> 
-        def generatedFile = new File("${absoluteCodegenArtifactsSource}/${existingFile.name}")
-
-        if (existingFile.text != generatedFile.text) {
-            throw new RuntimeException("[react-native-gesture-handler] The source of ${existingFile.name} does not match with the one generated by codegen. Please check if you commited changes produced by copyCodegenArtifacts task.")
-        }
-    }
-}

package/android/gradle.properties

@@ -17,10 +17,3 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemor
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 RNGH_kotlinVersion=1.6.21
-
-# Path to codegen output directory with this library view managers' interfaces & delegates. Used by `copyCodegenArtifacts` task that helps to synchronize newly generated files with their Paper counterparts.
-codegenArtifactsSource=android/build/generated/source/codegen/java/com/facebook/react/viewmanagers
-
-# Path to directory with view managers' interfaces & delegates used while running on Paper architecture. This property is used as the output path for `copyCodegenArtifacts` task.
-# Used by copyCodegenArtifacts task that automates copying those interfaces/delegates after codegen is run.
-codegenArtifactsPaperDestination=android/paper/src/main/java/com/facebook/react/viewmanagers

package/android/paper/src/main/java/com/swmansion/gesturehandler/NativeRNGestureHandlerModuleSpec.java

@@ -1,15 +1,27 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
 package com.swmansion.gesturehandler;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 import javax.annotation.Nonnull;
-import com.facebook.react.bridge.ReactMethod;
 
-public abstract class NativeRNGestureHandlerModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
+public abstract class NativeRNGestureHandlerModuleSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
   public static final String NAME = "RNGestureHandlerModule";
 
   public NativeRNGestureHandlerModuleSpec(ReactApplicationContext reactContext) {
@@ -21,35 +33,35 @@ public abstract class NativeRNGestureHandlerModuleSpec extends ReactContextBaseJ
     return NAME;
   }
 
-  @DoNotStrip
   @ReactMethod
+  @DoNotStrip
   public abstract void handleSetJSResponder(double tag, boolean blockNativeResponder);
 
-  @DoNotStrip
   @ReactMethod
+  @DoNotStrip
   public abstract void handleClearJSResponder();
 
-  @DoNotStrip
   @ReactMethod
+  @DoNotStrip
   public abstract void createGestureHandler(String handlerName, double handlerTag, ReadableMap config);
 
-  @DoNotStrip
   @ReactMethod
+  @DoNotStrip
   public abstract void attachGestureHandler(double handlerTag, double newView, double actionType);
 
-  @DoNotStrip
   @ReactMethod
+  @DoNotStrip
   public abstract void updateGestureHandler(double handlerTag, ReadableMap newConfig);
 
-  @DoNotStrip
   @ReactMethod
+  @DoNotStrip
   public abstract void dropGestureHandler(double handlerTag);
 
+  @ReactMethod(isBlockingSynchronousMethod = true)
   @DoNotStrip
-  @ReactMethod
   public abstract boolean install();
 
-  @DoNotStrip
   @ReactMethod
+  @DoNotStrip
   public abstract void flushOperations();
 }

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

@@ -615,7 +615,7 @@ class GestureHandlerOrchestrator(
     private val matrixTransformCoords = FloatArray(2)
     private val inverseMatrix = Matrix()
     private val tempCoords = FloatArray(2)
-    private val handlersComparator = Comparator<GestureHandler<*>?> { a, b ->
+    private val handlersComparator = Comparator<GestureHandler<*>> { a, b ->
       return@Comparator if (a.isActive && b.isActive || a.isAwaiting && b.isAwaiting) {
         // both A and B are either active or awaiting activation, in which case we prefer one that
         // has activated (or turned into "awaiting" state) earlier

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

@@ -9,6 +9,8 @@ import android.widget.ScrollView
 import com.facebook.react.views.scroll.ReactScrollView
 import com.facebook.react.views.swiperefresh.ReactSwipeRefreshLayout
 import com.facebook.react.views.textinput.ReactEditText
+import com.swmansion.gesturehandler.react.RNGestureHandlerButtonViewManager
+import com.swmansion.gesturehandler.react.isScreenReaderOn
 
 class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
   private var shouldActivateOnStart = false
@@ -82,6 +84,17 @@ class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
 
   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()
@@ -106,13 +119,16 @@ class NativeViewGestureHandler : GestureHandler<NativeViewGestureHandler>() {
           view.onTouchEvent(event)
           activate()
         }
+
         tryIntercept(view, event) -> {
           view.onTouchEvent(event)
           activate()
         }
+
         hook.wantsToHandleEventBeforeActivation() -> {
           hook.handleEventBeforeActivation(event)
         }
+
         state != STATE_BEGAN -> {
           if (hook.canBegin(event)) {
             begin()

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

@@ -70,14 +70,13 @@ class PinchGestureHandler : GestureHandler<PinchGestureHandler>() {
       this.focalPointX = point.x
       this.focalPointY = point.y
     }
-    var activePointers = sourceEvent.pointerCount
-    if (sourceEvent.actionMasked == MotionEvent.ACTION_POINTER_UP) {
-      activePointers -= 1
-    }
-    if (state == STATE_ACTIVE && activePointers < 2) {
-      end()
-    } else if (sourceEvent.actionMasked == MotionEvent.ACTION_UP) {
-      fail()
+
+    if (sourceEvent.actionMasked == MotionEvent.ACTION_UP) {
+      if (state == STATE_ACTIVE) {
+        end()
+      } else {
+        fail()
+      }
     }
   }
 

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

@@ -111,11 +111,21 @@ class RotationGestureDetector(private val gestureListener: OnRotationGestureList
         updateCurrent(event)
         gestureListener?.onRotation(this)
       }
-      MotionEvent.ACTION_POINTER_UP -> if (isInProgress) {
+      MotionEvent.ACTION_POINTER_UP -> {
         val pointerId = event.getPointerId(event.actionIndex)
-        if (pointerId == pointerIds[0] || pointerId == pointerIds[1]) {
-          // One of the key pointer has been lifted up, we have to end the gesture
-          finish()
+
+        // All key pointers are up
+        if (!isInProgress && pointerId == pointerIds[0]) {
+          gestureListener?.onRotationEnd(this)
+        }
+
+        // One of the key pointers is up
+        if (isInProgress && pointerIds.contains(pointerId)) {
+          if (pointerId == pointerIds[0]) {
+            pointerIds[0] = pointerIds[1]
+          }
+          pointerIds[1] = MotionEvent.INVALID_POINTER_ID
+          isInProgress = false
         }
       }
       MotionEvent.ACTION_UP -> finish()

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

@@ -9,6 +9,7 @@ package com.swmansion.gesturehandler.react
 import androidx.core.util.Pools
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.Event
 import com.swmansion.gesturehandler.core.GestureHandler
 import com.swmansion.gesturehandler.react.eventbuilders.GestureHandlerEventDataBuilder
@@ -29,7 +30,8 @@ class RNGestureHandlerEvent private constructor() : Event<RNGestureHandlerEvent>
     dataBuilder: GestureHandlerEventDataBuilder<T>,
     useNativeAnimatedName: Boolean
   ) {
-    super.init(handler.view!!.id)
+    val view = handler.view!!
+    super.init(UIManagerHelper.getSurfaceId(view), view.id)
     this.dataBuilder = dataBuilder
     this.useTopPrefixedName = useNativeAnimatedName
     coalescingKey = handler.eventCoalescingKey

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

@@ -9,6 +9,7 @@ package com.swmansion.gesturehandler.react
 import androidx.core.util.Pools
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.Event
 import com.swmansion.gesturehandler.core.GestureHandler
 import com.swmansion.gesturehandler.react.eventbuilders.GestureHandlerEventDataBuilder
@@ -24,7 +25,8 @@ class RNGestureHandlerStateChangeEvent private constructor() : Event<RNGestureHa
     oldState: Int,
     dataBuilder: GestureHandlerEventDataBuilder<T>,
   ) {
-    super.init(handler.view!!.id)
+    val view = handler.view!!
+    super.init(UIManagerHelper.getSurfaceId(view), view.id)
     this.dataBuilder = dataBuilder
     this.newState = newState
     this.oldState = oldState

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

@@ -11,7 +11,8 @@ class RNGestureHandlerTouchEvent private constructor() : Event<RNGestureHandlerT
   private var extraData: WritableMap? = null
   private var coalescingKey: Short = 0
   private fun <T : GestureHandler<T>> init(handler: T) {
-    super.init(UIManagerHelper.getSurfaceId(handler.view), handler.view!!.id)
+    val view = handler.view!!
+    super.init(UIManagerHelper.getSurfaceId(view), view.id)
     extraData = createEventData(handler)
     coalescingKey = handler.eventCoalescingKey
   }

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

@@ -4,6 +4,8 @@ import android.view.View
 import android.view.ViewGroup
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
+import com.facebook.react.views.scroll.ReactHorizontalScrollView
+import com.facebook.react.views.scroll.ReactScrollView
 import com.facebook.react.views.view.ReactViewGroup
 import com.swmansion.gesturehandler.core.PointerEventsConfig
 import com.swmansion.gesturehandler.core.ViewConfigurationHelper
@@ -40,12 +42,11 @@ class RNViewConfigurationHelper : ViewConfigurationHelper {
     } else parent.getChildAt(index)
   }
 
-  override fun isViewClippingChildren(view: ViewGroup): Boolean {
-    if (view.clipChildren) {
-      return true
-    }
-    return if (view is ReactViewGroup) {
-      "hidden" == view.overflow
-    } else false
+  override fun isViewClippingChildren(view: ViewGroup) = when {
+    view.clipChildren -> true
+    view is ReactScrollView -> view.overflow != "visible"
+    view is ReactHorizontalScrollView -> view.overflow != "visible"
+    view is ReactViewGroup -> view.overflow == "hidden"
+    else -> false
   }
 }

package/android/src/main/jni/cpp-adapter.cpp

@@ -18,9 +18,11 @@ void decorateRuntime(jsi::Runtime &runtime) {
                 if (!arguments[0].isObject()) {
                     return jsi::Value::null();
                 }
-                auto shadowNode = arguments[0]
-                        .asObject(runtime).getNativeState<ShadowNode>(runtime);
-                bool isFormsStackingContext = shadowNode->getTraits().check(ShadowNodeTraits::FormsStackingContext);
+
+                auto shadowNodeWrapper = arguments[0]
+                        .asObject(runtime).getNativeState<ShadowNodeWrapper>(runtime);
+                bool isFormsStackingContext = shadowNodeWrapper->shadowNode->getTraits()
+                        .check(ShadowNodeTraits::FormsStackingContext);
 
                 return jsi::Value(isFormsStackingContext);
             });

package/apple/Handlers/RNFlingHandler.m

@@ -60,6 +60,7 @@
   _lastPoint = [[[touches allObjects] objectAtIndex:0] locationInView:_gestureHandler.recognizer.view];
   [super touchesCancelled:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
+  [self reset];
 }
 
 - (void)triggerAction

package/apple/Handlers/RNForceTouchHandler.m

@@ -115,6 +115,7 @@ static const BOOL defaultFeedbackOnActivation = NO;
 {
   [super touchesCancelled:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
+  [self reset];
 }
 
 - (void)handleForceWithTouches:(NSSet<RNGHUITouch *> *)touches
@@ -184,6 +185,7 @@ static const BOOL defaultFeedbackOnActivation = NO;
 
 - (instancetype)initWithTag:(NSNumber *)tag
 {
+  RCTLogWarn(@"ForceTouchHandler is not supported on macOS");
   if ((self = [super initWithTag:tag])) {
     _recognizer = [NSGestureRecognizer alloc];
   }

package/apple/Handlers/RNLongPressHandler.m

@@ -75,7 +75,7 @@
   CGPoint trans = [self translationInView];
   if ((_gestureHandler.shouldCancelWhenOutside && ![_gestureHandler containsPointInView]) ||
       (TEST_MAX_IF_NOT_NAN(
-          fabs(trans.y * trans.y + trans.x + trans.x), self.allowableMovement * self.allowableMovement))) {
+          fabs(trans.y * trans.y + trans.x * trans.x), self.allowableMovement * self.allowableMovement))) {
     self.enabled = NO;
     self.enabled = YES;
   }
@@ -91,6 +91,7 @@
 {
   [super touchesCancelled:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
+  [self reset];
 }
 
 - (void)reset

package/apple/Handlers/RNManualHandler.m

@@ -57,6 +57,7 @@
 {
   [super touchesCancelled:touches withEvent:event];
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
+  [self reset];
 }
 
 - (void)reset

package/apple/Handlers/RNNativeViewHandler.mm

@@ -21,8 +21,6 @@
 #import <React/RCTScrollView.h>
 #endif // RCT_NEW_ARCH_ENABLED
 
-#if !TARGET_OS_OSX
-
 #pragma mark RNDummyGestureRecognizer
 
 @implementation RNDummyGestureRecognizer {
@@ -37,6 +35,7 @@
   return self;
 }
 
+#if !TARGET_OS_OSX
 - (void)touchesBegan:(NSSet<RNGHUITouch *> *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler setCurrentPointerType:event];
@@ -62,6 +61,30 @@
   [self reset];
 }
 
+#else
+- (void)mouseDown:(NSEvent *)event
+{
+  [_gestureHandler setCurrentPointerTypeToMouse];
+
+  self.state = NSGestureRecognizerStateBegan;
+  [_gestureHandler.pointerTracker touchesBegan:[NSSet setWithObject:event] withEvent:event];
+}
+
+- (void)mouseDragged:(NSEvent *)event
+{
+  self.state = NSGestureRecognizerStateChanged;
+  [_gestureHandler.pointerTracker touchesMoved:[NSSet setWithObject:event] withEvent:event];
+}
+
+- (void)mouseUp:(NSEvent *)event
+{
+  self.state = NSGestureRecognizerStateEnded;
+  [_gestureHandler.pointerTracker touchesEnded:[NSSet setWithObject:event] withEvent:event];
+  [self reset];
+}
+
+#endif
+
 - (void)reset
 {
   [_gestureHandler.pointerTracker reset];
@@ -93,6 +116,8 @@
   _disallowInterruption = [RCTConvert BOOL:config[@"disallowInterruption"]];
 }
 
+#if !TARGET_OS_OSX
+
 - (void)bindToView:(UIView *)view
 {
   // For UIControl based views (UIButton, UISwitch) we provide special handling that would allow
@@ -197,35 +222,14 @@
             withExtraData:[RNGestureHandlerEventExtraData forPointerInside:NO withPointerType:_pointerType]];
 }
 
-@end
-
 #else
 
-#pragma mark RNDummyGestureRecognizer
-
-@implementation RNDummyGestureRecognizer
-
-- (id)initWithGestureHandler:(RNGestureHandler *)gestureHandler
+- (RNGestureHandlerEventExtraData *)eventExtraData:(RNDummyGestureRecognizer *)recognizer
 {
-  self = [super initWithTarget:gestureHandler action:@selector(handleGesture:)];
-  return self;
+  return [RNGestureHandlerEventExtraData forPointerInside:[self containsPointInView]
+                                          withPointerType:RNGestureHandlerMouse];
 }
 
-@end
-
-#pragma mark RNNativeViewGestureHandler
-
-@implementation RNNativeViewGestureHandler
-
-- (instancetype)initWithTag:(NSNumber *)tag
-{
-  RCTLogWarn(@"NativeViewGestureHandler is not supported on macOS");
-  if ((self = [super initWithTag:tag])) {
-    _recognizer = [NSGestureRecognizer alloc];
-  }
-  return self;
-}
+#endif
 
 @end
-
-#endif

package/apple/Handlers/RNPanHandler.m

@@ -161,6 +161,7 @@
 - (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
+  [self reset];
 }
 
 #if TARGET_OS_OSX

package/apple/Handlers/RNPinchHandler.m

@@ -73,6 +73,7 @@
 - (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
+  [self reset];
 }
 
 #if TARGET_OS_OSX

package/apple/Handlers/RNRotationHandler.m

@@ -67,6 +67,7 @@
 - (void)interactionsCancelled:(NSSet *)touches withEvent:(UIEvent *)event
 {
   [_gestureHandler.pointerTracker touchesCancelled:touches withEvent:event];
+  [self reset];
 }
 
 #if TARGET_OS_OSX

package/apple/Handlers/RNTapHandler.m

@@ -206,6 +206,7 @@ static const NSTimeInterval defaultMaxDuration = 0.5;
 {
   [super touchesCancelled:touches withEvent:event];
   [self interactionsCancelled:touches withEvent:event];
+  [self reset];
 }
 
 #endif

package/apple/RNGestureHandlerModule.mm

@@ -99,9 +99,10 @@ void decorateRuntime(jsi::Runtime &runtime)
         if (!arguments[0].isObject()) {
           return jsi::Value::null();
         }
-        auto shadowNode = arguments[0].asObject(runtime).getNativeState<ShadowNode>(runtime);
-        bool isFormsStackingContext = shadowNode->getTraits().check(ShadowNodeTraits::FormsStackingContext);
 
+        auto shadowNodeWrapper = arguments[0].asObject(runtime).getNativeState<ShadowNodeWrapper>(runtime);
+        bool isFormsStackingContext =
+            shadowNodeWrapper->shadowNode->getTraits().check(ShadowNodeTraits::FormsStackingContext);
         return jsi::Value(isFormsStackingContext);
       });
   runtime.global().setProperty(runtime, "isFormsStackingContext", std::move(isFormsStackingContext));

package/apple/RNRootViewGestureRecognizer.m

@@ -113,6 +113,11 @@
 {
   [super rightMouseDown:event];
   [self interactionsBegan:[NSSet setWithObject:event] withEvent:event];
+
+  // This line fixes issue in which handlers couldn't react to mouse clicks after right click.
+  // Right click opens context menu, which prevents RootView from receiving rightMouseUp. This leads
+  // to a situation where RootView is left in Possible state, instead of Failed, thus blocking other handlers.
+  self.state = NSGestureRecognizerStateFailed;
 }
 
 - (void)mouseDragged:(NSEvent *)event

package/lib/commonjs/Directions.js

@@ -7,14 +7,14 @@ exports.DiagonalDirections = exports.Directions = void 0;
 const RIGHT = 1;
 const LEFT = 2;
 const UP = 4;
-const DOWN = 8; // public interface
+const DOWN = 8; // Public interface
 
 const Directions = {
   RIGHT: RIGHT,
   LEFT: LEFT,
   UP: UP,
   DOWN: DOWN
-}; // internal interface
+}; // Internal interface
 
 exports.Directions = Directions;
 const DiagonalDirections = {

package/lib/commonjs/Directions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["Directions.ts"],"names":["RIGHT","LEFT","UP","DOWN","Directions","DiagonalDirections","UP_RIGHT","DOWN_RIGHT","UP_LEFT","DOWN_LEFT"],"mappings":";;;;;;AAAA,MAAMA,KAAK,GAAG,CAAd;AACA,MAAMC,IAAI,GAAG,CAAb;AACA,MAAMC,EAAE,GAAG,CAAX;AACA,MAAMC,IAAI,GAAG,CAAb,C,CAEA;;AACO,MAAMC,UAAU,GAAG;AACxBJ,EAAAA,KAAK,EAAEA,KADiB;AAExBC,EAAAA,IAAI,EAAEA,IAFkB;AAGxBC,EAAAA,EAAE,EAAEA,EAHoB;AAIxBC,EAAAA,IAAI,EAAEA;AAJkB,CAAnB,C,CAOP;;;AACO,MAAME,kBAAkB,GAAG;AAChCC,EAAAA,QAAQ,EAAEJ,EAAE,GAAGF,KADiB;AAEhCO,EAAAA,UAAU,EAAEJ,IAAI,GAAGH,KAFa;AAGhCQ,EAAAA,OAAO,EAAEN,EAAE,GAAGD,IAHkB;AAIhCQ,EAAAA,SAAS,EAAEN,IAAI,GAAGF;AAJc,CAA3B,C,CAOP","sourcesContent":["const RIGHT = 1;\nconst LEFT = 2;\nconst UP = 4;\nconst DOWN = 8;\n\n// public interface\nexport const Directions = {\n  RIGHT: RIGHT,\n  LEFT: LEFT,\n  UP: UP,\n  DOWN: DOWN,\n} as const;\n\n// internal interface\nexport const DiagonalDirections = {\n  UP_RIGHT: UP | RIGHT,\n  DOWN_RIGHT: DOWN | RIGHT,\n  UP_LEFT: UP | LEFT,\n  DOWN_LEFT: DOWN | LEFT,\n} as const;\n\n// eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value\nexport type Directions = typeof Directions[keyof typeof Directions];\n// eslint-disable-next-line @typescript-eslint/no-redeclare\nexport type DiagonalDirections =\n  typeof DiagonalDirections[keyof typeof DiagonalDirections];\n"]}
+{"version":3,"sources":["Directions.ts"],"names":["RIGHT","LEFT","UP","DOWN","Directions","DiagonalDirections","UP_RIGHT","DOWN_RIGHT","UP_LEFT","DOWN_LEFT"],"mappings":";;;;;;AAAA,MAAMA,KAAK,GAAG,CAAd;AACA,MAAMC,IAAI,GAAG,CAAb;AACA,MAAMC,EAAE,GAAG,CAAX;AACA,MAAMC,IAAI,GAAG,CAAb,C,CAEA;;AACO,MAAMC,UAAU,GAAG;AACxBJ,EAAAA,KAAK,EAAEA,KADiB;AAExBC,EAAAA,IAAI,EAAEA,IAFkB;AAGxBC,EAAAA,EAAE,EAAEA,EAHoB;AAIxBC,EAAAA,IAAI,EAAEA;AAJkB,CAAnB,C,CAOP;;;AACO,MAAME,kBAAkB,GAAG;AAChCC,EAAAA,QAAQ,EAAEJ,EAAE,GAAGF,KADiB;AAEhCO,EAAAA,UAAU,EAAEJ,IAAI,GAAGH,KAFa;AAGhCQ,EAAAA,OAAO,EAAEN,EAAE,GAAGD,IAHkB;AAIhCQ,EAAAA,SAAS,EAAEN,IAAI,GAAGF;AAJc,CAA3B,C,CAOP","sourcesContent":["const RIGHT = 1;\nconst LEFT = 2;\nconst UP = 4;\nconst DOWN = 8;\n\n// Public interface\nexport const Directions = {\n  RIGHT: RIGHT,\n  LEFT: LEFT,\n  UP: UP,\n  DOWN: DOWN,\n} as const;\n\n// Internal interface\nexport const DiagonalDirections = {\n  UP_RIGHT: UP | RIGHT,\n  DOWN_RIGHT: DOWN | RIGHT,\n  UP_LEFT: UP | LEFT,\n  DOWN_LEFT: DOWN | LEFT,\n} as const;\n\n// eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value\nexport type Directions = typeof Directions[keyof typeof Directions];\n// eslint-disable-next-line @typescript-eslint/no-redeclare\nexport type DiagonalDirections =\n  typeof DiagonalDirections[keyof typeof DiagonalDirections];\n"]}

package/lib/commonjs/RNGestureHandlerModule.web.js

@@ -67,10 +67,10 @@ var _default = {
     }
 
     if ((0, _EnableNewWebImplementation.isNewWebImplementationEnabled)()) {
-      //@ts-ignore Types should be HTMLElement or React.Component
+      // @ts-ignore Types should be HTMLElement or React.Component
       _NodeManager.default.getHandler(handlerTag).init(newView, propsRef);
     } else {
-      //@ts-ignore Types should be HTMLElement or React.Component
+      // @ts-ignore Types should be HTMLElement or React.Component
       HammerNodeManager.getHandler(handlerTag).setView(newView, propsRef);
     }
   },