fix(upload): on-error & on-finish props don't allow () => void …

…type, closes #3290
tusen-ai · Jul 17, 2022 · 13b13f1 · 13b13f1
1 parent eda7c56
commit 13b13f1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -6,6 +6,7 @@
 
 - Fix `n-date-picker` will cancel selecting in range mode if click at disabled confirm button, closes [#3254](https://github.com/TuSimple/naive-ui/issues/3254).
 - Fix `n-button`'s `focusable` prop doesn't work, closes [#3292](https://github.com/TuSimple/naive-ui/issues/3292).
+- Fix `n-upload`'s `on-error` & `on-finish` props don't allow `() => void` type, closes [#3290](https://github.com/TuSimple/naive-ui/issues/3290).
 
 ### Feats
 

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -6,6 +6,7 @@
 
 - 修复 `n-date-picker` 在范围模式下点击禁用的确认按钮会取消选择中的状态，关闭 [#3254](https://github.com/TuSimple/naive-ui/issues/3254)
 - 修复 `n-button` 的 `focusable` 属性不生效，关闭 [#3292](https://github.com/TuSimple/naive-ui/issues/3292)
+- 修复 `n-upload` 的 `on-error` 和 `on-finish` 属性不允许 `() => void` 类型，关闭 [#3290](https://github.com/TuSimple/naive-ui/issues/3290)
 
 ### Feats
 

diff --git a/src/upload/src/interface.ts b/src/upload/src/interface.ts
@@ -29,17 +29,21 @@ export type OnChange = (data: {
   fileList: SettledFileInfo[]
   event: ProgressEvent | Event | undefined
 }) => void
+
 export type OnFinish = ({
   file,
   event
 }: {
   file: SettledFileInfo
   event?: ProgressEvent
-}) => FileInfo | undefined
+  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+}) => FileInfo | undefined | void
+
 export type OnRemove = (data: {
   file: SettledFileInfo
   fileList: SettledFileInfo[]
 }) => Promise<boolean> | boolean | any
+
 export type OnDownload = (
   file: SettledFileInfo
 ) => Promise<boolean> | boolean | any
@@ -144,7 +148,8 @@ export type OnError = ({
 }: {
   file: SettledFileInfo
   event?: ProgressEvent
-}) => FileInfo | undefined
+  // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+}) => FileInfo | undefined | void
 
 export interface FileAndEntry {
   file: File

diff --git a/src/upload/tests/Upload.spec.ts → src/upload/tests/Upload.spec.tsx b/src/upload/tests/Upload.spec.ts → src/upload/tests/Upload.spec.tsx
@@ -462,3 +462,10 @@ describe('match-type', () => {
     ).toEqual(true)
   })
 })
+
+describe('test type', () => {
+  it('works', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const _ = <NUpload onError={() => {}} onFinish={() => {}} />
+  })
+})