@aks-dev/easyui 1.0.132 → 1.0.134

package/lib/AnimationModal/AnimationModal.tsx

@@ -2,12 +2,12 @@
  * @Author: shiguo
  * @Date: 2022-05-17 15:22:06
  * @LastEditors: shiguo
- * @LastEditTime: 2022-12-22 11:06:15
+ * @LastEditTime: 2022-12-22 11:57:30
  * @FilePath: /@aks-dev/easyui/lib/AnimationModal/AnimationModal.tsx
  */
 
 import * as React from "react";
-import { View, Animated, Easing, LayoutRectangle, PanResponder, StyleSheet, useWindowDimensions } from 'react-native';
+import { View, Animated, Easing, LayoutRectangle, PanResponder, StyleSheet, useWindowDimensions, BackHandler } from 'react-native';
 import type { AnimationModalProps } from '.';
 import * as utils from '../../utils/lazy';
 type State = {
@@ -46,8 +46,6 @@ export const AnimationModal: React.ForwardRefExoticComponent<
             });
         };
 
-
-
         const layoutRef = React.useRef<{
             /**：父容器的高度 */
             h0: number;
@@ -55,7 +53,6 @@ export const AnimationModal: React.ForwardRefExoticComponent<
             h1: number;
         }>({ h0: 0, h1: 0 })
 
-
         React.useImperativeHandle<unknown, AnimationModalProps.RefAttributes>(ref, () => ({
             show,
             hide,
@@ -63,8 +60,7 @@ export const AnimationModal: React.ForwardRefExoticComponent<
         }), [])
         const targetRef = React.useRef<any>()
 
-        const show = async (target?: any) => {
-            targetRef.current = target
+        const show = async () => {
             dispatch({ display: 'flex' })
             await utils.sleep(50)
             timing(-layoutRef.current?.h1)
@@ -75,6 +71,17 @@ export const AnimationModal: React.ForwardRefExoticComponent<
             dispatch({ display: 'none' })
         }
 
+
+        React.useEffect(() => {
+            let addEventListener = BackHandler.addEventListener("hardwareBackPress", ()=>{
+                return state.display == 'flex'
+            })
+            return () => {
+                addEventListener.remove()
+            }
+        }, [state.display])
+
+
         return (
             <View
                 style={Object.assign({ display: state.display }, styles.container, props.style)}

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;
@@ -34,19 +35,21 @@ export default (props: MenuProps) => {
 
 
     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],
+        ;(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 getLayoutInfos: () => {
@@ -65,7 +68,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'
             }

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.132",
+  "version": "1.0.134",
   "description": "工具箱",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",