Skip to content

Commit 6ce7394

Browse files
committed
feat: support folder and deprecated directory
1 parent 96e588a commit 6ce7394

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/AjaxUploader.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint react/no-is-mounted:0,react/sort-comp:0,react/prop-types:0 */
22
import clsx from 'classnames';
33
import pickAttrs from 'rc-util/lib/pickAttrs';
4+
import warning from 'rc-util/lib/warning';
45
import React, { Component } from 'react';
56
import attrAccept from './attr-accept';
67
import type {
@@ -321,21 +322,26 @@ class AjaxUploader extends Component<UploadProps> {
321322
capture,
322323
children,
323324
directory,
325+
folder,
324326
openFileDialogOnClick,
325327
onMouseEnter,
326328
onMouseLeave,
327329
hasControlInside,
328330
...otherProps
329331
} = this.props;
332+
333+
warning(
334+
!('directory' in this.props),
335+
'directory will be deprecated, please use folder. folder will not filter files other than accept, just like the native method.',
336+
);
330337
const cls = clsx({
331338
[prefixCls]: true,
332339
[`${prefixCls}-disabled`]: disabled,
333340
[className]: className,
334341
});
335342
// because input don't have directory/webkitdirectory type declaration
336-
const dirProps: any = directory
337-
? { directory: 'directory', webkitdirectory: 'webkitdirectory' }
338-
: {};
343+
const dirProps: any =
344+
directory || folder ? { directory: 'directory', webkitdirectory: 'webkitdirectory' } : {};
339345
const events = disabled
340346
? {}
341347
: {

src/interface.tsx

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

0 commit comments

Comments
 (0)