publish 2.0.4

CHANGELOG.md

@@ -1,3 +1,8 @@
+<a name="2.0.4"></a>
+## [2.0.4](https://github.com/tinper-bee/upload/compare/v2.0.3...v2.0.4) (2019-10-11)
+
+
+
 <a name="2.0.3"></a>
 ## [2.0.3](https://github.com/tinper-bee/upload/compare/v2.0.2...v2.0.3) (2019-09-24)
 

build/Upload.css

@@ -2435,7 +2435,7 @@
       margin-right: 4px;
       font-size: 12px;
       color: #999; }
-    .u-upload-list .u-upload-list-item-info .uf-del {
+    .u-upload-list .u-upload-list-item-info .uf-close {
       display: inline-block;
       font-size: 12px;
       font-size: 10px \9;
@@ -2464,13 +2464,13 @@
       -webkit-transition: all 0.3s ease;
       transition: all 0.3s ease;
       opacity: 0; }
-    .u-upload-list .u-upload-list-item-info .uf-del:hover {
-      color: white; }
+    .u-upload-list .u-upload-list-item-info .uf-close:hover {
+      color: #666; }
     .u-upload-list .u-upload-list-item-info .uf-eye-o:hover {
       color: white; }
   .u-upload-list .u-upload-list-item-error .anticon-paper-clip {
     color: #f50; }
-  .u-upload-list .u-upload-list-item-error .uf-del {
+  .u-upload-list .u-upload-list-item-error .uf-close {
     opacity: 1; }
   .u-upload-list .u-upload-list-item-progress {
     padding: 0 8px 0 20px;

build/index.js

@@ -340,17 +340,41 @@ var Upload = function (_Component) {
   };
 
   Upload.prototype.handleRemove = function handleRemove(file) {
+    var _this3 = this;
+
     var onRemove = this.props.onRemove;
-    if (onRemove) {
-      onRemove(file);
-    }
-    var fileList = this.removeFile(file);
-    if (fileList) {
-      this.onChange({
-        file: file,
-        fileList: fileList
-      });
+    var fileList = this.state.fileList;
+    var status = file.status;
+
+
+    file.status = 'removed'; // eslint-disable-line
+
+    Promise.resolve(typeof onRemove === 'function' ? onRemove(file) : onRemove).then(function (ret) {
+      // Prevent removing file
+      if (ret === false) {
+        file.status = status;
+        return;
+      }
+
+      var removedFileList = _this3.removeFileItem(file, fileList);
+      if (removedFileList) {
+        _this3.onChange({
+          file: file,
+          fileList: removedFileList
+        });
+      }
+    });
+  };
+
+  Upload.prototype.removeFileItem = function removeFileItem(file, fileList) {
+    var matchKey = file.uid !== undefined ? 'uid' : 'name';
+    var removed = fileList.filter(function (item) {
+      return item[matchKey] !== file[matchKey];
+    });
+    if (removed.length === fileList.length) {
+      return null;
     }
+    return removed;
   };
 
   Upload.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {

dist/demo.js

@@ -36833,17 +36833,41 @@
 	  };
 
 	  Upload.prototype.handleRemove = function handleRemove(file) {
+	    var _this3 = this;
+
 	    var onRemove = this.props.onRemove;
-	    if (onRemove) {
-	      onRemove(file);
-	    }
-	    var fileList = this.removeFile(file);
-	    if (fileList) {
-	      this.onChange({
-	        file: file,
-	        fileList: fileList
-	      });
+	    var fileList = this.state.fileList;
+	    var status = file.status;
+
+
+	    file.status = 'removed'; // eslint-disable-line
+
+	    Promise.resolve(typeof onRemove === 'function' ? onRemove(file) : onRemove).then(function (ret) {
+	      // Prevent removing file
+	      if (ret === false) {
+	        file.status = status;
+	        return;
+	      }
+
+	      var removedFileList = _this3.removeFileItem(file, fileList);
+	      if (removedFileList) {
+	        _this3.onChange({
+	          file: file,
+	          fileList: removedFileList
+	        });
+	      }
+	    });
+	  };
+
+	  Upload.prototype.removeFileItem = function removeFileItem(file, fileList) {
+	    var matchKey = file.uid !== undefined ? 'uid' : 'name';
+	    var removed = fileList.filter(function (item) {
+	      return item[matchKey] !== file[matchKey];
+	    });
+	    if (removed.length === fileList.length) {
+	      return null;
 	    }
+	    return removed;
 	  };
 
 	  Upload.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {

package.json

@@ -1,6 +1,6 @@
 {
  "name": "bee-upload",
- "version": "2.0.3",
+ "version": "2.0.4",
  "description": "upload ui component for react",
  "keywords": [
   "react",

src/Upload.scss

@@ -165,7 +165,7 @@
             font-size: 12px;
             color: #999;
         }
-        .uf-del {
+        .uf-close {
             display: inline-block;
             font-size: 12px;
             font-size: 10px \9;
@@ -199,8 +199,8 @@
             transition: all 0.3s ease;
             opacity: 0;
         }
-        .uf-del:hover {
-            color: white;
+        .uf-close:hover {
+            color: #666;
         }
         .uf-eye-o:hover{
             color: white;
@@ -209,7 +209,7 @@
     .u-upload-list-item-error .anticon-paper-clip {
         color: $upload-list-error-color;
     }
-    .u-upload-list-item-error .uf-del {
+    .u-upload-list-item-error .uf-close {
         opacity: 1;
     }
     .u-upload-list-item-progress {

src/index.js

@@ -248,17 +248,36 @@ class Upload extends Component {
   }
 
   handleRemove(file) {
-    const onRemove = this.props.onRemove;
-    if (onRemove) {
-      onRemove(file);
-    }
-    let fileList = this.removeFile(file);
-    if (fileList) {
-      this.onChange({
-        file,
-        fileList,
-      });
+    const { onRemove } = this.props;
+    const { fileList } = this.state;
+    const { status } = file;
+
+    file.status = 'removed'; // eslint-disable-line
+
+    Promise.resolve(typeof onRemove === 'function' ? onRemove(file) : onRemove).then(ret => {
+      // Prevent removing file
+      if (ret === false) {
+        file.status = status;
+        return;
+      }
+
+      const removedFileList = this.removeFileItem(file, fileList);
+      if (removedFileList) {
+        this.onChange({
+          file,
+          fileList: removedFileList,
+        });
+      }
+    });
+  }
+
+  removeFileItem(file, fileList) {
+    const matchKey = file.uid !== undefined ? 'uid' : 'name';
+    const removed = fileList.filter(item => item[matchKey] !== file[matchKey]);
+    if (removed.length === fileList.length) {
+      return null;
     }
+    return removed;
   }
 
   handleManualRemove = (file) => {