From c061b7d1fc3d5ac422c7a39f76b90f973f33e0bd Mon Sep 17 00:00:00 2001 From: Shikhar Date: Sun, 25 May 2025 00:40:03 +0530 Subject: [PATCH 1/5] fix/fileupload-delete-click-issue --- components/lib/fileupload/FileUpload.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/components/lib/fileupload/FileUpload.js b/components/lib/fileupload/FileUpload.js index 4d849345a7..3f0b2f1d4a 100644 --- a/components/lib/fileupload/FileUpload.js +++ b/components/lib/fileupload/FileUpload.js @@ -125,9 +125,8 @@ export const FileUpload = React.memo( for (let i = 0; i < selectedFiles.length; i++) { let file = selectedFiles[i]; - const shouldAddFile = props.multiple ? !isFileSelected(file) && validate(file) : validate(file); - if (shouldAddFile) { + if (!isFileSelected(file) && validate(file)) { file.objectURL = window.URL.createObjectURL(file); currentFiles.push(file); @@ -140,12 +139,12 @@ export const FileUpload = React.memo( upload(currentFiles); } - if (props.onSelect) { + if (props.onSelect) { props.onSelect({ originalEvent: event, files: currentFiles }); } clearInput(); - + setFocusedState(false); if (props.mode === 'basic' && currentFiles.length > 0) { fileInputRef.current.style.display = 'none'; } From 3e20a07c35c8b6a85d60c7c4cbc8e3f50be00798 Mon Sep 17 00:00:00 2001 From: Shikhar Date: Sun, 25 May 2025 01:06:41 +0530 Subject: [PATCH 2/5] adjust-changes --- components/lib/fileupload/FileUpload.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/lib/fileupload/FileUpload.js b/components/lib/fileupload/FileUpload.js index 3f0b2f1d4a..bac9fb14ea 100644 --- a/components/lib/fileupload/FileUpload.js +++ b/components/lib/fileupload/FileUpload.js @@ -126,7 +126,9 @@ export const FileUpload = React.memo( for (let i = 0; i < selectedFiles.length; i++) { let file = selectedFiles[i]; - if (!isFileSelected(file) && validate(file)) { + const shouldAddFile = props.multiple ? !isFileSelected(file) && validate(file) : validate(file); + + if (shouldAddFile) { file.objectURL = window.URL.createObjectURL(file); currentFiles.push(file); @@ -139,7 +141,7 @@ export const FileUpload = React.memo( upload(currentFiles); } - if (props.onSelect) { + if (props.onSelect) { props.onSelect({ originalEvent: event, files: currentFiles }); } From 1410fb45b9ab83ca82319a1e4e31c6475b2b676b Mon Sep 17 00:00:00 2001 From: Shikhar Date: Sun, 25 May 2025 01:11:00 +0530 Subject: [PATCH 3/5] removing-space --- components/lib/fileupload/FileUpload.js | 1 - 1 file changed, 1 deletion(-) diff --git a/components/lib/fileupload/FileUpload.js b/components/lib/fileupload/FileUpload.js index bac9fb14ea..62a90741c2 100644 --- a/components/lib/fileupload/FileUpload.js +++ b/components/lib/fileupload/FileUpload.js @@ -125,7 +125,6 @@ export const FileUpload = React.memo( for (let i = 0; i < selectedFiles.length; i++) { let file = selectedFiles[i]; - const shouldAddFile = props.multiple ? !isFileSelected(file) && validate(file) : validate(file); if (shouldAddFile) { From a94cd6a84cbebf48b90ce55084f939233a770522 Mon Sep 17 00:00:00 2001 From: Shikhar Date: Sun, 25 May 2025 01:28:00 +0530 Subject: [PATCH 4/5] adjusting-spaces --- components/lib/fileupload/FileUpload.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/lib/fileupload/FileUpload.js b/components/lib/fileupload/FileUpload.js index 62a90741c2..7ee8b78b5e 100644 --- a/components/lib/fileupload/FileUpload.js +++ b/components/lib/fileupload/FileUpload.js @@ -145,7 +145,9 @@ export const FileUpload = React.memo( } clearInput(); + setFocusedState(false); + if (props.mode === 'basic' && currentFiles.length > 0) { fileInputRef.current.style.display = 'none'; } From 127ea29b8140a010d84901ff3559ed0166f95aa9 Mon Sep 17 00:00:00 2001 From: Shikhar Date: Sun, 25 May 2025 10:37:41 +0530 Subject: [PATCH 5/5] prettier-issue --- components/lib/fileupload/FileUpload.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lib/fileupload/FileUpload.js b/components/lib/fileupload/FileUpload.js index 7ee8b78b5e..1eb97977af 100644 --- a/components/lib/fileupload/FileUpload.js +++ b/components/lib/fileupload/FileUpload.js @@ -145,7 +145,7 @@ export const FileUpload = React.memo( } clearInput(); - + setFocusedState(false); if (props.mode === 'basic' && currentFiles.length > 0) {