From fde40b221bc2f22850aaf7bc03df112f6d2123a1 Mon Sep 17 00:00:00 2001
From: Nam Truong Le <lenamtruong@gmail.com>
Date: Wed, 18 Sep 2024 11:49:01 +0200
Subject: [PATCH] fix: set file status "uploading" earlier

---
 .gitignore                                                   | 2 ++
 .../components/FileUploader/hooks/useFileUploader/actions.ts | 2 --
 .../FileUploader/hooks/useFileUploader/useFileUploader.ts    | 3 +--
 .../FileUploader/hooks/useUploadFiles/useUploadFiles.ts      | 5 +++--
 .../src/components/FileUploader/utils/uploadFile.ts          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 63103b10011..460419fc0dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@ docs/public/previews
 
 # flutter assets are built with `yarn flutter:build` and should not be checked in to source control
 **/public/flutter/**/
+
+.idea
diff --git a/packages/react-storage/src/components/FileUploader/hooks/useFileUploader/actions.ts b/packages/react-storage/src/components/FileUploader/hooks/useFileUploader/actions.ts
index 9ee45720360..2cc9f421df5 100644
--- a/packages/react-storage/src/components/FileUploader/hooks/useFileUploader/actions.ts
+++ b/packages/react-storage/src/components/FileUploader/hooks/useFileUploader/actions.ts
@@ -32,11 +32,9 @@ export const setProcessedKeyAction = (input: {
 
 export const setUploadingFileAction = ({
   id,
-  uploadTask,
 }: TaskEvent): Action => ({
   type: FileUploaderActionTypes.SET_STATUS_UPLOADING,
   id,
-  uploadTask,
 });
 
 export const setUploadProgressAction = ({
diff --git a/packages/react-storage/src/components/FileUploader/hooks/useFileUploader/useFileUploader.ts b/packages/react-storage/src/components/FileUploader/hooks/useFileUploader/useFileUploader.ts
index 550704085ce..eb5effab5c6 100644
--- a/packages/react-storage/src/components/FileUploader/hooks/useFileUploader/useFileUploader.ts
+++ b/packages/react-storage/src/components/FileUploader/hooks/useFileUploader/useFileUploader.ts
@@ -71,10 +71,9 @@ export function useFileUploader(
   };
 
   const setUploadingFile: UseFileUploader['setUploadingFile'] = ({
-    uploadTask,
     id,
   }) => {
-    dispatch(setUploadingFileAction({ id, uploadTask }));
+    dispatch(setUploadingFileAction({ id }));
   };
 
   const setProcessedKey: UseFileUploader['setProcessedKey'] = (input) => {
diff --git a/packages/react-storage/src/components/FileUploader/hooks/useUploadFiles/useUploadFiles.ts b/packages/react-storage/src/components/FileUploader/hooks/useUploadFiles/useUploadFiles.ts
index 757f30c6091..586775c6053 100644
--- a/packages/react-storage/src/components/FileUploader/hooks/useUploadFiles/useUploadFiles.ts
+++ b/packages/react-storage/src/components/FileUploader/hooks/useUploadFiles/useUploadFiles.ts
@@ -82,6 +82,7 @@ export function useUploadFiles({
           useAccelerateEndpoint,
         });
 
+        setUploadingFile({ id });
         uploadFile({
           input,
           onComplete: (event) => {
@@ -99,11 +100,11 @@ export function useUploadFiles({
               onUploadError(error.message, { key });
             }
           },
-          onStart: ({ key, uploadTask }) => {
+          onStart: ({ key }) => {
             if (isFunction(onUploadStart)) {
               onUploadStart({ key });
             }
-            setUploadingFile({ id, uploadTask });
+            // setUploadingFile({ id, uploadTask });
           },
         });
       }
diff --git a/packages/react-storage/src/components/FileUploader/utils/uploadFile.ts b/packages/react-storage/src/components/FileUploader/utils/uploadFile.ts
index 762dbdca2ee..178bb6a8d1b 100644
--- a/packages/react-storage/src/components/FileUploader/utils/uploadFile.ts
+++ b/packages/react-storage/src/components/FileUploader/utils/uploadFile.ts
@@ -20,7 +20,7 @@ export type PathCallback = (input: {
 export type UploadTask = UploadDataOutput | UploadDataWithPathOutput;
 export interface TaskEvent {
   id: string;
-  uploadTask: UploadTask;
+  uploadTask?: UploadTask;
 }
 
 // omit `path` callback, `path` must always be a string to support resolving