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.

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

feat: support paste upload file #543

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
8 changes: 8 additions & 0 deletions docs/demo/paste.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
title: paste
nav:
title: Demo
path: /demo
---

<code src="../examples/paste.tsx"/></code>
43 changes: 43 additions & 0 deletions docs/examples/paste.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/* eslint no-console:0 */
import React from 'react';
import Upload from 'rc-upload';

const props = {
action: '/upload.do',
type: 'drag',
accept: '.png',
beforeUpload(file) {
console.log('beforeUpload', file.name);
},
onStart: file => {
console.log('onStart', file.name);
},
onSuccess(file) {
console.log('onSuccess', file);
},
onProgress(step, file) {
console.log('onProgress', Math.round(step.percent), file.name);
},
onError(err) {
console.log('onError', err);
},
style: { display: 'inline-block', width: 200, height: 200, background: '#eee' },
};

const Test = () => {
return (
<div
style={{
margin: 100,
}}
>
<div>
<Upload {...props}>
<a>开始上传</a>
</Upload>
</div>
</div>
);
};

export default Test;
66 changes: 47 additions & 19 deletions src/AjaxUploader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class AjaxUploader extends Component<UploadProps> {

private fileInput: HTMLInputElement;

private isMouseEnter: boolean;

private _isMounted: boolean;

onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
Expand Down Expand Up @@ -66,41 +68,57 @@ class AjaxUploader extends Component<UploadProps> {
}
};

