@react-native-oh-tpl/react-native-gesture-handler 2.12.6-1 → 2.12.9

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

@@ -1,56 +1,53 @@
-import { Descriptor, RNOHContext, RNViewBase, ComponentBuilderContext, RNComponentFactory, Tag } from "rnoh"
-import { RNGHRootTouchHandler } from "./RNGHRootTouchHandler"
-import { RNGestureHandlerModule } from "./RNGestureHandlerModule"
-import { Vector2D } from "./Vector2D"
-
-export type RNGestureHandlerRootViewDescriptor = Descriptor<"RNGestureHandlerRootView">
-
-@Component
-export struct RNGestureHandlerRootView {
-  /**
-   * @deprecated: Use RNGestureHandlerRootView.NAME instead
-   */
-  static readonly DESCRIPTOR_TYPE = "RNGestureHandlerRootView"
-  static readonly NAME = "RNGestureHandlerRootView"
-  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)
-
-    }
-  }
+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,11 +1,23 @@
-import { RNInstance } from "rnoh/ts"
-import { ScrollLocker } from "./GestureHandler"
-
-export class RNOHScrollLocker implements ScrollLocker {
-  public constructor(private rnInstance: RNInstance) {
-  }
-
-  public lockScrollContainingViewTag(viewTag: number) {
-    return this.rnInstance.blockComponentsGestures(viewTag)
-  }
-}
+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 +1,47 @@
-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"
-  }
+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 +1,206 @@
-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;
-  }
+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;
+  }
 }