access test 2

example/src/basic/multitap/index.tsx

@@ -41,16 +41,16 @@ export class PressBox extends Component<PressBoxProps> {
       // <LongPressGestureHandler
       //   onHandlerStateChange={this.onHandlerStateChange}
       //   minDurationMs={800}>
-      // <TapGestureHandler
-      //   onHandlerStateChange={this.onSingleTap}
-      //   waitFor={this.doubleTapRef}>
       <TapGestureHandler
-        ref={this.doubleTapRef}
-        onHandlerStateChange={this.onDoubleTap}
-        numberOfTaps={2}>
-        <View style={styles.box} />
+        onHandlerStateChange={this.onSingleTap}
+        waitFor={this.doubleTapRef}>
+        <TapGestureHandler
+          ref={this.doubleTapRef}
+          onHandlerStateChange={this.onDoubleTap}
+          numberOfTaps={2}>
+          <View style={styles.box} />
+        </TapGestureHandler>
       </TapGestureHandler>
-      // </TapGestureHandler>
       // </LongPressGestureHandler>
     );
   }

src/web/GestureHandler.ts

@@ -1,4 +1,4 @@
-import { findNodeHandle } from '../handlers/gestureHandlerCommon';
+import { findNodeHandle } from 'react-native';
 import { State } from '../State';
 import EventManager, { GHEvent } from './EventManager';
 import GestureHandlerOrchestrator from './GestureHandlerOrchestrator';
