@react-native-oh-tpl/react-native-gesture-handler 2.12.9 → 2.14.1

package/harmony/gesture_handler/src/main/ets/RNGestureHandlerRootView.ets

@@ -1,53 +0,0 @@
-import { RNOHContext, RNViewBase, ComponentBuilderContext, RNComponentFactory, Tag } from "@rnoh/react-native-openharmony"
-import { RNGestureHandlerRootView as RNC } from "./namespace/RNGestureHandlerRootView"
-import { RNGHRootTouchHandlerArkTS as RNGHRootTouchHandler } from "./RNGHRootTouchHandlerArkTS"
-import { RNGestureHandlerModule } from "./RNGestureHandlerModule"
-
-
-export type RNGestureHandlerRootViewDescriptor = RNC.Descriptor
-
-@Component
-export struct RNGestureHandlerRootView {
-  static readonly NAME = RNC.NAME
-  ctx!: RNOHContext
-  tag: number = -1
-  @BuilderParam buildCustomComponent: (componentBuilderContext: ComponentBuilderContext) => void
-  @State descriptor: RNGestureHandlerRootViewDescriptor = {} as RNGestureHandlerRootViewDescriptor
-  private unsubscribes: (() => void)[] = []
-  private touchHandler: RNGHRootTouchHandler | undefined = undefined
-
-  aboutToAppear() {
-    const rnGestureHandlerModule = this.ctx.rnInstance.getTurboModule<RNGestureHandlerModule>(RNGestureHandlerModule.NAME)
-    const rootTag = this.ctx.descriptorRegistry.getDescriptorLineage(this.tag)[0].tag
-    this.touchHandler = new RNGHRootTouchHandler(rootTag, rnGestureHandlerModule.getViewRegistry(), rnGestureHandlerModule.getGestureHandlerRegistry(), rnGestureHandlerModule.getLogger())
-    this.handleDescriptorChange(this.ctx.descriptorRegistry.getDescriptor<RNGestureHandlerRootViewDescriptor>(this.tag))
-    this.unsubscribes.push(this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, (d) => {
-      this.handleDescriptorChange(d as RNGestureHandlerRootViewDescriptor)
-    }))
-  }
-
-  aboutToDisappear() {
-    this.unsubscribes.forEach(unsubscribe => unsubscribe())
-  }
-
-  handleDescriptorChange(newDescriptor: RNGestureHandlerRootViewDescriptor) {
-    this.descriptor = newDescriptor
-  }
-
-  build() {
-    RNViewBase({ ctx: this.ctx, tag: this.tag }) {
-      ForEach(this.descriptor.childrenTags, (childrenTag: Tag) => {
-        RNComponentFactory({ ctx: this.ctx, tag: childrenTag, buildCustomComponent: this.buildCustomComponent })
-      })
-      Stack() {
-      }
-      .width("100%")
-      .height("100%")
-      .onTouch((e) => {
-        this.touchHandler?.handleTouch(e)
-      })
-      .hitTestBehavior(HitTestMode.Transparent)
-
-    }
-  }
-}

package/harmony/gesture_handler/src/main/ets/RNOHScrollLocker.ts

@@ -1,23 +0,0 @@
-import { RNInstance } from "@rnoh/react-native-openharmony/ts"
-import { ScrollLocker } from "./GestureHandler"
-
-export class RNOHScrollLockerArkTS implements ScrollLocker {
-  constructor(private rnInstance: RNInstance) {
-  }
-
-  lockScrollContainingViewTag(viewTag: number) {
-    return this.rnInstance.blockComponentsGestures(viewTag)
-  }
-}
-
-export class RNOHScrollLockerCAPI implements ScrollLocker {
-  constructor(private rnInstance: RNInstance) {
-  }
-
-  lockScrollContainingViewTag(viewTag: number) {
-    this.rnInstance.postMessageToCpp("RNGH::SET_NATIVE_RESPONDERS_BLOCK", { targetTag: viewTag, shouldBlock: true });
-    return () => {
-      this.rnInstance.postMessageToCpp("RNGH::SET_NATIVE_RESPONDERS_BLOCK", { targetTag: viewTag, shouldBlock: false });
-    }
-  }
-}

package/harmony/gesture_handler/src/main/ets/State.ts

