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

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

@@ -1,37 +1,37 @@
-import { Descriptor, RNOHContext, RNViewBase, ComponentBuilderContext, RNComponentFactory, Tag } from "rnoh"
-
-export type RNGestureHandlerButtonDescriptor = Descriptor<"RNGestureHandlerButton">
-
-@Component
-export struct RNGestureHandlerButton {
-  static readonly DESCRIPTOR_TYPE = "RNGestureHandlerButton"
-  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 })
-      })
-    }
-  }
+import { Descriptor, RNOHContext, RNViewBase, ComponentBuilderContext, RNComponentFactory, Tag } from "rnoh"
+
+export type RNGestureHandlerButtonDescriptor = Descriptor<"RNGestureHandlerButton">
+
+@Component
+export struct RNGestureHandlerButton {
+  static readonly DESCRIPTOR_TYPE = "RNGestureHandlerButton"
+  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/RNGestureHandlerModule.ts

@@ -1,125 +1,125 @@
-import { TurboModule, TurboModuleContext } from 'rnoh/ts';
-import { GestureHandlerRegistry } from './GestureHandlerRegistry';
-import { GestureHandlerFactory } from "./GestureHandlerFactory"
-import { ViewRegistry } from './ViewRegistry';
-import { RNGHLogger, StandardRNGHLogger, FakeRNGHLogger } from './RNGHLogger';
-import { EventDispatcher, JSEventDispatcher, AnimatedEventDispatcher } from './EventDispatcher'
-import { RNOHScrollLocker } from "./RNOHScrollLocker"
-
-export enum ActionType {
-  REANIMATED_WORKLET = 1,
-  NATIVE_ANIMATED_EVENT = 2,
-  JS_FUNCTION_OLD_API = 3,
-  JS_FUNCTION_NEW_API = 4,
-}
-
-
-export class RNGestureHandlerModule extends TurboModule {
-  static NAME = "RNGestureHandlerModule"
-
-  private gestureHandlerRegistry = new GestureHandlerRegistry()
-  private gestureHandlerFactory: GestureHandlerFactory | undefined = undefined
-  private viewRegistry: ViewRegistry | undefined = undefined
-  private logger: RNGHLogger
-
-  constructor(ctx: TurboModuleContext) {
-    super(ctx)
-    const debug = false
-    this.logger = debug ? new StandardRNGHLogger(ctx.logger, "RNGH") : new FakeRNGHLogger()
-  }
-
-  public install() {
-    this.viewRegistry = new ViewRegistry(this.ctx.descriptorRegistry, this.ctx.componentManagerRegistry)
-    this.gestureHandlerFactory = new GestureHandlerFactory(this.logger, new RNOHScrollLocker(this.ctx.rnInstance))
-  }
-
-  public createGestureHandler(
-    handlerName: string,
-    handlerTag: number,
-    config: Readonly<Record<string, unknown>>
-  ) {
-    if (!this.gestureHandlerFactory) {
-      this.ctx.logger.error("Trying to create a gesture handler before creating gesture handler factory")
-      return
-    }
-    const gestureHandler = this.gestureHandlerFactory.create(handlerName, handlerTag)
-    this.gestureHandlerRegistry.addGestureHandler(gestureHandler)
-    gestureHandler.updateGestureConfig(config)
-  }
-
-  public attachGestureHandler(
-    handlerTag: number,
-    viewTag: number,
-    actionType: ActionType
-  ) {
-    const eventDispatcher = this.createEventDispatcher(actionType, viewTag)
-    if (!eventDispatcher) {
-      this.ctx.logger.error("RNGH: Couldn't create EventDispatcher")
-      return
-    }
-    const view = this.viewRegistry.getViewByTag(viewTag)
-    if (!view) {
-      this.ctx.logger.error(`RNGH: Couldn't attachGestureHandler to view ${viewTag}`)
-      return;
-    }
-    this.gestureHandlerRegistry.bindGestureHandlerWithView(handlerTag, view)
-    this.gestureHandlerRegistry
-      .getGestureHandlerByHandlerTag(handlerTag)
-      .setEventDispatcher(eventDispatcher)
-  }
-
-  private createEventDispatcher(actionType: ActionType, viewTag: number): EventDispatcher | null {
-    switch (actionType) {
-      case ActionType.REANIMATED_WORKLET:
-        this.ctx.logger.error("RNGH: Reanimated Worklets are not supported")
-        break;
-      case ActionType.NATIVE_ANIMATED_EVENT:
-        return new AnimatedEventDispatcher(this.ctx.rnInstance, this.logger.cloneWithPrefix('AnimatedEventDispatcher'), viewTag)
-      case ActionType.JS_FUNCTION_OLD_API:
-      case ActionType.JS_FUNCTION_NEW_API:
-        return new JSEventDispatcher(this.ctx.rnInstance, this.logger.cloneWithPrefix('JSEventDispatcher'));
-    }
-    return null
-  }
-
-  public updateGestureHandler(
-    handlerTag: number,
-    newConfig: Readonly<Record<string, unknown>>
-  ) {
-    const gestureHandler = this.gestureHandlerRegistry.getGestureHandlerByHandlerTag(handlerTag)
-    gestureHandler.updateGestureConfig(newConfig)
-  }
-
-  public dropGestureHandler(handlerTag: number) {
-    this.warn("dropGestureHandler is not implemented")
-  }
-
-  public handleSetJSResponder(tag: number, blockNativeResponder: boolean) {
-    this.warn("handleSetJSResponder is not implemented")
-  }
-
-  public handleClearJSResponder() {
-    this.warn("handleClearJSResponder is not implemented")
-  }
-
-  public flushOperations() {
-    this.warn("flushOperations is not implemented")
-  }
-
-  // -------------------------------------------------------------------------------------------------------------------
-  protected warn(message: string) {
-    this.ctx.logger.warn("RNGH: " + message)
-  }
-
-  public getGestureHandlerRegistry() {
-    return this.gestureHandlerRegistry
-  }
-
-  public getLogger() {
-    return this.logger
-  }
-
-  public getViewRegistry() {
-    return this.viewRegistry
-  }
-}
+import { TurboModule, TurboModuleContext } from 'rnoh/ts';
+import { GestureHandlerRegistry } from './GestureHandlerRegistry';
+import { GestureHandlerFactory } from "./GestureHandlerFactory"
+import { ViewRegistry } from './ViewRegistry';
+import { RNGHLogger, StandardRNGHLogger, FakeRNGHLogger } from './RNGHLogger';
+import { EventDispatcher, JSEventDispatcher, AnimatedEventDispatcher } from './EventDispatcher'
+import { RNOHScrollLocker } from "./RNOHScrollLocker"
+
+export enum ActionType {
+  REANIMATED_WORKLET = 1,
+  NATIVE_ANIMATED_EVENT = 2,
+  JS_FUNCTION_OLD_API = 3,
+  JS_FUNCTION_NEW_API = 4,
+}
+
+
+export class RNGestureHandlerModule extends TurboModule {
+  static NAME = "RNGestureHandlerModule"
+
+  private gestureHandlerRegistry = new GestureHandlerRegistry()
+  private gestureHandlerFactory: GestureHandlerFactory | undefined = undefined
+  private viewRegistry: ViewRegistry | undefined = undefined
+  private logger: RNGHLogger
+
+  constructor(ctx: TurboModuleContext) {
+    super(ctx)
+    const debug = false
+    this.logger = debug ? new StandardRNGHLogger(ctx.logger, "RNGH") : new FakeRNGHLogger()
+  }
+
+  public install() {
+    this.viewRegistry = new ViewRegistry(this.ctx.descriptorRegistry, this.ctx.componentManagerRegistry)
+    this.gestureHandlerFactory = new GestureHandlerFactory(this.logger, new RNOHScrollLocker(this.ctx.rnInstance))
+  }
+
+  public createGestureHandler(
+    handlerName: string,
+    handlerTag: number,
+    config: Readonly<Record<string, unknown>>
+  ) {
+    if (!this.gestureHandlerFactory) {
+      this.ctx.logger.error("Trying to create a gesture handler before creating gesture handler factory")
+      return
+    }
+    const gestureHandler = this.gestureHandlerFactory.create(handlerName, handlerTag)
+    this.gestureHandlerRegistry.addGestureHandler(gestureHandler)
+    gestureHandler.updateGestureConfig(config)
+  }
+
+  public attachGestureHandler(
+    handlerTag: number,
+    viewTag: number,
+    actionType: ActionType
+  ) {
+    const eventDispatcher = this.createEventDispatcher(actionType, viewTag)
+    if (!eventDispatcher) {
+      this.ctx.logger.error("RNGH: Couldn't create EventDispatcher")
+      return
+    }
+    const view = this.viewRegistry.getViewByTag(viewTag)
+    if (!view) {
+      this.ctx.logger.error(`RNGH: Couldn't attachGestureHandler to view ${viewTag}`)
+      return;
+    }
+    this.gestureHandlerRegistry.bindGestureHandlerWithView(handlerTag, view)
+    this.gestureHandlerRegistry
+      .getGestureHandlerByHandlerTag(handlerTag)
+      .setEventDispatcher(eventDispatcher)
+  }
+
+  private createEventDispatcher(actionType: ActionType, viewTag: number): EventDispatcher | null {
+    switch (actionType) {
+      case ActionType.REANIMATED_WORKLET:
+        this.ctx.logger.error("RNGH: Reanimated Worklets are not supported")
+        break;
+      case ActionType.NATIVE_ANIMATED_EVENT:
+        return new AnimatedEventDispatcher(this.ctx.rnInstance, this.logger.cloneWithPrefix('AnimatedEventDispatcher'), viewTag)
+      case ActionType.JS_FUNCTION_OLD_API:
+      case ActionType.JS_FUNCTION_NEW_API:
+        return new JSEventDispatcher(this.ctx.rnInstance, this.logger.cloneWithPrefix('JSEventDispatcher'));
+    }
+    return null
+  }
+
+  public updateGestureHandler(
+    handlerTag: number,
+    newConfig: Readonly<Record<string, unknown>>
+  ) {
+    const gestureHandler = this.gestureHandlerRegistry.getGestureHandlerByHandlerTag(handlerTag)
+    gestureHandler.updateGestureConfig(newConfig)
+  }
+
+  public dropGestureHandler(handlerTag: number) {
+    this.warn("dropGestureHandler is not implemented")
+  }
+
+  public handleSetJSResponder(tag: number, blockNativeResponder: boolean) {
+    this.warn("handleSetJSResponder is not implemented")
+  }
+
+  public handleClearJSResponder() {
+    this.warn("handleClearJSResponder is not implemented")
+  }
+
+  public flushOperations() {
+    this.warn("flushOperations is not implemented")
+  }
+
+  // -------------------------------------------------------------------------------------------------------------------
+  protected warn(message: string) {
+    this.ctx.logger.warn("RNGH: " + message)
+  }
+
+  public getGestureHandlerRegistry() {
+    return this.gestureHandlerRegistry
+  }
+
+  public getLogger() {
+    return this.logger
+  }
+
+  public getViewRegistry() {
+    return this.viewRegistry
+  }
+}

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

@@ -1,56 +1,57 @@
-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 { Descriptor, RNOHContext, RNViewBase, ComponentBuilderContext, RNComponentFactory, Tag } from "rnoh"
+import { RNGHRootTouchHandler } from "./RNGHRootTouchHandler"
+import { RNGestureHandlerModule } from "./RNGestureHandlerModule"
+import { Vector2D } from "./Vector2D"
+import { ViewRegistry } from './ViewRegistry'
+
+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() as ViewRegistry, 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,11 @@
-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/ts"
+import { ScrollLocker } from "./GestureHandler"
+
+export class RNOHScrollLocker implements ScrollLocker {
+  public constructor(private rnInstance: RNInstance) {
+  }
+
+  public lockScrollContainingViewTag(viewTag: number) {
+    return this.rnInstance.blockComponentsGestures(viewTag)
+  }
 }

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"
+  }
 }