@@ -75,6 +75,7 @@ abstract class GestureHandler {
   // protected __initialX: any;
   // protected __initialY: any;
   protected config: Config = {};
+  protected enabled = false;
   // protected previousState: State = State.UNDETERMINED;
   private pendingGestures: Record<string, this> = {};
   // private oldState: State = State.UNDETERMINED;
@@ -108,16 +109,16 @@ abstract class GestureHandler {
     this.hasCustomActivationCriteria = false;
   }
 
-  getConfig() {
+  protected getConfig() {
     return this.config;
   }
 
-  removePendingGestures(id: string) {
+  protected removePendingGestures(id: string) {
     // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
     delete this.pendingGestures[id];
   }
 
-  addPendingGesture(gesture: this) {
+  public addPendingGesture(gesture: this) {
     this.pendingGestures[gesture.id] = gesture;
   }
 
@@ -129,7 +130,7 @@ abstract class GestureHandler {
     }
   }
 
-  updateGestureConfig({ enabled = true, ...props }): void {
+  public updateGestureConfig({ enabled = true, ...props }): void {
     this.clearSelfAsPending();
 
     this.config = this.ensureConfig({ enabled, ...props });
@@ -142,7 +143,7 @@ abstract class GestureHandler {
     }
   }
 
-  getState(): State {
+  public getState(): State {
     return this.currentState;
   }
 
@@ -184,11 +185,11 @@ abstract class GestureHandler {
     this.eventManager.setOutOfBoundsAction(this.onOutOfBoundsAction.bind(this));
   }
 
-  destroy() {
+  public destroy() {
     this.clearSelfAsPending();
   }
 
-  ensureConfig(config: Config): Required<Config> {
+  private ensureConfig(config: Config): Required<Config> {
     const props = { ...config };
 
     if (config.minDist) {
@@ -239,7 +240,7 @@ abstract class GestureHandler {
     return props as Required<Config>;
   }
 
-  asArray<T>(value: T | T[]) {
+  private asArray<T>(value: T | T[]) {
     return !value ? [] : Array.isArray(value) ? value : [value];
   }
 
@@ -248,8 +249,8 @@ abstract class GestureHandler {
   }
 
   //Handling states changes
-  abstract onCancel(): void;
-  abstract onReset(): void;
+  protected abstract onCancel(): void;
+  protected abstract onReset(): void;
   protected resetProgress(): void {
     //
   }
@@ -270,7 +271,7 @@ abstract class GestureHandler {
   public moveToState(newState: State, event: GHEvent) {
     if (this.currentState === newState) return;
 
-    console.log(newState, this.currentState);
+    // console.log(`${this.currentState} -> ${newState}`);
 
     if (
       this.tracker.getTrackedPointersNumber() > 0 &&
@@ -326,7 +327,7 @@ abstract class GestureHandler {
     }
   }
 
-  protected activate(event: GHEvent, _force = false) {
+  protected activate(event: GHEvent, force = false) {
     if (
       this.currentState === State.UNDETERMINED ||
       this.currentState === State.BEGAN
@@ -336,7 +337,8 @@ abstract class GestureHandler {
   }
 
   public end(event: GHEvent) {
-    if (this.getState() !== State.ACTIVE) this.resetProgress();
+    // if (this.getState() !== State.ACTIVE) this.resetProgress();
+    this.resetProgress();
     if (this.currentState === State.BEGAN || this.currentState === State.ACTIVE)
       this.moveToState(State.END, event);
   }

src/web/GestureHandlerOrchestrator.ts

@@ -102,9 +102,7 @@ export default class GestureHandlerOrchestrator {
     oldState: State,
     event: GHEvent
   ): void {
-    // console.log(getKeyByValue(newState));
-    // console.log(getKeyByValue(oldState));
-    // console.log(event);
+    // console.log(oldState, newState, handler.id);
     handler.sendEvent(event, newState, oldState);
   }
 

src/web/PanGestureHandler.ts

@@ -33,8 +33,6 @@ class PanGestureHandler extends GestureHandler {
   private defaultMinDistSq: number =
     this.DEFAULT_TOUCH_SLOP * this.DEFAULT_TOUCH_SLOP;
 
-  private enabled = false;
-
   private minDistSq = this.defaultMinDistSq;
 
   private activeOffsetXStart = Number.MAX_SAFE_INTEGER;
@@ -73,7 +71,7 @@ class PanGestureHandler extends GestureHandler {
     return 'pan';
   }
 
-  updateGestureConfig({ ...props }): void {
+  public updateGestureConfig({ ...props }): void {
     super.updateGestureConfig({ enabled: true, ...props });
 
     for (const key in this.config) {
@@ -143,7 +141,7 @@ class PanGestureHandler extends GestureHandler {
     }
   }
 
-  transformNativeEvent(event: GHEvent): any {
+  protected transformNativeEvent(event: GHEvent): any {
     if (!this.view) return;
 
     const rect = this.view.getBoundingClientRect();
@@ -186,19 +184,17 @@ class PanGestureHandler extends GestureHandler {
     this.activateAfterLongPress = 0;
   }
 
-  getTranslationX(): number {
+  private getTranslationX(): number {
     return this.lastX - this.startX + this.offsetX;
   }
-  getTranslationY(): number {
+  private getTranslationY(): number {
     return this.lastY - this.startY + this.offsetY;
   }
 
   //EventsHandling
-  onDownAction(event: GHEvent): void {
+  protected onDownAction(event: GHEvent): void {
     super.onDownAction(event);
-
-    this.tracker.addToTracker(event.pointerId);
-    this.tracker.track(event);
+    this.tracker.addToTracker(event);
 
     if (this.tracker.getTrackedPointersNumber() > 1) {
       event.eventType = EventTypes.POINTER_DOWN;
@@ -212,7 +208,7 @@ class PanGestureHandler extends GestureHandler {
     this.checkUndetermined(event);
     this.checkBegan(event);
   }
-  onPointerAdd(event: GHEvent): void {
+  protected onPointerAdd(event: GHEvent): void {
     this.offsetX += this.lastX - this.startX;
     this.offsetY += this.lastY - this.startY;
 
@@ -230,7 +226,7 @@ class PanGestureHandler extends GestureHandler {
     } else this.checkBegan(event);
   }
 
-  onUpAction(event: GHEvent): void {
+  protected onUpAction(event: GHEvent): void {
     super.onUpAction(event);
 
     if (this.tracker.getTrackedPointersNumber() > 1) {
@@ -257,7 +253,7 @@ class PanGestureHandler extends GestureHandler {
       this.fail(event);
     }
   }
-  onPointerRemove(event: GHEvent): void {
+  protected onPointerRemove(event: GHEvent): void {
     this.offsetX += this.lastX - this.startX;
     this.offsetY += this.lastY - this.startY;
 
@@ -275,10 +271,11 @@ class PanGestureHandler extends GestureHandler {
     ) {
       this.resetProgress();
       this.fail(event);
+      // this.end(event);
     } else this.checkBegan(event);
   }
 
-  onMoveAction(event: GHEvent): void {
+  protected onMoveAction(event: GHEvent): void {
     this.tracker.track(event);
 
     this.lastX = this.tracker.getLastAvgX();
@@ -289,19 +286,19 @@ class PanGestureHandler extends GestureHandler {
 
     if (this.getState() === State.ACTIVE) super.onMoveAction(event);
   }
-  onOutAction(event: GHEvent): void {
+  protected onOutAction(event: GHEvent): void {
     super.onOutAction(event);
   }
-  onEnterAction(event: GHEvent): void {
+  protected onEnterAction(event: GHEvent): void {
     super.onEnterAction(event);
   }
-  onCancelAction(event: GHEvent): void {
+  protected onCancelAction(event: GHEvent): void {
     super.onCancelAction(event);
 
     this.tracker.resetTracker();
     this.fail(event);
   }
-  onOutOfBoundsAction(event: GHEvent): void {
+  protected onOutOfBoundsAction(event: GHEvent): void {
     this.tracker.track(event);
 
     this.lastX = this.tracker.getLastAvgX();
@@ -460,10 +457,10 @@ class PanGestureHandler extends GestureHandler {
     this.startY = this.lastY;
   }
 
-  onCancel(): void {
+  protected onCancel(): void {
     //
   }
-  onReset(): void {
+  protected onReset(): void {
     //
   }
 }