Skip to content

Commit d3bab0d

Browse files
committed
Revert "feat: support folder and deprecated directory (#643)"
This reverts commit c1ea49f.
1 parent 1896e01 commit d3bab0d

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

src/AjaxUploader.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@ class AjaxUploader extends Component<UploadProps> {
322322
capture,
323323
children,
324324
directory,
325-
folder,
326325
openFileDialogOnClick,
327326
onMouseEnter,
328327
onMouseLeave,
@@ -331,8 +330,9 @@ class AjaxUploader extends Component<UploadProps> {
331330
} = this.props;
332331
const cls = clsx(prefixCls, { [`${prefixCls}-disabled`]: disabled, [className]: className });
333332
// because input don't have directory/webkitdirectory type declaration
334-
const dirProps: any =
335-
directory || folder ? { directory: 'directory', webkitdirectory: 'webkitdirectory' } : {};
333+
const dirProps: any = directory
334+
? { directory: 'directory', webkitdirectory: 'webkitdirectory' }
335+
: {};
336336
const events = disabled
337337
? {}
338338
: {

src/interface.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ export interface UploadProps
1313
component?: React.ComponentType<any> | string;
1414
action?: Action;
1515
method?: UploadRequestMethod;
16-
/** @deprecated Please use `folder` instead */
1716
directory?: boolean;
18-
folder?: boolean;
1917
data?: Record<string, unknown> | ((file: RcFile | string | Blob) => Record<string, unknown>);
2018
headers?: UploadRequestHeader;
2119
accept?: string;

tests/uploader.spec.tsx

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,18 +1038,6 @@ describe('uploader', () => {
10381038
directory: false,
10391039
},
10401040
);
1041-
1042-
it('should trigger beforeUpload when uploading non-accepted files in folder mode', () => {
1043-
const beforeUpload = jest.fn();
1044-
const { container } = render(<Upload accept=".png" folder beforeUpload={beforeUpload} />);
1045-
1046-
fireEvent.change(container.querySelector('input')!, {
1047-
target: {
1048-
files: [new File([], 'bamboo.png'), new File([], 'light.jpg')],
1049-
},
1050-
});
1051-
expect(beforeUpload).toHaveBeenCalledTimes(2);
1052-
});
10531041
});
10541042

10551043
describe('transform file before request', () => {

0 commit comments

Comments
 (0)