Skip to content

Commit

Permalink
fix: Add missing properties to ShowUploadListInterface (#26405)
Browse files Browse the repository at this point in the history
  • Loading branch information
bencallaway committed Aug 26, 2020
1 parent 008dc3e commit 8eff00b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
7 changes: 5 additions & 2 deletions components/upload/Upload.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Dragger from './Dragger';
import UploadList from './UploadList';
import {
RcFile,
ShowUploadListInterface,
UploadProps,
UploadFile,
UploadLocale,
Expand Down Expand Up @@ -247,7 +248,7 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (pr
<LocaleReceiver componentName="Upload" defaultLocale={defaultLocale.Upload}>
{(locale: UploadLocale) => {
const { showRemoveIcon, showPreviewIcon, showDownloadIcon, removeIcon, downloadIcon } =
typeof showUploadList === 'boolean' ? ({} as any) : showUploadList;
typeof showUploadList === 'boolean' ? ({} as ShowUploadListInterface) : showUploadList;
return (
<UploadList
listType={listType}
Expand All @@ -270,7 +271,9 @@ const InternalUpload: React.ForwardRefRenderFunction<unknown, UploadProps> = (pr
);
}}
</LocaleReceiver>
) : button;
) : (
button
);

if (type === 'drag') {
const dragCls = classNames(
Expand Down
17 changes: 17 additions & 0 deletions components/upload/__tests__/type.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,21 @@ describe('Upload.typescript', () => {
);
expect(upload).toBeTruthy();
});

it('showUploadList', () => {
const upload = (
<Upload
showUploadList={{
showPreviewIcon: true,
showRemoveIcon: true,
showDownloadIcon: true,
removeIcon: 'Remove',
downloadIcon: 'Download',
}}
>
<span>click to upload</span>
</Upload>
);
expect(upload).toBeTruthy();
});
});
2 changes: 2 additions & 0 deletions components/upload/interface.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ export interface ShowUploadListInterface {
showRemoveIcon?: boolean;
showPreviewIcon?: boolean;
showDownloadIcon?: boolean;
removeIcon?: React.ReactNode;
downloadIcon?: React.ReactNode;
}

export interface UploadLocale {
Expand Down

0 comments on commit 8eff00b

Please sign in to comment.