@aks-dev/easyui 1.0.134 → 1.0.136

package/lib/MenuView/MenuView.tsx

@@ -2,7 +2,7 @@ import React from "react";
 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 * as utils from '../../utils/lazy';
 import { hidePopoverView, showPopoverView } from '../Hud/Hud';
 
 type State = {
@@ -22,6 +22,11 @@ type Reducer = (prevState: State, action: Partial<State>) => State
 
 export default (props: MenuProps) => {
 
+    const {
+        defaultAlignHorizontal = 'left',
+        defaultAlignVertical = 'bottom'
+    } = props
+
     const [state, dispatch] = React.useReducer<Reducer>((prevState, action) => Object.assign({}, prevState, action), {})
 
     // const containerRef = React.useRef<{ measureInWindow: (callback: MeasureInWindowOnSuccessCallback) => void }>()
@@ -34,9 +39,26 @@ export default (props: MenuProps) => {
     }>({ x: 0, y: 0, width: 0, height: 0 })
 
 
-    React.useEffect(() => {
-        ;(async ()=>{
-            await utils.sleep()
+    // 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) {
@@ -47,9 +69,10 @@ export default (props: MenuProps) => {
                         height: args[3],
                     }
                 }
+                resovle(args)
             })
-        })()
-    },[])
+        })
+    }
 
 
     const getLayoutInfos: () => {
@@ -63,13 +86,13 @@ export default (props: MenuProps) => {
         target_height: number;
     }
         = () => {
-            let alignVertical: 'bottom' | 'top' = 'bottom'
-            let alignHorizontal: 'left' | 'right' = 'left'
+            let alignVertical: 'bottom' | 'top' = defaultAlignVertical
+            let alignHorizontal: 'left' | 'right' = defaultAlignHorizontal
             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 =  _container.current.y + height
+            let y = _container.current.y + height
             if (x > Math.abs(deviceWidth - width - x)) {
                 alignHorizontal = 'right'
             }
@@ -138,15 +161,18 @@ export default (props: MenuProps) => {
             y = y + 10
             return layout()
         } else {
-            y = (StatusBar.currentHeight || 0) + _container.current.y - target_height - 10
+            // y = (StatusBar.currentHeight || 0) + _container.current.y - target_height - 10
+            y = _container.current.y - target_height - 10
             return layout()
         }
     }
 
 
-    const show = () => {
-        // console.log('_container', _container.current, StatusBar.currentHeight)
+    const show = async () => {
         if (props.data == undefined || props.data?.length == 0) return
+        /**重新获取rootview的定位 */
+        await getRootViewlayoutPromise()
+        /**重新获取rootview的定位 */
         showPopoverView({
             content: (
                 <TouchableOpacity

package/lib/MenuView/index.ts

@@ -2,12 +2,12 @@
  * @Author: shiguo
  * @Date: 2022-07-14 18:09:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-12-22 22:38:52
+ * @LastEditTime: 2022-12-23 12:24:54
  * @FilePath: /@aks-dev/easyui/lib/MenuView/index.ts
  */
 
 import React from "react";
-import { ImageSourcePropType, StyleProp, ViewStyle } from 'react-native';
+import { ImageSourcePropType, StyleProp, ViewStyle, TouchableOpacityProps } from 'react-native';
 
 
 
@@ -18,11 +18,12 @@ export type MenuItem = {
 }
 
 export type MenuProps = {
-    activeOpacity?: number | undefined;
+    defaultAlignVertical?: 'bottom' | 'top';
+    defaultAlignHorizontal?: 'left' | 'right';
     style?: StyleProp<ViewStyle> | undefined;
     data?: MenuItem[];
     onItemClick?: (index: number, extra?: any) => void;
-} & Readonly<{ children?: React.ReactNode | undefined }>
+} & Readonly<{ children?: React.ReactNode | undefined }> & TouchableOpacityProps
 
 
 export declare const MenuView: React.FC<MenuProps>;

package/package.json

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