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

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

@@ -1,110 +0,0 @@
-import { RNGHRootTouchHandlerArkTS } from './RNGHRootTouchHandlerArkTS';
-import { TouchEvent as TouchEventArkTS, TouchType, TouchObject } from './types';
-import { RNGHLogger, View } from '../core';
-import { RawTouchableView } from "./View"
-
-type RawTouchPoint = {
-  pointerId: number;
-  windowX: number;
-  windowY: number;
-};
-
-export type RawTouchEvent = {
-  action: number;
-  actionTouch: RawTouchPoint;
-  touchPoints: RawTouchPoint[];
-  sourceType: number;
-  timestamp: number;
-  /** TouchableViews is a list of views from root to leaf which contain the touch point specified by `actionTouch` in their boundary boxes. */
-  touchableViews: RawTouchableView[]
-};
-
-const CACHED_TOUCHES_MAP = new Map<number, RawTouchPoint>();
-let lastChangedPointerId: number | null = null;
-const MAX_SIZE = 10;
-const areRawTouchPointsEqual = (a: RawTouchPoint, b: RawTouchPoint) =>
-  a.pointerId === b.pointerId &&
-  a.windowX === b.windowX &&
-  a.windowY === b.windowY;
-
-
-export class RNGHRootTouchHandlerCAPI {
-  private logger: RNGHLogger;
-
-  constructor(
-    logger: RNGHLogger,
-    private touchHandlerArkTS: RNGHRootTouchHandlerArkTS,
-  ) {
-    this.logger = logger.cloneWithPrefix('RNGHRootTouchHandlerCAPI');
-  }
-
-  handleTouch(rawTouchEvent: RawTouchEvent, touchableViews: View[]) {
-    this.touchHandlerArkTS.handleTouch(
-      touchEventArkTSFromRawTouchEvent(rawTouchEvent), touchableViews
-    );
-  }
-
-  cancelTouches() {
-    this.touchHandlerArkTS.cancelTouches()
-  }
-}
-
-function touchEventArkTSFromRawTouchEvent(raw: RawTouchEvent): TouchEventArkTS {
-  const touchType = touchTypeFromAction(raw.action);
-  const actionTouch = raw.actionTouch;
-  let hasTouchChanged = true;
-  let lastChangedTouch: RawTouchPoint = actionTouch;
-  if (CACHED_TOUCHES_MAP.has(actionTouch.pointerId)) {
-    if (areRawTouchPointsEqual(actionTouch, CACHED_TOUCHES_MAP.get(actionTouch.pointerId) as RawTouchPoint)) {
-      hasTouchChanged = false;
-    } else {
-      lastChangedPointerId = actionTouch.pointerId;
-      CACHED_TOUCHES_MAP.set(actionTouch.pointerId, actionTouch);
-    }
-  } else {
-    // remove first element if the cache is full
-    if (CACHED_TOUCHES_MAP.size >= MAX_SIZE) {
-      CACHED_TOUCHES_MAP.delete(CACHED_TOUCHES_MAP.keys().next().value);
-    }
-    lastChangedPointerId = actionTouch.pointerId;
-    CACHED_TOUCHES_MAP.set(actionTouch.pointerId, actionTouch);
-  }
-  lastChangedTouch = CACHED_TOUCHES_MAP.get(lastChangedPointerId as number) as RawTouchPoint
-  return {
-    type: touchTypeFromAction(raw.action),
-    touches: raw.touchPoints.map(tp =>
-    touchObjectFromTouchPoint(tp, touchType),
-    ),
-    changedTouches: [
-      touchObjectFromTouchPoint(lastChangedTouch, touchType),
-    ],
-    timestamp: raw.timestamp / Math.pow(10, 6),
-  };
-}
-
-function touchTypeFromAction(action: number): TouchType {
-  switch (action) {
-    case 1:
-      return TouchType.Down;
-    case 2:
-      return TouchType.Move;
-    case 3:
-      return TouchType.Up;
-    default:
-      return TouchType.Cancel;
-  }
-}
-
-function touchObjectFromTouchPoint(
-  touchPoint: RawTouchPoint,
-  touchType: TouchType,
-): TouchObject {
-  return {
-    id: touchPoint.pointerId,
-    windowX: touchPoint.windowX,
-    windowY: touchPoint.windowY,
-    x: touchPoint.windowX,
-    y: touchPoint.windowY,
-    type: touchType,
-  };
-}

package/harmony/gesture_handler/src/main/ets/rnoh/RNGestureHandlerButton.ets

@@ -1,38 +0,0 @@
-import { RNOHContext, RNViewBase, ComponentBuilderContext, RNComponentFactory, Tag } from "@rnoh/react-native-openharmony"
-import { RNC } from "../namespace/ts"
-
-export type RNGestureHandlerButtonDescriptor = RNC.RNGestureHandlerButton.Descriptor
-
-@Component
-export struct RNGestureHandlerButton {
-  static readonly NAME = RNC.RNGestureHandlerButton.NAME
-  public ctx!: RNOHContext
-  public tag: number = -1
-  @BuilderParam public buildCustomComponent: (componentBuilderContext: ComponentBuilderContext) => void
-
-  @State private descriptor: RNGestureHandlerButtonDescriptor = {} as RNGestureHandlerButtonDescriptor
-  private unsubscribes: (() => void)[] = []
-
-  aboutToAppear() {
-    this.handleDescriptorChange(this.ctx.descriptorRegistry.getDescriptor<RNGestureHandlerButtonDescriptor>(this.tag))
-    this.unsubscribes.push(this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, (d) => {
-      this.handleDescriptorChange(d as RNGestureHandlerButtonDescriptor)
-    }))
-  }
-
-  aboutToDisappear() {
-    this.unsubscribes.forEach(unsubscribe => unsubscribe())
-  }
-
-  handleDescriptorChange(newDescriptor: RNGestureHandlerButtonDescriptor) {
-    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 })
-      })
-    }
-  }
-}

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

