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

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

@@ -1,60 +1,36 @@
-#pragma once
-
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
-#include <react/renderer/components/view/ViewShadowNode.h>
-#include "RNOH/ArkJS.h"
-#include "RNOH/EventEmitRequestHandler.h"
-
-namespace facebook {
-namespace react {
-
-extern const char RNGestureHandlerRootViewComponentName[] = "RNGestureHandlerRootView";
-
-class RNGestureHandlerRootViewEventEmitter : public ViewEventEmitter {
-    using ViewEventEmitter::ViewEventEmitter;
-
-  public:
-    void emit(std::string type, const folly::dynamic &payload) const {
-        this->dispatchEvent(type, payload);
-    }
-};
-
-class RNGestureHandlerRootViewEventEmitRequestHandler : public rnoh::EventEmitRequestHandler {
-    void handleEvent(rnoh::EventEmitRequestHandler::Context const &ctx) override {
-        std::string prefix = "RNGestureHandlerRootView";
-        size_t prefixPos = ctx.eventName.find(prefix);
-        if (prefixPos != std::string::npos) {
-            ArkJS arkJs(ctx.env);
-            auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<RNGestureHandlerRootViewEventEmitter>(ctx.tag);
-            if (eventEmitter != nullptr) {
-                auto payload = arkJs.getDynamic(ctx.payload);
-                std::string eventName = ctx.eventName.substr(prefixPos + prefix.length());
-                eventEmitter->emit(eventName, payload);
-            }
-        }
-    }
-};
-
-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,
-    RNGestureHandlerRootViewEventEmitter>;
-
-class RNGestureHandlerRootViewComponentDescriptor final
-    : public ConcreteComponentDescriptor<RNGestureHandlerRootViewShadowNode> {
-  public:
-    RNGestureHandlerRootViewComponentDescriptor(ComponentDescriptorParameters const &parameters)
-        : ConcreteComponentDescriptor(parameters) {}
-};
-
-} // namespace react
-} // namespace facebook
+
+#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/RNGestureHandlerRootViewComponentInstance.h

