@react-native-oh-tpl/react-native-gesture-handler 2.14.14 → 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.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.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/cpp/RNGestureHandlerButtonComponentDescriptor.h

@@ -0,0 +1,36 @@
+
+#pragma once
+
+// This file was generated.
+
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/components/view/ViewShadowNode.h>
+
+namespace facebook {
+namespace react {
+
+extern const char RNGestureHandlerButtonComponentName[] = "RNGestureHandlerButton";
+
+class RNGestureHandlerButtonProps : public ViewProps {
+  public:
+    RNGestureHandlerButtonProps() = default;
+
+    RNGestureHandlerButtonProps(const PropsParserContext &context, const RNGestureHandlerButtonProps &sourceProps, const RawProps &rawProps)
+        : ViewProps(context, sourceProps, rawProps) {}
+};
+
+using RNGestureHandlerButtonShadowNode = ConcreteViewShadowNode<
+    RNGestureHandlerButtonComponentName,
+    RNGestureHandlerButtonProps,
+    ViewEventEmitter>;
+
+class RNGestureHandlerButtonComponentDescriptor final
+    : public ConcreteComponentDescriptor<RNGestureHandlerButtonShadowNode> {
+  public:
+    RNGestureHandlerButtonComponentDescriptor(ComponentDescriptorParameters const &parameters)
+        : ConcreteComponentDescriptor(parameters) {}
+};
+
+} // namespace react
+} // namespace facebook

package/harmony/gesture_handler/src/main/cpp/RNGestureHandlerButtonJSIBinder.h

@@ -0,0 +1,32 @@
+#pragma once
+
+// This file was generated.
+
+#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h"
+
+namespace rnoh {
+class RNGestureHandlerButtonJSIBinder : public ViewComponentJSIBinder {
+  protected:
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+        auto object = ViewComponentJSIBinder::createNativeProps(rt);
+        object.setProperty(rt, "exclusive", true);
+        object.setProperty(rt, "foreground", true);
+        object.setProperty(rt, "borderless", true);
+        object.setProperty(rt, "enabled", true);
+        object.setProperty(rt, "rippleColor", true);
+        object.setProperty(rt, "rippleRadius", true);
+        object.setProperty(rt, "touchSoundDisabled", true);
+        return object;
+    }
+
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+        facebook::jsi::Object events(rt);
+        return events;
+    }
+
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+        facebook::jsi::Object events(rt);
+        return events;
+    }
+};
+} // namespace rnoh

package/harmony/gesture_handler/src/main/cpp/RNGestureHandlerModule.cpp

@@ -0,0 +1,22 @@
+
+#include "RNGestureHandlerModule.h"
+
+// This file was generated.
+
+namespace rnoh {
+using namespace facebook;
+
+RNGestureHandlerModule::RNGestureHandlerModule(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name) {
+    methodMap_ = {
+        ARK_METHOD_METADATA(handleSetJSResponder, 2),
+        ARK_METHOD_METADATA(handleClearJSResponder, 0),
+        ARK_METHOD_METADATA(createGestureHandler, 3),
+        ARK_METHOD_METADATA(attachGestureHandler, 3),
+        ARK_METHOD_METADATA(updateGestureHandler, 2),
+        ARK_METHOD_METADATA(dropGestureHandler, 1),
+        ARK_METHOD_METADATA(install, 0),
+        ARK_METHOD_METADATA(flushOperations, 0),
+    };
+}
+
+} // namespace rnoh

package/harmony/gesture_handler/src/main/cpp/RNGestureHandlerModule.h

@@ -0,0 +1,15 @@
+
+#pragma once
+
+// This file was generated.
+
+#include "RNOH/ArkTSTurboModule.h"
+
+namespace rnoh {
+
+class JSI_EXPORT RNGestureHandlerModule : public ArkTSTurboModule {
+  public:
+    RNGestureHandlerModule(const ArkTSTurboModule::Context ctx, const std::string name);
+};
+
+} // namespace rnoh

package/harmony/gesture_handler/src/main/cpp/RNGestureHandlerRootViewComponentDescriptor.h

