@react-native-oh-tpl/react-native-gesture-handler 2.14.13 → 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.13';
+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/index.ets

@@ -1,3 +1,2 @@
 export * from "./ts"
-export * from "./src/main/ets/rnoh/RNGestureHandlerRootView"
-export * from "./src/main/ets/rnoh/RNGestureHandlerButton"
+export { default } from "./src/main/ets/RNOHPackage"

package/harmony/gesture_handler/oh-package-lock.json5

@@ -10,7 +10,7 @@
   "packages": {
     "@rnoh/react-native-openharmony@../react_native_openharmony.har": {
       "name": "@rnoh/react-native-openharmony",
-      "version": "0.72.28",
+      "version": "0.72.35",
       "resolved": "../react_native_openharmony.har",
       "registryType": "local"
     }

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.13',
+  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/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
 file(GLOB rnoh_gesture_handler_SRC CONFIGURE_DEPENDS *.cpp)
+
 add_library(rnoh_gesture_handler SHARED ${rnoh_gesture_handler_SRC})
 target_include_directories(rnoh_gesture_handler PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(rnoh_gesture_handler PUBLIC rnoh)
-

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

@@ -1,21 +1,12 @@
 #pragma once
-#include "RNOH/Package.h"
+#include "RnohReactNativeHarmonyGestureHandlerPackage.h"
 
 namespace rnoh {
-    class GestureHandlerPackage : public Package {
-    public:
-        GestureHandlerPackage(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();
-
-        std::vector<ArkTSMessageHandler::Shared> createArkTSMessageHandlers() override;
-    };
-} // namespace rnoh
+/**
+ * @deprecated: Use RnohReactNativeHarmonyGestureHandlerPackage instead (2024-10-10)
+ */
+class GestureHandlerPackage : public RnohReactNativeHarmonyGestureHandlerPackage {
+    using Super = RnohReactNativeHarmonyGestureHandlerPackage;
+    using Super::Super;
+};
+} // namespace rnoh

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

@@ -0,0 +1,157 @@
+#pragma once
+#include "RnohReactNativeHarmonyGestureHandlerPackage.h"
+#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");
+        auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<facebook::react::ViewEventEmitter>(ctx.tag);
+        if (eventEmitter == nullptr) {
+            return;
+        }
+        if (ctx.eventName == "onGestureHandlerEvent") {
+            eventEmitter->dispatchUniqueEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload));
+        } else if (ctx.eventName == "onGestureHandlerStateChange") {
+            eventEmitter->dispatchEvent("onGestureHandlerStateChange", ArkJS(ctx.env).getDynamic(ctx.payload));
+        }
+    }
+};
+
+class RNOHCorePackageComponentInstanceFactoryDelegate : public ComponentInstanceFactoryDelegate {
+public:
+    using ComponentInstanceFactoryDelegate::ComponentInstanceFactoryDelegate;
+
+    ComponentInstance::Shared create(ComponentInstance::Context ctx) override {
+        if (ctx.componentName == "RNGestureHandlerButton") {
+            return std::make_shared<RNGestureHandlerButtonComponentInstance>(ctx);
+        } else if (ctx.componentName == "RNGestureHandlerRootView") {
+            return std::make_shared<RNGestureHandlerRootViewComponentInstance>(ctx);
+        }
+        return nullptr;
+    }
+};
+
+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 {
+        std::make_shared<RNGHEventEmitRequestHandler>(),
+    };
+}
+
+ComponentInstanceFactoryDelegate::Shared
+RnohReactNativeHarmonyGestureHandlerPackage::createComponentInstanceFactoryDelegate() {
+    return std::make_shared<RNOHCorePackageComponentInstanceFactoryDelegate>();
+}
+
+class ScrollLockerArkTSMessageHandler : public ArkTSMessageHandler {
+public:
+    void handleArkTSMessage(const Context &ctx) override {
+        facebook::react::SystraceSection s("RNGH::ScrollLockerArkTSMessageHandler::handleArkTSMessage");
+        if (ctx.messageName == "RNGH::SET_NATIVE_RESPONDERS_BLOCK") {
+            auto targetComponentInstanceTag = ctx.messagePayload["targetTag"].asDouble();
+            auto shouldBlock = ctx.messagePayload["shouldBlock"].asBool();
+            auto rnInstance = ctx.rnInstance.lock();
+            if (rnInstance != nullptr) {
+                auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
+                if (rnInstanceCAPI != nullptr) {
+
+                    std::vector<ComponentInstance::Shared> ancestors;
+                    auto tmpComponentInstance = rnInstanceCAPI->findComponentInstanceByTag(targetComponentInstanceTag);
+                    while (tmpComponentInstance != nullptr) {
+                        ancestors.push_back(tmpComponentInstance);
+                        tmpComponentInstance = tmpComponentInstance->getParent().lock();
+                    }
+                    if (ancestors.size() == 0) {
+                        return;
+                    }
+                    /**
+                     * Ensure consistent behavior with Android by not blocking
+                     * scrolls above the GestureHandlerRootView handling the
+                     * touch. If there are multiple nested
+                     * GestureHandlerRootViews, the one nearest to the actual
+                     * root will handle the touch.
+                     */
+                    auto isChangingResponderStatusAllowed = false;
+                    for (size_t i = ancestors.size() - 1; i > 0; i--) {
+                        auto ancestor = ancestors[i];
+                        if (!isChangingResponderStatusAllowed) {
+                            auto rootView =
+                                std::dynamic_pointer_cast<RNGestureHandlerRootViewComponentInstance>(ancestor);
+                            if (rootView != nullptr) {
+                                isChangingResponderStatusAllowed = true;
+                            }
+                        } else {
+                            ancestor->setNativeResponderBlocked(shouldBlock, "RNGH");
+                        }
+                    }
+                }
+            }
+        } else if (ctx.messageName == "RNGH::ROOT_VIEW_IS_HANDLING_TOUCHES") {
+            auto descendantViewTag = ctx.messagePayload["descendantViewTag"].asDouble();
+            auto isHandlingTouches = ctx.messagePayload["isHandlingTouches"].asBool();
+            auto rnInstance = ctx.rnInstance.lock();
+            if (rnInstance != nullptr) {
+                auto rnInstanceCAPI = std::dynamic_pointer_cast<RNInstanceCAPI>(rnInstance);
+                if (rnInstanceCAPI != nullptr) {
+                    auto tmpComponentInstance = rnInstanceCAPI->findComponentInstanceByTag(descendantViewTag);
+                    while (tmpComponentInstance != nullptr) {
+                        tmpComponentInstance = tmpComponentInstance->getParent().lock();
+                        if (tmpComponentInstance) {
+                            auto rnghRootViewComponentInstance =
+                                std::dynamic_pointer_cast<RNGestureHandlerRootViewComponentInstance>(
+                                    tmpComponentInstance);
+                            if (rnghRootViewComponentInstance) {
+                                rnghRootViewComponentInstance->setIsHandlingTouches(isHandlingTouches);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    };
+};
+
+std::vector<ArkTSMessageHandler::Shared> RnohReactNativeHarmonyGestureHandlerPackage::createArkTSMessageHandlers() {
+    return {std::make_shared<ScrollLockerArkTSMessageHandler>()};
+}

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

@@ -0,0 +1,21 @@
+#pragma once
+#include "RNOH/Package.h"
+
+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();
+
+    std::vector<ArkTSMessageHandler::Shared> createArkTSMessageHandlers() override;
+};
+} // namespace rnoh

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

@@ -4,24 +4,24 @@
 #import "../RNGestureHandlerButtonComponentDescriptor.h"
 
 namespace rnoh {
-    class RNGestureHandlerButtonComponentInstance
-        : public CppComponentInstance<facebook::react::RNGestureHandlerButtonShadowNode> {
-    private:
-        StackNode m_stackNode;
+class RNGestureHandlerButtonComponentInstance
+    : public CppComponentInstance<facebook::react::RNGestureHandlerButtonShadowNode> {
+private:
+    StackNode m_stackNode;
 
-    public:
-        RNGestureHandlerButtonComponentInstance(Context context) : CppComponentInstance(std::move(context)) {};
+public:
+    RNGestureHandlerButtonComponentInstance(Context context) : CppComponentInstance(std::move(context)){};
 
-        StackNode &getLocalRootArkUINode() override { return m_stackNode; };
+    StackNode &getLocalRootArkUINode() override { return m_stackNode; };
 
-        void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override {
-            CppComponentInstance::onChildInserted(childComponentInstance, index);
-            m_stackNode.insertChild(childComponentInstance->getLocalRootArkUINode(), index);
-        };
+    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());
-        };
+    void onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override {
+        CppComponentInstance::onChildRemoved(childComponentInstance);
+        m_stackNode.removeChild(childComponentInstance->getLocalRootArkUINode());
     };
-} // namespace rnoh
+};
+} // namespace rnoh