fix(ImagePicker):优化ImagePicker组件报错和文档示例

uiwjs · Apr 21, 2023 · e0fd493 · e0fd493
1 parent 1dfbab5
commit e0fd493
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/example/examples/src/routes/ImagePicker/index.tsx b/example/examples/src/routes/ImagePicker/index.tsx
@@ -18,9 +18,9 @@ export default function MenuDropdownView(props: ImagePickerProps) {
         <Body>
           <Card title="基础实例">
             <ImagePicker
-              upload={(file: File[]) => {
+              upload={async (file: File[]) => {
                 let imageList: string[] = [];
-                file.forEach(file => imageList.push(file.uri));
+                await file.forEach(file => imageList.push(file.uri));
                 return imageList;
               }}
               selectionLimit={2}
@@ -44,9 +44,9 @@ export default function MenuDropdownView(props: ImagePickerProps) {
             <ImagePicker
               value={['https://wx3.sinaimg.cn/mw690/4718260ely1gt2cg7t5udj23dw1wkhdu.jpg']}
               maxCount={2}
-              upload={(file: File[]) => {
+              upload={async (file: File[]) => {
                 let imageList: string[] = [];
-                file.forEach(file => imageList.push(file.uri));
+                await file.forEach(file => imageList.push(file.uri));
                 return imageList;
               }}
             />
@@ -56,9 +56,9 @@ export default function MenuDropdownView(props: ImagePickerProps) {
           </Card>
           <Card title="上传前置处理">
             <ImagePicker
-              upload={(file: File[]) => {
+              upload={async (file: File[]) => {
                 let imageList: string[] = [];
-                file.forEach(file => imageList.push(file.uri));
+                await file.forEach(file => imageList.push(file.uri));
                 return imageList;
               }}
               beforeUpload={(file: File[]) => {

diff --git a/packages/react-native-image-picker/src/ImagePicker/types.ts b/packages/react-native-image-picker/src/ImagePicker/types.ts
@@ -22,7 +22,7 @@ export declare type ImagePickerProps = PropsWithChildren<{
   /** 上传文件之前的钩子，参数为上传的文件，若返回 false 则停止上传,同时可以在里面执行一些上传提示操作 */
   beforeUpload?: (file: File[]) => boolean | ((file: File) => Promise<boolean>);
   /** 上传 */
-  upload?: (file: File[]) => string[];
+  upload?: (file: File[]) => Promise<string[]>;
   /** 上传完成 */
   uploadFinish?: (result?: string[] | undefined) => void;
   /** 取消上传事件回调 */

diff --git a/packages/react-native-image-picker/src/ImagePicker/useImagePicker.ts b/packages/react-native-image-picker/src/ImagePicker/useImagePicker.ts
@@ -140,7 +140,7 @@ export default function useImagePicker({
           }
         }
         setLoading(true);
-        const result = upload?.(imageFiles);
+        const result = await upload?.(imageFiles);
         setLoading(false);
         uploadFinish?.(result);
         setLaunchVisibleFalse();