@@ -0,0 +1,36 @@
+
+#pragma once
+
+// This file was generated.
+
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/components/view/ViewShadowNode.h>
+
+namespace facebook {
+namespace react {
+
+extern const char RNGestureHandlerRootViewComponentName[] = "RNGestureHandlerRootView";
+
+class RNGestureHandlerRootViewProps : public ViewProps {
+  public:
+    RNGestureHandlerRootViewProps() = default;
+
+    RNGestureHandlerRootViewProps(const PropsParserContext &context, const RNGestureHandlerRootViewProps &sourceProps, const RawProps &rawProps)
+        : ViewProps(context, sourceProps, rawProps) {}
+};
+
+using RNGestureHandlerRootViewShadowNode = ConcreteViewShadowNode<
+    RNGestureHandlerRootViewComponentName,
+    RNGestureHandlerRootViewProps,
+    ViewEventEmitter>;
+
+class RNGestureHandlerRootViewComponentDescriptor final
+    : public ConcreteComponentDescriptor<RNGestureHandlerRootViewShadowNode> {
+  public:
+    RNGestureHandlerRootViewComponentDescriptor(ComponentDescriptorParameters const &parameters)
+        : ConcreteComponentDescriptor(parameters) {}
+};
+
+} // namespace react
+} // namespace facebook

package/harmony/gesture_handler/src/main/cpp/RNGestureHandlerRootViewJSIBinder.h

@@ -0,0 +1,25 @@
+#pragma once
+
+// This file was generated.
+
+#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h"
+
+namespace rnoh {
+class RNGestureHandlerRootViewJSIBinder : public ViewComponentJSIBinder {
+  protected:
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+        auto object = ViewComponentJSIBinder::createNativeProps(rt);
+        return object;
+    }
+
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+        facebook::jsi::Object events(rt);
+        return events;
+    }
+
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+        facebook::jsi::Object events(rt);
+        return events;
+    }
+};
+} // namespace rnoh

package/harmony/gesture_handler/src/main/cpp/RnohReactNativeHarmonyGestureHandlerPackage.cpp

@@ -3,12 +3,29 @@
 #include "RNOH/RNInstanceCAPI.h"
 #include "componentInstances/RNGestureHandlerButtonComponentInstance.h"
 #include "componentInstances/RNGestureHandlerRootViewComponentInstance.h"
+#include "RNOH/ArkTSTurboModule.h"
+#include "RNGestureHandlerModule.h"
+#include "RNGestureHandlerButtonComponentDescriptor.h"
+#include "RNGestureHandlerRootViewComponentDescriptor.h"
+#include "RNGestureHandlerButtonJSIBinder.h"
+#include "RNGestureHandlerRootViewJSIBinder.h"
 #include <glog/logging.h>
 #include <react/renderer/debug/SystraceSection.h>
 
 using namespace rnoh;
 using namespace facebook;
 
+class GestureHandlerTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
+public:
+    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
+        if (name == "RNGestureHandlerModule") {
+            return std::make_shared<RNGestureHandlerModule>(ctx, name);
+        }
+        return nullptr;
+    };
+};
+
+
 class RNGHEventEmitRequestHandler : public EventEmitRequestHandler {
     void handleEvent(EventEmitRequestHandler::Context const &ctx) override {
         facebook::react::SystraceSection s("RNGH::RNGHEventEmitRequestHandler::handleEvent");
@@ -38,6 +55,23 @@ public:
     }
 };
 
