@react-native-ohos/react-native-pager-view 6.7.2-rc.2 → 6.7.3-rc.1

package/README.OpenSource

@@ -1,11 +1,11 @@
-[
-    {
-        "Name": "react-native-pager-view",
-        "License": "MIT License",
-        "License File": " LICENSE ",
-        "Version Number": "6.7.1",
-        "Owner" : "xiafeng@huawei.com",
-        "Upstream URL": "https://github.com/callstack/react-native-pager-view",
-        "Description": "React Native wrapper for the Android ViewPager and iOS UIPageViewController."
-    }
+[
+    {
+        "Name": "react-native-pager-view",
+        "License": "MIT License",
+        "License File": " LICENSE ",
+        "Version Number": "6.7.1",
+        "Owner" : "xiafeng@huawei.com",
+        "Upstream URL": "https://github.com/callstack/react-native-pager-view",
+        "Description": "React Native wrapper for the Android ViewPager and iOS UIPageViewController."
+    }
 ]

package/README.md

@@ -1,6 +1,6 @@
 # @react-native-ohos/react-native-pager-view
 
-This project is based on [react-native-pager-view](https://github.com/callstack/react-native-pager-view)
+This project is based on [react-native-pager-view@v6.7.1](https://github.com/callstack/react-native-pager-view/tree/v6.7.1)
 
 ## Documentation
 

package/harmony/pager_view/oh-package.json5

@@ -5,9 +5,9 @@
   "name": "@react-native-ohos/react-native-pager-view",
   "description": "React Native wrapper for HarmonyOS ViewPager",
   "main": "index.ets",
-  "version": "6.7.2-rc.2",
+  "version": "6.7.3-rc.1",
   "dependencies": {
-    "@rnoh/react-native-openharmony": "file:../react_native_openharmony.har"
+    "@rnoh/react-native-openharmony": "file:../../node_modules/@react-native-oh/react-native-harmony/harmony/react_native_openharmony.har"
   },
   "metadata": {
     "sourceRoots": [

package/harmony/pager_view/src/main/cpp/ViewPagerComponentInstance.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "ViewPagerComponentInstance.h"
-#include <arkui/native_gesture.h>
 #include <arkui/native_interface.h>
 
 namespace rnoh {
@@ -34,6 +33,14 @@ ViewPagerComponentInstance::ViewPagerComponentInstance(Context context)
     this->regsiterGestureEvent();
 }
 
+ViewPagerComponentInstance::~ViewPagerComponentInstance() {
+    if (swiperGestureApi && swiperGestureRecognizer) {
+        DLOG(INFO) << "~ViewPagerComponentInstance removeGestureFromNode";
+        swiperGestureApi->removeGestureFromNode(
+                        getLocalRootArkUINode().getArkUINodeHandle(), swiperGestureRecognizer);
+    }
+}
+
 void ViewPagerComponentInstance::onChildInserted(ComponentInstance::Shared const &childComponentInstance,
                                                  std::size_t index) {
     super::onChildInserted(childComponentInstance, index);
@@ -172,8 +179,8 @@ bool ViewPagerComponentInstance::isHandlingTouches() const {
 void ViewPagerComponentInstance::regsiterGestureEvent() {
     DLOG(INFO) << "ViewPagerComponentInstance::regsiterGestureEvent";
     auto gestureApi = OH_ArkUI_QueryModuleInterfaceByName(ARKUI_NATIVE_GESTURE, "ArkUI_NativeGestureAPI_1");
-    auto swiperGestureApi = reinterpret_cast<ArkUI_NativeGestureAPI_1 *>(gestureApi);
-    auto swiperGestureRecognizer = swiperGestureApi->createPanGesture(1, GESTURE_DIRECTION_ALL, 50);
+    swiperGestureApi = reinterpret_cast<ArkUI_NativeGestureAPI_1 *>(gestureApi);
+    swiperGestureRecognizer = swiperGestureApi->createPanGesture(1, GESTURE_DIRECTION_ALL, 50);
     auto onPanActionCallBack = [](ArkUI_GestureEvent *event, void *extraParam) {
         PanActionCallBack *panActionCallBack = (PanActionCallBack *)extraParam;
         ArkUI_GestureEventActionType actionType = OH_ArkUI_GestureEvent_GetActionType(event);

package/harmony/pager_view/src/main/cpp/ViewPagerComponentInstance.h

@@ -24,6 +24,7 @@
 
 #pragma once
 #include "SwiperNode.h"
+#include <arkui/native_gesture.h>
 #include <folly/dynamic.h>
 #include "RNOHCorePackage/TurboModules/Animated/NativeAnimatedTurboModule.h"
 #include "generated/RNOH/generated/components/BaseRNCViewPagerComponentInstance.h"
@@ -57,9 +58,15 @@ private:
     };
 
     std::weak_ptr<NativeAnimatedTurboModule> m_swiperNativeAnimatedTurboModule{};
-
+    
+    ArkUI_NativeGestureAPI_1 *swiperGestureApi;
+    
+    ArkUI_GestureRecognizer *swiperGestureRecognizer;
+    
 public:
     ViewPagerComponentInstance(Context context);
+    
+    ~ViewPagerComponentInstance() override;
 
     void onChildInserted(ComponentInstance::Shared const &childComponentInstance, std::size_t index) override;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-pager-view",
-  "version": "6.7.2-rc.2",
+  "version": "6.7.3-rc.1",
   "description": "React Native wrapper for Harmony ViewPager",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -36,14 +36,14 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/react-native-oh-library/react-native-pager-view.git"
+    "url": "https://gitcode.com/openharmony-sig/rntpc_react-native-pager-view.git"
   },
   "author": "troZee <hello@callstack.com> (https://github.com/callstack)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/callstack/react-native-pager-view/issues"
+    "url": "https://gitcode.com/openharmony-sig/rntpc_react-native-pager-view/issues"
   },
-  "homepage": "https://github.com/callstack/react-native-pager-view#readme",
+  "homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-pager-view/tree/br_rnoh0.77#readme",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
      "access": "public"

package/harmony/pager_view/BuildProfile.ets

@@ -1,17 +0,0 @@
-/**
- * Use these variables when you tailor your ArkTS code. They must be of the const type.
- */
-export const HAR_VERSION = '6.7.2-rc.2';
-export const BUILD_MODE_NAME = 'debug';
-export const DEBUG = true;
-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;
-}