@aks-dev/easyui 1.0.131 → 1.0.133

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/AnimationModal/index.d.ts

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-05-18 17:26:41
  * @LastEditors: shiguo
- * @LastEditTime: 2022-12-21 18:13:47
- * @FilePath: /aks-fire-app/node_modules/@aks-dev/easyui/lib/AnimationModal/index.d.ts
+ * @LastEditTime: 2022-12-22 11:17:17
+ * @FilePath: /@aks-dev/easyui/lib/AnimationModal/index.d.ts
  */
 import { StyleProp, ViewStyle } from 'react-native';
 
@@ -13,6 +13,7 @@ export type AnimationModalProps = {
     /**
      * 动画方向，默认 'from-bottom'
      * center-in 动画暂未实现
+     * @deprecated
      */
     animationType?: 'from-bottom' | 'center-in';
     /**

package/package.json

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