react-native-gesture-handler 2.22.1 → 2.23.0

package/src/web/handlers/NativeViewGestureHandler.ts

@@ -19,13 +19,13 @@ export default class NativeViewGestureHandler extends GestureHandler {
   public init(ref: number, propsRef: React.RefObject<unknown>): void {
     super.init(ref, propsRef);
 
-    this.setShouldCancelWhenOutside(true);
+    this.shouldCancelWhenOutside = true;
 
     if (Platform.OS !== 'web') {
       return;
     }
 
-    const view = this.delegate.getView() as HTMLElement;
+    const view = this.delegate.view as HTMLElement;
 
     this.restoreViewStyles(view);
     this.buttonRole = view.getAttribute('role') === 'button';
@@ -41,7 +41,7 @@ export default class NativeViewGestureHandler extends GestureHandler {
       this.disallowInterruption = this.config.disallowInterruption;
     }
 
-    const view = this.delegate.getView() as HTMLElement;
+    const view = this.delegate.view as HTMLElement;
     this.restoreViewStyles(view);
   }
 
@@ -74,13 +74,13 @@ export default class NativeViewGestureHandler extends GestureHandler {
     this.startX = lastCoords.x;
     this.startY = lastCoords.y;
 
-    if (this.currentState !== State.UNDETERMINED) {
+    if (this.state !== State.UNDETERMINED) {
       return;
     }
 
     this.begin();
 
-    const view = this.delegate.getView() as HTMLElement;
+    const view = this.delegate.view as HTMLElement;
     const isRNGHText = view.hasAttribute('rnghtext');
 
     if (this.buttonRole || isRNGHText) {
@@ -97,19 +97,16 @@ export default class NativeViewGestureHandler extends GestureHandler {
     const distSq = dx * dx + dy * dy;
 
     if (distSq >= this.minDistSq) {
-      if (this.buttonRole && this.currentState === State.ACTIVE) {
+      if (this.buttonRole && this.state === State.ACTIVE) {
         this.cancel();
-      } else if (!this.buttonRole && this.currentState === State.BEGAN) {
+      } else if (!this.buttonRole && this.state === State.BEGAN) {
         this.activate();
       }
     }
   }
 
   protected onPointerLeave(): void {
-    if (
-      this.currentState === State.BEGAN ||
-      this.currentState === State.ACTIVE
-    ) {
+    if (this.state === State.BEGAN || this.state === State.ACTIVE) {
       this.cancel();
     }
   }
@@ -127,8 +124,8 @@ export default class NativeViewGestureHandler extends GestureHandler {
   private onUp(event: AdaptedEvent): void {
     this.tracker.removeFromTracker(event.pointerId);
 
-    if (this.tracker.getTrackedPointersCount() === 0) {
-      if (this.currentState === State.ACTIVE) {
+    if (this.tracker.trackedPointersCount === 0) {
+      if (this.state === State.ACTIVE) {
         this.end();
       } else {
         this.fail();
@@ -143,7 +140,7 @@ export default class NativeViewGestureHandler extends GestureHandler {
 
     if (
       handler instanceof NativeViewGestureHandler &&
-      handler.getState() === State.ACTIVE &&
+      handler.state === State.ACTIVE &&
       handler.disallowsInterruption()
     ) {
       return false;
@@ -152,17 +149,15 @@ export default class NativeViewGestureHandler extends GestureHandler {
     const canBeInterrupted = !this.disallowInterruption;
 
     if (
-      this.currentState === State.ACTIVE &&
-      handler.getState() === State.ACTIVE &&
+      this.state === State.ACTIVE &&
+      handler.state === State.ACTIVE &&
       canBeInterrupted
     ) {
       return false;
     }
 
     return (
-      this.currentState === State.ACTIVE &&
-      canBeInterrupted &&
-      handler.getTag() > 0
+      this.state === State.ACTIVE && canBeInterrupted && handler.handlerTag > 0
     );
   }
 

package/src/web/handlers/PanGestureHandler.ts

@@ -257,8 +257,8 @@ export default class PanGestureHandler extends GestureHandler {
     this.startX = this.lastX;
     this.startY = this.lastY;
 
-    if (this.tracker.getTrackedPointersCount() > this.maxPointers) {
-      if (this.currentState === State.ACTIVE) {
+    if (this.tracker.trackedPointersCount > this.maxPointers) {
+      if (this.state === State.ACTIVE) {
         this.cancel();
       } else {
         this.fail();
@@ -272,7 +272,7 @@ export default class PanGestureHandler extends GestureHandler {
     this.stylusData = event.stylusData;
 
     super.onPointerUp(event);
-    if (this.currentState === State.ACTIVE) {
+    if (this.state === State.ACTIVE) {
       const lastCoords = this.tracker.getAbsoluteCoordsAverage();
       this.lastX = lastCoords.x;
       this.lastY = lastCoords.y;
@@ -280,11 +280,11 @@ export default class PanGestureHandler extends GestureHandler {
 
     this.tracker.removeFromTracker(event.pointerId);
 
-    if (this.tracker.getTrackedPointersCount() === 0) {
+    if (this.tracker.trackedPointersCount === 0) {
       this.clearActivationTimeout();
     }
 
-    if (this.currentState === State.ACTIVE) {
+    if (this.state === State.ACTIVE) {
       this.end();
     } else {
       this.resetProgress();
@@ -308,8 +308,8 @@ export default class PanGestureHandler extends GestureHandler {
 
     if (
       !(
-        this.currentState === State.ACTIVE &&
-        this.tracker.getTrackedPointersCount() < this.minPointers
+        this.state === State.ACTIVE &&
+        this.tracker.trackedPointersCount < this.minPointers
       )
     ) {
       this.checkBegan();
@@ -334,7 +334,7 @@ export default class PanGestureHandler extends GestureHandler {
   }
 
   protected onPointerOutOfBounds(event: AdaptedEvent): void {
-    if (this.getShouldCancelWhenOutside()) {
+    if (this.shouldCancelWhenOutside) {
       return;
     }
 
@@ -351,7 +351,7 @@ export default class PanGestureHandler extends GestureHandler {
 
     this.checkBegan();
 
-    if (this.currentState === State.ACTIVE) {
+    if (this.state === State.ACTIVE) {
       super.onPointerOutOfBounds(event);
     }
   }
@@ -360,10 +360,10 @@ export default class PanGestureHandler extends GestureHandler {
     clearTimeout(this.endWheelTimeout);
 
     this.endWheelTimeout = setTimeout(() => {
-      if (this.currentState === State.ACTIVE) {
+      if (this.state === State.ACTIVE) {
         this.end();
         this.tracker.removeFromTracker(event.pointerId);
-        this.currentState = State.UNDETERMINED;
+        this.state = State.UNDETERMINED;
       }
 
       this.wheelDevice = WheelDevice.UNDETERMINED;
@@ -378,7 +378,7 @@ export default class PanGestureHandler extends GestureHandler {
       return;
     }
 
-    if (this.currentState === State.UNDETERMINED) {
+    if (this.state === State.UNDETERMINED) {
       this.wheelDevice =
         event.wheelDeltaY! % 120 !== 0
           ? WheelDevice.TOUCHPAD
@@ -523,8 +523,8 @@ export default class PanGestureHandler extends GestureHandler {
 
   private tryBegin(event: AdaptedEvent): void {
     if (
-      this.currentState === State.UNDETERMINED &&
-      this.tracker.getTrackedPointersCount() >= this.minPointers
+      this.state === State.UNDETERMINED &&
+      this.tracker.trackedPointersCount >= this.minPointers
     ) {
       this.resetProgress();
       this.offsetX = 0;
@@ -547,7 +547,7 @@ export default class PanGestureHandler extends GestureHandler {
   }
 
   private checkBegan(): void {
-    if (this.currentState === State.BEGAN) {
+    if (this.state === State.BEGAN) {
       if (this.shouldFail()) {
         this.fail();
       } else if (this.shouldActivate()) {
@@ -557,7 +557,7 @@ export default class PanGestureHandler extends GestureHandler {
   }
 
   public activate(force = false): void {
-    if (this.currentState !== State.ACTIVE) {
+    if (this.state !== State.ACTIVE) {
       this.resetProgress();
     }
 
@@ -573,7 +573,7 @@ export default class PanGestureHandler extends GestureHandler {
   }
 
   protected resetProgress(): void {
-    if (this.currentState === State.ACTIVE) {
+    if (this.state === State.ACTIVE) {
       return;
     }
 

package/src/web/handlers/PinchGestureHandler.ts

@@ -16,24 +16,23 @@ export default class PinchGestureHandler extends GestureHandler {
 
   private scaleDetectorListener: ScaleGestureListener = {
     onScaleBegin: (detector: ScaleGestureDetector): boolean => {
-      this.startingSpan = detector.getCurrentSpan();
+      this.startingSpan = detector.currentSpan;
       return true;
     },
     onScale: (detector: ScaleGestureDetector): boolean => {
       const prevScaleFactor: number = this.scale;
-      this.scale *= detector.getScaleFactor(
-        this.tracker.getTrackedPointersCount()
+      this.scale *= detector.calculateScaleFactor(
+        this.tracker.trackedPointersCount
       );
 
-      const delta = detector.getTimeDelta();
+      const delta = detector.timeDelta;
       if (delta > 0) {
         this.velocity = (this.scale - prevScaleFactor) / delta;
       }
 
       if (
-        Math.abs(this.startingSpan - detector.getCurrentSpan()) >=
-          this.spanSlop &&
-        this.currentState === State.BEGAN
+        Math.abs(this.startingSpan - detector.currentSpan) >= this.spanSlop &&
+        this.state === State.BEGAN
       ) {
         this.activate();
       }
@@ -52,13 +51,13 @@ export default class PinchGestureHandler extends GestureHandler {
   public init(ref: number, propsRef: React.RefObject<unknown>) {
     super.init(ref, propsRef);
 
-    this.setShouldCancelWhenOutside(false);
+    this.shouldCancelWhenOutside = false;
   }
 
   protected transformNativeEvent() {
     return {
-      focalX: this.scaleGestureDetector.getFocusX(),
-      focalY: this.scaleGestureDetector.getFocusY(),
+      focalX: this.scaleGestureDetector.focusX,
+      focalY: this.scaleGestureDetector.focusY,
       velocity: this.velocity,
       scale: this.scale,
     };
@@ -81,12 +80,12 @@ export default class PinchGestureHandler extends GestureHandler {
   protected onPointerUp(event: AdaptedEvent): void {
     super.onPointerUp(event);
     this.tracker.removeFromTracker(event.pointerId);
-    if (this.currentState !== State.ACTIVE) {
+    if (this.state !== State.ACTIVE) {
       return;
     }
     this.scaleGestureDetector.onTouchEvent(event, this.tracker);
 
-    if (this.currentState === State.ACTIVE) {
+    if (this.state === State.ACTIVE) {
       this.end();
     } else {
       this.fail();
@@ -98,16 +97,13 @@ export default class PinchGestureHandler extends GestureHandler {
     this.scaleGestureDetector.onTouchEvent(event, this.tracker);
     this.tracker.removeFromTracker(event.pointerId);
 
-    if (
-      this.currentState === State.ACTIVE &&
-      this.tracker.getTrackedPointersCount() < 2
-    ) {
+    if (this.state === State.ACTIVE && this.tracker.trackedPointersCount < 2) {
       this.end();
     }
   }
 
   protected onPointerMove(event: AdaptedEvent): void {
-    if (this.tracker.getTrackedPointersCount() < 2) {
+    if (this.tracker.trackedPointersCount < 2) {
       return;
     }
     this.tracker.track(event);
@@ -116,7 +112,7 @@ export default class PinchGestureHandler extends GestureHandler {
     super.onPointerMove(event);
   }
   protected onPointerOutOfBounds(event: AdaptedEvent): void {
-    if (this.tracker.getTrackedPointersCount() < 2) {
+    if (this.tracker.trackedPointersCount < 2) {
       return;
     }
     this.tracker.track(event);
@@ -126,7 +122,7 @@ export default class PinchGestureHandler extends GestureHandler {
   }
 
   private tryBegin(): void {
-    if (this.currentState !== State.UNDETERMINED) {
+    if (this.state !== State.UNDETERMINED) {
       return;
     }
 
@@ -135,7 +131,7 @@ export default class PinchGestureHandler extends GestureHandler {
   }
 
   public activate(force?: boolean): void {
-    if (this.currentState !== State.ACTIVE) {
+    if (this.state !== State.ACTIVE) {
       this.resetProgress();
     }
 
@@ -147,7 +143,7 @@ export default class PinchGestureHandler extends GestureHandler {
   }
 
   protected resetProgress(): void {
-    if (this.currentState === State.ACTIVE) {
+    if (this.state === State.ACTIVE) {
       return;
     }
     this.velocity = 0;

package/src/web/handlers/RotationGestureHandler.ts

@@ -19,9 +19,9 @@ export default class RotationGestureHandler extends GestureHandler {
     onRotationBegin: (_detector: RotationGestureDetector): boolean => true,
     onRotation: (detector: RotationGestureDetector): boolean => {
       const previousRotation: number = this.rotation;
-      this.rotation += detector.getRotation();
+      this.rotation += detector.rotation;
 
-      const delta = detector.getTimeDelta();
+      const delta = detector.timeDelta;
 
       if (delta > 0) {
         this.velocity = (this.rotation - previousRotation) / delta;
@@ -29,7 +29,7 @@ export default class RotationGestureHandler extends GestureHandler {
 
       if (
         Math.abs(this.rotation) >= ROTATION_RECOGNITION_THRESHOLD &&
-        this.currentState === State.BEGAN
+        this.state === State.BEGAN
       ) {
         this.activate();
       }
@@ -47,7 +47,7 @@ export default class RotationGestureHandler extends GestureHandler {
   public init(ref: number, propsRef: React.RefObject<unknown>): void {
     super.init(ref, propsRef);
 
-    this.setShouldCancelWhenOutside(false);
+    this.shouldCancelWhenOutside = false;
   }
 
   protected transformNativeEvent() {
@@ -60,13 +60,13 @@ export default class RotationGestureHandler extends GestureHandler {
   }
 
   public getAnchorX(): number {
-    const anchorX = this.rotationGestureDetector.getAnchorX();
+    const anchorX = this.rotationGestureDetector.anchorX;
 
     return anchorX ? anchorX : this.cachedAnchorX;
   }
 
   public getAnchorY(): number {
-    const anchorY = this.rotationGestureDetector.getAnchorY();
+    const anchorY = this.rotationGestureDetector.anchorY;
 
     return anchorY ? anchorY : this.cachedAnchorY;
   }
@@ -87,7 +87,7 @@ export default class RotationGestureHandler extends GestureHandler {
   }
 
   protected onPointerMove(event: AdaptedEvent): void {
-    if (this.tracker.getTrackedPointersCount() < 2) {
+    if (this.tracker.trackedPointersCount < 2) {
       return;
     }
 
@@ -106,7 +106,7 @@ export default class RotationGestureHandler extends GestureHandler {
   }
 
   protected onPointerOutOfBounds(event: AdaptedEvent): void {
-    if (this.tracker.getTrackedPointersCount() < 2) {
+    if (this.tracker.trackedPointersCount < 2) {
       return;
     }
 
@@ -129,11 +129,11 @@ export default class RotationGestureHandler extends GestureHandler {
     this.tracker.removeFromTracker(event.pointerId);
     this.rotationGestureDetector.onTouchEvent(event, this.tracker);
 
-    if (this.currentState !== State.ACTIVE) {
+    if (this.state !== State.ACTIVE) {
       return;
     }
 
-    if (this.currentState === State.ACTIVE) {
+    if (this.state === State.ACTIVE) {
       this.end();
     } else {
       this.fail();
@@ -147,7 +147,7 @@ export default class RotationGestureHandler extends GestureHandler {
   }
 
   protected tryBegin(): void {
-    if (this.currentState !== State.UNDETERMINED) {
+    if (this.state !== State.UNDETERMINED) {
       return;
     }
 
@@ -155,7 +155,7 @@ export default class RotationGestureHandler extends GestureHandler {
   }
 
   protected onReset(): void {
-    if (this.currentState === State.ACTIVE) {
+    if (this.state === State.ACTIVE) {
       return;
     }
 

package/src/web/handlers/TapGestureHandler.ts

@@ -195,10 +195,8 @@ export default class TapGestureHandler extends GestureHandler {
   }
 
   private updateState(event: AdaptedEvent): void {
-    if (
-      this.currentMaxNumberOfPointers < this.tracker.getTrackedPointersCount()
-    ) {
-      this.currentMaxNumberOfPointers = this.tracker.getTrackedPointersCount();
+    if (this.currentMaxNumberOfPointers < this.tracker.trackedPointersCount) {
+      this.currentMaxNumberOfPointers = this.tracker.trackedPointersCount;
     }
 
     if (this.shouldFail()) {
@@ -206,7 +204,7 @@ export default class TapGestureHandler extends GestureHandler {
       return;
     }
 
-    switch (this.currentState) {
+    switch (this.state) {
       case State.UNDETERMINED:
         if (event.eventType === EventTypes.DOWN) {
           this.begin();
@@ -227,7 +225,7 @@ export default class TapGestureHandler extends GestureHandler {
   }
 
   private trySettingPosition(event: AdaptedEvent): void {
-    if (this.currentState !== State.UNDETERMINED) {
+    if (this.state !== State.UNDETERMINED) {
       return;
     }
 

package/src/web/tools/CircularBuffer.ts

@@ -1,31 +1,27 @@
 export default class CircularBuffer<T> {
-  private bufferSize: number;
+  private capacity: number;
   private buffer: T[];
   private index: number;
-  private actualSize: number;
+  private _size: number;
 
   constructor(size: number) {
-    this.bufferSize = size;
+    this.capacity = size;
     this.buffer = new Array<T>(size);
     this.index = 0;
-    this.actualSize = 0;
-  }
-
-  public get size(): number {
-    return this.actualSize;
+    this._size = 0;
   }
 
   public push(element: T): void {
     this.buffer[this.index] = element;
-    this.index = (this.index + 1) % this.bufferSize;
-    this.actualSize = Math.min(this.actualSize + 1, this.bufferSize);
+    this.index = (this.index + 1) % this.capacity;
+    this._size = Math.min(this.size + 1, this.capacity);
   }
 
   public get(at: number): T {
-    if (this.actualSize === this.bufferSize) {
-      let index = (this.index + at) % this.bufferSize;
+    if (this._size === this.capacity) {
+      let index = (this.index + at) % this.capacity;
       if (index < 0) {
-        index += this.bufferSize;
+        index += this.capacity;
       }
 
       return this.buffer[index];
@@ -35,8 +31,12 @@ export default class CircularBuffer<T> {
   }
 
   public clear(): void {
-    this.buffer = new Array<T>(this.bufferSize);
+    this.buffer = new Array<T>(this.capacity);
     this.index = 0;
-    this.actualSize = 0;
+    this._size = 0;
+  }
+
+  public get size() {
+    return this._size;
   }
 }

package/src/web/tools/GestureHandlerDelegate.ts

@@ -8,7 +8,7 @@ export interface MeasureResult {
 }
 
 export interface GestureHandlerDelegate<TComponent, THandler> {
-  getView(): TComponent;
+  view: TComponent;
 
   init(viewRef: number, handler: THandler): void;
   isPointerInBounds({ x, y }: { x: number; y: number }): boolean;