+std::unique_ptr<TurboModuleFactoryDelegate> RnohReactNativeHarmonyGestureHandlerPackage::createTurboModuleFactoryDelegate() {
+    return std::make_unique<GestureHandlerTurboModuleFactoryDelegate>();
+}
+
+std::vector<react::ComponentDescriptorProvider> RnohReactNativeHarmonyGestureHandlerPackage::createComponentDescriptorProviders() {
+    return {
+        react::concreteComponentDescriptorProvider<react::RNGestureHandlerRootViewComponentDescriptor>(),
+        react::concreteComponentDescriptorProvider<react::RNGestureHandlerButtonComponentDescriptor>(),
+    };
+}
+
+ComponentJSIBinderByString RnohReactNativeHarmonyGestureHandlerPackage::createComponentJSIBinderByName() {
+    return {
+        {"RNGestureHandlerButton", std::make_shared<RNGestureHandlerButtonJSIBinder>()},
+        {"RNGestureHandlerRootView", std::make_shared<RNGestureHandlerRootViewJSIBinder>()},
+    };
+};
 
 EventEmitRequestHandlers RnohReactNativeHarmonyGestureHandlerPackage::createEventEmitRequestHandlers() {
     return {

package/harmony/gesture_handler/src/main/cpp/RnohReactNativeHarmonyGestureHandlerPackage.h

@@ -5,7 +5,13 @@ namespace rnoh {
 class RnohReactNativeHarmonyGestureHandlerPackage : public Package {
 public:
     RnohReactNativeHarmonyGestureHandlerPackage(Package::Context ctx) : Package(ctx) {}
+    
+    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override;
+    
+    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override;
 
+    ComponentJSIBinderByString createComponentJSIBinderByName() override;
+    
     EventEmitRequestHandlers createEventEmitRequestHandlers();
 
     ComponentInstanceFactoryDelegate::Shared createComponentInstanceFactoryDelegate();

package/harmony/gesture_handler/src/main/cpp/componentInstances/RNGestureHandlerButtonComponentInstance.h

@@ -1,7 +1,7 @@
 #pragma once
 #import "RNOH/CppComponentInstance.h"
 #import "RNOH/arkui/StackNode.h"
-#import "generated/RNGestureHandlerButtonComponentDescriptor.h"
+#import "../RNGestureHandlerButtonComponentDescriptor.h"
 
 namespace rnoh {
 class RNGestureHandlerButtonComponentInstance

package/harmony/gesture_handler/src/main/cpp/componentInstances/RNGestureHandlerRootViewComponentInstance.h

@@ -4,7 +4,7 @@
 #import "RNOH/arkui/ArkUINodeRegistry.h"
 #import "RNOH/arkui/NativeNodeApi.h"
 #import "RNOH/RNInstanceCAPI.h"
-#import "generated/RNGestureHandlerRootViewComponentDescriptor.h"
+#import "../RNGestureHandlerRootViewComponentDescriptor.h"
 #import "RNGestureHandlerButtonComponentInstance.h"
 
 namespace rnoh {

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/namespace/RNGestureHandlerModule.ts

@@ -0,0 +1,24 @@
+// This file was generated.
+
+export namespace RNGestureHandlerModule {
+  export const NAME = 'RNGestureHandlerModule' as const
+
+  export interface Spec {
+    handleSetJSResponder(tag: number, blockNativeResponder: boolean): void;
+
+    handleClearJSResponder(): void;
+
+    createGestureHandler(handlerName: string, handlerTag: number, config: Object): void;
+
+    attachGestureHandler(handlerTag: number, newView: number, actionType: number): void;
+
+    updateGestureHandler(handlerTag: number, newConfig: Object): void;
+
+    dropGestureHandler(handlerTag: number): void;
+
+    install(): boolean;
+
+    flushOperations(): void;
+
+  }
+}

package/harmony/gesture_handler/src/main/ets/namespace/components/RNGestureHandlerButton.ts

@@ -0,0 +1,139 @@
+// This file was generated.
+import {
+  Descriptor as ComponentDescriptor,
+  ViewBaseProps,
+  ViewRawProps,
+  ViewDescriptorWrapperBase,
+  ColorValue,
+  Color,
+  RNInstance,
+  Tag,
+  RNComponentCommandReceiver,
+  ViewPropsSelector,
+} from '@rnoh/react-native-openharmony/ts';
+
+
+export namespace RNGestureHandlerButton {
+  export const NAME = "RNGestureHandlerButton" as const
+
+  export interface DirectRawProps {
+    exclusive?: boolean;
+    foreground?: boolean;
+    borderless?: boolean;
+    enabled?: boolean;
+    rippleColor?: ColorValue;
+    rippleRadius?: number;
+    touchSoundDisabled?: boolean;
+  }
+
+  export interface Props extends ViewBaseProps {}
+
+  export interface State {}
+
+  export interface RawProps extends ViewRawProps, DirectRawProps {}
+
+  export class PropsSelector extends ViewPropsSelector<Props, RawProps> {
+    get exclusive() {
+      return this.rawProps.exclusive ?? true;
+    }
+
+    get foreground() {
+      return this.rawProps.foreground ?? false;
+    }
+
+    get borderless() {
+      return this.rawProps.borderless ?? false;
+    }
+
+    get enabled() {
+      return this.rawProps.enabled ?? true;
+    }
+
+    get rippleRadius() {
+      return this.rawProps.rippleRadius ?? 0;
+    }
+
+    get touchSoundDisabled() {
+      return this.rawProps.touchSoundDisabled ?? false;
+    }
+
+
+    get rippleColor() {
+      if (this.rawProps.rippleColor) {
+        return Color.fromColorValue(this.rawProps.rippleColor)
+      } else {
+        return new Color({ r: 0, g: 0, b: 0, a: 255})
+      }
+    }
+
+  }
+
+  export type Descriptor = ComponentDescriptor<
+  typeof NAME,
+  Props,
+  State,
+  RawProps
+  >;
+
+  export class DescriptorWrapper extends ViewDescriptorWrapperBase<
+  typeof NAME,
+  Props,
+  State,
+  RawProps,
+  PropsSelector
+  > {
+    protected createPropsSelector() {
+      return new PropsSelector(this.descriptor.props, this.descriptor.rawProps)
+    }
+  }
+
+  export interface EventPayloadByName {
+  }
+
+  export class EventEmitter {
+    constructor(private rnInstance: RNInstance, private tag: Tag) {}
+
+    emit<TEventName extends keyof EventPayloadByName>(eventName: TEventName, payload: EventPayloadByName[TEventName]) {
+      this.rnInstance.emitComponentEvent(this.tag, eventName, payload)
+    }
+  }
+
+  export interface CommandArgvByName {
+  }
+
+  export class CommandReceiver {
+    private listenersByCommandName = new Map<string, Set<(...args: any[]) => void>>()
+    private cleanUp: (() => void) | undefined = undefined
+
+    constructor(private componentCommandReceiver: RNComponentCommandReceiver, private tag: Tag) {
+    }
+
+    subscribe<TCommandName extends keyof CommandArgvByName>(commandName: TCommandName, listener: (argv: CommandArgvByName[TCommandName]) => void) {
+      if (!this.listenersByCommandName.has(commandName)) {
+        this.listenersByCommandName.set(commandName, new Set())
+      }
+      this.listenersByCommandName.get(commandName)!.add(listener)
+      const hasRegisteredCommandReceiver = !!this.cleanUp
+      if (!hasRegisteredCommandReceiver) {
+        this.cleanUp = this.componentCommandReceiver.registerCommandCallback(this.tag, (commandName: string, argv: any[]) => {
+          if (this.listenersByCommandName.has(commandName)) {
+            const listeners = this.listenersByCommandName.get(commandName)!
+            listeners.forEach(listener => {
+              listener(argv)
+            })
+          }
+        })
+      }
+
+      return () => {
+        this.listenersByCommandName.get(commandName)?.delete(listener)
+        if (this.listenersByCommandName.get(commandName)?.size ?? 0 === 0) {
+          this.listenersByCommandName.delete(commandName)
+        }
+        if (this.listenersByCommandName.size === 0) {
+          this.cleanUp?.()
+        }
+      }
+    }
+  }
+}

package/harmony/gesture_handler/src/main/ets/namespace/components/RNGestureHandlerRootView.ts

@@ -0,0 +1,101 @@
+// This file was generated.
+import {
+  Descriptor as ComponentDescriptor,
+  ViewBaseProps,
+  ViewRawProps,
+  ViewDescriptorWrapperBase,
+  ColorValue,
+  Color,
+  RNInstance,
+  Tag,
+  RNComponentCommandReceiver,
+  ViewPropsSelector,
+} from '@rnoh/react-native-openharmony/ts';
+
+
+export namespace RNGestureHandlerRootView {
+  export const NAME = "RNGestureHandlerRootView" as const
+
+  export interface DirectRawProps {
+  }
+
+  export interface Props extends ViewBaseProps {}
+
+  export interface State {}
+
+  export interface RawProps extends ViewRawProps, DirectRawProps {}
+
+  export class PropsSelector extends ViewPropsSelector<Props, RawProps> {
+
+  }
+
+  export type Descriptor = ComponentDescriptor<
+  typeof NAME,
+  Props,
+  State,
+  RawProps
+  >;
+
+  export class DescriptorWrapper extends ViewDescriptorWrapperBase<
+  typeof NAME,
+  Props,
+  State,
+  RawProps,
+  PropsSelector
+  > {
+    protected createPropsSelector() {
+      return new PropsSelector(this.descriptor.props, this.descriptor.rawProps)
+    }
+  }
+
+  export interface EventPayloadByName {
+  }
+
+  export class EventEmitter {
+    constructor(private rnInstance: RNInstance, private tag: Tag) {}
+
+    emit<TEventName extends keyof EventPayloadByName>(eventName: TEventName, payload: EventPayloadByName[TEventName]) {
+      this.rnInstance.emitComponentEvent(this.tag, eventName, payload)
+    }
+  }
+
+  export interface CommandArgvByName {
+  }
+
+  export class CommandReceiver {
+    private listenersByCommandName = new Map<string, Set<(...args: any[]) => void>>()
+    private cleanUp: (() => void) | undefined = undefined
+
+    constructor(private componentCommandReceiver: RNComponentCommandReceiver, private tag: Tag) {
+    }
+
+    subscribe<TCommandName extends keyof CommandArgvByName>(commandName: TCommandName, listener: (argv: CommandArgvByName[TCommandName]) => void) {
+      if (!this.listenersByCommandName.has(commandName)) {
+        this.listenersByCommandName.set(commandName, new Set())
+      }
+      this.listenersByCommandName.get(commandName)!.add(listener)
+      const hasRegisteredCommandReceiver = !!this.cleanUp
+      if (!hasRegisteredCommandReceiver) {
+        this.cleanUp = this.componentCommandReceiver.registerCommandCallback(this.tag, (commandName: string, argv: any[]) => {
+          if (this.listenersByCommandName.has(commandName)) {
+            const listeners = this.listenersByCommandName.get(commandName)!
+            listeners.forEach(listener => {
+              listener(argv)
+            })
+          }
+        })
+      }
+
+      return () => {
+        this.listenersByCommandName.get(commandName)?.delete(listener)
+        if (this.listenersByCommandName.get(commandName)?.size ?? 0 === 0) {
+          this.listenersByCommandName.delete(commandName)
+        }
+        if (this.listenersByCommandName.size === 0) {
+          this.cleanUp?.()
+        }
+      }
+    }
+  }
+
+}

package/harmony/gesture_handler/src/main/ets/namespace/components/ts.ts

@@ -0,0 +1,2 @@
+export * from "./RNGestureHandlerButton"
+export * from "./RNGestureHandlerRootView"

package/harmony/gesture_handler/src/main/ets/namespace/ts.ts

@@ -0,0 +1,2 @@
+export * as RNC from "./components/ts"
+export * as TM from "./RNGestureHandlerModule"

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/harmony/gesture_handler/src/main/ets/rnoh/RNGestureHandlerModule.ts

@@ -1,5 +1,5 @@
-import { UITurboModule, UITurboModuleContext, Tag } from "@rnoh/react-native-openharmony/ts";
-import { TM } from "@rnoh/react-native-openharmony/generated/ts"
+import { TurboModule, TurboModuleContext, Tag } from "@rnoh/react-native-openharmony/ts";
+import { TM } from "../namespace/ts"
 import {
   GestureHandlerRegistry,
   State,
@@ -25,7 +25,7 @@ export enum ActionType {
 }
 
 
-export class RNGestureHandlerModule extends UITurboModule implements TM.RNGestureHandlerModule.Spec {
+export class RNGestureHandlerModule extends TurboModule implements TM.RNGestureHandlerModule.Spec {
   static readonly NAME = "RNGestureHandlerModule"
 
   private gestureHandlerRegistry: GestureHandlerRegistry
@@ -36,7 +36,7 @@ export class RNGestureHandlerModule extends UITurboModule implements TM.RNGestur
   private rootViewControllerByRootTag = new Map<Tag, RNGHRootViewController>()
   private interactionManager: InteractionManager
 
-  constructor(ctx: UITurboModuleContext, isDevModeEnabled: boolean = false) {
+  constructor(ctx: TurboModuleContext, isDevModeEnabled: boolean = false) {
     super(ctx)
     this.cleanLogger =
       isDevModeEnabled && ctx.isDebugModeEnabled ? new DevelopmentRNGHLogger(ctx.logger, "RNGH") :

package/package.json

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