@aks-dev/easyui 1.0.101 → 1.0.102

package/lib/Hud/AlertBottomView/AlertBottomView.tsx

@@ -5,20 +5,20 @@ import Modal from 'react-native-modal'
 import { px2dp, deviceWidth } from '../../../screen/px2dp'
 import { px2sp } from '../../../screen/px2sp'
 
-import { AlertBottomViewOptions, AlertBottomViewCurrent } from '.'
+import { AlertBottomOptions } from '.'
 
 
 
 type State = {
     visible: boolean;
 
-} & Omit<AlertBottomViewOptions, 'cancel' | 'confirm'>
+} & Omit<AlertBottomOptions, 'cancel' | 'confirm'>
 
 
 
 
 
-export default React.forwardRef<AlertBottomViewCurrent, {}>((_, ref) => {
+export default React.forwardRef<AlertBottomOptions.RefAttributes, {}>((_, ref) => {
 
 
     const defaultState: Partial<State> = {
@@ -32,8 +32,8 @@ export default React.forwardRef<AlertBottomViewCurrent, {}>((_, ref) => {
 
 
 
-    React.useImperativeHandle<unknown, AlertBottomViewCurrent>(ref, () => ({
-        show: async (options: Partial<AlertBottomViewOptions>) => {
+    React.useImperativeHandle<unknown, AlertBottomOptions.RefAttributes>(ref, () => ({
+        show: async (options: Partial<AlertBottomOptions>) => {
 
             setState(Object.assign({}, defaultState, { visible: true }, options))
             cancelCallbackRef.current = options.cancel;
@@ -130,11 +130,11 @@ export default React.forwardRef<AlertBottomViewCurrent, {}>((_, ref) => {
 
 
 
-export const alertBottomViewRef = React.createRef<AlertBottomViewCurrent>();
+export const alertBottomViewRef = React.createRef<AlertBottomOptions.RefAttributes>();
 
 
 
-export const showAlertBottomModal = (props: Partial<AlertBottomViewOptions>) => {
+export const showAlertBottomModal = (props: Partial<AlertBottomOptions>) => {
     alertBottomViewRef.current?.show(props)
 }
 

package/lib/Hud/AlertBottomView/{index.ts → index.d.ts}

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-22 17:30:32
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-12 19:39:48
- * @FilePath: /@aks-dev/easyui/lib/Hud/AlertBottomView/index.ts
+ * @LastEditTime: 2022-09-09 10:52:55
+ * @FilePath: /@aks-dev/easyui/lib/Hud/AlertBottomView/index.d.ts
  */
 import * as React from 'react'
 
@@ -11,7 +11,7 @@ import * as React from 'react'
 import { StyleProp, ViewStyle, TextStyle } from 'react-native'
 
 
-export declare type AlertBottomViewOptions = {
+export declare type AlertBottomOptions = {
     title: string;
     wrapperStyle: StyleProp<ViewStyle>;
     content: string | React.ReactElement;
@@ -27,16 +27,16 @@ export declare type AlertBottomViewOptions = {
 }
 
 
-export declare const showAlertBottomModal: (props: Partial<AlertBottomViewOptions>) => void;
+export declare const showAlertBottomModal: (props: Partial<AlertBottomOptions>) => void;
 
-
-
-export declare type AlertBottomViewCurrent = {
-    show: (options: Partial<AlertBottomViewOptions>) => void;
-    hide: () => void;
+declare namespace AlertBottomOptions {
+    type RefAttributes = {
+        show: (options: Partial<AlertBottomOptions>) => void;
+        hide: () => void;
+    }
 }
 
 
-export declare const AlertBottomView: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<AlertBottomViewCurrent>>;
+export declare const AlertBottomView: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<AlertBottomOptions.RefAttributes>>;
 
-export declare const AlertBottomViewRef: React.RefObject<AlertBottomViewCurrent>
+export declare const AlertBottomViewRef: React.RefObject<AlertBottomOptions.RefAttributes>

package/lib/Hud/AlertSheetView/AlertSheetView.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { Dimensions, Platform, StatusBar, StyleSheet, Text, TouchableOpacity, View } from 'react-native'
 import Modal from 'react-native-modal'
-import { AlertSheetViewOptions, AlertSheetViewRefAttributes } from '.'
+import { AlertSheetViewOptions } from '.'
 import { px2dp } from '../../../screen/px2dp'
 import { px2sp } from '../../../screen/px2sp'
 
@@ -17,7 +17,7 @@ type State = {
 
 
 
-export default React.forwardRef<AlertSheetViewRefAttributes, {}>((_, ref) => {
+export default React.forwardRef<AlertSheetViewOptions.RefAttributes, {}>((_, ref) => {
 
 
     const defaultState: Partial<State> = {
@@ -26,7 +26,7 @@ export default React.forwardRef<AlertSheetViewRefAttributes, {}>((_, ref) => {
     }
     const [state, setState] = React.useState<Partial<State>>(defaultState)
 
-    React.useImperativeHandle<unknown, AlertSheetViewRefAttributes>(ref, () => ({
+    React.useImperativeHandle<unknown, AlertSheetViewOptions.RefAttributes>(ref, () => ({
         show: async (options: Partial<AlertSheetViewOptions>) => {
             setState(Object.assign({}, defaultState, { visible: true }, options))
         },
@@ -103,7 +103,7 @@ export default React.forwardRef<AlertSheetViewRefAttributes, {}>((_, ref) => {
 
 
 
-export const alertSheetViewRef = React.createRef<AlertSheetViewRefAttributes>();
+export const alertSheetViewRef = React.createRef<AlertSheetViewOptions.RefAttributes>();
 
 
 

package/lib/Hud/AlertSheetView/{index.ts → index.d.ts}

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-22 17:30:32
  * @LastEditors: shiguo
- * @LastEditTime: 2022-09-09 10:11:11
- * @FilePath: /cmwy-device-app/node_modules/@aks-dev/easyui/lib/Hud/AlertSheetView/index.ts
+ * @LastEditTime: 2022-09-09 10:51:19
+ * @FilePath: /@aks-dev/easyui/lib/Hud/AlertSheetView/index.d.ts
  */
 import * as React from 'react';
 import { ColorValue } from 'react-native';
@@ -23,13 +23,13 @@ export declare type AlertSheetViewOptions = {
 export declare const showAlertSheetModal: (props: Partial<AlertSheetViewOptions>) => void;
 
 
-
-export declare type AlertSheetViewRefAttributes = {
-    show: (options: Partial<AlertSheetViewOptions>) => void;
-    hide: () => void;
+declare namespace AlertSheetViewOptions {
+    type RefAttributes = {
+        show: (options: Partial<AlertSheetViewOptions>) => void;
+        hide: () => void;
+    }
 }
 
+export declare const AlertSheetView: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<AlertSheetViewOptions.RefAttributes>>;
 
-export declare const AlertSheetView: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<AlertSheetViewRefAttributes>>;
-
-export declare const AlertSheetViewRef: React.RefObject<AlertSheetViewRefAttributes>
+export declare const AlertSheetViewRef: React.RefObject<AlertSheetViewOptions.RefAttributes>

package/lib/Hud/AlertView/AlertView.tsx

@@ -5,7 +5,7 @@ import { View, Text, StyleSheet, Platform, Modal, StatusBar, TouchableOpacity, A
 import { px2dp, deviceWidth } from '../../../screen/px2dp'
 import { px2sp } from '../../../screen/px2sp'
 
-import { AlertViewOptions, AlertViewCurrent } from '.'
+import { AlertViewOptions } from '.'
 
 
 
@@ -18,7 +18,7 @@ type State = {
 
 
 
-export default React.forwardRef<AlertViewCurrent, {}>((_, ref) => {
+export default React.forwardRef<AlertViewOptions.RefAttributes, {}>((_, ref) => {
 
 
     const defaultState: Partial<State> = {
@@ -32,7 +32,7 @@ export default React.forwardRef<AlertViewCurrent, {}>((_, ref) => {
 
 
     
-    React.useImperativeHandle<unknown, AlertViewCurrent>(ref, () => ({
+    React.useImperativeHandle<unknown, AlertViewOptions.RefAttributes>(ref, () => ({
         show: async (options: Partial<AlertViewOptions>) => {
 
             setState(Object.assign({}, defaultState, { visible: true }, options))
@@ -134,7 +134,7 @@ export default React.forwardRef<AlertViewCurrent, {}>((_, ref) => {
 
 
 
-export const alertViewRef = React.createRef<AlertViewCurrent>();
+export const alertViewRef = React.createRef<AlertViewOptions.RefAttributes>();
 
 
 

package/lib/Hud/AlertView/{index.ts → index.d.ts}

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-22 17:30:32
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-12 19:06:29
- * @FilePath: /cmwy-device-app/node_modules/@aks-dev/easyui/lib/Hud/AlertView/index.ts
+ * @LastEditTime: 2022-09-09 10:53:51
+ * @FilePath: /@aks-dev/easyui/lib/Hud/AlertView/index.ts
  */
 import * as React from 'react'
 
@@ -30,12 +30,16 @@ export declare const showAlertModal: (props: Partial<AlertViewOptions>) => void;
 
 
 
-export declare type AlertViewCurrent = {
-    show: (options: Partial<AlertViewOptions>) => void;
-    hide: () => void;
+declare namespace AlertViewOptions {
+    type RefAttributes = {
+        show: (options: Partial<AlertViewOptions>) => void;
+        hide: () => void;
+    }
 }
 
 
-export declare const AlertView: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<AlertViewCurrent>>;
 
-export declare const alertViewRef: React.RefObject<AlertViewCurrent>
+
+export declare const AlertView: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<AlertViewOptions.RefAttributes>>;
+
+export declare const alertViewRef: React.RefObject<AlertViewOptions.RefAttributes>

package/lib/Hud/Loading/Loading.tsx

@@ -2,19 +2,19 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-15 14:21:00
+ * @LastEditTime: 2022-09-09 10:55:48
  * @FilePath: /@aks-dev/easyui/lib/Hud/Loading/Loading.tsx
  */
 import React, { useImperativeHandle, useState } from 'react';
 import { View, ActivityIndicator, StyleSheet, Text, Dimensions, TouchableOpacity, BackHandler } from 'react-native';
 
-import type { LoadingCurrent } from '.'
+import { LoadingOptions } from '.'
 
 
 
 
 
-export const Loading = React.forwardRef<LoadingCurrent, {}>((_, ref) => {
+export const Loading = React.forwardRef<LoadingOptions.RefAttributes, {}>((_, ref) => {
     const [show, setShow] = useState(false);
     const [tipText, setTipText] = useState('加载中');
 
@@ -26,7 +26,7 @@ export const Loading = React.forwardRef<LoadingCurrent, {}>((_, ref) => {
     }, [show])
 
 
-    useImperativeHandle<unknown, LoadingCurrent>(ref, () => ({
+    useImperativeHandle<unknown, LoadingOptions.RefAttributes>(ref, () => ({
         showLoading: (content?: string) => {
             setShow(true);
             setTipText(content || '加载中')
@@ -50,7 +50,7 @@ export const Loading = React.forwardRef<LoadingCurrent, {}>((_, ref) => {
     )
 })
 
-export const loadingRef = React.createRef<LoadingCurrent>();
+export const loadingRef = React.createRef<LoadingOptions.RefAttributes>();
 export const showLoading = (content?: string) => loadingRef.current?.showLoading(content)
 export const hideLoading = () => loadingRef.current?.hideLoading()
 

package/lib/Hud/Loading/index.d.ts

@@ -0,0 +1,38 @@
+
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-24 14:27:02
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-09-09 10:55:28
+ * @FilePath: /@aks-dev/easyui/lib/Hud/Loading/index.ts
+ */
+import * as React from 'react'
+
+
+
+
+
+
+
+
+
+
+declare namespace LoadingOptions {
+    type RefAttributes = {
+        showLoading: (content?: string) => void;
+        hideLoading: () => void;
+    }
+}
+
+
+
+export declare const showLoading: (content?: string) => void;
+
+
+export declare const hideLoading: () => void;
+
+
+export declare const loadingRef: React.RefObject<LoadingOptions.RefAttributes>;
+
+export declare const Loading: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<LoadingOptions.RefAttributes>>
+

package/lib/Hud/PopoverView/PopoverView.tsx

@@ -2,19 +2,19 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-15 14:20:40
+ * @LastEditTime: 2022-09-09 10:57:45
  * @FilePath: /@aks-dev/easyui/lib/Hud/PopoverView/PopoverView.tsx
  */
 import React, { useImperativeHandle, useState } from 'react';
 import { StyleSheet, TouchableOpacity, BackHandler } from 'react-native';
-import type { PopoverViewCurrent, PopoverViewOptions } from '.';
+import type {PopoverViewOptions } from '.';
 
 
 
 
 
 
-export const PopoverView = React.forwardRef<PopoverViewCurrent, {}>((_, ref) => {
+export const PopoverView = React.forwardRef<PopoverViewOptions.RefAttributes, {}>((_, ref) => {
     const [visible, setVisible] = useState<boolean>(false);
     const [options, setOptions] = useState<Partial<PopoverViewOptions> | undefined>()
 
@@ -25,7 +25,7 @@ export const PopoverView = React.forwardRef<PopoverViewCurrent, {}>((_, ref) =>
     }, [visible])
 
 
-    useImperativeHandle<unknown, PopoverViewCurrent>(ref, () => ({
+    useImperativeHandle<unknown, PopoverViewOptions.RefAttributes>(ref, () => ({
         showPopoverView: (options: Partial<PopoverViewOptions>) => {
             setVisible(true);
             setOptions(options)
@@ -51,7 +51,7 @@ export const PopoverView = React.forwardRef<PopoverViewCurrent, {}>((_, ref) =>
     )
 })
 
-export const popoverViewRef = React.createRef<PopoverViewCurrent>();
+export const popoverViewRef = React.createRef<PopoverViewOptions.RefAttributes>();
 export const showPopoverView = (options: Partial<PopoverViewOptions>) => popoverViewRef.current?.showPopoverView(options)
 export const hidePopoverView = () => popoverViewRef.current?.hidePopoverView()
 

package/lib/Hud/PopoverView/{index.ts → index.d.ts}

@@ -3,8 +3,8 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-15 10:07:56
- * @FilePath: /cmwy-device-app/node_modules/@aks-dev/easyui/lib/Hud/PopoverView/index.ts
+ * @LastEditTime: 2022-09-09 10:57:07
+ * @FilePath: /@aks-dev/easyui/lib/Hud/PopoverView/index.ts
  */
 import * as React from 'react'
 
@@ -18,21 +18,21 @@ export type PopoverViewOptions = {
 
 
 
-export declare type PopoverViewCurrent = {
-    showPopoverView: (options:Partial<PopoverViewOptions>) => void;
-    hidePopoverView: () => void;
+declare namespace PopoverViewOptions {
+    type   RefAttributes = {
+        showPopoverView: (options:Partial<PopoverViewOptions>) => void;
+        hidePopoverView: () => void;
+    }
 }
 
 
-
-
 export declare const showPopoverView: (options:Partial<PopoverViewOptions>) => void;
 
 
 export declare const hidePopoverView: () => void;
 
 
-export declare const popoverViewRef: React.RefObject<PopoverViewCurrent>;
+export declare const popoverViewRef: React.RefObject<PopoverViewOptions.RefAttributes>;
 
-export declare const PopoverView: React.ForwardRefExoticComponent<React.PropsWithoutRef<PopoverViewOptions> & React.RefAttributes<PopoverViewCurrent>>
+export declare const PopoverView: React.ForwardRefExoticComponent<React.PropsWithoutRef<PopoverViewOptions> & React.RefAttributes<PopoverViewOptions.RefAttributes>>
 

package/lib/Hud/Toast/Toast.tsx

@@ -2,18 +2,18 @@
  * @Author: shiguo
  * @Date: 2021-04-27 10:38:04
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-12 11:33:40
- * @FilePath: /@aks/easyui/lib/Easy-Hud/Toast/Toast.tsx
+ * @LastEditTime: 2022-09-09 10:58:34
+ * @FilePath: /@aks-dev/easyui/lib/Hud/Toast/Toast.tsx
  */
 import React, { useImperativeHandle, useState, useRef } from 'react';
 import { View, StyleSheet, Text, Dimensions, Animated, Easing } from 'react-native';
 
 
-import type { ToastCurrent } from '.'
+import type { ToastOptions } from '.'
 
 const errorMsg = '(^_^)∠※ 送你一束小花'
 
-export const Toast = React.forwardRef<ToastCurrent, {}>((_, ref) => {
+export const Toast = React.forwardRef<ToastOptions.RefAttributes, {}>((_, ref) => {
     const [tipText, setTipText] = useState(errorMsg);
     const fade = useRef(new Animated.Value(0)).current;
 
@@ -33,7 +33,7 @@ export const Toast = React.forwardRef<ToastCurrent, {}>((_, ref) => {
         })
     ])
 
-    useImperativeHandle<unknown, ToastCurrent>(ref, () => ({
+    useImperativeHandle<unknown, ToastOptions.RefAttributes>(ref, () => ({
         showToast: (content: string) => {
             setTipText(content || errorMsg)
             fadeAnimation.reset()
@@ -51,7 +51,7 @@ export const Toast = React.forwardRef<ToastCurrent, {}>((_, ref) => {
     )
 })
 
-export const toastRef = React.createRef<ToastCurrent>();
+export const toastRef = React.createRef<ToastOptions.RefAttributes>();
 
 export const showToast = (content: string) => toastRef.current?.showToast(content)
 

package/lib/Hud/Toast/index.d.ts

@@ -0,0 +1,22 @@
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-18 19:18:03
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-09-09 10:58:11
+ * @FilePath: /@aks-dev/easyui/lib/Hud/Toast/index.ts
+ */
+import * as React from 'react'
+
+
+declare namespace ToastOptions {
+    type   RefAttributes = {
+        showToast: (content: string) => void;
+    }
+}
+
+export declare const showToast: (content: string) => void;
+
+
+export declare const toastRef: React.RefObject<ToastOptions.RefAttributes>;
+
+export declare const Toast: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<ToastOptions.RefAttributes>>;

package/lib/TextInputArea/TextInputArea.tsx

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-24 13:56:47
  * @LastEditors: shiguo
- * @LastEditTime: 2022-09-07 18:37:00
+ * @LastEditTime: 2022-09-09 10:59:38
  * @FilePath: /@aks-dev/easyui/lib/TextInputArea/TextInputArea.tsx
  */
 import React from 'react'
@@ -11,9 +11,9 @@ import {px2dp} from '../../screen/px2dp'
 import {px2sp} from '../../screen/px2sp'
 
 
-import type { TextInputAreaProps ,TextInputAreaRefAttributes} from '.'
+import type { TextInputAreaProps } from '.'
 
-export default React.forwardRef<TextInputAreaRefAttributes, Partial<TextInputAreaProps>>((props, ref) => {
+export default React.forwardRef<TextInputAreaProps.RefAttributes, Partial<TextInputAreaProps>>((props, ref) => {
     const { defaultValue, placeholder, maxLength = 200, on, ...rest } = props
 
     const [value, setValue] = React.useState<string | undefined>(defaultValue)
@@ -23,7 +23,7 @@ export default React.forwardRef<TextInputAreaRefAttributes, Partial<TextInputAre
     }, [defaultValue])
 
 
-    React.useImperativeHandle<unknown,TextInputAreaRefAttributes>(ref, () => ({
+    React.useImperativeHandle<unknown,TextInputAreaProps.RefAttributes>(ref, () => ({
         value: value,
     }), [value])
 

package/lib/TextInputArea/{index.ts → index.d.ts}

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-24 13:59:32
  * @LastEditors: shiguo
- * @LastEditTime: 2022-09-07 18:38:10
- * @FilePath: /@aks-dev/easyui/lib/TextInputArea/index.ts
+ * @LastEditTime: 2022-09-09 10:59:23
+ * @FilePath: /@aks-dev/easyui/lib/TextInputArea/index.d.ts
  */
 import * as  React from 'react'
 import { ViewStyle, StyleProp, TextInputProps, TextStyle } from 'react-native'
@@ -21,11 +21,13 @@ export type TextInputAreaProps = {
 } & TextInputProps
 
 
-export type TextInputAreaRefAttributes = {
-    value: string | undefined;
+declare namespace TextInputAreaProps {
+    type RefAttributes = {
+        value: string | undefined;
+    }
 }
 
 
-export declare const TextInputArea: React.ForwardRefExoticComponent<React.PropsWithoutRef<Partial<TextInputAreaProps>> & React.RefAttributes<TextInputAreaRefAttributes>>;
+export declare const TextInputArea: React.ForwardRefExoticComponent<React.PropsWithoutRef<Partial<TextInputAreaProps>> & React.RefAttributes<TextInputAreaProps.RefAttributes>>;
 
 

package/package.json

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

package/lib/Hud/Loading/index.ts

@@ -1,35 +0,0 @@
-
-/*
- * @Author: shiguo
- * @Date: 2022-04-24 14:27:02
- * @LastEditors: shiguo
- * @LastEditTime: 2022-05-12 11:32:41
- * @FilePath: /@aks/easyui/lib/Easy-Hud/Loading/index.ts
- */
-import * as React from 'react'
-
-
-
-
-
-
-
-
-export declare type LoadingCurrent = {
-    showLoading: (content?: string) => void;
-    hideLoading: () => void;
-}
-
-
-
-
-export declare const showLoading: (content?: string) => void;
-
-
-export declare const hideLoading: () => void;
-
-
-export declare const loadingRef: React.RefObject<LoadingCurrent>;
-
-export declare const Loading: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<LoadingCurrent>>
-

package/lib/Hud/Toast/index.ts

@@ -1,22 +0,0 @@
-/*
- * @Author: shiguo
- * @Date: 2022-04-18 19:18:03
- * @LastEditors: shiguo
- * @LastEditTime: 2022-05-12 11:33:32
- * @FilePath: /@aks/easyui/lib/Easy-Hud/Toast/index.ts
- */
-import * as React from 'react'
-
-
-
-
-export declare type ToastCurrent = {
-    showToast: (content: string) => void;
-}
-
-export declare const showToast: (content: string) => void;
-
-
-export declare const toastRef: React.RefObject<ToastCurrent>;
-
-export declare const Toast: React.ForwardRefExoticComponent<React.PropsWithoutRef<{}> & React.RefAttributes<ToastCurrent>>;