@@ -1,47 +0,0 @@
-export enum State {
-  /** This is the initial state of each handler and it goes into this state after it's done recognizing a gesture. */
-  UNDETERMINED,
-
-  /** A handler received some touches but for some reason didn't recognize them. For example, if a finger travels more
-   * distance than a defined maxDist property allows, then the handler won't become active but will fail instead.
-   * Afterwards, it's state will be reset to UNDETERMINED. */
-  FAILED,
-
-  /** Handler has started receiving touch stream but hasn't yet received enough data to either fail or activate. */
-  BEGAN,
-
-  /** The gesture recognizer has received a signal (possibly new touches or a command from the touch system controller)
-   * resulting in the cancellation of a continuous gesture. The gesture's state will become CANCELLED until it is
-   * finally reset to the initial state, UNDETERMINED. */
-  CANCELLED,
-
-  /** Handler has recognized a gesture. It will become and stay in the ACTIVE state until the gesture finishes
-   * (e.g. when user lifts the finger) or gets cancelled by the touch system. Under normal circumstances the state will
-   * then turn into END. In the case that a gesture is cancelled by the touch system, its state would then become
-   * CANCELLED. Learn about discrete and continuous handlers here to understand how long a handler can be kept in the
-   * ACTIVE state.
-   * */
-  ACTIVE,
-
-  /** The gesture recognizer has received touches signalling the end of a gesture. Its state will become END until it is
-   * reset to UNDETERMINED.
-   * */
-  END,
-}
-
-export function getStateName(state: State): string {
-  switch (state) {
-    case State.UNDETERMINED:
-      return "UNDETERMINED"
-    case State.FAILED:
-      return "FAILED"
-    case State.BEGAN:
-      return "BEGAN"
-    case State.CANCELLED:
-      return "CANCELLED"
-    case State.ACTIVE:
-      return "ACTIVE"
-    case State.END:
-      return "END"
-  }
-}

package/harmony/gesture_handler/src/main/ets/TapGestureHandler.ts

