@react-native-oh-tpl/react-native-gesture-handler 2.14.1-2.14.12 → 2.14.1-2.14.13

package/harmony/gesture_handler/BuildProfile.ets

@@ -1,7 +1,7 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '2.14.1-2.14.12';
+export const HAR_VERSION = '2.14.1-2.14.13';
 export const BUILD_MODE_NAME = 'release';
 export const DEBUG = false;
 export const TARGET_NAME = 'default';

package/harmony/gesture_handler/oh-package.json5

@@ -5,8 +5,8 @@
   name: '@react-native-oh-tpl/react-native-gesture-handler',
   description: '',
   type: 'module',
-  version: '2.14.1-2.14.12',
+  version: '2.14.1-2.14.13',
   dependencies: {
-    "@rnoh/react-native-openharmony": "file:../react_native_openharmony"
-  }
+    "@rnoh/react-native-openharmony": "file:./react_native_openharmony"
+  },
 }

package/harmony/gesture_handler/src/main/ets/core/GestureHandler.ts

@@ -579,8 +579,14 @@ export abstract class GestureHandler<TGestureConfig extends GestureConfig = Gest
     };
   }
 
-  protected transformNativeEvent() {
-    return {};
+  protected transformNativeEvent(): Record<string, unknown> {
+    const rect = this.view.getBoundingRect();
+    return {
+      x: this.tracker.getLastAvgX() - rect.x,
+      y: this.tracker.getLastAvgY() - rect.y,
+      absoluteX: this.tracker.getLastAvgX(),
+      absoluteY: this.tracker.getLastAvgY(),
+    };
   }
 
   setAwaiting(isAwaiting: boolean): void {

package/harmony/gesture_handler/src/main/ets/core/GestureHandlerRegistry.ts

@@ -1,14 +1,17 @@
 import { GestureHandler } from "./GestureHandler"
 import { View } from "./View"
 import { RNGHLogger } from "./RNGHLogger"
+import { ViewRegistry } from "./ViewRegistry"
 
 export class GestureHandlerRegistry {
   private gestureHandlerByHandlerTag: Map<number, GestureHandler> = new Map()
   private gestureHandlersByViewTag: Map<number, Set<GestureHandler>> = new Map()
+  private viewRegistry: ViewRegistry | undefined
   private logger: RNGHLogger
 
-  constructor(logger: RNGHLogger) {
+  constructor(viewRegistry: ViewRegistry | undefined, logger: RNGHLogger) {
     this.logger = logger.cloneWithPrefix("GestureHandlerRegistry")
+    this.viewRegistry = viewRegistry
   }
 
   public addGestureHandler(gestureHandler: GestureHandler) {
@@ -29,6 +32,31 @@ export class GestureHandlerRegistry {
     return Array.from(this.gestureHandlersByViewTag.get(viewTag) ?? [])
   }
 
+  public removeGestureHandlerByHandlerTag(handlerTag: number) {
+    const gestureHandler = this.gestureHandlerByHandlerTag.get(handlerTag)
+    if (!gestureHandler) {
+      return;
+    }
+    const viewTag = gestureHandler.getView()?.getTag();
+    if (viewTag) {
+      const gestureHandlers = this.gestureHandlersByViewTag.get(viewTag)
+      if (gestureHandlers) {
+        gestureHandlers.delete(gestureHandler)
+        if (gestureHandlers.size === 0) {
+          this.gestureHandlersByViewTag.delete(viewTag)
+          this.viewRegistry?.deleteByTag(viewTag)
+        }
+      }
+    }
+    if (gestureHandler.getView()) {
+      // Handler is in "prepared" state which means it is registered in the orchestrator and can
+      // receive touch events. This means that before we remove it from the registry we need to
+      // "cancel" it so that orchestrator does no longer keep a reference to it.
+      gestureHandler.cancel()
+    }
+    this.gestureHandlerByHandlerTag.delete(handlerTag)
+  }
+
   public getGestureHandlerByHandlerTag(handlerTag: number): GestureHandler {
     return this.gestureHandlerByHandlerTag.get(handlerTag)
   }

package/harmony/gesture_handler/src/main/ets/core/ViewFinder.ts

@@ -0,0 +1,11 @@
+import { Tag, View } from "./View"
+
+export interface ViewFinder {
+    getTouchableViewsAt(
+      pointRelativeToRoot: {
+        x: number,
+        y: number
+      },
+      rootTag: Tag
+    ): View[]
+  }

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

@@ -0,0 +1,8 @@
+import { Tag, View } from "./View"
+import { ViewFinder } from "./ViewFinder"
+
+export interface ViewRegistry extends ViewFinder {
+  getViewByTag(viewTag: Tag): View | undefined
+  save(view: View): void
+  deleteByTag(viewTag: Tag): void
+}

package/harmony/gesture_handler/src/main/ets/core/index.ts

@@ -10,4 +10,6 @@ export * from "./InteractionManager"
 export * from "./PointerTracker"
 export * from "./RNGHError"
 export * from "./State"
-export * from "./GestureHandlerRegistry"
+export * from "./GestureHandlerRegistry"
+export * from "./ViewFinder"
+export * from "./ViewRegistry"

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

@@ -1,18 +1,8 @@
 import { Tag } from '@rnoh/react-native-openharmony/ts';
 import { GestureHandlerArkUIAdapter } from './GestureHandlerArkUIAdapter';
-import { RNGHLogger, GestureHandlerRegistry, View } from '../core';
+import { RNGHLogger, GestureHandlerRegistry, View, ViewFinder } from '../core';
 import { TouchEvent, TouchType } from './types';
 
-export interface ViewFinder {
-  getTouchableViewsAt(
-    pointRelativeToRoot: {
-      x: number,
-      y: number
-    },
-    rootTag: Tag
-  ): View[]
-}
-
 export class RNGHRootTouchHandlerArkTS {
   private adapterByViewTag: Map<number, GestureHandlerArkUIAdapter> = new Map(); // TODO: remove adapter when view is removed
   /**

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

@@ -1,8 +1,8 @@
 import { TurboModule, TurboModuleContext, Tag } from "@rnoh/react-native-openharmony/ts";
 import { TM } from "../namespace/ts"
-import { GestureHandlerRegistry, State, OutgoingEventDispatcher, RNGHLogger, InteractionManager } from '../core';
+import { GestureHandlerRegistry, State, OutgoingEventDispatcher, RNGHLogger, InteractionManager, ViewRegistry } from '../core';
 import { GestureHandlerFactory } from "../gesture-handlers"
-import { ViewRegistry, ViewRegistryArkTS, ViewRegistryCAPI } from './ViewRegistry';
+import { ViewRegistryArkTS, ViewRegistryCAPI } from './ViewRegistry';
 import { StandardRNGHLogger, FakeRNGHLogger } from './Logger';
 import { JSEventDispatcher, AnimatedEventDispatcher, ReanimatedEventDispatcher } from './OutgoingEventDispatchers'
 import { RNOHScrollLockerArkTS, RNOHScrollLockerCAPI } from "./RNOHScrollLocker"
@@ -34,7 +34,7 @@ export class RNGestureHandlerModule extends TurboModule implements TM.RNGestureH
     const debug = false
     this.logger = debug ? new StandardRNGHLogger(ctx.logger, "RNGH") : new FakeRNGHLogger()
     this.interactionManager = new InteractionManager(this.logger)
-    this.gestureHandlerRegistry = new GestureHandlerRegistry(this.logger)
+    this.gestureHandlerRegistry = new GestureHandlerRegistry(this.viewRegistry, this.logger)
 
     if (this.ctx.rnInstance.getArchitecture() === "C_API") {
       this.ctx.rnInstance.cppEventEmitter.subscribe("RNGH::TOUCH_EVENT", (e: any) => {
@@ -173,7 +173,8 @@ export class RNGestureHandlerModule extends TurboModule implements TM.RNGestureH
   }
 
   public dropGestureHandler(handlerTag: number) {
-    this.warn("dropGestureHandler is not implemented")
+    this.interactionManager.dropRelationsForHandlerWithTag(handlerTag)
+    this.gestureHandlerRegistry.removeGestureHandlerByHandlerTag(handlerTag)
   }
 
   public handleSetJSResponder(tag: number, blockNativeResponder: boolean) {
@@ -185,7 +186,7 @@ export class RNGestureHandlerModule extends TurboModule implements TM.RNGestureH
   }
 
   public flushOperations() {
-    this.warn("flushOperations is not implemented")
+    // no-op
   }
 
   // -------------------------------------------------------------------------------------------------------------------

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

@@ -1,12 +1,6 @@
 import { DescriptorRegistry, Tag, } from '@rnoh/react-native-openharmony/ts';
 import { ViewArkTS } from './View';
-import { View } from '../core';
-import type { ViewFinder } from "./RNGHRootTouchHandlerArkTS"
-
-export interface ViewRegistry extends ViewFinder {
-  getViewByTag(viewTag: Tag)
-  save(view: View)
-}
+import { View, ViewRegistry } from '../core';
 
 export class ViewRegistryArkTS implements ViewRegistry {
   constructor(
@@ -27,6 +21,10 @@ export class ViewRegistryArkTS implements ViewRegistry {
      */
   }
 
+  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);
   }
@@ -77,6 +75,10 @@ export class ViewRegistryCAPI implements ViewRegistry {
     this.viewByTag.set(view.getTag(), view)
   }
 
+  deleteByTag(viewTag: Tag) {
+    this.viewByTag.delete(viewTag)
+  }
+
   getViewByTag(viewTag: Tag) {
     return this.viewByTag.get(viewTag);
   }

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/react-native-oh-library/react-native-harmony-gesture-handler.git"
   },
-  "version": "2.14.1-2.14.12",
+  "version": "2.14.1-2.14.13",
   "description": "",
   "react-native": "src/index.ts",
   "main": "lib/commonjs/index.js",