@react-native-ohos/react-native-context-menu-view 1.19.1-rc.2 → 1.20.0-beta.2

package/README.OpenSource

@@ -2,10 +2,10 @@
     {
         "Name": "react-native-context-menu-view",
         "License": "MIT License",
-        "License File": "https://github.com/mpiannucci/react-native-context-menu-view/blob/v1.19.0/LICENSE",
-        "Version Number": "1.19.0",
+        "License File": "https://github.com/mpiannucci/react-native-context-menu-view/blob/v1.21.0/LICENSE",
+        "Version Number": "1.21.0",
 		"Owner" : "xiafeng@huawei.com",
-        "Upstream URL": "https://github.com/mpiannucci/react-native-context-menu-view/tree/v1.19.0",
+        "Upstream URL": "https://github.com/mpiannucci/react-native-context-menu-view/tree/v1.21.0",
         "Description": "Use native context menus in React Native"
     }
 ]

package/README.md

@@ -1,13 +1,13 @@
 # @react-native-ohos/react-native-context-menu-view
 
-This project is based on [react-native-context-menu-view@v1.19.0](https://github.com/mpiannucci/react-native-context-menu-view/tree/v1.19.0)
+This project is based on [react-native-context-menu-view@v1.21.0](https://github.com/mpiannucci/react-native-context-menu-view/tree/v1.21.0)
 
 ## Documentation
 
-- [中文](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-context-menu-view.md)
+- [中文](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/zh-cn/react-native-context-menu-view.md)
 
-- [English](https://gitee.com/react-native-oh-library/usage-docs/blob/master/en/react-native-context-menu-view.md)
+- [English](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/en/react-native-context-menu-view.md)
 
 ## License
 
-This library is licensed under [The MIT License (MIT)](https://github.com/mpiannucci/react-native-context-menu-view/blob/v1.19.0/LICENSE)
+This library is licensed under [The MIT License (MIT)](https://github.com/mpiannucci/react-native-context-menu-view/blob/v1.21.0/LICENSE)

package/harmony/context_menu/BuildProfile.ets

@@ -1,17 +1,17 @@
-/**
- * Use these variables when you tailor your ArkTS code. They must be of the const type.
- */
-export const HAR_VERSION = '1.19.1-rc.1';
-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;
+/**
+ * Use these variables when you tailor your ArkTS code. They must be of the const type.
+ */
+export const HAR_VERSION = '1.20.0-beta.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;
 }

package/harmony/context_menu/index.ets

@@ -22,5 +22,6 @@
  * SOFTWARE.
  */
 
+import {ContextMenuPackage} from './src/main/ets/ContextMenuPackage'
 export * from './ts'
-export * from './src/main/ets/ContextMenuLongPress'
+export default ContextMenuPackage;

package/harmony/context_menu/oh-package.json5

@@ -2,7 +2,7 @@
   license: 'ISC',
   types: '',
   name: "@react-native-ohos/react-native-context-menu-view",
-  version: '1.19.1-rc.2',
+  version: '1.20.0-beta.2',
   description: '',
   main: 'index.ets',
   type: 'module',

package/harmony/context_menu/src/main/ets/ContextMenuLongPress.ets

@@ -228,7 +228,7 @@ export struct ContextMenuLongPress {
                 labelInfo: item.subtitle,
               })
                 .contentFont({
-                  family : this.menuFontName
+                  family: this.menuFontName
                 })
                 .selected(item.selected)
                 .selectIcon(new SymbolGlyphModifier($r('sys.symbol.checkmark')).fontSize('24vp'))
@@ -236,6 +236,9 @@ export struct ContextMenuLongPress {
                 .enabled(item.disabled)
                 .contentFontColor(item.titleColor)
                 .onClick(() => {
+                  // fix 二级菜单不能连续点击
+                  this.isTouch = false;
+                  this.isTouchWithNoSelect = false;
                   //当item.inlineChildren默认为false,表示以二级目录展示
                   //true的时候,以同目录展示
                   this.isTouch = true && (!item.inlineChildren) && (item.d_childActions !== undefined);
@@ -268,7 +271,7 @@ export struct ContextMenuLongPress {
                 labelInfo: item.subtitle,
               })
                 .contentFont({
-                  family : this.menuFontName
+                  family: this.menuFontName
                 })
                 .selected(item.selected)
                 .selectIcon(new SymbolGlyphModifier($r('sys.symbol.checkmark')).fontSize('24vp'))
@@ -276,6 +279,9 @@ export struct ContextMenuLongPress {
                 .enabled(item.disabled)
                 .contentFontColor(item.titleColor)
                 .onClick(() => {
+                  // fix 二级菜单不能连续点击
+                  this.isTouch = false;
+                  this.isTouchWithNoSelect = false;
                   //当item.inlineChildren默认为false,表示以二级目录展示
                   //true的时候,以同目录展示
                   this.isTouch = true && (!item.inlineChildren) && (item.d_childActions !== undefined);
@@ -310,7 +316,7 @@ export struct ContextMenuLongPress {
                 labelInfo: item.subtitle,
               })
                 .contentFont({
-                  family : this.menuFontName
+                  family: this.menuFontName
                 })
                 .selected(item.selected)
                 .selectIcon(new SymbolGlyphModifier($r('sys.symbol.checkmark')).fontSize('24vp'))
@@ -318,6 +324,9 @@ export struct ContextMenuLongPress {
                 .enabled(item.disabled)
                 .contentFontColor(item.titleColor)
                 .onClick(() => {
+                  // fix 二级菜单不能连续点击
+                  this.isTouch = false;
+                  this.isTouchWithNoSelect = false;
                   //当item.inlineChildren默认为false,表示以二级目录展示
                   //true的时候,以同目录展示
                   this.isTouch = true && (!item.inlineChildren) && (item.d_childActions !== undefined);
@@ -349,7 +358,7 @@ export struct ContextMenuLongPress {
                 labelInfo: item.subtitle,
               })
                 .contentFont({
-                  family : this.menuFontName
+                  family: this.menuFontName
                 })
                 .selected(item.selected)
                 .selectIcon(new SymbolGlyphModifier($r('sys.symbol.checkmark')).fontSize('24vp'))
@@ -357,6 +366,9 @@ export struct ContextMenuLongPress {
                 .enabled(item.disabled)
                 .contentFontColor(item.titleColor)
                 .onClick(() => {
+                  // fix 二级菜单不能连续点击
+                  this.isTouch = false;
+                  this.isTouchWithNoSelect = false;
                   //当item.inlineChildren默认为false,表示以二级目录展示
                   //true的时候,以同目录展示
                   this.isTouch = true && (!item.inlineChildren) && (item.d_childActions !== undefined);
@@ -387,7 +399,7 @@ export struct ContextMenuLongPress {
       }.backgroundColor('white')
     }
     .onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
-      writeResult(newValue.width, newValue.height)
+      writeResult(newValue)
     })
     .onDisAppear(() => {
       this.menuCtx.rnInstance.postMessageToCpp('contextMenu::onCancel', {

package/harmony/context_menu/src/main/ets/ContextMenuLongPressWithNoSelect.ets

@@ -237,6 +237,9 @@ export struct ContextMenuLongPressWithNoSelect {
                 .enabled(item.disabled)
                 .contentFontColor(item.titleColor)
                 .onClick(() => {
+                  // fix 二级菜单不能连续点击
+                  this.isTouch = false;
+                  this.isTouchWithNoSelect = false;
                   //当item.inlineChildren默认为false,表示以二级目录展示
                   //true的时候,以同目录展示
                   this.isTouch = true && (!item.inlineChildren) && (item.d_childActions !== undefined);
@@ -272,6 +275,9 @@ export struct ContextMenuLongPressWithNoSelect {
                 .enabled(item.disabled)
                 .contentFontColor(item.titleColor)
                 .onClick(() => {
+                  // fix 二级菜单不能连续点击
+                  this.isTouch = false;
+                  this.isTouchWithNoSelect = false;
                   //当item.inlineChildren默认为false,表示以二级目录展示
                   //true的时候,以同目录展示
                   this.isTouch = true && (!item.inlineChildren) && (item.d_childActions !== undefined);
@@ -309,6 +315,9 @@ export struct ContextMenuLongPressWithNoSelect {
                 .enabled(item.disabled)
                 .contentFontColor(item.titleColor)
                 .onClick(() => {
+                  // fix 二级菜单不能连续点击
+                  this.isTouch = false;
+                  this.isTouchWithNoSelect = false;
                   //当item.inlineChildren默认为false,表示以二级目录展示
                   //true的时候,以同目录展示
                   this.isTouch = true && (!item.inlineChildren) && (item.d_childActions !== undefined);
@@ -342,6 +351,9 @@ export struct ContextMenuLongPressWithNoSelect {
                 .enabled(item.disabled)
                 .contentFontColor(item.titleColor)
                 .onClick(() => {
+                  // fix 二级菜单不能连续点击
+                  this.isTouch = false;
+                  this.isTouchWithNoSelect = false;
                   //当item.inlineChildren默认为false,表示以二级目录展示
                   //true的时候,以同目录展示
                   this.isTouch = true && (!item.inlineChildren) && (item.d_childActions !== undefined);
@@ -369,7 +381,7 @@ export struct ContextMenuLongPressWithNoSelect {
       }.backgroundColor('white')
     }
     .onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
-      writeResult(newValue.width, newValue.height)
+      writeResult(newValue)
     })
     .onDisAppear(() => {
       this.menuCtx.rnInstance.postMessageToCpp('contextMenu::onCancel', {

package/harmony/context_menu/src/main/ets/ContextMenuPackage.ets

@@ -22,7 +22,8 @@
  * SOFTWARE.
  */
 
-import {RNPackage, TurboModulesFactory} from '@rnoh/react-native-openharmony/ts';
+import {TurboModulesFactory} from '@rnoh/react-native-openharmony/ts';
+import { RNOHPackage } from '@rnoh/react-native-openharmony';
 import type {TurboModule, TurboModuleContext} from '@rnoh/react-native-openharmony/ts';
 import { ContextMenuTurboModule } from './ContextMenuTurboModule';
 
@@ -40,7 +41,7 @@ class ContextMenuTurboModulesFactory extends TurboModulesFactory {
   }
 }
 
-export class ContextMenuPackage extends RNPackage {
+export class ContextMenuPackage extends RNOHPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new ContextMenuTurboModulesFactory(ctx);
   }

package/harmony/context_menu/src/main/ets/ContextMenuThreeMenu.ets

@@ -93,7 +93,7 @@ export struct ContextMenuThreeMenu {
     this.menuTag = this.menuTag;
     Logger.info('2024-3menu:' + JSON.stringify(this.longPress))
     //menu的大标题
-    this.listDate = this.longPress;
+    this.listDate = JSON.parse(JSON.stringify(this.longPress));
     Logger.info('2024-3menu,this.listDate:' + JSON.stringify(this.listDate))
     for (let i = 0; i < this.listDate.length; i++) {
       if (this.listDate[i] !== null && this.listDate[i] !== undefined) {

package/harmony/context_menu/src/main/ets/ContextMenuThreeMenuWithNoSelect.ets

@@ -93,7 +93,7 @@ export struct ContextMenuThreeMenuWithNoSelect {
     this.menuTag = this.menuTag;
     Logger.info('2024-3menu:' + JSON.stringify(this.longPress))
     //menu的大标题
-    this.listDate = this.longPress;
+    this.listDate = JSON.parse(JSON.stringify(this.longPress));
     Logger.info('2024-3menu,this.listDate:' + JSON.stringify(this.listDate))
     for (let i = 0; i < this.listDate.length; i++) {
       if (this.listDate[i] !== null && this.listDate[i] !== undefined) {

package/harmony/context_menu/src/main/ets/ContextMenuTurboModule.ets

@@ -23,7 +23,7 @@
  */
 
 import { TurboModule, TurboModuleContext } from "@rnoh/react-native-openharmony/ts";
-import { ComponentContent, window } from '@kit.ArkUI';
+import { ComponentContent, PromptAction, window } from '@kit.ArkUI';
 import { ContextMenuLongPress } from './ContextMenuLongPress';
 import { RNOHContext } from '@rnoh/react-native-openharmony';
 import { ContextMenuLongPressWithNoSelect } from './ContextMenuLongPressWithNoSelect';
@@ -41,19 +41,20 @@ function buildContextMenuWithNoSelect(realViewPoint: ESObject) {
 }
 
 
-let uiContext = null;
-let promptAction = null;
-let contentNode = null;
+let uiContext: UIContext | null = null;
+let promptAction: PromptAction | null = null;
+let contentNode: ComponentContent<Object> | null = null;
 
 let realViewPointX = 0;
 let realViewPointY = 0;
 let windowWidth: number = 0;
 let windowHeight: number = 0;
+let rnOHContext: RNOHContext;
 
-export function writeResult(width: Length, height: Length) {
+export function writeResult(newValue: SizeOptions) {
   try {
-    let x = realViewPointX + (width as number);
-    let y = realViewPointY + (height as number);
+    let x = realViewPointX + (newValue.width as number);
+    let y = realViewPointY + (newValue.height as number);
 
     if (x > windowWidth) {
       realViewPointX = realViewPointX - (x - windowWidth) - 10;
@@ -69,8 +70,7 @@ export function writeResult(width: Length, height: Length) {
         dy: realViewPointY,
       }
     })
-    this.menuHeight = 0;
-    this.ctx.rnInstance.cppEventEmitter.subscribe("RNGH::CLOSE_MENU", () => {
+    rnOHContext.rnInstance.cppEventEmitter.subscribe("RNGH::CLOSE_MENU", () => {
       promptAction?.closeCustomDialog(contentNode);
     })
   } catch (error) {
@@ -141,12 +141,14 @@ export class ContextMenuTurboModule extends TurboModule {
 
   constructor(ctx: TurboModuleContext) {
     super(ctx)
+    rnOHContext = ctx;
     if (this.ctx.rnInstance.getArchitecture() === "C_API") {
       //e为C层拦截的ArkUI_UIInputEvent
       this.ctx.rnInstance.cppEventEmitter.subscribe("RNGH::TOUCH_EVENT", (e: ESObject) => {
         //获取view坐标
         console.log('ContextMenu:在ArkTs侧获取到了点击事件！TOUCH_EVENT，touchableViews：' +
-        JSON.stringify(e.touchableViews) + '最后点击的节点为View:' + JSON.stringify(e.touchableViews[e.touchableViews.length-1]));
+        JSON.stringify(e.touchableViews) + '最后点击的节点为View:' +
+        JSON.stringify(e.touchableViews[e.touchableViews.length-1]));
         //e.action进行获取点击事件的次数，进行判定
         switch (e.action) {
           case 1:
@@ -167,6 +169,10 @@ export class ContextMenuTurboModule extends TurboModule {
             this.longPressTimestamp = e.timestamp / Math.pow(10, 6);
             this.longResult = this.longPressTimestamp - this.downTimestamp
             if (e.touchableViews[e.touchableViews.length-1] && !(e.dropdownMenuMode) && this.longResult >= 500) {
+              // fix 外层disabled不生效
+              if (e.disabled) {
+                return;
+              }
               //2024.12.06 fix：当处于多层嵌套外层情况下，tag值会错误
               this.realViewPoint.tag = e.rootTag;
               this.realViewPoint.x = e.touchableViews[e.touchableViews.length-1].x;
@@ -226,6 +232,10 @@ export class ContextMenuTurboModule extends TurboModule {
             //当点击外部的stack区域时候,获取的view只有两个，主屏幕和contextmenu容器,逻辑上是点击view才会触发menu
             // dropdownMenuMode-->true---->onTouch(),如果此时点击的事件大于500ms则不触发点击事件，如果小于500ms则触发点击效果
             if (e.touchableViews[e.touchableViews.length-1] && e.dropdownMenuMode && this.result < 500) {
+              // fix 外层disabled不生效
+              if (e.disabled) {
+                return;
+              }
               this.realViewPoint.tag = e.rootTag;
               this.realViewPoint.x = e.touchableViews[e.touchableViews.length-1].x;
               this.realViewPoint.y = e.touchableViews[e.touchableViews.length-1].y;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-context-menu-view",
-  "version": "1.19.1-rc.2",
+  "version": "1.20.0-beta.2",
   "description": "Use native context menu views from React Native",
   "main": "index.js",
   "types": "index.d.ts",
@@ -14,7 +14,8 @@
     "!ios/build",
     "!**/__tests__",
     "!**/__fixtures__",
-    "!**/__mocks__"
+    "!**/__mocks__",
+    "!build"
   ],
   "keywords": [
     "react-native",
@@ -34,6 +35,12 @@
     "react-native": "*"
   },
   "harmony": {
-    "alias": "react-native-context-menu-view"
+    "alias": "react-native-context-menu-view",
+    "autolinking": {
+      "etsPackageClassName":"ContextMenuPackage",
+      "cppPackageClassName":"ContextMenuPackage",
+      "cmakeLibraryTargetName": "rnoh_context_menu", 
+      "ohPackageName": "@react-native-ohos/react-native-context-menu-view"
+    }
   }
 }