onFileDrop = (e: React.DragEvent<HTMLDivElement>) => {
const { multiple } = this.props;

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

if (e.type === 'dragover') {
return;
}

if (this.props.directory) {
traverseFileTree(
Array.prototype.slice.call(e.dataTransfer.items),
this.uploadFiles,
(_file: RcFile) => attrAccept(_file, this.props.accept),
const { multiple, accept, directory } = this.props;
let items: DataTransferItem[] = [];
let files: File[] = [];

if (e.type === 'drop') {
const dataTransfer = (e as React.DragEvent<HTMLDivElement>).dataTransfer;
items = [...(dataTransfer.items || [])];
files = [...(dataTransfer.files || [])];
} else if (e.type === 'paste') {
const clipboardData = (e as ClipboardEvent).clipboardData;
items = [...(clipboardData.items || [])];
files = [...(clipboardData.files || [])];
}

if (directory) {
traverseFileTree(Array.prototype.slice.call(items), this.uploadFiles, (_file: RcFile) =>
attrAccept(_file, accept),
);
} else {
let files = [...e.dataTransfer.files].filter((file: RcFile) =>
attrAccept(file, this.props.accept),
);
let acceptFiles = [...files].filter((file: RcFile) => attrAccept(file, accept));

if (multiple === false) {
files = files.slice(0, 1);
acceptFiles = files.slice(0, 1);
}

this.uploadFiles(files);
this.uploadFiles(acceptFiles);
}
};

onPrePaste(e: ClipboardEvent) {
if (this.isMouseEnter) {
this.onFileDropOrPaste(e);
}
}

componentDidMount() {
this._isMounted = true;
document.addEventListener('paste', this.onPrePaste.bind(this));
}

componentWillUnmount() {
this._isMounted = false;
this.abort();
document.removeEventListener('paste', this.onPrePaste.bind(this));
}

uploadFiles = (files: File[]) => {
Expand Down Expand Up @@ -261,6 +279,18 @@ class AjaxUploader extends Component<UploadProps> {
this.fileInput = node;
};

handleMouseEnter = (e: React.MouseEvent<HTMLDivElement>) => {
this.isMouseEnter = true;

this.props.onMouseEnter?.(e);
};

handleMouseLeave = (e: React.MouseEvent<HTMLDivElement>) => {
this.isMouseEnter = false;

this.props.onMouseLeave?.(e);
};

render() {
const {
component: Tag,
Expand All @@ -277,8 +307,6 @@ class AjaxUploader extends Component<UploadProps> {
children,
directory,
openFileDialogOnClick,
onMouseEnter,
onMouseLeave,
hasControlInside,
...otherProps
} = this.props;
Expand All @@ -296,10 +324,10 @@ class AjaxUploader extends Component<UploadProps> {
: {
onClick: openFileDialogOnClick ? this.onClick : () => {},
onKeyDown: openFileDialogOnClick ? this.onKeyDown : () => {},
onMouseEnter,
onMouseLeave,
onDrop: this.onFileDrop,
onDragOver: this.onFileDrop,
onMouseEnter: this.handleMouseEnter,
onMouseLeave: this.handleMouseLeave,
onDrop: this.onFileDropOrPaste,
onDragOver: this.onFileDropOrPaste,
tabIndex: hasControlInside ? undefined : '0',
};
return (
Expand Down
115 changes: 115 additions & 0 deletions tests/uploader.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,106 @@ describe('uploader', () => {
}, 100);
});

it('paste to upload', done => {
const rcUpload = uploader.container.querySelector('.rc-upload')!;
const input = uploader.container.querySelector('input')!;

const files = [
{
name: 'success.png',
toString() {
return this.name;
},
},
];
(files as any).item = (i: number) => files[i];

handlers.onSuccess = (ret, file) => {
expect(ret[1]).toEqual(file.name);
expect(file).toHaveProperty('uid');
done();
};

handlers.onError = err => {
done(err);
};

fireEvent.mouseEnter(rcUpload);
fireEvent.paste(input, {
clipboardData: { files },
});

setTimeout(() => {
requests[0].respond(200, {}, `["","${files[0].name}"]`);
}, 100);
});

it('paste unaccepted type files to upload will not trigger onStart', done => {
const input = uploader.container.querySelector('input')!;
const files = [
{
name: 'success.jpg',
toString() {
return this.name;
},
},
];
(files as any).item = (i: number) => files[i];

fireEvent.paste(input, {
clipboardData: { files },
});
const mockStart = jest.fn();
handlers.onStart = mockStart;
setTimeout(() => {
expect(mockStart.mock.calls.length).toBe(0);
done();
}, 100);
});

it('paste files with multiple false', done => {
const { container } = render(<Upload {...props} multiple={false} />);
const rcUpload = container.querySelector('.rc-upload')!;
const input = container.querySelector('input')!;
const files = [
new File([''], 'success.png', { type: 'image/png' }),
new File([''], 'filtered.png', { type: 'image/png' }),
];
Object.defineProperty(files, 'item', {
value: i => files[i],
});

// Only can trigger once
let triggerTimes = 0;
handlers.onStart = () => {
triggerTimes += 1;
};
handlers.onSuccess = (ret, file) => {
try {
expect(ret[1]).toEqual(file.name);
expect(file).toHaveProperty('uid');
expect(triggerTimes).toEqual(1);
done();
} catch (error) {
done(error);
}
};
handlers.onError = error => {
done(error);
};

Object.defineProperty(input, 'files', {
value: files,
});

fireEvent.mouseEnter(rcUpload);
fireEvent.paste(input, { clipboardData: { files } });

setTimeout(() => {
handlers.onSuccess!(['', files[0].name] as any, files[0] as any, null!);
}, 100);
});

it('support action and data is function returns Promise', async () => {
const action: any = () => {
return new Promise(resolve => {
Expand All @@ -332,6 +432,21 @@ describe('uploader', () => {
await new Promise(resolve => setTimeout(resolve, 100));
await new Promise(resolve => setTimeout(resolve, 2000));
});

it('support onMouseEnter and onMouseLeave', async () => {
const onMouseEnter = jest.fn();
const onMouseLeave = jest.fn();

const { container } = render(
<Upload onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave} />,
);
const rcUpload = container.querySelector('.rc-upload')!;

fireEvent.mouseEnter(rcUpload);
fireEvent.mouseLeave(rcUpload);
expect(onMouseEnter).toHaveBeenCalled();
expect(onMouseLeave).toHaveBeenCalled();
});
});

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