@aks-dev/easyui 1.0.133 → 1.0.135

package/lib/MenuView/MenuView.tsx

@@ -1,10 +1,10 @@
 import React from "react";
-import { Image, LayoutRectangle, MeasureInWindowOnSuccessCallback, ScrollView, StatusBar, Text, TouchableOpacity, View } from 'react-native';
+import { Image, LayoutRectangle, MeasureOnSuccessCallback, ScrollView, StatusBar, Text, TouchableOpacity, View } from 'react-native';
 import type { MenuProps } from '.';
 import { deviceHeight, deviceWidth } from '../../screen/px2dp';
+// import * as utils from '../../utils/lazy';
 import { hidePopoverView, showPopoverView } from '../Hud/Hud';
 
-
 type State = {
     target?: LayoutRectangle;
     arrow?: Partial<{
@@ -24,7 +24,8 @@ export default (props: MenuProps) => {
 
     const [state, dispatch] = React.useReducer<Reducer>((prevState, action) => Object.assign({}, prevState, action), {})
 
-    const containerRef = React.useRef<{ measureInWindow: (callback: MeasureInWindowOnSuccessCallback) => void }>()
+    // const containerRef = React.useRef<{ measureInWindow: (callback: MeasureInWindowOnSuccessCallback) => void }>()
+    const containerRef = React.useRef<{ measure: (callback: MeasureOnSuccessCallback) => void }>()
     const _container = React.useRef<{
         x: number;
         y: number;
@@ -33,20 +34,40 @@ export default (props: MenuProps) => {
     }>({ x: 0, y: 0, width: 0, height: 0 })
 
 
-    React.useEffect(() => {
-        containerRef.current?.measureInWindow((...args) => {
-            // console.log('containerRef', args)
-            if (args.length == 4) {
-                _container.current = {
-                    x: args[0],
-                    y: args[1],
-                    width: args[2],
-                    height: args[3],
+    // React.useEffect(() => {
+    //     ; (async () => {
+    //         await utils.sleep()
+    //         containerRef.current?.measure((...args) => {
+    //             console.log('containerRef', args)
+    //             if (args.length == 6) {
+    //                 _container.current = {
+    //                     x: args[4],
+    //                     y: args[5],
+    //                     width: args[2],
+    //                     height: args[3],
+    //                 }
+    //             }
+    //         })
+    //     })()
+    // })
+
+
+    const getRootViewlayoutPromise = () => {
+        return new Promise((resovle, reject) => {
+            containerRef.current?.measure((...args) => {
+                // console.log('containerRef', args)
+                if (args.length == 6) {
+                    _container.current = {
+                        x: args[4],
+                        y: args[5],
+                        width: args[2],
+                        height: args[3],
+                    }
                 }
-            }
+                resovle(args)
+            })
         })
-
-    })
+    }
 
 
     const getLayoutInfos: () => {
@@ -65,7 +86,8 @@ export default (props: MenuProps) => {
             let width = _container.current.width
             let height = _container.current.height
             let x = _container.current.x
-            let y = (StatusBar.currentHeight || 0) + _container.current.y + height
+            // let y = (StatusBar.currentHeight || 0) + _container.current.y + height
+            let y = _container.current.y + height
             if (x > Math.abs(deviceWidth - width - x)) {
                 alignHorizontal = 'right'
             }
@@ -140,9 +162,10 @@ export default (props: MenuProps) => {
     }
 
 
-    const show = () => {
-        // console.log('_container', _container.current, StatusBar.currentHeight)
+    const show = async () => {
         if (props.data == undefined || props.data?.length == 0) return
+        /**重新获取rootview的定位 */
+        await getRootViewlayoutPromise()
         showPopoverView({
             content: (
                 <TouchableOpacity

package/lib/MenuView/index.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-07-14 18:09:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-21 16:08:43
+ * @LastEditTime: 2022-12-22 22:38:52
  * @FilePath: /@aks-dev/easyui/lib/MenuView/index.ts
  */
 
@@ -18,6 +18,7 @@ export type MenuItem = {
 }
 
 export type MenuProps = {
+    activeOpacity?: number | undefined;
     style?: StyleProp<ViewStyle> | undefined;
     data?: MenuItem[];
     onItemClick?: (index: number, extra?: any) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.133",
+  "version": "1.0.135",
   "description": "工具箱",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",