Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/AjaxUploader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ class AjaxUploader extends Component<UploadProps> {
};

onFileDropOrPaste = async (e: React.DragEvent<HTMLDivElement> | ClipboardEvent) => {
e.preventDefault();

if (e.type === 'dragover') {
return;
}
Expand All @@ -87,6 +85,10 @@ class AjaxUploader extends Component<UploadProps> {
files = [...(clipboardData.files || [])];
}

if (files.length > 0 || items.some(item => item.kind === 'file')) {
e.preventDefault();
}

if (directory) {
files = await traverseFileTree(Array.prototype.slice.call(items), (_file: RcFile) =>
attrAccept(_file, this.props.accept),
Expand Down
36 changes: 36 additions & 0 deletions tests/uploader.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,42 @@ describe('uploader', () => {

fireEvent.change(input, { target: { files } });
});

it('should call preventDefault when paste contains files', () => {
const { container } = render(<Upload {...props} pastable />);
const input = container.querySelector('input')!;

const files = [new File([''], 'test.png', { type: 'image/png' })];

const preventDefaultSpy = jest.spyOn(Event.prototype, 'preventDefault');

fireEvent.paste(input, {
clipboardData: {
items: [{ kind: 'file' }],
files,
},
});

expect(preventDefaultSpy).toHaveBeenCalledTimes(1);
preventDefaultSpy.mockRestore();
});

it('should not call preventDefault when paste contains no files', () => {
const { container } = render(<Upload {...props} pastable />);
const input = container.querySelector('input')!;

const preventDefaultSpy = jest.spyOn(Event.prototype, 'preventDefault');

fireEvent.paste(input, {
clipboardData: {
items: [{ kind: 'string' }],
files: [],
},
});

expect(preventDefaultSpy).toHaveBeenCalledTimes(0);
preventDefaultSpy.mockRestore();
});
});

describe('directory uploader', () => {
Expand Down