Skip to content

fix: Dropping a file from another browser window creates two upload dialogs #31332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 3 commits into from
Jan 8, 2024
Merged

fix: Dropping a file from another browser window creates two upload dialogs #31332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0c0859
fix:duplicate file uploads
Sayan4444 Dec 28, 2023
f6c7868
Create clean-melons-return.md
hugocostadev Jan 5, 2024
0cb0583
Merge branch 'develop' into duplicateFileUploads
kodiakhq[bot] Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/clean-melons-return.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed image dropping from another browser window creates two upload dialogs in some OS and browsers
16 changes: 15 additions & 1 deletion apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,21 @@ export const useFileUploadDropTarget = (): readonly [
const onFileDrop = useMutableCallback(async (files: File[]) => {
const { mime } = await import('../../../../../app/utils/lib/mimeTypes');

const uploads = Array.from(files).map((file) => {
const getUniqueFiles = () => {
const uniqueFiles: File[] = [];
const st: Set<number> = new Set();
files.forEach((file) => {
const key = file.size;
if (!st.has(key)) {
uniqueFiles.push(file);
st.add(key);
}
});
return uniqueFiles;
};
const uniqueFiles = getUniqueFiles();

const uploads = Array.from(uniqueFiles).map((file) => {
Object.defineProperty(file, 'type', { value: mime.lookup(file.name) });
return file;
});
Expand Down