@@ -0,0 +1,123 @@
+#pragma once
+#import "RNOH/CppComponentInstance.h"
+#import "RNOH/arkui/StackNode.h"
+#import "RNOH/arkui/ArkUINodeRegistry.h"
+#import "RNOH/arkui/NativeNodeApi.h"
+#import "RNGestureHandlerRootViewComponentDescriptor.h"
+#include "RNOH/arkui/TouchEventDispatcher.h"
+
+namespace rnoh {
+class RNGestureHandlerRootViewComponentInstance
+    : public CppComponentInstance<facebook::react::RNGestureHandlerRootViewShadowNode>,
+      public TouchEventHandler {
+private:
+    StackNode m_stackNode;
+
+public:
+    RNGestureHandlerRootViewComponentInstance(Context context) : CppComponentInstance(std::move(context)) {
+        ArkUINodeRegistry::getInstance().registerTouchHandler(&m_stackNode, this);
+        NativeNodeApi::getInstance()->registerNodeEvent(m_stackNode.getArkUINodeHandle(), NODE_TOUCH_EVENT, 0, nullptr);
+        m_deps->arkTSChannel->postMessage("RNGH::ROOT_CREATED", m_tag);
+    };
+
+    ~RNGestureHandlerRootViewComponentInstance() {
+        ArkUINodeRegistry::getInstance().unregisterTouchHandler(&m_stackNode);
+        NativeNodeApi::getInstance()->unregisterNodeEvent(m_stackNode.getArkUINodeHandle(), NODE_TOUCH_EVENT);
+    }
+
+    StackNode &getLocalRootArkUINode() override { return m_stackNode; };
+
+    void onTouchEvent(ArkUI_UIInputEvent *e) override {
+        folly::dynamic payload = folly::dynamic::object;
+        payload["action"] = static_cast<int>(OH_ArkUI_UIInputEvent_GetAction(e));
+        payload["actionTouch"] = this->convertNodeTouchPointToDynamic(getActiveTouchFromEvent(e));
+        folly::dynamic touchPoints = folly::dynamic::array();
+        touchPoints.push_back(this->convertNodeTouchPointToDynamic(getActiveTouchFromEvent(e)));
+        payload["touchPoints"] = touchPoints;
+        payload["sourceType"] = static_cast<int>(OH_ArkUI_UIInputEvent_GetSourceType(e));
+        payload["timestamp"] = OH_ArkUI_UIInputEvent_GetEventTime(e);
+        payload["rootTag"] = m_tag;
+        m_deps->arkTSChannel->postMessage("RNGH::TOUCH_EVENT", payload);
+    }
+
+private:
+    struct TouchPoint {
+        int32_t contactAreaHeight;
+        int32_t contactAreaWidth;
+        int32_t id;
+        int32_t nodeX;
+        int32_t nodeY;
+        int64_t pressedTime;
+        double pressure;
+        int32_t rawX;
+        int32_t rawY;
+        int32_t screenX;
+        int32_t screenY;
+        double tiltX;
+        double tiltY;
+        int32_t toolHeight;
+        int32_t toolWidth;
+        int32_t toolX;
+        int32_t toolY;
+        int32_t toolType;
+        int32_t windowX;
+        int32_t windowY;
+    };
+
+    TouchPoint getActiveTouchFromEvent(ArkUI_UIInputEvent *event) {
+        TouchPoint actionTouch{};
+        actionTouch = TouchPoint{
+            .contactAreaHeight = int32_t(OH_ArkUI_PointerEvent_GetTouchAreaHeight(event, 0)),
+            .contactAreaWidth = int32_t(OH_ArkUI_PointerEvent_GetTouchAreaWidth(event, 0)),
+            .id = OH_ArkUI_PointerEvent_GetPointerId(event, 0),
+            .nodeX = int32_t(OH_ArkUI_PointerEvent_GetX(event)),
+            .nodeY = int32_t(OH_ArkUI_PointerEvent_GetY(event)),
+            .pressure = double(OH_ArkUI_PointerEvent_GetPressure(event, 0)),
+            .screenX = int32_t(OH_ArkUI_PointerEvent_GetDisplayX(event)),
+            .screenY = int32_t(OH_ArkUI_PointerEvent_GetDisplayY(event)),
+            .tiltX = double(OH_ArkUI_PointerEvent_GetTiltX(event, 0)),
+            .tiltY = double(OH_ArkUI_PointerEvent_GetTiltX(event, 0)),
+            .toolType = int32_t(OH_ArkUI_UIInputEvent_GetToolType(event)),
+            .windowX = int32_t(OH_ArkUI_PointerEvent_GetWindowX(event)),
+            .windowY = int32_t(OH_ArkUI_PointerEvent_GetWindowY(event)),
+        };
+        return actionTouch;
+    }
+
+    folly::dynamic convertNodeTouchPointToDynamic(TouchPoint actionTouch) {
+        folly::dynamic result = folly::dynamic::object;
+        result["contactAreaHeight"] = actionTouch.contactAreaHeight;
+        result["contactAreaWidth"] = actionTouch.contactAreaWidth;
+        result["id"] = actionTouch.id;
+        result["nodeX"] = actionTouch.nodeX;
+        result["nodeY"] = actionTouch.nodeY;
+        //         result["pressedTime"] = actionTouch.pressedTime;
+        result["pressure"] = actionTouch.pressure;
+        //         result["rawX"] = actionTouch.rawX;
+        //         result["rawY"] = actionTouch.rawY;
+        result["screenX"] = actionTouch.screenX;
+        result["screenY"] = actionTouch.screenY;
+        result["tiltX"] = actionTouch.tiltX;
+        result["tiltY"] = actionTouch.tiltY;
+        //         result["toolHeight"] = actionTouch.toolHeight;
+        //         result["toolWidth"] = actionTouch.toolWidth;
+        //         result["toolX"] = actionTouch.toolX;
+        //         result["toolY"] = actionTouch.toolY;
+        result["toolType"] = static_cast<int>(actionTouch.toolType);
+        result["windowX"] = actionTouch.windowX;
+        result["windowY"] = actionTouch.windowY;
+        return result;
+    }
+
+protected:
+    void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override {
+        CppComponentInstance::onChildInserted(childComponentInstance, index);
+        m_stackNode.insertChild(childComponentInstance->getLocalRootArkUINode(), index);
+    };
+
+    void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override {
+        CppComponentInstance::onChildRemoved(childComponentInstance);
+        m_stackNode.removeChild(childComponentInstance->getLocalRootArkUINode());
+    };
+};
+} // namespace rnoh

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 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/ets/CircularBuffer.ts

