feat: Add defaultRequest to customRequest (#660)

* feat: Add defaultRequest to customRequest

* test: change test

* feat: change info.defaultRequest

* feat: simplify

* feat: simplify function

* teat: verify defaultRequest path

---------

Co-authored-by: 刘欢 <lh01217311@antgroup.com>

Author: EmilyyyLiu

src/AjaxUploader.tsx

@@ -245,6 +245,7 @@ class AjaxUploader extends Component<UploadProps> {
     const { onStart, customRequest, name, headers, withCredentials, method } = this.props;
 
     const { uid } = origin;
+
     const request = customRequest || defaultRequest;
 
     const requestOption = {
@@ -274,7 +275,7 @@ class AjaxUploader extends Component<UploadProps> {
     };
 
     onStart(origin);
-    this.reqs[uid] = request(requestOption);
+    this.reqs[uid] = request(requestOption, { defaultRequest });
   }
 
   reset() {

src/interface.tsx

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

@@ -1266,4 +1266,32 @@ describe('uploader', () => {
     expect(container.querySelector('span')!.tabIndex).not.toBe(0);
     expect(container.querySelector('span')!).not.toHaveAttribute('role', 'button');
   });
+
+  it('should receive same defaultRequest as src', done => {
+    const { default: srcRequest } = require('../src/request');
+    let receivedDefaultRequest: any;
+    const customRequest = jest.fn((option, { defaultRequest }) => {
+      if (option.file.name === 'test.png') {
+        defaultRequest(option);
+        receivedDefaultRequest = defaultRequest;
+      } else {
+        option.onError(new Error('custom error'));
+      }
+    });
+    const { container } = render(<Upload customRequest={customRequest} />);
+
+    const input = container.querySelector('input')!;
+    const files = [new File([''], 'test.png')];
+    Object.defineProperty(files, 'item', {
+      value: i => files[i],
+    });
+
+    fireEvent.change(input, { target: { files } });
+    setTimeout(() => {
+      requests[0].respond(200, {}, `["","${files[0].name}"]`);
+      expect(customRequest).toHaveBeenCalled();
+      expect(receivedDefaultRequest).toBe(srcRequest);
+      done();
+    }, 100);
+  });
 });