Skip to content
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

fix(FileUploaderDropContainer): enforce multiple prop on drag-and-drop #18669

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(FileUploaderDropContainer): enforce multiple prop on drag-and-drop #18669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions packages/react/src/components/FileUploader/FileUploaderDropContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2016, 2023
* Copyright IBM Corp. 2016, 2025
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand Down Expand Up @@ -150,13 +150,15 @@ function FileUploaderDropContainer({

function handleChange(event: React.ChangeEvent<HTMLInputElement>) {
const files = [...(event.target.files ?? [])];
const addedFiles = validateFiles(files);
const filesToValidate = multiple ? files : [files[0]];
const addedFiles = validateFiles(filesToValidate);
return onAddFiles(event, { addedFiles });
}

function handleDrop(event: React.DragEvent<HTMLDivElement>) {
const files = [...event.dataTransfer.files];
const addedFiles = validateFiles(files);
const filesToValidate = multiple ? files : [files[0]];
const addedFiles = validateFiles(filesToValidate);
return onAddFiles(event, { addedFiles });
}

Expand Down
45 changes: 40 additions & 5 deletions packages/react/src/components/FileUploader/__tests__/FileUploaderDropContainer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright IBM Corp. 2016, 2023
* Copyright IBM Corp. 2016, 2025
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
Expand Down Expand Up @@ -80,7 +80,11 @@ describe('FileUploaderDropContainer', () => {
it('should call `onAddFiles` when a file is selected', () => {
const onAddFiles = jest.fn();
const { container } = render(
<FileUploaderDropContainer onAddFiles={onAddFiles} {...requiredProps} />
<FileUploaderDropContainer
multiple
onAddFiles={onAddFiles}
{...requiredProps}
/>
);
// eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
const input = container.querySelector('input');
Expand All @@ -105,8 +109,9 @@ describe('FileUploaderDropContainer', () => {
const onAddFiles = jest.fn();
const { container } = render(
<FileUploaderDropContainer
onAddFiles={onAddFiles}
accept={['.txt']}
multiple
onAddFiles={onAddFiles}
{...requiredProps}
/>
);
Expand Down Expand Up @@ -152,8 +157,9 @@ describe('FileUploaderDropContainer', () => {
const onAddFiles = jest.fn();
const { container } = render(
<FileUploaderDropContainer
onAddFiles={onAddFiles}
accept={['.jpeg']}
multiple
onAddFiles={onAddFiles}
{...requiredProps}
/>
);
Expand Down Expand Up @@ -195,8 +201,9 @@ describe('FileUploaderDropContainer', () => {
const onAddFiles = jest.fn();
const { container } = render(
<FileUploaderDropContainer
onAddFiles={onAddFiles}
accept={['.txt', '.a_a', '.b-b', '.a-b_c']}
multiple
onAddFiles={onAddFiles}
pattern=".[0-9a-z-_]+$"
{...requiredProps}
/>
Expand Down Expand Up @@ -259,6 +266,7 @@ describe('FileUploaderDropContainer', () => {
const { container } = render(
<FileUploaderDropContainer
accept={['.png']}
multiple
onAddFiles={onAddFiles}
{...requiredProps}
/>
Expand Down Expand Up @@ -501,4 +509,31 @@ describe('FileUploaderDropContainer', () => {
dropArea.dispatchEvent(dropEvent);
expect(handleDrop).not.toHaveBeenCalled();
});

it('should only emit one file when multiple files are dropped and `multiple` is false', () => {
const onAddFiles = jest.fn();
const { container } = render(
<FileUploaderDropContainer
onAddFiles={onAddFiles}
multiple={false}
{...requiredProps}
/>
);
const dropArea = container.firstChild;
const files = [
new File(['content'], 'file1.txt', { type: 'text/plain' }),
new File(['content'], 'file2.txt', { type: 'text/plain' }),
];
const dropEvent = {
dataTransfer: { files },
preventDefault: jest.fn(),
stopPropagation: jest.fn(),
};

fireEvent.drop(dropArea, dropEvent);

expect(onAddFiles).toHaveBeenCalledWith(expect.anything(), {
addedFiles: [files[0]],
});
});
});
Loading