feat: change info.defaultRequest

Author: 刘欢

src/AjaxUploader.tsx

@@ -255,7 +255,7 @@ class AjaxUploader extends Component<UploadProps> {
 
     const request =
       typeof propsCustomRequest === 'function'
-        ? args => propsCustomRequest({ ...args, info: { defaultRequest } })
+        ? args => propsCustomRequest(args, { defaultRequest })
         : propsCustomRequest || defaultRequest;
 
     const requestOption = {

src/interface.tsx

@@ -31,7 +31,7 @@ export interface UploadProps
     file: RcFile,
     FileList: RcFile[],
   ) => BeforeUploadFileType | Promise<void | BeforeUploadFileType> | void;
-  customRequest?: (option: CustomUploadRequestOption) => void | { abort: () => void };
+  customRequest?: CustomUploadRequestOption;
   withCredentials?: boolean;
   openFileDialogOnClick?: boolean;
   prefixCls?: string;
@@ -78,11 +78,10 @@ export interface UploadRequestOption<T = any> {
   method: UploadRequestMethod;
 }
 
-export interface CustomUploadRequestOption extends UploadRequestOption {
-  info: {
-    defaultRequest: (option: UploadRequestOption) => { abort: () => void } | void;
-  };
-}
+export type CustomUploadRequestOption = (
+  option: UploadRequestOption,
+  info: { defaultRequest: (option: UploadRequestOption) => { abort: () => void } | void },
+) => void | { abort: () => void };
 export interface RcFile extends File {
   uid: string;
 }

tests/uploader.spec.tsx

@@ -1267,10 +1267,9 @@ describe('uploader', () => {
     expect(container.querySelector('span')!).not.toHaveAttribute('role', 'button');
   });
   it('should support defaultRequest in customRequest', done => {
-    const customRequest = jest.fn(({ file, onSuccess, onError, info }) => {
-      // 模拟条件判断后使用默认上传
+    const customRequest = jest.fn(({ file, onSuccess, onError }, { defaultRequest }) => {
       if (file.name === 'success.png') {
-        info.defaultRequest({ file, onSuccess, onError });
+        defaultRequest({ file, onSuccess, onError });
       } else {
         onError(new Error('custom error'));
       }
@@ -1286,13 +1285,12 @@ describe('uploader', () => {
       value: i => files[i],
     });
     fireEvent.change(input, { target: { files } });
+
     setTimeout(() => {
       requests[0].respond(200, {}, `["","${files[0].name}"]`);
-      setTimeout(() => {
-        expect(customRequest).toHaveBeenCalled();
-        expect(onSuccess).toHaveBeenCalled();
-        done();
-      }, 100);
+      expect(customRequest).toHaveBeenCalled();
+      expect(onSuccess).toHaveBeenCalled();
+      done();
     }, 100);
   });
 });