fix(type): fix type of feedback hooks

innocces · Sep 15, 2021 · 4728379 · 4728379 · vercel · Sep 15, 2021
1 parent f45191b
commit 4728379
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 43 deletions.
diff --git a/packages/hooks/src/useActionSheet/index.ts b/packages/hooks/src/useActionSheet/index.ts
@@ -1,5 +1,5 @@
 import { showActionSheet, General } from '@tarojs/taro';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 
 export interface ActionSheetOption {
   itemList: string[];
@@ -8,23 +8,25 @@ export interface ActionSheetOption {
 }
 
 export type ShowActionSheet = (
-  option?: ActionSheetOption,
+  option?: Partial<ActionSheetOption>,
 ) => Promise<General.CallbackResult>;
 
 export type onActionItemTap = (
   tapIndex: number,
   tapItem: string | undefined,
 ) => any;
 
-function useActionSheet(option?: ActionSheetOption): [ShowActionSheet] {
-  const initialOption = useRef<ActionSheetOption>();
+function useActionSheet(
+  option?: Partial<ActionSheetOption>,
+): [ShowActionSheet] {
+  const initialOption = useRef<Partial<ActionSheetOption>>();
 
   useEffect(() => {
     initialOption.current = option;
   }, [option]);
 
   const showActionSheetAsync = useCallback<ShowActionSheet>(
-    (option?: ActionSheetOption) => {
+    (option?: Partial<ActionSheetOption>) => {
       return new Promise((resolve, reject) => {
         try {
           if (!option && !initialOption.current) {
@@ -35,21 +37,27 @@ function useActionSheet(option?: ActionSheetOption): [ShowActionSheet] {
               {},
               initialOption.current || {},
               option || {},
-            ) as ActionSheetOption;
-            showActionSheet({
-              ...options,
-              success: (res) => {
-                if (onActionItemTap) {
-                  const tapIndex = res.tapIndex;
-                  onActionItemTap(
-                    tapIndex,
-                    options.itemList.find((v, i) => i === tapIndex),
-                  );
-                }
-                resolve(res);
-              },
-              fail: reject,
-            }).catch(reject);
+            );
+            if (!options.itemList) {
+              reject({ errMsg: 'showActionSheet: fail' });
+            } else {
+              showActionSheet({
+                ...(options as ActionSheetOption),
+                success: (res) => {
+                  if (onActionItemTap) {
+                    const tapIndex = res.tapIndex;
+                    onActionItemTap(
+                      tapIndex,
+                      (options as ActionSheetOption).itemList.find(
+                        (v, i) => i === tapIndex,
+                      ),
+                    );
+                  }
+                  resolve(res);
+                },
+                fail: reject,
+              }).catch(reject);
+            }
           }
         } catch (e) {
           reject(e);

diff --git a/packages/hooks/src/useLoading/index.ts b/packages/hooks/src/useLoading/index.ts
@@ -7,19 +7,21 @@ export interface LoadingOption {
 }
 
 export type ShowLoading = (
-  option?: LoadingOption,
+  option?: Partial<LoadingOption>,
 ) => Promise<General.CallbackResult>;
 export type HideLoading = () => Promise<General.CallbackResult>;
 
-function useLoading(option?: LoadingOption): [ShowLoading, HideLoading] {
-  const initialOption = useRef<LoadingOption>();
+function useLoading(
+  option?: Partial<LoadingOption>,
+): [ShowLoading, HideLoading] {
+  const initialOption = useRef<Partial<LoadingOption>>();
 
   useEffect(() => {
     initialOption.current = option;
   }, [option]);
 
   const showLoadingAsync = useCallback<ShowLoading>(
-    (option?: LoadingOption) => {
+    (option?: Partial<LoadingOption>) => {
       return new Promise((resolve, reject) => {
         try {
           if (!option && !initialOption.current) {
@@ -30,12 +32,16 @@ function useLoading(option?: LoadingOption): [ShowLoading, HideLoading] {
               {},
               initialOption.current || {},
               option || {},
-            ) as LoadingOption;
-            showLoading({
-              ...options,
-              success: resolve,
-              fail: reject,
-            }).catch(reject);
+            );
+            if (!options.title) {
+              reject({ errMsg: 'showLoading: fail' });
+            } else {
+              showLoading({
+                ...(options as LoadingOption),
+                success: resolve,
+                fail: reject,
+              }).catch(reject);
+            }
           }
         } catch (e) {
           reject(e);

diff --git a/packages/hooks/src/useModal/index.ts b/packages/hooks/src/useModal/index.ts
@@ -3,7 +3,8 @@ import { useCallback, useEffect, useRef } from 'react';
 
 export interface ModalOption {
   title?: string;
-  content: string;
+  content?: string;
+  mask?: boolean;
   cancelColor?: string;
   cancelText?: string;
   confirmColor?: string;
@@ -34,7 +35,7 @@ function useModal(option?: ModalOption): [ShowModal] {
               {},
               initialOption.current || {},
               option || {},
-            ) as ModalOption;
+            );
             showModal({
               ...options,
               success: resolve,

diff --git a/packages/hooks/src/useToast/index.ts b/packages/hooks/src/useToast/index.ts
@@ -1,5 +1,5 @@
 import { showToast, hideToast, General } from '@tarojs/taro';
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 
 export interface ToastOption {
   title: string;
@@ -10,19 +10,19 @@ export interface ToastOption {
 }
 
 export type ShowToast = (
-  option?: ToastOption,
+  option?: Partial<ToastOption>,
 ) => Promise<General.CallbackResult>;
 export type HideToast = () => Promise<General.CallbackResult>;
 
-function useToast(option?: ToastOption): [ShowToast, HideToast] {
-  const initialOption = useRef<ToastOption>();
+function useToast(option?: Partial<ToastOption>): [ShowToast, HideToast] {
+  const initialOption = useRef<Partial<ToastOption>>();
 
   useEffect(() => {
     initialOption.current = option;
   }, [option]);
 
   const showToastAsync = useCallback<ShowToast>(
-    (option?: ToastOption) => {
+    (option?: Partial<ToastOption>) => {
       return new Promise((resolve, reject) => {
         try {
           if (!option && !initialOption.current) {
@@ -33,12 +33,16 @@ function useToast(option?: ToastOption): [ShowToast, HideToast] {
               {},
               initialOption.current || {},
               option || {},
-            ) as ToastOption;
-            showToast({
-              ...options,
-              success: resolve,
-              fail: reject,
-            }).catch(reject);
+            );
+            if (!options.title) {
+              reject({ errMsg: 'showToast: fail' });
+            } else {
+              showToast({
+                ...(options as ToastOption),
+                success: resolve,
+                fail: reject,
+              }).catch(reject);
+            }
           }
         } catch (e) {
           reject(e);