diff --git a/.gitignore b/.gitignore index 63103b1001..460419fc0d 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 9ee4572036..2cc9f421df 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 550704085c..eb5effab5c 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 757f30c609..586775c605 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 762dbdca2e..178bb6a8d1 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