@@ -1,42 +1,42 @@
-export class CircularBuffer<T> {
-  private bufferSize: number;
-  private buffer: T[];
-  private index: number;
-  private actualSize: number;
-
-  constructor(size: number) {
-    this.bufferSize = size;
-    this.buffer = new Array<T>(size);
-    this.index = 0;
-    this.actualSize = 0;
-  }
-
-  public get size(): number {
-    return this.actualSize;
-  }
-
-  public push(element: T): void {
-    this.buffer[this.index] = element;
-    this.index = (this.index + 1) % this.bufferSize;
-    this.actualSize = Math.min(this.actualSize + 1, this.bufferSize);
-  }
-
-  public get(at: number): T {
-    if (this.actualSize === this.bufferSize) {
-      let index = (this.index + at) % this.bufferSize;
-      if (index < 0) {
-        index += this.bufferSize;
-      }
-
-      return this.buffer[index];
-    } else {
-      return this.buffer[at];
-    }
-  }
-
-  public clear(): void {
-    this.buffer = new Array<T>(this.bufferSize);
-    this.index = 0;
-    this.actualSize = 0;
-  }
-}
+export class CircularBuffer<T> {
+  private bufferSize: number;
+  private buffer: T[];
+  private index: number;
+  private actualSize: number;
+
+  constructor(size: number) {
+    this.bufferSize = size;
+    this.buffer = new Array<T>(size);
+    this.index = 0;
+    this.actualSize = 0;
+  }
+
+  public get size(): number {
+    return this.actualSize;
+  }
+
+  public push(element: T): void {
+    this.buffer[this.index] = element;
+    this.index = (this.index + 1) % this.bufferSize;
+    this.actualSize = Math.min(this.actualSize + 1, this.bufferSize);
+  }
+
+  public get(at: number): T {
+    if (this.actualSize === this.bufferSize) {
+      let index = (this.index + at) % this.bufferSize;
+      if (index < 0) {
+        index += this.bufferSize;
+      }
+
+      return this.buffer[index];
+    } else {
+      return this.buffer[at];
+    }
+  }
+
+  public clear(): void {
+    this.buffer = new Array<T>(this.bufferSize);
+    this.index = 0;
+    this.actualSize = 0;
+  }
+}

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

