@react-native-oh-tpl/react-native-gesture-handler 2.14.1-2.14.14 → 2.14.1-2.14.15

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.14';
+export const HAR_VERSION = '2.14.1-2.14.15';
 export const BUILD_MODE_NAME = 'release';
 export const DEBUG = false;
 export const TARGET_NAME = 'default';

package/harmony/gesture_handler/build-profile.json5

@@ -1,12 +1,5 @@
 {
   "apiType": 'stageMode',
-//  "buildOption": {
-//    "externalNativeOptions": {
-//      "path": "./src/main/cpp/CMakeLists.txt",
-//      "arguments": "",
-//      "cppFlags": "",
-//    },
-//  },
   "targets": [
     {
       "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.14',
+  version: '2.14.1-2.14.15',
   dependencies: {
-    "@rnoh/react-native-openharmony": "file:./react_native_openharmony"
+    "@rnoh/react-native-openharmony": "file:../react_native_openharmony"
   },
 }

package/harmony/gesture_handler/src/main/ets/gesture-handlers/PanGestureHandler.ts

@@ -284,7 +284,13 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
     if (this.currentState === State.ACTIVE) {
       this.lastPos = this.tracker.getLastAvgPos();
     }
+
     this.tracker.removeFromTracker(event.pointerId);
+    
+    if (this.tracker.getTrackedPointersCount() === 0) {
+      this.clearActivationTimeout();
+    }
+
     if (this.currentState === State.ACTIVE) {
       this.end();
     } else {
@@ -358,4 +364,12 @@ export class PanGestureHandler extends GestureHandler<PanGestureHandlerConfig> {
       this.unlockRNGestureResponder?.()
     }
   }
+
+  protected onCancel(): void {
+    this.clearActivationTimeout();
+  }
+
+  protected onReset(): void {
+    this.clearActivationTimeout();
+  }
 }

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

@@ -19,7 +19,7 @@ class GestureHandlerTurboModuleFactory extends TurboModulesFactory {
  * @deprecated: Use the package class exported from ../RNOHPackage.ets (2024-10-10)
  */
 export class GestureHandlerPackage extends RNPackage {
-  createUITurboModuleFactory(ctx: TurboModuleContext): TurboModulesFactory {
+  createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new GestureHandlerTurboModuleFactory(ctx);
   }
 }

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

@@ -1,6 +1,6 @@
 import { TouchEvent as TouchEventArkTS, TouchType, TouchObject } from './types';
 import { RNGHLogger, View, Multiset, GestureHandlerRegistry } from '../core';
-import { RawTouchableView } from "./RNGHView"
+import { RawTouchableView, RNGHView } from "./RNGHView"
 import { RNGHViewController } from './RNGHViewController';
 
 type RawTouchPoint = {
@@ -59,8 +59,9 @@ export class RNGHRootViewController {
     if (e.type === TouchType.Down) {
       this.activeViewTags.clear();
     }
-    const views = touchableViews
-    for (const view of views) {
+    const views = touchableViews as RNGHView[]
+    for (let i = 0; i < views.length; i++) {
+      const view = views[i];
       for (const handler of this.gestureHandlerRegistry.getGestureHandlersByViewTag(
         view.getTag(),
       )) {
@@ -87,6 +88,19 @@ export class RNGHRootViewController {
           this.activeViewTags.add(view.getTag());
         }
       }
+
+      // If the pointer is inside the view but it overflows its parent, handlers attached to the parent
+      // might not have been called correctly (wrong bounding box). Extending the parent bounding box 
+      // with the child bounding box ensures that the parent handlers are called correctly.
+      // This approach is slightly different from Android RNGH implementation (extracting parent gesture handlers), 
+      // however, the outcome is the same.
+      for (let j = i; j > 1; j--) {
+        const currentView = views[j];
+        const parentView = views[j-1];
+        if (parentView.intersectsWith(currentView)) {
+          parentView.attachChildrenBoundingRects(currentView);
+        }
+      }
     }
 
     // send touch to gesture handlers, prioritize handling touch events for child components

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

@@ -20,6 +20,7 @@ export class RNGHView implements View {
   private tag: number
   private buttonRole: boolean
   private boundingBox: BoundingBox
+  private childrenBoundingBoxes: Set<BoundingBox> = new Set()
 
   constructor({ tag, buttonRole, ...boundingBox }: RawTouchableView) {
     this.tag = tag
@@ -35,23 +36,45 @@ export class RNGHView implements View {
     return { ...this.boundingBox }
   }
 
+  getChildrenBoundingRects(): BoundingBox[] {
+    return Array.from(this.childrenBoundingBoxes)
+  }
+
   isPositionInBounds({ x, y }: {
     x: number;
     y: number
   }): boolean {
-    const rect = this.getBoundingRect();
-    return (
+    const rects = [this.boundingBox, ...this.childrenBoundingBoxes]
+    return rects.some(rect => (
       x >= rect.x &&
         x <= rect.x + rect.width &&
         y >= rect.y &&
         y <= rect.y + rect.height
-    );
+    ))
   }
 
   updateBoundingBox(boundingBox: BoundingBox) {
     this.boundingBox = boundingBox
   }
 
+  attachChildrenBoundingRects(view: RNGHView) {
+    this.childrenBoundingBoxes.add(view.getBoundingRect())
+    for (const childBoundingBox of view.getChildrenBoundingRects()) {
+      this.childrenBoundingBoxes.add(childBoundingBox)
+    }
+  }
+
+  intersectsWith(view: RNGHView): boolean {
+    const rect1 = this.getBoundingRect()
+    const rect2 = view.getBoundingRect()
+    return (
+      rect1.x < rect2.x + rect2.width &&
+      rect1.x + rect1.width > rect2.x &&
+      rect1.y < rect2.y + rect2.height &&
+      rect1.y + rect1.height > rect2.y
+    )
+  }
+
   setButtonRole(buttonRole: boolean) {
     this.buttonRole = buttonRole
   }

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

@@ -165,16 +165,9 @@ export class RNGHViewController {
   }
 
   private isInBounds(point: Point): boolean {
-    const x = point.x;
-    const y = point.y;
     const rect = this.view.getBoundingRect();
     this.logger.cloneAndJoinPrefix("isInBounds").debug({ rect })
-    const result =
-      x >= rect.x &&
-        x <= rect.x + rect.width &&
-        y >= rect.y &&
-        y <= rect.y + rect.height;
-    return result;
+    return this.view.isPositionInBounds(point);
   }
 
   private updateActivePointers(touchType: TouchType, pointerId: number): void {

package/package.json

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