[Web] Migrate to get and set

src/RNGestureHandlerModule.web.ts

@@ -37,7 +37,7 @@
       handlerTag,
       new GestureClass(new GestureHandlerWebDelegate())
     );
-    InteractionManager.getInstance().configureInteractions(
+    InteractionManager.instance.configureInteractions(
       NodeManager.getHandler(handlerTag),
       config as unknown as Config
     );
@@ -63,12 +63,11 @@
     }
 
     // @ts-ignore Types should be HTMLElement or React.Component
     NodeManager.getHandler(handlerTag).init(newView, propsRef);
   },
   updateGestureHandler(handlerTag: number, newConfig: Config) {
     NodeManager.getHandler(handlerTag).updateGestureConfig(newConfig);
-
-    InteractionManager.getInstance().configureInteractions(
+    InteractionManager.instance.configureInteractions(
       NodeManager.getHandler(handlerTag),
       newConfig
     );

src/web/detectors/RotationGestureDetector.ts

@@ -18,10 +18,10 @@ export default class RotationGestureDetector
   private previousTime = 0;
 
   private previousAngle = 0;
-  private rotation = 0;
+  private _rotation = 0;
 
-  private anchorX = 0;
-  private anchorY = 0;
+  private _anchorX = 0;
+  private _anchorY = 0;
 
   private isInProgress = false;
 
@@ -85,7 +85,7 @@ export default class RotationGestureDetector
       return;
     }
 
-    const pointerIDs: IterableIterator<number> = tracker.getData().keys();
+    const pointerIDs: IterableIterator<number> = tracker.trackedPointers.keys();
 
     this.keyPointers[0] = pointerIDs.next().value as number;
     this.keyPointers[1] = pointerIDs.next().value as number;
@@ -143,24 +143,33 @@ export default class RotationGestureDetector
     return true;
   }
 
-  public getTimeDelta(): number {
-    return this.currentTime + this.previousTime;
+  public reset(): void {
+    this.keyPointers = [NaN, NaN];
+    this.isInProgress = false;
   }
 
-  public getAnchorX(): number {
-    return this.anchorX;
+  public get anchorX() {
+    return this._anchorX;
+  }
+  private set anchorX(value: number) {
+    this._anchorX = value;
   }
 
-  public getAnchorY(): number {
-    return this.anchorY;
+  public get anchorY() {
+    return this._anchorY;
+  }
+  private set anchorY(value: number) {
+    this._anchorY = value;
   }
 
-  public getRotation(): number {
-    return this.rotation;
+  public get rotation() {
+    return this._rotation;
+  }
+  private set rotation(value: number) {
+    this._rotation = value;
   }
 
-  public reset(): void {
-    this.keyPointers = [NaN, NaN];
-    this.isInProgress = false;
+  public get timeDelta() {
+    return this.currentTime + this.previousTime;
   }
 }

src/web/detectors/ScaleGestureDetector.ts

@@ -14,10 +14,10 @@ export default class ScaleGestureDetector implements ScaleGestureListener {
   public onScale: (detector: ScaleGestureDetector) => boolean;
   public onScaleEnd: (detector: ScaleGestureDetector) => void;
 
-  private focusX!: number;
-  private focusY!: number;
+  private _focusX!: number;
+  private _focusY!: number;
 
-  private currentSpan!: number;
+  private _currentSpan!: number;
   private prevSpan!: number;
   private initialSpan!: number;
 
@@ -42,7 +42,7 @@ export default class ScaleGestureDetector implements ScaleGestureListener {
     this.currentTime = event.time;
 
     const action: EventTypes = event.eventType;
-    const numOfPointers = tracker.getTrackedPointersCount();
+    const numOfPointers = tracker.trackedPointersCount;
 
     const streamComplete: boolean =
       action === EventTypes.UP ||
@@ -86,7 +86,7 @@ export default class ScaleGestureDetector implements ScaleGestureListener {
     let devSumX = 0;
     let devSumY = 0;
 
-    tracker.getData().forEach((value, key) => {
+    tracker.trackedPointers.forEach((value, key) => {
       if (key === ignoredPointer) {
         return;
       }
@@ -145,27 +145,36 @@ export default class ScaleGestureDetector implements ScaleGestureListener {
     return true;
   }
 
-  public getCurrentSpan(): number {
-    return this.currentSpan;
-  }
+  public calculateScaleFactor(numOfPointers: number): number {
+    if (numOfPointers < 2) {
+      return 1;
+    }
 
-  public getFocusX(): number {
-    return this.focusX;
+    return this.prevSpan > 0 ? this.currentSpan / this.prevSpan : 1;
   }
 
-  public getFocusY(): number {
-    return this.focusY;
+  public get currentSpan() {
+    return this._currentSpan;
+  }
+  private set currentSpan(value: number) {
+    this._currentSpan = value;
   }
 
-  public getTimeDelta(): number {
-    return this.currentTime - this.prevTime;
+  public get focusX() {
+    return this._focusX;
+  }
+  private set focusX(value: number) {
+    this._focusX = value;
   }
 
-  public getScaleFactor(numOfPointers: number): number {
-    if (numOfPointers < 2) {
-      return 1;
-    }
+  public get focusY() {
+    return this._focusY;
+  }
+  private set focusY(value: number) {
+    this._focusY = value;
+  }
 
-    return this.prevSpan > 0 ? this.currentSpan / this.prevSpan : 1;
+  public get timeDelta() {
+    return this.currentTime - this.prevTime;
   }
 }

src/web/handlers/FlingGestureHandler.ts

@@ -125,29 +125,28 @@ export default class FlingGestureHandler extends GestureHandler {
   }
 
   private newPointerAction(): void {
-    if (this.currentState === State.UNDETERMINED) {
+    if (this.state === State.UNDETERMINED) {
       this.startFling();
     }
 
-    if (this.currentState !== State.BEGAN) {
+    if (this.state !== State.BEGAN) {
       return;
     }
 
     this.tryEndFling();
 
     if (
-      this.tracker.getTrackedPointersCount() >
-      this.maxNumberOfPointersSimultaneously
+      this.tracker.trackedPointersCount > this.maxNumberOfPointersSimultaneously
     ) {
       this.maxNumberOfPointersSimultaneously =
-        this.tracker.getTrackedPointersCount();
+        this.tracker.trackedPointersCount;
     }
   }
 
   private pointerMoveAction(event: AdaptedEvent): void {
     this.tracker.track(event);
 
-    if (this.currentState !== State.BEGAN) {
+    if (this.state !== State.BEGAN) {
       return;
     }
 
@@ -177,7 +176,7 @@ export default class FlingGestureHandler extends GestureHandler {
   }
 
   private onUp(event: AdaptedEvent): void {
-    if (this.currentState === State.BEGAN) {
+    if (this.state === State.BEGAN) {
       this.endFling();
     }