@@ -1,68 +1,68 @@
-export interface HitSlop {
-  left?: number;
-  right?: number;
-  top?: number;
-  bottom?: number;
-  horizontal?: number;
-  vertical?: number;
-  width?: number;
-  height?: number;
-}
-
-export const Directions = {
-  RIGHT: 1,
-  LEFT: 2,
-  UP: 4,
-  DOWN: 8,
-} as const;
-
-export enum PointerType {
-  NONE = 'none',
-  MOUSE = 'mouse',
-  TOUCH = 'touch',
-  PEN = 'pen',
-}
-
-export enum EventType {
-  DOWN,
-  ADDITIONAL_POINTER_DOWN,
-  UP,
-  ADDITIONAL_POINTER_UP,
-  MOVE,
-  ENTER,
-  OUT,
-  CANCEL,
-}
-
-export type Touch = {id: number, x: number, y: number, absoluteX: number, absoluteY: number}
-
-export enum TouchEventType {
-  UNDETERMINED = 0,
-  DOWN = 1,
-  MOVE = 2,
-  UP = 3,
-  CANCELLED = 4,
-}
-
-export interface AdaptedEvent {
-  x: number;
-  y: number;
-  offsetX: number;
-  offsetY: number;
-  pointerId: number;
-  eventType: EventType;
-  pointerType: PointerType;
-  buttons: number;
-  time: number;
-  allTouches?: Touch[];
-  changedTouches?: Touch[];
-  touchEventType?: TouchEventType;
-}
-
-export interface TrackerElement {
-  lastX: number;
-  lastY: number;
-  timeStamp: number;
-  velocityX: number;
-  velocityY: number;
+export interface HitSlop {
+  left?: number;
+  right?: number;
+  top?: number;
+  bottom?: number;
+  horizontal?: number;
+  vertical?: number;
+  width?: number;
+  height?: number;
+}
+
+export const Directions = {
+  RIGHT: 1,
+  LEFT: 2,
+  UP: 4,
+  DOWN: 8,
+} as const;
+
+export enum PointerType {
+  NONE = 'none',
+  MOUSE = 'mouse',
+  TOUCH = 'touch',
+  PEN = 'pen',
+}
+
+export enum EventType {
+  DOWN,
+  ADDITIONAL_POINTER_DOWN,
+  UP,
+  ADDITIONAL_POINTER_UP,
+  MOVE,
+  ENTER,
+  OUT,
+  CANCEL,
+}
+
+export type Touch = {id: number, x: number, y: number, absoluteX: number, absoluteY: number}
+
+export enum TouchEventType {
+  UNDETERMINED = 0,
+  DOWN = 1,
+  MOVE = 2,
+  UP = 3,
+  CANCELLED = 4,
+}
+
+export interface AdaptedEvent {
+  x: number;
+  y: number;
+  offsetX: number;
+  offsetY: number;
+  pointerId: number;
+  eventType: EventType;
+  pointerType: PointerType;
+  buttons: number;
+  time: number;
+  allTouches?: Touch[];
+  changedTouches?: Touch[];
+  touchEventType?: TouchEventType;
+}
+
+export interface TrackerElement {
+  lastX: number;
+  lastY: number;
+  timeStamp: number;
+  velocityX: number;
+  velocityY: number;
 }

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

@@ -1,38 +1,53 @@
-import { RNInstance } from "rnoh/ts"
-import { GestureStateChangeEvent, GestureUpdateEvent, GestureTouchEvent } from "./OutgoingEvent"
-import { RNGHLogger } from './RNGHLogger'
-
-export interface EventDispatcher {
-  onGestureHandlerStateChange(event: GestureStateChangeEvent): void
-  onGestureHandlerEvent(event: GestureStateChangeEvent | GestureUpdateEvent | GestureTouchEvent): void
-}
-
-export class JSEventDispatcher implements EventDispatcher {
-  constructor(private rnInstance: RNInstance, private logger: RNGHLogger) {
-  }
-
-  public onGestureHandlerStateChange(event: GestureStateChangeEvent) {
-    this.logger.info(`onGestureHandlerStateChange`)
-    this.rnInstance.emitDeviceEvent("onGestureHandlerStateChange", event)
-  }
-
-  public onGestureHandlerEvent(event: GestureStateChangeEvent | GestureUpdateEvent | GestureTouchEvent) {
-    this.logger.info(`onGestureHandlerEvent`)
-    this.rnInstance.emitDeviceEvent("onGestureHandlerEvent", event)
-  }
-}
-
-export class AnimatedEventDispatcher implements EventDispatcher {
-  constructor(private rnInstance: RNInstance, private logger: RNGHLogger, private viewTag: number) {
-  }
-
-  public onGestureHandlerStateChange(event: GestureStateChangeEvent) {
-    this.logger.info(`onGestureHandlerStateChange`)
-    this.rnInstance.emitDeviceEvent("onGestureHandlerStateChange", event)
-  }
-
-  public onGestureHandlerEvent(event: GestureStateChangeEvent | GestureUpdateEvent | GestureTouchEvent) {
-    this.logger.info(`onGestureHandlerEvent`)
-    this.rnInstance.emitComponentEvent(this.viewTag, "onGestureHandlerEvent", event)
-  }
+import { RNInstance } from "@rnoh/react-native-openharmony/ts"
+import { GestureStateChangeEvent, GestureUpdateEvent, GestureTouchEvent } from "./OutgoingEvent"
+import { RNGHLogger } from './RNGHLogger'
+
+export interface EventDispatcher {
+  onGestureHandlerStateChange(event: GestureStateChangeEvent): void
+  onGestureHandlerEvent(event: GestureStateChangeEvent | GestureUpdateEvent | GestureTouchEvent): void
+}
+
+export class JSEventDispatcher implements EventDispatcher {
+  constructor(private rnInstance: RNInstance, private logger: RNGHLogger) {
+  }
+
+  public onGestureHandlerStateChange(event: GestureStateChangeEvent) {
+    this.logger.info(`onGestureHandlerStateChange`)
+    this.rnInstance.emitDeviceEvent("onGestureHandlerStateChange", event)
+  }
+
+  public onGestureHandlerEvent(event: GestureStateChangeEvent | GestureUpdateEvent | GestureTouchEvent) {
+    this.logger.info(`onGestureHandlerEvent`)
+    this.rnInstance.emitDeviceEvent("onGestureHandlerEvent", event)
+  }
+}
+
+export class AnimatedEventDispatcher implements EventDispatcher {
+  constructor(private rnInstance: RNInstance, private logger: RNGHLogger, private viewTag: number) {
+  }
+
+  public onGestureHandlerStateChange(event: GestureStateChangeEvent) {
+    this.logger.info(`onGestureHandlerStateChange`)
+    this.rnInstance.emitDeviceEvent("onGestureHandlerStateChange", event)
+  }
+
+  public onGestureHandlerEvent(event: GestureStateChangeEvent | GestureUpdateEvent | GestureTouchEvent) {
+    this.logger.info(`onGestureHandlerEvent`)
+    this.rnInstance.emitComponentEvent(this.viewTag, "onGestureHandlerEvent", event)
+  }
+}
+
+export class ReanimatedEventDispatcher implements EventDispatcher {
+  constructor(private rnInstance: RNInstance, private logger: RNGHLogger, private viewTag: number) {
+  }
+
+  public onGestureHandlerStateChange(event: GestureStateChangeEvent) {
+    this.logger.info(`onGestureHandlerStateChange`)
+    this.rnInstance.emitComponentEvent(this.viewTag, "onGestureHandlerStateChange", event)
+  }
+
+  public onGestureHandlerEvent(event: GestureStateChangeEvent | GestureUpdateEvent | GestureTouchEvent) {
+    this.logger.info(`onGestureHandlerEvent`)
+    this.rnInstance.emitComponentEvent(this.viewTag, "onGestureHandlerEvent", event)
+  }
 }