acud 1.2.17 → 1.2.18

package/es/upload/BaseUpload/AjaxUploader.js

@@ -8,9 +8,7 @@ import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitial
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 /* eslint react/no-is-mounted:0,react/sort-comp:0,react/prop-types:0 */
-
 /*
  * base-upload
  * author zhousheng
@@ -21,7 +19,6 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
       resolve(value);
     });
   }
-
   return new (P || (P = Promise))(function (resolve, reject) {
     function fulfilled(value) {
       try {
@@ -30,7 +27,6 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
         reject(e);
       }
     }
-
     function rejected(value) {
       try {
         step(generator["throw"](value));
@@ -38,28 +34,20 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
         reject(e);
       }
     }
-
     function step(result) {
       result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
-
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
 };
-
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
-
-  for (var p in s) {
-    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  }
-
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
   if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
     if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
   }
   return t;
 };
-
 import React, { Component } from 'react';
 import classNames from 'classnames';
 import pickAttrs from "rc-util/es/pickAttrs";
@@ -67,76 +55,57 @@ import defaultRequest from './request';
 import getUid from './uid';
 import attrAccept from './attr-accept';
 import traverseFileTree from './traverseFileTree';
-
 var AjaxUploader = /*#__PURE__*/function (_Component) {
   _inherits(AjaxUploader, _Component);
-
   var _super = _createSuper(AjaxUploader);
-
   function AjaxUploader() {
     var _this;
-
     _classCallCheck(this, AjaxUploader);
-
     _this = _super.apply(this, arguments);
     _this.state = {
       uid: getUid()
     };
     _this.reqs = {};
-
     _this.onChange = function (e) {
       var _this$props = _this.props,
-          accept = _this$props.accept,
-          directory = _this$props.directory;
+        accept = _this$props.accept,
+        directory = _this$props.directory;
       var files = e.target.files;
-
       var acceptedFiles = _toConsumableArray(files).filter(function (file) {
         return !directory || attrAccept(file, accept);
       });
-
       _this.uploadFiles(acceptedFiles);
-
       _this.reset();
     };
-
     _this.onClick = function (e) {
       var el = _this.fileInput;
-
       if (!el) {
         return;
       }
-
       var _this$props2 = _this.props,
-          children = _this$props2.children,
-          onClick = _this$props2.onClick;
-
+        children = _this$props2.children,
+        onClick = _this$props2.onClick;
       if (children && children.type === 'button') {
         var parent = el.parentNode;
         parent.focus();
         parent.querySelector('button').blur();
       }
-
       el.click();
-
       if (onClick) {
         onClick(e);
       }
     };
-
     _this.onKeyDown = function (e) {
       if (e.key === 'Enter') {
         _this.onClick(e);
       }
     };
-
     _this.onFileDrop = function (e) {
       var multiple = _this.props.multiple;
       e.preventDefault();
-
       if (e.type === 'dragover') {
         return;
       }
-
       if (_this.props.directory) {
         traverseFileTree(Array.prototype.slice.call(e.dataTransfer.items), _this.uploadFiles, function (_file) {
           return attrAccept(_file, _this.props.accept);
@@ -145,30 +114,26 @@ var AjaxUploader = /*#__PURE__*/function (_Component) {
         var files = _toConsumableArray(e.dataTransfer.files).filter(function (file) {
           return attrAccept(file, _this.props.accept);
         });
-
         if (multiple === false) {
           files = files.slice(0, 1);
         }
-
         _this.uploadFiles(files);
       }
     };
-
     _this.uploadFiles = function (files) {
       var originFiles = _toConsumableArray(files);
-
       var postFiles = originFiles.map(function (file) {
         // eslint-disable-next-line no-param-reassign
         // 处理重新上传文件时已有uid的情况
         file.uid = (file === null || file === void 0 ? void 0 : file.uid) || getUid();
         return _this.processFile(file, originFiles);
-      }); // Batch upload files
-
+      });
+      // Batch upload files
       Promise.all(postFiles).then(function (fileList) {
         var onBatchStart = _this.props.onBatchStart;
         onBatchStart === null || onBatchStart === void 0 ? void 0 : onBatchStart(fileList.map(function (_ref) {
           var origin = _ref.origin,
-              parsedFile = _ref.parsedFile;
+            parsedFile = _ref.parsedFile;
           return {
             file: origin,
             parsedFile: parsedFile
@@ -184,129 +149,103 @@ var AjaxUploader = /*#__PURE__*/function (_Component) {
     /**
      * Process file before upload. When all the file is ready, we start upload.
      */
-
-
     _this.processFile = function (file, fileList) {
       return __awaiter(_assertThisInitialized(_this), void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var beforeUpload, transformedFile, action, mergedAction, data, mergedData, parsedData, parsedFile, mergedParsedFile;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                beforeUpload = this.props.beforeUpload;
-                transformedFile = file;
-
-                if (!beforeUpload) {
-                  _context.next = 14;
-                  break;
-                }
-
-                _context.prev = 3;
-                _context.next = 6;
-                return beforeUpload(file, fileList);
-
-              case 6:
-                transformedFile = _context.sent;
-                _context.next = 12;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              beforeUpload = this.props.beforeUpload;
+              transformedFile = file;
+              if (!beforeUpload) {
+                _context.next = 14;
                 break;
-
-              case 9:
-                _context.prev = 9;
-                _context.t0 = _context["catch"](3);
-                // Rejection will also trade as false
-                transformedFile = false;
-
-              case 12:
-                if (!(transformedFile === false)) {
-                  _context.next = 14;
-                  break;
-                }
-
-                return _context.abrupt("return", {
-                  origin: file,
-                  parsedFile: null,
-                  action: null,
-                  data: null
-                });
-
-              case 14:
-                // Get latest action
-                action = this.props.action;
-
-                if (!(typeof action === 'function')) {
-                  _context.next = 21;
-                  break;
-                }
-
-                _context.next = 18;
-                return action(file);
-
-              case 18:
-                mergedAction = _context.sent;
-                _context.next = 22;
+              }
+              _context.prev = 3;
+              _context.next = 6;
+              return beforeUpload(file, fileList);
+            case 6:
+              transformedFile = _context.sent;
+              _context.next = 12;
+              break;
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](3);
+              // Rejection will also trade as false
+              transformedFile = false;
+            case 12:
+              if (!(transformedFile === false)) {
+                _context.next = 14;
+                break;
+              }
+              return _context.abrupt("return", {
+                origin: file,
+                parsedFile: null,
+                action: null,
+                data: null
+              });
+            case 14:
+              // Get latest action
+              action = this.props.action;
+              if (!(typeof action === 'function')) {
+                _context.next = 21;
                 break;
-
-              case 21:
-                mergedAction = action;
-
-              case 22:
-                // Get latest data
-                data = this.props.data;
-
-                if (!(typeof data === 'function')) {
-                  _context.next = 29;
-                  break;
-                }
-
-                _context.next = 26;
-                return data(file);
-
-              case 26:
-                mergedData = _context.sent;
-                _context.next = 30;
+              }
+              _context.next = 18;
+              return action(file);
+            case 18:
+              mergedAction = _context.sent;
+              _context.next = 22;
+              break;
+            case 21:
+              mergedAction = action;
+            case 22:
+              // Get latest data
+              data = this.props.data;
+              if (!(typeof data === 'function')) {
+                _context.next = 29;
                 break;
-
-              case 29:
-                mergedData = data;
-
-              case 30:
-                parsedData // string type is from legacy `transformFile`.
-                // Not sure if this will work since no related test case works with it
-                = (_typeof(transformedFile) === 'object' || typeof transformedFile === 'string') && transformedFile ? transformedFile : file;
-
-                if (parsedData instanceof File) {
-                  parsedFile = parsedData;
-                } else {
-                  parsedFile = new File([parsedData], file.name, {
-                    type: file.type
-                  });
-                }
-
-                mergedParsedFile = parsedFile;
-                mergedParsedFile.uid = file.uid;
-                return _context.abrupt("return", {
-                  origin: file,
-                  data: mergedData,
-                  parsedFile: mergedParsedFile,
-                  action: mergedAction
+              }
+              _context.next = 26;
+              return data(file);
+            case 26:
+              mergedData = _context.sent;
+              _context.next = 30;
+              break;
+            case 29:
+              mergedData = data;
+            case 30:
+              parsedData
+              // string type is from legacy `transformFile`.
+              // Not sure if this will work since no related test case works with it
+              = (_typeof(transformedFile) === 'object' || typeof transformedFile === 'string') && transformedFile ? transformedFile : file;
+              if (parsedData instanceof File) {
+                parsedFile = parsedData;
+              } else {
+                parsedFile = new File([parsedData], file.name, {
+                  type: file.type
                 });
-
-              case 35:
-              case "end":
-                return _context.stop();
-            }
+              }
+              mergedParsedFile = parsedFile;
+              mergedParsedFile.uid = file.uid;
+              return _context.abrupt("return", {
+                origin: file,
+                data: mergedData,
+                parsedFile: mergedParsedFile,
+                action: mergedAction
+              });
+            case 35:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this, [[3, 9]]);
       }));
     };
-
     _this.saveFileInput = function (node) {
       _this.fileInput = node;
     };
-
     return _this;
   }
-
   _createClass(AjaxUploader, [{
     key: "componentDidMount",
     value: function componentDidMount() {
@@ -322,23 +261,20 @@ var AjaxUploader = /*#__PURE__*/function (_Component) {
     key: "post",
     value: function post(_ref2) {
       var _this2 = this;
-
       var data = _ref2.data,
-          origin = _ref2.origin,
-          action = _ref2.action,
-          parsedFile = _ref2.parsedFile;
-
+        origin = _ref2.origin,
+        action = _ref2.action,
+        parsedFile = _ref2.parsedFile;
       if (!this._isMounted) {
         return;
       }
-
       var _this$props3 = this.props,
-          onStart = _this$props3.onStart,
-          customRequest = _this$props3.customRequest,
-          name = _this$props3.name,
-          headers = _this$props3.headers,
-          withCredentials = _this$props3.withCredentials,
-          method = _this$props3.method;
+        onStart = _this$props3.onStart,
+        customRequest = _this$props3.customRequest,
+        name = _this$props3.name,
+        headers = _this$props3.headers,
+        withCredentials = _this$props3.withCredentials,
+        method = _this$props3.method;
       var uid = origin.uid;
       var request = customRequest || defaultRequest;
       var requestOption = {
@@ -378,21 +314,17 @@ var AjaxUploader = /*#__PURE__*/function (_Component) {
     key: "abort",
     value: function abort(file) {
       var reqs = this.reqs;
-
       if (file) {
         var uid = file.uid ? file.uid : file;
-
         if (reqs[uid] && reqs[uid].abort) {
           reqs[uid].abort();
         }
-
         delete reqs[uid];
       } else {
         Object.keys(reqs).forEach(function (uid) {
           if (reqs[uid] && reqs[uid].abort) {
             reqs[uid].abort();
           }
-
           delete reqs[uid];
         });
       }
@@ -401,26 +333,24 @@ var AjaxUploader = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var _classNames;
-
       var _a = this.props,
-          Tag = _a.component,
-          prefixCls = _a.prefixCls,
-          className = _a.className,
-          disabled = _a.disabled,
-          id = _a.id,
-          style = _a.style,
-          multiple = _a.multiple,
-          accept = _a.accept,
-          capture = _a.capture,
-          children = _a.children,
-          directory = _a.directory,
-          openFileDialogOnClick = _a.openFileDialogOnClick,
-          onMouseEnter = _a.onMouseEnter,
-          onMouseLeave = _a.onMouseLeave,
-          otherProps = __rest(_a, ["component", "prefixCls", "className", "disabled", "id", "style", "multiple", "accept", "capture", "children", "directory", "openFileDialogOnClick", "onMouseEnter", "onMouseLeave"]);
-
-      var cls = classNames((_classNames = {}, _defineProperty(_classNames, prefixCls, true), _defineProperty(_classNames, "".concat(prefixCls, "-disabled"), disabled), _defineProperty(_classNames, className, className), _classNames)); // because input don't have directory/webkitdirectory type declaration
-
+        Tag = _a.component,
+        prefixCls = _a.prefixCls,
+        className = _a.className,
+        disabled = _a.disabled,
+        id = _a.id,
+        style = _a.style,
+        multiple = _a.multiple,
+        accept = _a.accept,
+        capture = _a.capture,
+        children = _a.children,
+        directory = _a.directory,
+        openFileDialogOnClick = _a.openFileDialogOnClick,
+        onMouseEnter = _a.onMouseEnter,
+        onMouseLeave = _a.onMouseLeave,
+        otherProps = __rest(_a, ["component", "prefixCls", "className", "disabled", "id", "style", "multiple", "accept", "capture", "children", "directory", "openFileDialogOnClick", "onMouseEnter", "onMouseLeave"]);
+      var cls = classNames((_classNames = {}, _defineProperty(_classNames, prefixCls, true), _defineProperty(_classNames, "".concat(prefixCls, "-disabled"), disabled), _defineProperty(_classNames, className, className), _classNames));
+      // because input don't have directory/webkitdirectory type declaration
       var dirProps = directory ? {
         directory: 'directory',
         webkitdirectory: 'webkitdirectory'
@@ -462,8 +392,6 @@ var AjaxUploader = /*#__PURE__*/function (_Component) {
       } : {})), children);
     }
   }]);
-
   return AjaxUploader;
 }(Component);
-
 export default AjaxUploader;

package/es/upload/BaseUpload/Upload.d.ts

@@ -1,4 +1,4 @@
-import { Component } from 'react';
+import React, { Component } from 'react';
 import AjaxUpload from './AjaxUploader';
 import type { UploadProps, RcFile } from './interface';
 declare function empty(): void;
@@ -22,6 +22,6 @@ declare class Upload extends Component<UploadProps> {
     private uploader;
     abort(file: RcFile): void;
     saveUploader: (node: AjaxUpload) => void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export default Upload;

package/es/upload/BaseUpload/Upload.js

@@ -3,37 +3,26 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-
 /* eslint react/prop-types:0 */
-
 /*
  * base-upload
  * author zhousheng
  */
 import React, { Component } from 'react';
 import AjaxUpload from './AjaxUploader';
-
 function empty() {}
-
 var Upload = /*#__PURE__*/function (_Component) {
   _inherits(Upload, _Component);
-
   var _super = _createSuper(Upload);
-
   function Upload() {
     var _this;
-
     _classCallCheck(this, Upload);
-
     _this = _super.apply(this, arguments);
-
     _this.saveUploader = function (node) {
       _this.uploader = node;
     };
-
     return _this;
   }
-
   _createClass(Upload, [{
     key: "abort",
     value: function abort(file) {
@@ -47,10 +36,8 @@ var Upload = /*#__PURE__*/function (_Component) {
       }));
     }
   }]);
-
   return Upload;
 }(Component);
-
 Upload.defaultProps = {
   component: 'span',
   prefixCls: 'rc-upload',

package/es/upload/BaseUpload/attr-accept.js

@@ -10,46 +10,38 @@ export default (function (file, acceptedFiles) {
     var mimeType = file.type || '';
     var baseMimeType = mimeType.replace(/\/.*$/, '');
     return acceptedFilesArray.some(function (type) {
-      var validType = type.trim(); // This is something like */*,*  allow all files
-
+      var validType = type.trim();
+      // This is something like */*,*  allow all files
       if (/^\*(\/\*)?$/.test(type)) {
         return true;
-      } // like .jpg, .png
-
-
+      }
+      // like .jpg, .png
       if (validType.charAt(0) === '.') {
         var lowerFileName = fileName.toLowerCase();
         var lowerType = validType.toLowerCase();
         var affixList = [lowerType];
-
         if (lowerType === '.jpg' || lowerType === '.jpeg') {
           affixList = ['.jpg', '.jpeg'];
         }
-
         return affixList.some(function (affix) {
           return lowerFileName.endsWith(affix);
         });
-      } // This is something like a image/* mime type
-
-
+      }
+      // This is something like a image/* mime type
       if (/\/\*$/.test(validType)) {
         return baseMimeType === validType.replace(/\/.*$/, '');
-      } // Full match
-
-
+      }
+      // Full match
       if (mimeType === validType) {
         return true;
-      } // Invalidate type should skip
-
-
+      }
+      // Invalidate type should skip
       if (/^\w+$/.test(validType)) {
         warning(false, "Upload takes an invalidate 'accept' type '".concat(validType, "'.Skip for check."));
         return true;
       }
-
       return false;
     });
   }
-
   return true;
 });

package/es/upload/BaseUpload/interface.d.ts

@@ -1,6 +1,6 @@
 import type * as React from 'react';
-export declare type BeforeUploadFileType = File | Blob | boolean | string;
-export declare type Action = string | ((file: RcFile) => string | PromiseLike<string>);
+export type BeforeUploadFileType = File | Blob | boolean | string;
+export type Action = string | ((file: RcFile) => string | PromiseLike<string>);
 export interface UploadProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onError' | 'onProgress'> {
     name?: string;
     style?: React.CSSProperties;
@@ -35,8 +35,8 @@ export interface UploadProps extends Omit<React.InputHTMLAttributes<HTMLInputEle
 export interface UploadProgressEvent extends ProgressEvent {
     percent: number;
 }
-export declare type UploadRequestMethod = 'POST' | 'PUT' | 'PATCH' | 'post' | 'put' | 'patch';
-export declare type UploadRequestHeader = Record<string, string>;
+export type UploadRequestMethod = 'POST' | 'PUT' | 'PATCH' | 'post' | 'put' | 'patch';
+export type UploadRequestHeader = Record<string, string>;
 export interface UploadRequestError extends Error {
     status?: number;
     method?: UploadRequestMethod;