@@ -1,206 +0,0 @@
-import { GestureHandler, GestureHandlerDependencies } from "./GestureHandler"
-import { AdaptedEvent, EventType } from "./Event"
-import { State, getStateName } from "./State"
-
-const DEFAULT_MAX_DURATION_MS = 500;
-const DEFAULT_NUMBER_OF_TAPS = 1;
-const DEFAULT_MAX_DELAY_MS = 500;
-
-export class TapGestureHandler extends GestureHandler {
-  private startX = 0;
-  private startY = 0;
-  private offsetX = 0;
-  private offsetY = 0;
-  private lastX = 0;
-  private lastY = 0;
-  private maxNumberOfPointersSoFar = 0;
-  private numberOfTapsSoFar: number = 0;
-  private waitTimeout: number | undefined;
-  private delayTimeout: number | undefined;
-
-  constructor(deps: GestureHandlerDependencies) {
-    super({...deps, logger: deps.logger.cloneWithPrefix("TapGestureHandler")})
-  }
-
-  onPointerDown(event) {
-    this.tracker.addToTracker(event);
-    super.onPointerDown(event);
-    this.trySettingPosition(event);
-    this.lastX = event.x;
-    this.lastY = event.y;
-    this.updateState(event);
-  }
-
-  onAdditionalPointerAdd(event: AdaptedEvent): void {
-    super.onAdditionalPointerAdd(event);
-    this.tracker.addToTracker(event);
-    this.trySettingPosition(event);
-
-    this.offsetX += this.lastX - this.startX;
-    this.offsetY += this.lastY - this.startY;
-
-    this.lastX = this.tracker.getLastAvgX();
-    this.lastY = this.tracker.getLastAvgY();
-
-    this.startX = this.tracker.getLastAvgX();
-    this.startY = this.tracker.getLastAvgY();
-
-    this.updateState(event);
-  }
-
-  onPointerUp(event: AdaptedEvent): void {
-    super.onPointerUp(event);
-    this.lastX = this.tracker.getLastAvgX();
-    this.lastY = this.tracker.getLastAvgY();
-
-    this.tracker.removeFromTracker(event.pointerId);
-
-    this.updateState(event);
-  }
-
-  onAdditionalPointerRemove(event: AdaptedEvent): void {
-    super.onAdditionalPointerRemove(event);
-    this.tracker.removeFromTracker(event.pointerId);
-
-    this.offsetX += this.lastX - this.startX;
-    this.offsetY += this.lastY = this.startY;
-
-    this.lastX = this.tracker.getLastAvgX();
-    this.lastY = this.tracker.getLastAvgY();
-
-    this.startX = this.lastX;
-    this.startY = this.lastY;
-
-    this.updateState(event);
-  }
-
-  onPointerMove(event: AdaptedEvent): void {
-    this.trySettingPosition(event);
-    this.tracker.track(event);
-
-    this.lastX = this.tracker.getLastAvgX();
-    this.lastY = this.tracker.getLastAvgY();
-
-    this.updateState(event);
-
-    super.onPointerMove(event);
-  }
-
-  onPointerOutOfBounds(event: AdaptedEvent): void {
-    this.trySettingPosition(event);
-    this.tracker.track(event);
-
-    this.lastX = this.tracker.getLastAvgX();
-    this.lastY = this.tracker.getLastAvgY();
-
-    this.updateState(event);
-
-    super.onPointerOutOfBounds(event);
-  }
-
-  getDefaultConfig() {
-    return {}
-  }
-
-  private trySettingPosition(event: AdaptedEvent): void {
-    if (this.currentState !== State.UNDETERMINED) return;
-    this.offsetX = 0;
-    this.offsetY = 0;
-    this.startX = event.x;
-    this.startY = event.y;
-  }
-
-  private updateState(event: AdaptedEvent): void {
-    const logger = this.logger.cloneWithPrefix("updateState")
-    if (this.maxNumberOfPointersSoFar < this.tracker.getTrackedPointersCount()) {
-      this.maxNumberOfPointersSoFar = this.tracker.getTrackedPointersCount()
-    }
-    if (this.shouldFail()) {
-      logger.info("fail")
-      this.fail()
-      return;
-    }
-    switch (this.currentState) {
-      case State.UNDETERMINED:
-        if (event.eventType === EventType.DOWN) {
-          this.begin()
-        }
-        this.startTap();
-        break;
-      case State.BEGAN:
-        if (event.eventType === EventType.UP) {
-          logger.info("endTap")
-          this.endTap();
-        }
-        if (event.eventType === EventType.DOWN) {
-          this.startTap();
-        }
-        break;
-      default:
-        logger.info(`default case - currentState ${getStateName(this.currentState)}`)
-        break;
-    }
-  }
-
-  private shouldFail(): boolean {
-    const maxDeltaX = this.config.maxDeltaX ?? Number.MIN_SAFE_INTEGER
-    const maxDeltaY = this.config.maxDeltaY ?? Number.MIN_SAFE_INTEGER
-    const maxDistSq = this.config.maxDistSq ?? Number.MIN_SAFE_INTEGER
-
-    const dx = this.lastX - this.startX + this.offsetX;
-    if (
-      maxDeltaX !== Number.MIN_SAFE_INTEGER &&
-        Math.abs(dx) > maxDeltaX
-    ) {
-      return true;
-    }
-    const dy = this.lastY - this.startY + this.offsetY;
-    if (
-      maxDeltaY !== Number.MIN_SAFE_INTEGER &&
-        Math.abs(dy) > maxDeltaY
-    ) {
-      return true;
-    }
-    const distSq = dy * dy + dx * dx;
-    const result = maxDistSq !== Number.MIN_SAFE_INTEGER && distSq > maxDistSq
-    return result;
-  }
-
-  private startTap() {
-    this.clearTimeouts();
-    this.waitTimeout = setTimeout(() => this.fail(), this.config.maxDurationMs ?? DEFAULT_MAX_DURATION_MS);
-  }
-
-  private clearTimeouts() {
-    clearTimeout(this.waitTimeout);
-    clearTimeout(this.delayTimeout);
-  }
-
-  private endTap() {
-    this.clearTimeouts();
-    if (
-      ++this.numberOfTapsSoFar === (this.config.numberOfTaps ?? DEFAULT_NUMBER_OF_TAPS) &&
-        this.maxNumberOfPointersSoFar >= (this.config.minNumberOfPointers ?? 0)
-    ) {
-      this.activate();
-    } else {
-      this.delayTimeout = setTimeout(() => this.fail(), this.config.maxDelayMs ?? DEFAULT_MAX_DELAY_MS);
-    }
-  }
-
-  public activate(): void {
-    super.activate();
-    this.end();
-  }
-
-  protected onCancel() {
-    super.onCancel()
-    this.resetProgress()
-  }
-
-  protected resetProgress(): void {
-    this.clearTimeouts();
-    this.numberOfTapsSoFar = 0;
-    this.maxNumberOfPointersSoFar = 0;
-  }
-}

