@react-native-oh-tpl/react-native-gesture-handler 2.14.8-rc.1 → 2.14.13

package/DrawerLayout/index.ts

@@ -1,2 +1,2 @@
-import DrawerLayout from 'react-native-gesture-handler/DrawerLayout';
-export default DrawerLayout;
+import DrawerLayout from 'react-native-gesture-handler/DrawerLayout';
+export default DrawerLayout;

package/Swipeable/index.ts

@@ -1,2 +1,2 @@
-import Swipeable from 'react-native-gesture-handler/Swipeable';
-export default Swipeable;
+import Swipeable from 'react-native-gesture-handler/Swipeable';
+export default Swipeable;

package/harmony/gesture_handler/BuildProfile.ets

@@ -0,0 +1,17 @@
+/**
+ * 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 BUILD_MODE_NAME = 'release';
+export const DEBUG = false;
+export const TARGET_NAME = 'default';
+
+/**
+ * BuildProfile Class is used only for compatibility purposes.
+ */
+export default class BuildProfile { 
+	static readonly HAR_VERSION = HAR_VERSION;
+	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
+	static readonly DEBUG = DEBUG;
+	static readonly TARGET_NAME = TARGET_NAME;
+}

package/harmony/gesture_handler/build-profile.json5

@@ -0,0 +1,19 @@
+{
+  "apiType": 'stageMode',
+//  "buildOption": {
+//    "externalNativeOptions": {
+//      "path": "./src/main/cpp/CMakeLists.txt",
+//      "arguments": "",
+//      "cppFlags": "",
+//    },
+//  },
+  "targets": [
+    {
+      "name": "default",
+      "runtimeOS": "HarmonyOS"
+    },
+    {
+      "name": "ohosTest",
+    }
+  ]
+}

package/harmony/gesture_handler/hvigorfile.ts

@@ -0,0 +1,2 @@
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+export { harTasks } from '@ohos/hvigor-ohos-plugin';

package/harmony/gesture_handler/index.ets

@@ -0,0 +1,3 @@
+export * from "./ts"
+export * from "./src/main/ets/rnoh/RNGestureHandlerRootView"
+export * from "./src/main/ets/rnoh/RNGestureHandlerButton"

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

@@ -0,0 +1,18 @@
+{
+  "meta": {
+    "stableOrder": false
+  },
+  "lockfileVersion": 3,
+  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
+  "specifiers": {
+    "@rnoh/react-native-openharmony@../react_native_openharmony.har": "@rnoh/react-native-openharmony@../react_native_openharmony.har"
+  },
+  "packages": {
+    "@rnoh/react-native-openharmony@../react_native_openharmony.har": {
+      "name": "@rnoh/react-native-openharmony",
+      "version": "0.72.28",
+      "resolved": "../react_native_openharmony.har",
+      "registryType": "local"
+    }
+  }
+}

package/harmony/gesture_handler/oh-package.json5

@@ -0,0 +1,12 @@
+{
+  license: '',
+  devDependencies: {},
+  author: '',
+  name: '@react-native-oh-tpl/react-native-gesture-handler',
+  description: '',
+  type: 'module',
+  version: '2.14.1-2.14.13',
+  dependencies: {
+    "@rnoh/react-native-openharmony": "file:./react_native_openharmony"
+  },
+}

package/harmony/gesture_handler/src/main/cpp/CMakeLists.txt

@@ -0,0 +1,8 @@
+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.cpp

@@ -0,0 +1,149 @@
+#pragma once
+#include "GestureHandlerPackage.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>
+
+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 {
+        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> GestureHandlerPackage::createTurboModuleFactoryDelegate() {
+    return std::make_unique<GestureHandlerTurboModuleFactoryDelegate>();
+}
+
+std::vector<react::ComponentDescriptorProvider> GestureHandlerPackage::createComponentDescriptorProviders() {
+    return {
+        react::concreteComponentDescriptorProvider<react::RNGestureHandlerRootViewComponentDescriptor>(),
+        react::concreteComponentDescriptorProvider<react::RNGestureHandlerButtonComponentDescriptor>(),
+    };
+}
+
+ComponentJSIBinderByString GestureHandlerPackage::createComponentJSIBinderByName() {
+    return {
+        {"RNGestureHandlerButton", std::make_shared<RNGestureHandlerButtonJSIBinder>()},
+        {"RNGestureHandlerRootView", std::make_shared<RNGestureHandlerRootViewJSIBinder>()},
+    };
+};
+
+EventEmitRequestHandlers GestureHandlerPackage::createEventEmitRequestHandlers() {
+    return {
+        std::make_shared<RNGHEventEmitRequestHandler>(),
+    };
+}
+
+ComponentInstanceFactoryDelegate::Shared GestureHandlerPackage::createComponentInstanceFactoryDelegate() {
+    return std::make_shared<RNOHCorePackageComponentInstanceFactoryDelegate>();
+}
+
+class ScrollLockerArkTSMessageHandler : public ArkTSMessageHandler {
+public:
+  void handleArkTSMessage(const Context &ctx) override {
+    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> GestureHandlerPackage::createArkTSMessageHandlers() {
+    return {std::make_shared<ScrollLockerArkTSMessageHandler>()};
+}

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

@@ -0,0 +1,21 @@
+#pragma once
+#include "RNOH/Package.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

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/componentInstances/RNGestureHandlerButtonComponentInstance.h

@@ -0,0 +1,27 @@
+#pragma once
+#import "RNOH/CppComponentInstance.h"
+#import "RNOH/arkui/StackNode.h"
+#import "../RNGestureHandlerButtonComponentDescriptor.h"
+
+namespace rnoh {
+    class RNGestureHandlerButtonComponentInstance
+        : public CppComponentInstance<facebook::react::RNGestureHandlerButtonShadowNode> {
+    private:
+        StackNode m_stackNode;
+
+    public:
+        RNGestureHandlerButtonComponentInstance(Context context) : CppComponentInstance(std::move(context)) {};
+
+        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 onChildRemoved(ComponentInstance::Shared const &childComponentInstance) override {
+            CppComponentInstance::onChildRemoved(childComponentInstance);
+            m_stackNode.removeChild(childComponentInstance->getLocalRootArkUINode());
+        };
+    };
+} // namespace rnoh