@react-native-oh-tpl/react-native-gesture-handler 2.14.13 → 2.14.15

package/harmony/gesture_handler/src/main/ets/gesture-handlers/LongPressGestureHandler.ts

@@ -18,7 +18,15 @@ export class LongPressGestureHandler extends GestureHandler {
   private activationTimeout: number | undefined;
 
   constructor(deps: GestureHandlerDependencies) {
-    super({...deps, logger: deps.logger.cloneWithPrefix("LongPressGestureHandler")})
+    super({ ...deps, logger: deps.logger.cloneAndJoinPrefix("LongPressGestureHandler") })
+  }
+
+  override getName(): string {
+    return "LongPressGestureHandler"
+  }
+
+  public override isGestureContinuous(): boolean {
+    return false
   }
 
   public getDefaultConfig() {
@@ -45,7 +53,6 @@ export class LongPressGestureHandler extends GestureHandler {
   }
 
 
-
   protected resetConfig(): void {
     super.resetConfig();
     this.minDurationMs = DEFAULT_MIN_DURATION_MS;
@@ -71,6 +78,11 @@ export class LongPressGestureHandler extends GestureHandler {
     this.checkDistanceFail(event);
   }
 
+  public onPointerOutOfBounds(e: IncomingEvent): void {
+    this.tracker.track(e);
+    super.onPointerOutOfBounds(e);
+  }
+
   public onPointerUp(event: IncomingEvent): void {
     super.onPointerUp(event);
     this.tracker.removeFromTracker(event.pointerId);

package/harmony/gesture_handler/src/main/ets/gesture-handlers/ManualGestureHandler.ts

@@ -2,7 +2,15 @@ import { GestureHandler, GestureHandlerDependencies, IncomingEvent } from '../co
 
 export class ManualGestureHandler extends GestureHandler {
   constructor(deps: GestureHandlerDependencies) {
-    super({...deps, logger: deps.logger.cloneWithPrefix("ManualGestureHandler")})
+    super({...deps, logger: deps.logger.cloneAndJoinPrefix("ManualGestureHandler")})
+  }
+
+  public override getName(): string {
+    return "ManualGestureHandler"
+  }
+
+  public override isGestureContinuous(): boolean {
+    return false
   }
 
   public getDefaultConfig() {

package/harmony/gesture_handler/src/main/ets/gesture-handlers/NativeViewGestureHandler.ts

@@ -11,7 +11,15 @@ export class NativeViewGestureHandler extends GestureHandler {
   }
 
   constructor(deps: GestureHandlerDependencies) {
-    super({ ...deps, logger: deps.logger.cloneWithPrefix("NativeViewGestureHandler") })
+    super({ ...deps, logger: deps.logger.cloneAndJoinPrefix("NativeViewGestureHandler") })
+  }
+
+  public override getName(): string {
+    return "NativeViewGestureHandler"
+  }
+
+  public override isGestureContinuous(): boolean {
+    return false
   }
 
   public getDefaultConfig() {
@@ -26,10 +34,11 @@ export class NativeViewGestureHandler extends GestureHandler {
 
   protected onNewPointer() {
     this.startPos = this.tracker.getLastAvgPos();
-    if (this.currentState !== State.UNDETERMINED)
+    if (this.currentState !== State.UNDETERMINED) {
       return;
+    }
     this.begin();
-    if(this.view.hasButtonRole()) {
+    if (this.view.hasButtonRole()) {
       this.activate();
     }
   }
@@ -42,7 +51,7 @@ export class NativeViewGestureHandler extends GestureHandler {
 
   public onPointerMove(e: IncomingEvent): void {
     this.tracker.track(e);
-    const {x: dx, y: dy} = this.startPos.clone().subtract(this.tracker.getLastAvgPos()).value
+    const { x: dx, y: dy } = this.startPos.clone().subtract(this.tracker.getLastAvgPos()).value
     const distSq = dx * dx + dy * dy;
 
     if (distSq >= this.minDistSq) {

package/harmony/gesture_handler/src/main/ets/gesture-handlers/PanGestureHandler.ts

@@ -21,24 +21,35 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
   private velocity = new Vector2D();
   private activationTimeout = 0;
 
+  public override getName(): string {
+    return "PanGestureHandler"
+  }
+
+  public override isGestureContinuous(): boolean {
+    return true
+  }
+
   private get failOffsetXStart() {
     if (this.config.failOffsetXStart === undefined
-      && this.config.failOffsetXEnd === undefined)
+      && this.config.failOffsetXEnd === undefined) {
       return undefined
+    }
     return this.config.failOffsetXStart ?? Number.MIN_SAFE_INTEGER
   }
 
   private get failOffsetXEnd() {
     if (this.config.failOffsetXStart === undefined
-      && this.config.failOffsetXEnd === undefined)
+      && this.config.failOffsetXEnd === undefined) {
       return undefined
+    }
     return this.config.failOffsetXEnd ?? Number.MAX_SAFE_INTEGER
   }
 
   private get failOffsetYStart() {
     if (this.config.failOffsetYStart === undefined
-      && this.config.failOffsetYEnd === undefined)
+      && this.config.failOffsetYEnd === undefined) {
       return undefined
+    }
     return this.config.failOffsetYStart ?? Number.MIN_SAFE_INTEGER
   }
 
@@ -48,29 +59,33 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
 
   private get activeOffsetXStart() {
     if (this.config.activeOffsetXStart === undefined
-      && this.config.activeOffsetXEnd === undefined)
+      && this.config.activeOffsetXEnd === undefined) {
       return undefined
+    }
     return this.config.activeOffsetXStart ?? Number.MIN_SAFE_INTEGER
   }
 
   private get activeOffsetXEnd() {
     if (this.config.activeOffsetXStart === undefined
-      && this.config.activeOffsetXEnd === undefined)
+      && this.config.activeOffsetXEnd === undefined) {
       return undefined
+    }
     return this.config.activeOffsetXEnd ?? Number.MAX_SAFE_INTEGER
   }
 
   private get activeOffsetYStart() {
     if (this.config.activeOffsetYStart === undefined
-      && this.config.activeOffsetYEnd === undefined)
+      && this.config.activeOffsetYEnd === undefined) {
       return undefined
+    }
     return this.config.activeOffsetYStart ?? Number.MIN_SAFE_INTEGER
   }
 
   private get activeOffsetYEnd() {
     if (this.config.activeOffsetYStart === undefined
-      && this.config.activeOffsetYEnd === undefined)
+      && this.config.activeOffsetYEnd === undefined) {
       return undefined
+    }
     return this.config.activeOffsetYEnd ?? Number.MAX_SAFE_INTEGER
   }
 
@@ -92,7 +107,7 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
   private unlockRNGestureResponder: (() => void) | undefined
 
   public constructor(deps: GestureHandlerDependencies) {
-    super({ ...deps, logger: deps.logger.cloneWithPrefix("PanGestureHandler") })
+    super({ ...deps, logger: deps.logger.cloneAndJoinPrefix("PanGestureHandler") })
   }
 
   public onPointerDown(e) {
@@ -115,7 +130,7 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
   }
 
   private shouldFail(): boolean {
-    const {x: dx, y: dy} = this.getTranslation().value;
+    const { x: dx, y: dy } = this.getTranslation().value;
     const distanceSq = dx * dx + dy * dy;
     if (this.activateAfterLongPress > 0 && distanceSq > DEFAULT_MIN_DIST_SQ) {
       this.clearActivationTimeout();
@@ -138,7 +153,7 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
   }
 
   private shouldActivate(): boolean {
-    const {x: dx, y: dy} = this.getTranslation().value;
+    const { x: dx, y: dy } = this.getTranslation().value;
     if (this.activeOffsetXStart !== Number.MAX_SAFE_INTEGER && dx < this.activeOffsetXStart
     ) {
       return true;
@@ -156,7 +171,7 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
     if (this.minDistSq !== Number.MAX_SAFE_INTEGER && distanceSq >= this.minDistSq) {
       return true;
     }
-    const {x: vx, y: vy} = this.velocity
+    const { x: vx, y: vy } = this.velocity
     if (
       this.minVelocityX !== Number.MAX_SAFE_INTEGER &&
         ((this.minVelocityX < 0 && vx <= this.minVelocityX) ||
@@ -183,7 +198,11 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
   }
 
   private tryBegin(e: IncomingEvent): void {
-    this.logger.cloneWithPrefix("tryBegin").debug({currentState: getStateName(this.currentState), trackedPointersCount: this.tracker.getTrackedPointersCount(), minPointers: this.minPointers})
+    this.logger.cloneAndJoinPrefix("tryBegin").debug({
+      currentState: getStateName(this.currentState),
+      trackedPointersCount: this.tracker.getTrackedPointersCount(),
+      minPointers: this.minPointers
+    })
     if (
       (this.currentState === State.UNDETERMINED) &&
         this.tracker.getTrackedPointersCount() >= this.minPointers
@@ -265,7 +284,13 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
     if (this.currentState === State.ACTIVE) {
       this.lastPos = this.tracker.getLastAvgPos();
     }
+
     this.tracker.removeFromTracker(event.pointerId);
+    
+    if (this.tracker.getTrackedPointersCount() === 0) {
+      this.clearActivationTimeout();
+    }
+
     if (this.currentState === State.ACTIVE) {
       this.end();
     } else {
@@ -339,4 +364,12 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
       this.unlockRNGestureResponder?.()
     }
   }
+
+  protected onCancel(): void {
+    this.clearActivationTimeout();
+  }
+
+  protected onReset(): void {
+    this.clearActivationTimeout();
+  }
 }

package/harmony/gesture_handler/src/main/ets/gesture-handlers/PinchGestureHandler.ts

@@ -1,159 +1,174 @@
-import { GestureHandler, DEFAULT_TOUCH_SLOP, IncomingEvent, GestureConfig, State, GestureHandlerDependencies } from "../core"
+import {
+  GestureHandler,
+  DEFAULT_TOUCH_SLOP,
+  IncomingEvent,
+  GestureConfig,
+  State,
+  GestureHandlerDependencies
+} from "../core"
 import ScaleGestureDetector, { ScaleGestureListener } from "../detectors/ScaleGestureDetector";
 
 
-
 export class PinchGestureHandler extends GestureHandler {
-    private scale = 1;
-    private velocity = 0;
-
-    private startingSpan = 0;
-    private spanSlop = DEFAULT_TOUCH_SLOP;
-
-    private scaleDetectorListener: ScaleGestureListener = {
-      onScaleBegin: (detector: ScaleGestureDetector): boolean => {
-        this.startingSpan = detector.getCurrentSpan();
-        return true;
-      },
-      onScale: (detector: ScaleGestureDetector): boolean => {
-        const prevScaleFactor: number = this.scale;
-        this.scale *= detector.getScaleFactor(
-          this.tracker.getTrackedPointersCount()
-        );
-
-        const delta = detector.getTimeDelta();
-        if (delta > 0) {
-          this.velocity = (this.scale - prevScaleFactor) / delta;
-        }
-
-        if (
-          Math.abs(this.startingSpan - detector.getCurrentSpan()) >=
-            this.spanSlop &&
+  private scale = 1;
+  private velocity = 0;
+
+  private startingSpan = 0;
+  private spanSlop = DEFAULT_TOUCH_SLOP;
+
+  private scaleDetectorListener: ScaleGestureListener = {
+    onScaleBegin: (detector: ScaleGestureDetector): boolean => {
+      this.startingSpan = detector.getCurrentSpan();
+      return true;
+    },
+    onScale: (detector: ScaleGestureDetector): boolean => {
+      const prevScaleFactor: number = this.scale;
+      this.scale *= detector.getScaleFactor(
+        this.tracker.getTrackedPointersCount()
+      );
+
+      const delta = detector.getTimeDelta();
+      if (delta > 0) {
+        this.velocity = (this.scale - prevScaleFactor) / delta;
+      }
+
+      if (
+        Math.abs(this.startingSpan - detector.getCurrentSpan()) >=
+        this.spanSlop &&
           this.currentState === State.BEGAN
-        ) {
-          this.activate();
-        }
-        return true;
-      },
-      onScaleEnd: (
-        _detector: ScaleGestureDetector
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
-      ): void => {},
+      ) {
+        this.activate();
+      }
+      return true;
+    },
+    onScaleEnd: (
+      _detector: ScaleGestureDetector
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    ): void => {
+    },
+  };
+
+  private scaleGestureDetector: ScaleGestureDetector = new ScaleGestureDetector(
+    this.scaleDetectorListener
+  );
+
+
+  public constructor(deps: GestureHandlerDependencies) {
+    super({ ...deps, logger: deps.logger.cloneAndJoinPrefix("PinchGestureHandler") })
+    this.setShouldCancelWhenOutside(false);
+  }
+
+  public getName(): string {
+    return "PinchGestureHandler"
+  }
+
+  public override isGestureContinuous(): boolean {
+    return true
+  }
+
+  public getDefaultConfig() {
+    return {}
+  }
+
+  public updateGestureConfig({ enabled = true, ...props }: GestureConfig): void {
+    super.updateGestureConfig({ enabled: enabled, ...props });
+  }
+
+  protected transformNativeEvent() {
+    return {
+      focalX: this.scaleGestureDetector.getFocusX(),
+      focalY: this.scaleGestureDetector.getFocusY(),
+      velocity: this.velocity,
+      scale: this.scale,
     };
-
-    private scaleGestureDetector: ScaleGestureDetector = new ScaleGestureDetector(
-      this.scaleDetectorListener
-    );
-
-
-    public constructor(deps: GestureHandlerDependencies) {
-        super({ ...deps, logger: deps.logger.cloneWithPrefix("PinchGestureHandler") })
-        this.setShouldCancelWhenOutside(false);
-    }
-
-    public getDefaultConfig() {
-      return {}
-    }
-
-    public updateGestureConfig({ enabled = true, ...props }: GestureConfig): void {
-      super.updateGestureConfig({ enabled: enabled, ...props });
-    }
-
-    protected transformNativeEvent() {
-      return {
-        focalX: this.scaleGestureDetector.getFocusX(),
-        focalY: this.scaleGestureDetector.getFocusY(),
-        velocity: this.velocity,
-        scale: this.scale,
-      };
-    }
-
-    public onPointerDown(event: IncomingEvent): void {
-      this.tracker.addToTracker(event);
-      super.onPointerDown(event);
+  }
+
+  public onPointerDown(event: IncomingEvent): void {
+    this.tracker.addToTracker(event);
+    super.onPointerDown(event);
+  }
+
+  public onAdditionalPointerAdd(event: IncomingEvent): void {
+    this.tracker.addToTracker(event);
+    super.onAdditionalPointerAdd(event);
+    this.tryBegin();
+    this.scaleGestureDetector.onTouchEvent(event, this.tracker);
+  }
+
+  public onPointerUp(event: IncomingEvent): void {
+    super.onPointerUp(event);
+    this.tracker.removeFromTracker(event.pointerId);
+    if (this.currentState !== State.ACTIVE) {
+      return;
     }
+    this.scaleGestureDetector.onTouchEvent(event, this.tracker);
 
-    public onAdditionalPointerAdd(event: IncomingEvent): void {
-      this.tracker.addToTracker(event);
-      super.onAdditionalPointerAdd(event);
-      this.tryBegin();
-      this.scaleGestureDetector.onTouchEvent(event, this.tracker);
+    if (this.currentState === State.ACTIVE) {
+      this.end();
+    } else {
+      this.fail();
     }
+  }
 
-    public onPointerUp(event: IncomingEvent): void {
-      super.onPointerUp(event);
-      this.tracker.removeFromTracker(event.pointerId);
-      if (this.currentState !== State.ACTIVE) {
-        return;
-      }
-      this.scaleGestureDetector.onTouchEvent(event, this.tracker);
+  public onAdditionalPointerRemove(event: IncomingEvent): void {
+    super.onAdditionalPointerRemove(event);
+    this.scaleGestureDetector.onTouchEvent(event, this.tracker);
+    this.tracker.removeFromTracker(event.pointerId);
 
-      if (this.currentState === State.ACTIVE) {
-        this.end();
-      } else {
-        this.fail();
-      }
+    if (
+      this.currentState === State.ACTIVE &&
+        this.tracker.getTrackedPointersCount() < 2
+    ) {
+      this.end();
     }
+  }
 
-    public onAdditionalPointerRemove(event: IncomingEvent): void {
-      super.onAdditionalPointerRemove(event);
-      this.scaleGestureDetector.onTouchEvent(event, this.tracker);
-      this.tracker.removeFromTracker(event.pointerId);
-
-      if (
-        this.currentState === State.ACTIVE &&
-        this.tracker.getTrackedPointersCount() < 2
-      ) {
-        this.end();
-      }
+  public onPointerMove(event: IncomingEvent): void {
+    if (this.tracker.getTrackedPointersCount() < 2) {
+      return;
     }
+    this.tracker.track(event);
 
-    public onPointerMove(event: IncomingEvent): void {
-        if (this.tracker.getTrackedPointersCount() < 2) {
-        return;
-      }
-      this.tracker.track(event);
+    this.scaleGestureDetector.onTouchEvent(event, this.tracker);
+    super.onPointerMove(event);
+  }
 
-      this.scaleGestureDetector.onTouchEvent(event, this.tracker);
-      super.onPointerMove(event);
+  public onPointerOutOfBounds(event: IncomingEvent): void {
+    if (this.tracker.getTrackedPointersCount() < 2) {
+      return;
     }
+    this.tracker.track(event);
 
-    public onPointerOutOfBounds(event: IncomingEvent): void {
-      if (this.tracker.getTrackedPointersCount() < 2) {
-        return;
-      }
-      this.tracker.track(event);
+    this.scaleGestureDetector.onTouchEvent(event, this.tracker);
+    super.onPointerOutOfBounds(event);
+  }
 
-      this.scaleGestureDetector.onTouchEvent(event, this.tracker);
-      super.onPointerOutOfBounds(event);
+  private tryBegin(): void {
+    if (this.currentState !== State.UNDETERMINED) {
+      return;
     }
 
-    private tryBegin(): void {
-        if (this.currentState !== State.UNDETERMINED) {
-        return;
-      }
+    this.resetProgress();
+    this.begin();
+  }
 
+  public activate(force?: boolean): void {
+    if (this.currentState !== State.ACTIVE) {
       this.resetProgress();
-      this.begin();
     }
 
-    public activate(force?: boolean): void {
-        if (this.currentState !== State.ACTIVE) {
-        this.resetProgress();
-      }
-
-      super.activate();
-    }
+    super.activate();
+  }
 
-    protected onReset(): void {
-      this.resetProgress();
-    }
+  protected onReset(): void {
+    this.resetProgress();
+  }
 
-    protected resetProgress(): void {
-      if (this.currentState === State.ACTIVE) {
-        return;
-      }
-      this.velocity = 0;
-      this.scale = 1;
+  protected resetProgress(): void {
+    if (this.currentState === State.ACTIVE) {
+      return;
     }
+    this.velocity = 0;
+    this.scale = 1;
+  }
 }

package/harmony/gesture_handler/src/main/ets/gesture-handlers/RotationGestureHandler.ts

@@ -12,7 +12,15 @@ export class RotationGestureHandler extends GestureHandler {
   private unlockScrolls: (() => void) | undefined
 
   constructor(deps: GestureHandlerDependencies) {
-    super({ ...deps, logger: deps.logger.cloneWithPrefix("RotationGestureHandler") })
+    super({ ...deps, logger: deps.logger.cloneAndJoinPrefix("RotationGestureHandler") })
+  }
+
+  public override getName(): string {
+    return "RotationGestureHandler"
+  }
+
+  public override isGestureContinuous(): boolean {
+    return true
   }
 
   private rotationGestureListener: RotationGestureListener = {

package/harmony/gesture_handler/src/main/ets/gesture-handlers/TapGestureHandler.ts

@@ -17,7 +17,15 @@ export class TapGestureHandler extends GestureHandler {
   private delayTimeout: number | undefined;
 
   constructor(deps: GestureHandlerDependencies) {
-    super({...deps, logger: deps.logger.cloneWithPrefix(`TapGestureHandler${deps.handlerTag}`)})
+    super({ ...deps, logger: deps.logger.cloneAndJoinPrefix(`TapGestureHandler${deps.handlerTag}`) })
+  }
+
+  public override getName(): string {
+    return "TapGestureHandler"
+  }
+
+  public override isGestureContinuous(): boolean {
+    return false
   }
 
   onPointerDown(event) {
@@ -101,7 +109,9 @@ export class TapGestureHandler extends GestureHandler {
   }
 
   private trySettingPosition(event: IncomingEvent): void {
-    if (this.currentState !== State.UNDETERMINED) return;
+    if (this.currentState !== State.UNDETERMINED) {
+      return;
+    }
     this.offsetX = 0;
     this.offsetY = 0;
     this.startX = event.x;
@@ -109,7 +119,7 @@ export class TapGestureHandler extends GestureHandler {
   }
 
   private updateState(event: IncomingEvent): void {
-    const logger = this.logger.cloneWithPrefix("updateState")
+    const logger = this.logger.cloneAndJoinPrefix("updateState")
     if (this.maxNumberOfPointersSoFar < this.tracker.getTrackedPointersCount()) {
       this.maxNumberOfPointersSoFar = this.tracker.getTrackedPointersCount()
     }
@@ -175,13 +185,13 @@ export class TapGestureHandler extends GestureHandler {
   }
 
   private endTap() {
-    const logger = this.logger.cloneWithPrefix("endTap")
+    const logger = this.logger.cloneAndJoinPrefix("endTap")
     this.clearTimeouts();
     if (
       ++this.numberOfTapsSoFar === (this.config.numberOfTaps ?? DEFAULT_NUMBER_OF_TAPS) &&
         this.maxNumberOfPointersSoFar >= (this.config.minNumberOfPointers ?? 0)
     ) {
-      logger.info(JSON.stringify({numberOfTapsSoFar: this.numberOfTapsSoFar}))
+      logger.info(JSON.stringify({ numberOfTapsSoFar: this.numberOfTapsSoFar }))
       this.activate();
     } else {
       this.delayTimeout = setTimeout(() => this.fail(), this.config.maxDelayMs ?? DEFAULT_MAX_DELAY_MS);

package/harmony/gesture_handler/src/main/ets/rnoh/GestureHandlerPackage.ts

@@ -2,7 +2,7 @@ import {RNPackage, TurboModulesFactory} from "@rnoh/react-native-openharmony/ts"
 import type {TurboModule, TurboModuleContext} from "@rnoh/react-native-openharmony/ts";
 import {RNGestureHandlerModule} from './RNGestureHandlerModule';
 
-class GestureHandlerTurboModulesFactory extends TurboModulesFactory {
+class GestureHandlerTurboModuleFactory extends TurboModulesFactory {
   createTurboModule(name: string): TurboModule | null {
     if (name === RNGestureHandlerModule.NAME) {
       return new RNGestureHandlerModule(this.ctx);
@@ -15,8 +15,11 @@ class GestureHandlerTurboModulesFactory extends TurboModulesFactory {
   }
 }
 
+/**
+ * @deprecated: Use the package class exported from ../RNOHPackage.ets (2024-10-10)
+ */
 export class GestureHandlerPackage extends RNPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
-    return new GestureHandlerTurboModulesFactory(ctx);
+    return new GestureHandlerTurboModuleFactory(ctx);
   }
-}
+}