package/harmony/gesture_handler/src/main/ets/Vector2D.ts

@@ -1,36 +0,0 @@
-export class Vector2D {
-  constructor(
-    private val: {
-      x: number;
-      y: number;
-    } = {x: 0, y: 0},
-  ) {}
-
-  get x() {
-    return this.val.x;
-  }
-
-  get y() {
-    return this.val.y;
-  }
-
-  get value() {
-    return {...this.val};
-  }
-
-  public clone() {
-    return new Vector2D({...this.val});
-  }
-
-  public subtract(vec: Vector2D) {
-    this.val.x -= vec.x;
-    this.val.y -= vec.y;
-    return this;
-  }
-
-  public add(vec: Vector2D) {
-    this.val.x += vec.x;
-    this.val.y += vec.y;
-    return this;
-  }
-}

package/harmony/gesture_handler/src/main/ets/VelocityTracker.ts

@@ -1,98 +0,0 @@
-import { AdaptedEvent } from './Event';
-import { CircularBuffer } from './CircularBuffer';
-import { LeastSquareSolver } from './LeastSquareSolver';
-
-export default class VelocityTracker {
-  private assumePointerMoveStoppedMilliseconds = 40;
-  private historySize = 20;
-  private horizonMilliseconds = 300;
-  private minSampleSize = 3;
-
-  private samples: CircularBuffer<AdaptedEvent>;
-
-  constructor() {
-    this.samples = new CircularBuffer<AdaptedEvent>(this.historySize);
-  }
-
-  public add(event: AdaptedEvent): void {
-    this.samples.push(event);
-  }
-
-  /// Returns an estimate of the velocity of the object being tracked by the
-  /// tracker given the current information available to the tracker.
-  ///
-  /// Information is added using [addPosition].
-  ///
-  /// Returns null if there is no data on which to base an estimate.
-  private getVelocityEstimate(): [number, number] | null {
-    const x = [];
-    const y = [];
-    const w = [];
-    const time = [];
-
-    let sampleCount = 0;
-    let index = this.samples.size - 1;
-    const newestSample = this.samples.get(index);
-    if (!newestSample) {
-      return null;
-    }
-
-    let previousSample = newestSample;
-
-    // Starting with the most recent PointAtTime sample, iterate backwards while
-    // the samples represent continuous motion.
-    while (sampleCount < this.samples.size) {
-      const sample = this.samples.get(index);
-
-      const age = newestSample.time - sample.time;
-      const delta = Math.abs(sample.time - previousSample.time);
-      previousSample = sample;
-
-      if (
-        age > this.horizonMilliseconds ||
-          delta > this.assumePointerMoveStoppedMilliseconds
-      ) {
-        break;
-      }
-
-      x.push(sample.x);
-      y.push(sample.y);
-      w.push(1);
-      time.push(-age);
-
-      sampleCount++;
-      index--;
-    }
-
-    if (sampleCount >= this.minSampleSize) {
-      const xSolver = new LeastSquareSolver(time, x, w);
-      const xFit = xSolver.solve(2);
-
-      if (xFit !== null) {
-        const ySolver = new LeastSquareSolver(time, y, w);
-        const yFit = ySolver.solve(2);
-
-        if (yFit !== null) {
-          const xVelocity = xFit.coefficients[1] * 1000;
-          const yVelocity = yFit.coefficients[1] * 1000;
-
-          return [xVelocity, yVelocity];
-        }
-      }
-    }
-
-    return null;
-  }
-
-  public getVelocity(): [number, number] {
-    const estimate = this.getVelocityEstimate();
-    if (estimate !== null) {
-      return estimate;
-    }
-    return [0, 0];
-  }
-
-  public reset(): void {
-    this.samples.clear();
-  }
-}

