fix: still keep order when upload fails (ant-design#10794)

wanjarus · Jun 6, 2018 · e1ba74e · e1ba74e
1 parent 6602df1
commit e1ba74e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/components/upload/Upload.tsx b/components/upload/Upload.tsx
@@ -196,7 +196,7 @@ export default class Upload extends React.Component<UploadProps, UploadState> {
     if (result === false) {
       this.onChange({
         file,
-        fileList: uniqBy(fileList.map(fileToObject).concat(this.state.fileList),  (item: UploadFile) => item.uid),
+        fileList: uniqBy(this.state.fileList.concat(fileList.map(fileToObject)),  (item: UploadFile) => item.uid),
       });
       return false;
     } else if (result && (result as PromiseLike<any>).then) {

diff --git a/components/upload/__tests__/upload.test.js b/components/upload/__tests__/upload.test.js
@@ -60,16 +60,22 @@ describe('Upload', () => {
   });
 
   it('should not stop upload when return value of beforeUpload is false', (done) => {
+    const fileList = [{
+      uid: 'bar',
+      name: 'bar.png',
+    }];
     const mockFile = new File(['foo'], 'foo.png', {
       type: 'image/png',
     });
     const data = jest.fn();
     const props = {
       action: 'http://upload.com',
+      fileList,
       beforeUpload: () => false,
       data,
-      onChange: ({ file }) => {
+      onChange: ({ file, fileList: updatedFileList }) => {
         expect(file instanceof File).toBe(true);
+        expect(updatedFileList.map(f => f.name)).toEqual(['bar.png', 'foo.png']);
         expect(data).not.toBeCalled();
         done();
       },