@aks-dev/easyui 1.0.82 → 1.0.85

package/lib/Hud/Loading/Loading.tsx

@@ -2,11 +2,11 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-12 11:33:21
- * @FilePath: /@aks/easyui/lib/Easy-Hud/Loading/Loading.tsx
+ * @LastEditTime: 2022-07-15 14:21:00
+ * @FilePath: /@aks-dev/easyui/lib/Hud/Loading/Loading.tsx
  */
 import React, { useImperativeHandle, useState } from 'react';
-import { View, ActivityIndicator, StyleSheet, Text, Dimensions,TouchableOpacity } from 'react-native';
+import { View, ActivityIndicator, StyleSheet, Text, Dimensions, TouchableOpacity, BackHandler } from 'react-native';
 
 import type { LoadingCurrent } from '.'
 
@@ -19,6 +19,13 @@ export const Loading = React.forwardRef<LoadingCurrent, {}>((_, ref) => {
     const [tipText, setTipText] = useState('加载中');
 
 
+    React.useEffect(() => {
+        const onBackPress = () => show;
+        BackHandler.addEventListener('hardwareBackPress', onBackPress);
+        return () => BackHandler.removeEventListener('hardwareBackPress', onBackPress);
+    }, [show])
+
+
     useImperativeHandle<unknown, LoadingCurrent>(ref, () => ({
         showLoading: (content?: string) => {
             setShow(true);

package/lib/Hud/PopoverView/PopoverView.tsx

@@ -2,11 +2,11 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-15 10:08:14
- * @FilePath: /cmwy-device-app/node_modules/@aks-dev/easyui/lib/Hud/PopoverView/PopoverView.tsx
+ * @LastEditTime: 2022-07-15 14:20:40
+ * @FilePath: /@aks-dev/easyui/lib/Hud/PopoverView/PopoverView.tsx
  */
 import React, { useImperativeHandle, useState } from 'react';
-import { Dimensions, StyleSheet, TouchableOpacity } from 'react-native';
+import { StyleSheet, TouchableOpacity, BackHandler } from 'react-native';
 import type { PopoverViewCurrent, PopoverViewOptions } from '.';
 
 
@@ -18,6 +18,12 @@ export const PopoverView = React.forwardRef<PopoverViewCurrent, {}>((_, ref) =>
     const [visible, setVisible] = useState<boolean>(false);
     const [options, setOptions] = useState<Partial<PopoverViewOptions> | undefined>()
 
+    React.useEffect(() => {
+        const onBackPress = () => visible;
+        BackHandler.addEventListener('hardwareBackPress', onBackPress);
+        return () => BackHandler.removeEventListener('hardwareBackPress', onBackPress);
+    }, [visible])
+
 
     useImperativeHandle<unknown, PopoverViewCurrent>(ref, () => ({
         showPopoverView: (options: Partial<PopoverViewOptions>) => {
@@ -35,12 +41,12 @@ export const PopoverView = React.forwardRef<PopoverViewCurrent, {}>((_, ref) =>
         return null;
 
     return (
-        <TouchableOpacity activeOpacity={1}  style={[styles.container,options.style]} onPress={e=>{
+        <TouchableOpacity activeOpacity={1} style={[styles.container, options?.style]} onPress={e => {
             setVisible(false);
             setOptions(undefined)
             // e.stopPropagation()
         }}>
-            {React.isValidElement(options.content) && options.content}
+            {React.isValidElement(options?.content) && options?.content}
         </TouchableOpacity>
     )
 })

package/lib/MenuView/MenuView.tsx

@@ -142,6 +142,7 @@ export default (props: MenuProps) => {
 
     const show = () => {
         // console.log('_container', _container.current, StatusBar.currentHeight)
+        if(props.data == undefined || props.data?.length == 0) return
         showPopoverView({
             content: (
                 <TouchableOpacity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.82",
+  "version": "1.0.85",
   "description": "移动端App开发工具包",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",

package/{README.md → readme.md}

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-25 17:57:29
  * @LastEditors: shiguo
- * @LastEditTime: 2022-06-14 13:56:32
+ * @LastEditTime: 2022-07-15 12:47:16
  * @FilePath: /@aks-dev/easyui/README.md
 -->
 
@@ -39,6 +39,10 @@ import '@aks-dev/easyui/screen/text-fit'
 + TableCell
 + TextInputArea
 + WithLoadingContainer
++ DottedLine
++ MenuView
++ RichText
++ ...
 
 
 ### utils