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

package/harmony/context_menu/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 = '1.19.1-rc.1';
+export const HAR_VERSION = '1.19.1';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

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.19.1',
   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'))
@@ -268,7 +268,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'))
@@ -310,7 +310,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'))
@@ -349,7 +349,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'))
@@ -387,7 +387,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

@@ -369,7 +369,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/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:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-context-menu-view",
-  "version": "1.19.1-rc.2",
+  "version": "1.19.1",
   "description": "Use native context menu views from React Native",
   "main": "index.js",
   "types": "index.d.ts",

package/react-native-context-menu-view.podspec

@@ -1,26 +0,0 @@
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-
-Pod::Spec.new do |s|
-  s.name         = "react-native-context-menu-view"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.description  = <<-DESC
-                  react-native-context-menu-view
-                   DESC
-  s.homepage     = "https://github.com/mpiannucci/react-native-context-menu-view"
-  s.license      = "MIT"
-  # s.license    = { :type => "MIT", :file => "FILE_LICENSE" }
-  s.authors      = { "Matthew Iannucci" => "mpiannucci@gmail.com" }
-  s.platforms    = { :ios => "9.0" }
-  s.source       = { :git => "https://github.com/mpiannucci/react-native-context-menu-view.git", :tag => "#{s.version}" }
-
-  s.source_files = "ios/**/*.{h,m,swift}"
-  s.requires_arc = true
-
-  s.dependency "React"
-  # ...
-  # s.dependency "..."
-end
-