@@ -1,53 +0,0 @@
-import { RNOHContext, RNViewBase, ComponentBuilderContext, RNComponentFactory, Tag } from "@rnoh/react-native-openharmony"
-import { RNC } from "../namespace/ts"
-import { RNGHRootTouchHandlerArkTS as RNGHRootTouchHandler } from "./RNGHRootTouchHandlerArkTS"
-import { RNGestureHandlerModule } from "./RNGestureHandlerModule"
-
-
-export type RNGestureHandlerRootViewDescriptor = RNC.RNGestureHandlerRootView.Descriptor
-
-@Component
-export struct RNGestureHandlerRootView {
-  static readonly NAME = RNC.RNGestureHandlerRootView.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/rnoh/View.ts

@@ -1,134 +0,0 @@
-import { DescriptorRegistry, Descriptor, Tag } from '@rnoh/react-native-openharmony/ts';
-import { View, Vector2D, BoundingBox } from "../core"
-
-
-export type RawTouchableView = {
-  tag: number,
-  /**
-   * Relative to application window.
-   */
-  x: number,
-  /**
-   * Relative to application window.
-   */
-  y: number,
-  width: number,
-  height: number,
-  buttonRole: boolean,
-}
-
-export class ViewCAPI implements View {
-  private tag: number
-  private buttonRole: boolean
-  private boundingBox: BoundingBox
-
-  constructor({ tag, buttonRole, ...boundingBox }: RawTouchableView) {
-    this.tag = tag
-    this.buttonRole = buttonRole
-    this.boundingBox = boundingBox
-  }
-
-  getTag(): number {
-    return this.tag
-  }
-
-  getBoundingRect(): BoundingBox {
-    return { ...this.boundingBox }
-  }
-
-  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
-    );
-  }
-
-  updateBoundingBox(boundingBox: BoundingBox) {
-    this.boundingBox = boundingBox
-  }
-
-  setButtonRole(buttonRole: boolean) {
-    this.buttonRole = buttonRole
-  }
-
-  hasButtonRole(): boolean {
-    return this.buttonRole
-  }
-}
-
-export class ViewArkTS implements View {
-  constructor(
-    private descriptorRegistry: DescriptorRegistry,
-    private viewTag: number,
-  ) {
-  }
-
-
-  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,
-    });
-  }
-
-  public hasButtonRole(): boolean {
-    return false;
-  }
-}

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

@@ -1,97 +0,0 @@
-import { DescriptorRegistry, Tag, } from '@rnoh/react-native-openharmony/ts';
-import { ViewArkTS } from './View';
-import { View, ViewRegistry } from '../core';
-
-export class ViewRegistryArkTS implements ViewRegistry {
-  constructor(
-    private descriptorRegistry: DescriptorRegistry,
-  ) {
-  }
-
-  getViewByTag(viewTag: Tag) {
-    return this.createView(viewTag);
-  }
-
-  save(view: View) {
-    /**
-     * Currently, a new View object is created when getViewByTag is called. That was the approach in initial "quick"
-     * implementation of this library. The save was introduced later, for the needs of implementation using C-API architecture.
-     * C-API architecture is going to replace ArkTS anyway, so there's no point of doing this properly since this class
-     * will be removed in the future.
-     */
-  }
-
-  deleteByTag(viewTag: Tag) {
-    // No-op, ArkTS is going to be deprecated at some point in the future.
-  }
-
-  private createView(tag: Tag): ViewArkTS {
-    return new ViewArkTS(this.descriptorRegistry, tag);
-  }
-
-  getTouchableViewsAt(
-    pos: {
-      x: number;
-      y: number;
-    },
-    rootTag: Tag,
-  ): ViewArkTS[] {
-    const rootView = this.createView(rootTag);
-    const results: ViewArkTS[] = [];
-    for (const view of this.getTouchableViewsAtPosInView(pos, rootView)) {
-      results.push(view);
-    }
-    return results;
-  }
-
-  private getTouchableViewsAtPosInView(
-    pos: {
-      x: number;
-      y: number;
-    },
-    view: ViewArkTS,
-  ) {
-    if (!view.isPositionInBounds(pos)) return [];
-    const results: ViewArkTS[] = [];
-    results.push(view);
-    for (const child of this.getChildrenOf(view.getTag())) {
-      for (const result of this.getTouchableViewsAtPosInView(pos, child)) {
-        results.push(result);
-      }
-    }
-    return results;
-  }
-
-  private getChildrenOf(viewTag: Tag): ViewArkTS[] {
-    return this.descriptorRegistry.findDescriptorWrapperByTag(viewTag).childrenTags.map((tag) => new ViewArkTS(this.descriptorRegistry, tag))
-  }
-}
-
-
-export class ViewRegistryCAPI implements ViewRegistry {
-  private viewByTag = new Map<Tag, View>()
-
-  save(view: View) {
-    this.viewByTag.set(view.getTag(), view)
-  }
-
-  deleteByTag(viewTag: Tag) {
-    this.viewByTag.delete(viewTag)
-  }
-
-  getViewByTag(viewTag: Tag) {
-    return this.viewByTag.get(viewTag);
-  }
-
-  getTouchableViewsAt(
-    pos: {
-      x: number;
-      y: number;
-    },
-    rootTag: Tag,
-  ): ViewArkTS[] {
-    // Finding views is handled on CPP side and provided with the touch event.
-    // This method can be removed from ViewRegistry interface once support for ArkTS architecture is removed.
-    return []
-  }
-}