@aks-dev/easyui 1.0.139 → 1.0.142

package/lib/AnimationModal/AnimationModal.tsx

@@ -2,12 +2,12 @@
  * @Author: shiguo
  * @Date: 2022-05-17 15:22:06
  * @LastEditors: shiguo
- * @LastEditTime: 2022-12-26 17:26:14
+ * @LastEditTime: 2022-12-27 09:12:36
  * @FilePath: /@aks-dev/easyui/lib/AnimationModal/AnimationModal.tsx
  */
 
 import * as React from "react";
-import { View, Animated, Easing, LayoutRectangle, PanResponder, StyleSheet, useWindowDimensions, BackHandler } from 'react-native';
+import { View, Animated, Easing, LayoutRectangle, PanResponder, StyleSheet, useWindowDimensions, BackHandler, MeasureOnSuccessCallback } from 'react-native';
 import type { AnimationModalProps } from '.';
 import * as utils from '../../utils/lazy';
 // type State = {
@@ -17,6 +17,7 @@ import * as utils from '../../utils/lazy';
 
 
 
+
 export const AnimationModal: React.ForwardRefExoticComponent<
     React.PropsWithoutRef<AnimationModalProps>
     & React.RefAttributes<AnimationModalProps.RefAttributes>
@@ -49,24 +50,40 @@ export const AnimationModal: React.ForwardRefExoticComponent<
             });
         };
 
+
+        const viewRef = React.useRef<{ measure: (callback: MeasureOnSuccessCallback) => void }>() as any
         const layoutRef = React.useRef<{
             /**：父容器的高度 */
             h0: number;
             /**：子容器的高度 */
             h1: number;
         }>({ h0: 0, h1: 0 })
+        const getLayoutPromise = () => {
+            return new Promise((resovle, reject) => {
+                viewRef.current?.measure((...args: any[]) => {
+                    if (args.length == 6) {
+                        layoutRef.current.h1 = args[3]
+                    }
+                    resovle(args)
+                })
+            })
+        }
 
         React.useImperativeHandle<unknown, AnimationModalProps.RefAttributes>(ref, () => ({
             show,
             hide,
             target: targetRef.current
         }), [])
+
         const targetRef = React.useRef<any>()
 
 
+
+
         const show = async () => {
             setDisplay('flex', async () => {
                 await utils.sleep(50)
+                await getLayoutPromise()
                 timing(-layoutRef.current?.h1)
             })
         }
@@ -115,10 +132,12 @@ export const AnimationModal: React.ForwardRefExoticComponent<
             >
                 <Animated.View
                     style={Object.assign({}, styles.wrapper, { transform: [{ translateY: animatedValue }] })}
-                    onLayout={e => {
-                        let target: LayoutRectangle = e.nativeEvent.layout
-                        layoutRef.current.h1 = target.height
-                    }}
+                    // onLayout={e => {
+                    //     let target: LayoutRectangle = e.nativeEvent.layout
+                    //     layoutRef.current.h1 = target.height
+                    // }}
+
+                    ref={viewRef}
                 >
                     {props.children}
                 </Animated.View>
@@ -172,4 +191,4 @@ const useCallbackState = <T,>(od: T): [T, (d: T, callback?: Function) => void] =
             setData(d)
         }
     ]
-}
+}

package/lib/MenuView/MenuView.tsx

@@ -168,7 +168,7 @@ export default (props: MenuProps) => {
 
 
     const show = async () => {
-        props.onContainerPress && props.onContainerPress()
+        props.onContainerClick && props.onContainerClick()
         if (props.data == undefined || props.data?.length == 0) return
         /**重新获取rootview的定位 */
         await getRootViewlayoutPromise()

package/lib/MenuView/index.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-07-14 18:09:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-12-26 18:00:33
+ * @LastEditTime: 2022-12-26 18:01:52
  * @FilePath: /@aks-dev/easyui/lib/MenuView/index.ts
  */
 
@@ -23,7 +23,7 @@ export type MenuProps = {
     style?: StyleProp<ViewStyle> | undefined;
     data?: MenuItem[];
     onItemClick?: (index: number, extra?: any) => void;
-    onContainerPress?:Function;
+    onContainerClick?:Function;
 } & Readonly<{ children?: React.ReactNode | undefined }> & TouchableOpacityProps
 
 

package/package.json

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