package/harmony/gesture_handler/src/main/ets/View.ts

@@ -1,71 +0,0 @@
-import { DescriptorRegistry, Descriptor, Tag } from "@rnoh/react-native-openharmony/ts"
-import { Vector2D } from "./Vector2D"
-
-export type BoundingBox = {
-  x: number,
-  y: number,
-  width: number,
-  height: number
-}
-
-export class View {
-  constructor(private descriptorRegistry: DescriptorRegistry, private viewTag: number) {
-  }
-
-  public getChildren() {
-    return this.getDescriptor().childrenTags.map(childrenTag => {
-      return new View(this.descriptorRegistry, childrenTag)
-    })
-  }
-
-  public getTag(): Tag {
-    return this.viewTag
-  }
-
-  public isPositionInBounds({x, y}: {
-    x: number,
-    y: number
-  }): boolean {
-    const rect = this.getBoundingRect()
-    return x >= rect.x && x <= (rect.x + rect.width) && y >= rect.y && y <= (rect.y + rect.height);
-  }
-
-  public getBoundingRect(): BoundingBox {
-    const d = this.getDescriptor()
-    if (!d) {
-      return { x: 0, y: 0, width: 0, height: 0 }
-    }
-    const offsetToAbsolutePosition = this.getOffsetToAbsolutePosition()
-    return {
-      x: d.layoutMetrics.frame.origin.x - offsetToAbsolutePosition.x,
-      y: d.layoutMetrics.frame.origin.y - offsetToAbsolutePosition.y,
-      width: d.layoutMetrics.frame.size.width,
-      height: d.layoutMetrics.frame.size.height
-    }
-  }
-
-  private getDescriptor() {
-    return this.descriptorRegistry.getDescriptor(this.viewTag)
-  }
-
-
-  private getOffsetToAbsolutePosition(): Vector2D {
-    const currentOffset = new Vector2D()
-    let parentTag = this.getDescriptor()?.parentTag
-    while (parentTag !== undefined) {
-      const d = this.descriptorRegistry.getDescriptor(parentTag)
-      currentOffset.add(this.extractScrollOffsetFromDescriptor(d))
-      currentOffset.subtract(new Vector2D(d.layoutMetrics.frame.origin))
-      parentTag = d.parentTag
-    }
-    return currentOffset
-  }
-
-  private extractScrollOffsetFromDescriptor(descriptor: Descriptor<any>) {
-    if (descriptor.type !== "ScrollView") {
-      return new Vector2D();
-    }
-    const scrollViewState: any = descriptor.state;
-    return new Vector2D({ x: scrollViewState.contentOffsetX, y: scrollViewState.contentOffsetY })
-  }
-}

package/harmony/gesture_handler/src/main/ets/ViewRegistry.ts

@@ -1,43 +0,0 @@
-import { DescriptorRegistry, ComponentManagerRegistry, Tag } from "@rnoh/react-native-openharmony/ts"
-import { View } from "./View"
-
-export class ViewRegistry {
-  constructor(private descriptorRegistry: DescriptorRegistry, private componentManagerRegistry: ComponentManagerRegistry) {
-  }
-
-  public getViewByTag(viewTag: Tag) {
-    return this.createView(viewTag)
-  }
-
-  private createView(tag: Tag): View {
-    return new View(this.descriptorRegistry, tag)
-  }
-
-  public getTouchableViewsAt(pos: {
-    x: number,
-    y: number
-  }, rootTag: Tag): View[] {
-    const rootView = this.createView(rootTag)
-    const results: View[] = []
-    for (const view of this.getTouchableViewsAtPosInView(pos, rootView)) {
-      results.push(view)
-    }
-    return results
-  }
-
-  private getTouchableViewsAtPosInView(pos: {
-    x: number,
-    y: number
-  }, view: View) {
-    if (!view.isPositionInBounds(pos))
-      return [];
-    const results: View[] = []
-    results.push(view)
-    for (const child of view.getChildren()) {
-      for (const result of this.getTouchableViewsAtPosInView(pos, child)) {
-        results.push(result)
-      }
-    }
-    return results
-  }
-}