react-native-gesture-handler 2.22.1 → 2.23.1

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;

package/src/web/tools/GestureHandlerOrchestrator.ts

@@ -5,7 +5,7 @@ import type IGestureHandler from '../handlers/IGestureHandler';
 import PointerTracker from './PointerTracker';
 
 export default class GestureHandlerOrchestrator {
-  private static instance: GestureHandlerOrchestrator;
+  private static _instance: GestureHandlerOrchestrator;
 
   private gestureHandlers: IGestureHandler[] = [];
   private awaitingHandlers: IGestureHandler[] = [];
@@ -26,9 +26,9 @@ export default class GestureHandlerOrchestrator {
 
   private cleanHandler(handler: IGestureHandler): void {
     handler.reset();
-    handler.setActive(false);
-    handler.setAwaiting(false);
-    handler.setActivationIndex(Number.MAX_VALUE);
+    handler.active = false;
+    handler.awaiting = false;
+    handler.activationIndex = Number.MAX_VALUE;
   }
 
   public removeHandlerFromOrchestrator(handler: IGestureHandler): void {
@@ -41,7 +41,7 @@ export default class GestureHandlerOrchestrator {
 
     if (indexInAwaitingHandlers >= 0) {
       this.awaitingHandlers.splice(indexInAwaitingHandlers, 1);
-      this.awaitingHandlersTags.delete(handler.getTag());
+      this.awaitingHandlersTags.delete(handler.handlerTag);
     }
   }
 
@@ -51,7 +51,7 @@ export default class GestureHandlerOrchestrator {
     for (let i = this.gestureHandlers.length - 1; i >= 0; --i) {
       const handler = this.gestureHandlers[i];
 
-      if (this.isFinished(handler.getState()) && !handler.isAwaiting()) {
+      if (this.isFinished(handler.state) && !handler.awaiting) {
         this.cleanHandler(handler);
         handlersToRemove.add(handler);
       }
@@ -65,7 +65,7 @@ export default class GestureHandlerOrchestrator {
   private hasOtherHandlerToWaitFor(handler: IGestureHandler): boolean {
     const hasToWaitFor = (otherHandler: IGestureHandler) => {
       return (
-        !this.isFinished(otherHandler.getState()) &&
+        !this.isFinished(otherHandler.state) &&
         this.shouldHandlerWaitForOther(handler, otherHandler)
       );
     };
@@ -79,7 +79,7 @@ export default class GestureHandlerOrchestrator {
     const shouldBeCancelled = (otherHandler: IGestureHandler) => {
       return (
         this.shouldHandlerWaitForOther(handler, otherHandler) &&
-        otherHandler.getState() === State.END
+        otherHandler.state === State.END
       );
     };
 
@@ -97,7 +97,7 @@ export default class GestureHandlerOrchestrator {
       return;
     }
 
-    const handlerState = handler.getState();
+    const handlerState = handler.state;
 
     if (handlerState === State.CANCELLED || handlerState === State.FAILED) {
       return;
@@ -129,7 +129,7 @@ export default class GestureHandlerOrchestrator {
   private cleanupAwaitingHandlers(handler: IGestureHandler): void {
     const shouldWait = (otherHandler: IGestureHandler) => {
       return (
-        !otherHandler.isAwaiting() &&
+        !otherHandler.awaiting &&
         this.shouldHandlerWaitForOther(otherHandler, handler)
       );
     };
@@ -137,12 +137,12 @@ export default class GestureHandlerOrchestrator {
     for (const otherHandler of this.awaitingHandlers) {
       if (shouldWait(otherHandler)) {
         this.cleanHandler(otherHandler);
-        this.awaitingHandlersTags.delete(otherHandler.getTag());
+        this.awaitingHandlersTags.delete(otherHandler.handlerTag);
       }
     }
 
     this.awaitingHandlers = this.awaitingHandlers.filter((otherHandler) =>
-      this.awaitingHandlersTags.has(otherHandler.getTag())
+      this.awaitingHandlersTags.has(otherHandler.handlerTag)
     );
   }
 
@@ -152,7 +152,7 @@ export default class GestureHandlerOrchestrator {
     oldState: State,
     sendIfDisabled?: boolean
   ): void {
-    if (!handler.isEnabled() && !sendIfDisabled) {
+    if (!handler.enabled && !sendIfDisabled) {
       return;
     }
 
@@ -162,7 +162,7 @@ export default class GestureHandlerOrchestrator {
       for (const otherHandler of this.awaitingHandlers) {
         if (
           !this.shouldHandlerWaitForOther(otherHandler, handler) ||
-          !this.awaitingHandlersTags.has(otherHandler.getTag())
+          !this.awaitingHandlersTags.has(otherHandler.handlerTag)
         ) {
           continue;
         }
@@ -174,7 +174,7 @@ export default class GestureHandlerOrchestrator {
 
         otherHandler.cancel();
 
-        if (otherHandler.getState() === State.END) {
+        if (otherHandler.state === State.END) {
           // Handle edge case, where discrete gestures end immediately after activation thus
           // their state is set to END and when the gesture they are waiting for activates they
           // should be cancelled, however `cancel` was never sent as gestures were already in the END state.
@@ -182,14 +182,14 @@ export default class GestureHandlerOrchestrator {
           otherHandler.sendEvent(State.CANCELLED, State.BEGAN);
         }
 
-        otherHandler.setAwaiting(false);
+        otherHandler.awaiting = false;
       }
     }
 
     if (newState === State.ACTIVE) {
       this.tryActivate(handler);
     } else if (oldState === State.ACTIVE || oldState === State.END) {
-      if (handler.isActive()) {
+      if (handler.active) {
         handler.sendEvent(newState, oldState);
       } else if (
         oldState === State.ACTIVE &&
@@ -214,11 +214,11 @@ export default class GestureHandlerOrchestrator {
   }
 
   private makeActive(handler: IGestureHandler): void {
-    const currentState = handler.getState();
+    const currentState = handler.state;
 
-    handler.setActive(true);
-    handler.setShouldResetProgress(true);
-    handler.setActivationIndex(this.activationIndex++);
+    handler.active = true;
+    handler.shouldResetProgress = true;
+    handler.activationIndex = this.activationIndex++;
 
     for (let i = this.gestureHandlers.length - 1; i >= 0; --i) {
       if (this.shouldHandlerBeCancelledBy(this.gestureHandlers[i], handler)) {
@@ -228,7 +228,7 @@ export default class GestureHandlerOrchestrator {
 
     for (const otherHandler of this.awaitingHandlers) {
       if (this.shouldHandlerBeCancelledBy(otherHandler, handler)) {
-        otherHandler.setAwaiting(false);
+        otherHandler.awaiting = false;
       }
     }
 
@@ -241,11 +241,11 @@ export default class GestureHandlerOrchestrator {
       }
     }
 
-    if (!handler.isAwaiting()) {
+    if (!handler.awaiting) {
       return;
     }
 
-    handler.setAwaiting(false);
+    handler.awaiting = false;
 
     this.awaitingHandlers = this.awaitingHandlers.filter(
       (otherHandler) => otherHandler !== handler
@@ -258,10 +258,10 @@ export default class GestureHandlerOrchestrator {
     }
 
     this.awaitingHandlers.push(handler);
-    this.awaitingHandlersTags.add(handler.getTag());
+    this.awaitingHandlersTags.add(handler.handlerTag);
 
-    handler.setAwaiting(true);
-    handler.setActivationIndex(this.activationIndex++);
+    handler.awaiting = true;
+    handler.activationIndex = this.activationIndex++;
   }
 
   public recordHandlerIfNotPresent(handler: IGestureHandler): void {
@@ -271,9 +271,9 @@ export default class GestureHandlerOrchestrator {
 
     this.gestureHandlers.push(handler);
 
-    handler.setActive(false);
-    handler.setAwaiting(false);
-    handler.setActivationIndex(Number.MAX_SAFE_INTEGER);
+    handler.active = false;
+    handler.awaiting = false;
+    handler.activationIndex = Number.MAX_SAFE_INTEGER;
   }
 
   private shouldHandlerWaitForOther(
@@ -306,7 +306,7 @@ export default class GestureHandlerOrchestrator {
       return false;
     }
 
-    if (handler.isAwaiting() || handler.getState() === State.ACTIVE) {
+    if (handler.awaiting || handler.state === State.ACTIVE) {
       // For now it always returns false
       return handler.shouldBeCancelledByOther(otherHandler);
     }
@@ -316,7 +316,7 @@ export default class GestureHandlerOrchestrator {
 
     if (
       !PointerTracker.shareCommonPointers(handlerPointers, otherPointers) &&
-      handler.getDelegate().getView() !== otherHandler.getDelegate().getView()
+      handler.delegate.view !== otherHandler.delegate.view
     ) {
       return this.checkOverlap(handler, otherHandler);
     }
@@ -335,11 +335,11 @@ export default class GestureHandlerOrchestrator {
     // TODO: Find better way to handle that issue, for example by activation order and handler cancelling
 
     const isPointerWithinBothBounds = (pointer: number) => {
-      const point = handler.getTracker().getLastAbsoluteCoords(pointer);
+      const point = handler.tracker.getLastAbsoluteCoords(pointer);
 
       return (
-        handler.getDelegate().isPointerInBounds(point) &&
-        otherHandler.getDelegate().isPointerInBounds(point)
+        handler.delegate.isPointerInBounds(point) &&
+        otherHandler.delegate.isPointerInBounds(point)
       );
     };
 
@@ -361,8 +361,8 @@ export default class GestureHandlerOrchestrator {
   public cancelMouseAndPenGestures(currentHandler: IGestureHandler): void {
     this.gestureHandlers.forEach((handler: IGestureHandler) => {
       if (
-        handler.getPointerType() !== PointerType.MOUSE &&
-        handler.getPointerType() !== PointerType.STYLUS
+        handler.pointerType !== PointerType.MOUSE &&
+        handler.pointerType !== PointerType.STYLUS
       ) {
         return;
       }
@@ -377,16 +377,16 @@ export default class GestureHandlerOrchestrator {
         //
         // However, handler will receive manually created onPointerEnter that is triggered in EventManager in onPointerMove method.
         // There may be possibility to use that fact to make handler respond properly to first mouse click
-        handler.getTracker().resetTracker();
+        handler.tracker.resetTracker();
       }
     });
   }
 
-  public static getInstance(): GestureHandlerOrchestrator {
-    if (!GestureHandlerOrchestrator.instance) {
-      GestureHandlerOrchestrator.instance = new GestureHandlerOrchestrator();
+  public static get instance(): GestureHandlerOrchestrator {
+    if (!GestureHandlerOrchestrator._instance) {
+      GestureHandlerOrchestrator._instance = new GestureHandlerOrchestrator();
     }
 
-    return GestureHandlerOrchestrator.instance;
+    return GestureHandlerOrchestrator._instance;
   }
 }