react-native-gesture-handler 2.7.0 → 2.7.1

package/src/handlers/gestures/gestureComposition.ts

@@ -69,14 +69,24 @@ export class ComposedGesture extends Gesture {
 
 export class SimultaneousGesture extends ComposedGesture {
   prepare() {
-    const simultaneousArray = this.gestures
-      .flatMap((gesture) => gesture.toGestureArray())
-      .concat(this.simultaneousGestures);
+    // this piece of magic works something like this:
+    // for every gesture in the array
+    const simultaneousArrays = this.gestures.map((gesture) =>
+      // we take the array it's in
+      this.gestures
+        // and make a copy without it
+        .filter((x) => x !== gesture)
+        // then we flatmap the result to get list of raw (not composed) gestures
+        // this way we don't make the gestures simultaneous with themselves, which is
+        // important when the gesture is `ExclusiveGesture` - we don't want to make
+        // exclusive gestures simultaneous
+        .flatMap((x) => x.toGestureArray())
+    );
 
-    for (const gesture of this.gestures) {
+    for (let i = 0; i < this.gestures.length; i++) {
       this.prepareSingleGesture(
-        gesture,
-        simultaneousArray,
+        this.gestures[i],
+        simultaneousArrays[i],
         this.requireGesturesToFail
       );
     }
@@ -85,6 +95,8 @@ export class SimultaneousGesture extends ComposedGesture {
 
 export class ExclusiveGesture extends ComposedGesture {
   prepare() {
+    // transforms the array of gestures into array of grouped raw (not composed) gestures
+    // i.e. [gesture1, gesture2, ComposedGesture(gesture3, gesture4)] -> [[gesture1], [gesture2], [gesture3, gesture4]]
     const gestureArrays = this.gestures.map((gesture) =>
       gesture.toGestureArray()
     );
@@ -98,6 +110,7 @@ export class ExclusiveGesture extends ComposedGesture {
         this.requireGesturesToFail.concat(requireToFail)
       );
 
+      // every group gets to wait for all groups before it
       requireToFail = requireToFail.concat(gestureArrays[i]);
     }
   }

package/src/web/handlers/FlingGestureHandler.ts

@@ -21,6 +21,7 @@ export default class FlingGestureHandler extends GestureHandler {
   private startY = 0;
 
   private maxNumberOfPointersSimultaneously = 0;
+  private keyPointer = NaN;
 
   public init(ref: number, propsRef: React.RefObject<unknown>): void {
     super.init(ref, propsRef);
@@ -51,9 +52,9 @@ export default class FlingGestureHandler extends GestureHandler {
     };
   }
 
-  private startFling(event: AdaptedEvent): void {
-    this.startX = event.x;
-    this.startY = event.y;
+  private startFling(): void {
+    this.startX = this.tracker.getLastX(this.keyPointer);
+    this.startY = this.tracker.getLastY(this.keyPointer);
 
     this.begin();
 
@@ -62,18 +63,22 @@ export default class FlingGestureHandler extends GestureHandler {
     this.delayTimeout = setTimeout(() => this.fail(), this.maxDurationMs);
   }
 
-  private tryEndFling(event: AdaptedEvent): boolean {
+  private tryEndFling(): boolean {
     if (
       this.maxNumberOfPointersSimultaneously ===
         this.numberOfPointersRequired &&
       ((this.direction & Direction.RIGHT &&
-        event.x - this.startX > this.minAcceptableDelta) ||
+        this.tracker.getLastX(this.keyPointer) - this.startX >
+          this.minAcceptableDelta) ||
         (this.direction & Direction.LEFT &&
-          this.startX - event.x > this.minAcceptableDelta) ||
+          this.startX - this.tracker.getLastX(this.keyPointer) >
+            this.minAcceptableDelta) ||
         (this.direction & Direction.UP &&
-          this.startY - event.y > this.minAcceptableDelta) ||
+          this.startY - this.tracker.getLastY(this.keyPointer) >
+            this.minAcceptableDelta) ||
         (this.direction & Direction.DOWN &&
-          event.y - this.startY > this.minAcceptableDelta))
+          this.tracker.getLastY(this.keyPointer) - this.startY >
+            this.minAcceptableDelta))
     ) {
       clearTimeout(this.delayTimeout);
       this.activate();
@@ -84,34 +89,36 @@ export default class FlingGestureHandler extends GestureHandler {
     return false;
   }
 
-  private endFling(event: AdaptedEvent) {
-    if (!this.tryEndFling(event)) {
+  private endFling() {
+    if (!this.tryEndFling()) {
       this.fail();
     }
   }
 
   protected onPointerDown(event: AdaptedEvent): void {
     this.tracker.addToTracker(event);
+    this.keyPointer = event.pointerId;
+
     super.onPointerDown(event);
-    this.newPointerAction(event);
+    this.newPointerAction();
   }
 
   protected onPointerAdd(event: AdaptedEvent): void {
     this.tracker.addToTracker(event);
     super.onPointerAdd(event);
-    this.newPointerAction(event);
+    this.newPointerAction();
   }
 
-  private newPointerAction(event: AdaptedEvent): void {
+  private newPointerAction(): void {
     if (this.currentState === State.UNDETERMINED) {
-      this.startFling(event);
+      this.startFling();
     }
 
     if (this.currentState !== State.BEGAN) {
       return;
     }
 
-    this.tryEndFling(event);
+    this.tryEndFling();
 
     if (
       this.tracker.getTrackedPointersCount() >
@@ -128,7 +135,7 @@ export default class FlingGestureHandler extends GestureHandler {
       return;
     }
 
-    this.tryEndFling(event);
+    this.tryEndFling();
 
     super.onPointerMove(event);
   }
@@ -136,6 +143,8 @@ export default class FlingGestureHandler extends GestureHandler {
   protected onPointerUp(event: AdaptedEvent): void {
     super.onPointerUp(event);
     this.onUp(event);
+
+    this.keyPointer = NaN;
   }
 
   protected onPointerRemove(event: AdaptedEvent): void {
@@ -148,7 +157,7 @@ export default class FlingGestureHandler extends GestureHandler {
     if (this.currentState !== State.BEGAN) {
       return;
     }
-    this.endFling(event);
+    this.endFling();
   }
 
   protected onPointerCancel(event: AdaptedEvent): void {

package/src/web/handlers/GestureHandler.ts

@@ -121,19 +121,17 @@ export default abstract class GestureHandler {
       return;
     }
 
+    const oldState = this.currentState;
+    this.currentState = newState;
+
     if (
       this.tracker.getTrackedPointersCount() > 0 &&
       this.config.needsPointerData &&
-      (newState === State.END ||
-        newState === State.CANCELLED ||
-        newState === State.FAILED)
+      this.isFinished()
     ) {
       this.cancelTouches();
     }
 
-    const oldState = this.currentState;
-    this.currentState = newState;
-
     GestureHandlerOrchestrator.getInstance().onHandlerStateChange(
       this,
       newState,
@@ -775,6 +773,14 @@ export default abstract class GestureHandler {
     return this.enabled;
   }
 
+  private isFinished(): boolean {
+    return (
+      this.currentState === State.END ||
+      this.currentState === State.FAILED ||
+      this.currentState === State.CANCELLED
+    );
+  }
+
   protected setShouldCancelWhenOutside(shouldCancel: boolean) {
     this.shouldCancellWhenOutside = shouldCancel;
   }

package/src/web/handlers/LongPressGestureHandler.ts

@@ -23,6 +23,8 @@ export default class LongPressGestureHandler extends GestureHandler {
   public init(ref: number, propsRef: React.RefObject<unknown>) {
     super.init(ref, propsRef);
     this.setShouldCancelWhenOutside(true);
+
+    this.view.oncontextmenu = () => false;
   }
 
   protected transformNativeEvent() {

package/src/web/handlers/NativeViewGestureHandler.ts

@@ -29,11 +29,8 @@ export default class NativeViewGestureHandler extends GestureHandler {
       this.buttonRole = true;
     } else {
       this.buttonRole = false;
-    }
-
-    if (this.view.tagName.toLowerCase() === 'input') {
-      //Enables text input on Safari
       this.view.style['webkitUserSelect'] = 'auto';
+      this.view.style['userSelect'] = 'auto';
     }
   }
 

package/src/web/handlers/PanGestureHandler.ts

@@ -98,8 +98,8 @@ export default class PanGestureHandler extends GestureHandler {
       this.activateAfterLongPress = this.config.activateAfterLongPress;
     }
 
-    if (this.config.shouldCancelWhenOutside) {
-      this.setShouldCancelWhenOutside(false);
+    if (this.config.shouldCancelWhenOutside !== undefined) {
+      this.setShouldCancelWhenOutside(this.config.shouldCancelWhenOutside);
     }
 
     if (this.config.activeOffsetXStart !== undefined) {

package/ios/RNGestureHandler.xcodeproj/xcuserdata/jakubpiasecki.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>RNGestureHandler-tvOS.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-		<key>RNGestureHandler.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>