antd-mobile 5.10.4 → 5.11.2

package/bundle/antd-mobile.es.js

@@ -1,5 +1,5 @@
 import { __rest, __awaiter } from "tslib";
-import React$1, { useContext, useRef, useEffect, useMemo, useState, memo, forwardRef, useImperativeHandle, useCallback, createContext, cloneElement, createRef } from "react";
+import React$1, { useContext, useRef, useEffect, useMemo, useState, memo, forwardRef, useImperativeHandle, useCallback, createContext, cloneElement, useLayoutEffect, createRef } from "react";
 import classNames from "classnames";
 import { useUnmountedRef, useUpdate, useMemoizedFn, useUpdateEffect, useIsomorphicLayoutEffect, createUpdateEffect, useThrottleFn, useDebounceEffect, useMount, useInViewport, useClickAway, useUnmount, useLockFn, useTimeout } from "ahooks";
 import { useSpring, animated, to } from "@react-spring/web";
@@ -8,7 +8,7 @@ import { isFragment } from "react-is";
 import { useDrag, useWheel, createUseGesture, dragAction, pinchAction } from "@use-gesture/react";
 import { RightOutline, CheckOutline, DownOutline, PictureOutline, PictureWrongOutline, DownFill, QuestionCircleOutline, CloseOutline, AddOutline, CloseCircleFill, LeftOutline, SoundOutline, TextDeletionOutline, StarFill, CheckCircleFill, InformationCircleFill, ClockCircleFill, ExclamationCircleFill, SearchOutline, MinusOutline } from "antd-mobile-icons";
 import { staged } from "staged-components";
-import RcForm, { List as List$2, Field, useForm } from "rc-field-form";
+import RcForm, { List as List$2, Field, useForm, useWatch } from "rc-field-form";
 import { computePosition, offset, shift, limitShift, flip, hide, arrow, autoUpdate } from "@floating-ui/dom";
 import Big from "big.js";
 var global$1 = "";
@@ -1313,7 +1313,8 @@ const base = {
     }
   },
   ImageUploader: {
-    uploading: "Uploading..."
+    uploading: "Uploading...",
+    upload: "Upload"
   },
   InfiniteScroll: {
     noMore: "No more"
@@ -1418,7 +1419,8 @@ const zhCN = mergeLocale(base, {
     }
   },
   ImageUploader: {
-    uploading: "\u4E0A\u4F20\u4E2D..."
+    uploading: "\u4E0A\u4F20\u4E2D...",
+    upload: "\u4E0A\u4F20"
   },
   InfiniteScroll: {
     noMore: "\u6CA1\u6709\u66F4\u591A\u4E86"
@@ -8435,29 +8437,52 @@ const DotLoading = memo((p) => {
     keyTimes: "0; 0.1; 0.3; 0.4; 1"
   }))))))))));
 });
+function isPromise(obj) {
+  return !!obj && typeof obj === "object" && typeof obj.then === "function";
+}
 const classPrefix$1d = `adm-button`;
 const defaultProps$W = {
   color: "default",
   fill: "solid",
   block: false,
   loading: false,
+  loadingIcon: React$1.createElement(DotLoading, {
+    color: "currentColor"
+  }),
   type: "button",
   shape: "default",
   size: "middle"
 };
 const Button = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps$W, p);
-  const disabled = props.disabled || props.loading;
+  const [innerLoading, setInnerLoading] = useState(false);
   const nativeButtonRef = useRef(null);
+  const loading = props.loading === "auto" ? innerLoading : props.loading;
+  const disabled = props.disabled || loading;
   useImperativeHandle(ref, () => ({
     get nativeElement() {
       return nativeButtonRef.current;
     }
   }));
+  const handleClick = (e) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!props.onClick)
+      return;
+    const promise = props.onClick(e);
+    if (isPromise(promise)) {
+      try {
+        setInnerLoading(true);
+        yield promise;
+        setInnerLoading(false);
+      } catch (e2) {
+        setInnerLoading(false);
+        throw e2;
+      }
+    }
+  });
   return withNativeProps(props, React$1.createElement("button", {
     ref: nativeButtonRef,
     type: props.type,
-    onClick: props.onClick,
+    onClick: handleClick,
     className: classNames(classPrefix$1d, props.color ? `${classPrefix$1d}-${props.color}` : null, {
       [`${classPrefix$1d}-block`]: props.block,
       [`${classPrefix$1d}-disabled`]: disabled,
@@ -8466,14 +8491,12 @@ const Button = forwardRef((p, ref) => {
       [`${classPrefix$1d}-mini`]: props.size === "mini",
       [`${classPrefix$1d}-small`]: props.size === "small",
       [`${classPrefix$1d}-large`]: props.size === "large",
-      [`${classPrefix$1d}-loading`]: props.loading
+      [`${classPrefix$1d}-loading`]: loading
     }, `${classPrefix$1d}-shape-${props.shape}`),
     disabled
-  }, props.loading ? React$1.createElement("div", {
+  }, loading ? React$1.createElement("div", {
     className: `${classPrefix$1d}-loading-wrapper`
-  }, React$1.createElement(DotLoading, {
-    color: "currentColor"
-  }), props.loadingText) : props.children));
+  }, props.loadingIcon, props.loadingText) : props.children));
 });
 var safeArea = "";
 const classPrefix$1c = "adm-safe-area";
@@ -8904,6 +8927,8 @@ const Calendar = forwardRef((p, ref) => {
       setCurrent(current.add(1, "year"));
     }
   }, React$1.createElement(ArrowLeftDouble, null)));
+  const maxDay = useMemo(() => props.max && dayjs(props.max), [props.max]);
+  const minDay = useMemo(() => props.min && dayjs(props.min), [props.min]);
   function renderCells() {
     var _a;
     const cells = [];
@@ -8923,9 +8948,10 @@ const Calendar = forwardRef((p, ref) => {
         isSelect = isBegin || isEnd || d.isAfter(begin, "day") && d.isBefore(end, "day");
       }
       const inThisMonth = d.month() === current.month();
+      const disabled = !inThisMonth || maxDay && d.isAfter(maxDay, "day") || minDay && d.isBefore(minDay, "day");
       cells.push(React$1.createElement("div", {
         key: d.valueOf(),
-        className: classNames(`${classPrefix$17}-cell`, inThisMonth ? `${classPrefix$17}-cell-in` : `${classPrefix$17}-cell-out`, inThisMonth && {
+        className: classNames(`${classPrefix$17}-cell`, disabled && `${classPrefix$17}-cell-disabled`, inThisMonth && {
           [`${classPrefix$17}-cell-today`]: d.isSame(today, "day"),
           [`${classPrefix$17}-cell-selected`]: isSelect,
           [`${classPrefix$17}-cell-selected-begin`]: isBegin,
@@ -8934,6 +8960,8 @@ const Calendar = forwardRef((p, ref) => {
         onClick: () => {
           if (!props.selectionMode)
             return;
+          if (disabled)
+            return;
           const date = d.toDate();
           if (!inThisMonth) {
             setCurrent(d.clone().date(1));
@@ -9980,62 +10008,52 @@ function prompt$3(props) {
 var Picker = attachPropertiesToComponent(Picker$1, {
   prompt: prompt$3
 });
-function useCascadePickerOptions(options) {
-  return useMemo(() => {
-    let depth = 1;
-    const subOptionsRecord = {};
-    function traverse(option, currentDepth) {
-      if (!option.children) {
-        return;
-      }
-      subOptionsRecord[option.value] = option.children;
+function useColumnsFn(options) {
+  const depth = useMemo(() => {
+    let depth2 = 0;
+    function traverse(options2, currentDepth) {
+      if (currentDepth > depth2)
+        depth2 = currentDepth;
       const nextDepth = currentDepth + 1;
-      if (nextDepth > depth) {
-        depth = nextDepth;
-      }
-      option.children.forEach((option2) => {
-        traverse(option2, nextDepth);
+      options2.forEach((option) => {
+        if (option.children) {
+          traverse(option.children, nextDepth);
+        }
       });
     }
-    options.forEach((option) => {
-      traverse(option, 1);
-    });
-    return {
-      depth,
-      subOptionsRecord
-    };
+    traverse(options, 1);
+    return depth2;
   }, [options]);
-}
-function generateCascadePickerColumns(value, options, depth, subOptionsRecord) {
-  const columns = [];
-  columns.push(options.map((option) => ({
-    label: option.label,
-    value: option.value
-  })));
-  for (let i = 0; i < depth - 1; i++) {
-    const x = value[i];
-    const subOptions = subOptionsRecord[x];
-    if (!subOptions) {
-      columns.push([]);
-    } else {
-      columns.push(subOptions.map((option) => ({
+  return (selected) => {
+    const columns = [];
+    let currentOptions = options;
+    let i = 0;
+    while (true) {
+      columns.push(currentOptions.map((option) => ({
         label: option.label,
         value: option.value
       })));
+      const x = selected[i];
+      const targetOptions = currentOptions.find((option) => option.value === x);
+      if (!targetOptions || !targetOptions.children)
+        break;
+      currentOptions = targetOptions.children;
+      i++;
     }
-  }
-  return columns;
+    while (i < depth - 1) {
+      columns.push([]);
+      i++;
+    }
+    return columns;
+  };
 }
 const CascadePicker = (props) => {
   const {
     options
   } = props, pickerProps = __rest(props, ["options"]);
-  const {
-    depth,
-    subOptionsRecord
-  } = useCascadePickerOptions(options);
+  const columnsFn = useColumnsFn(options);
   return React$1.createElement(Picker, Object.assign({}, pickerProps, {
-    columns: (selected) => generateCascadePickerColumns(selected, options, depth, subOptionsRecord)
+    columns: columnsFn
   }));
 };
 function prompt$2(props) {
@@ -10075,12 +10093,9 @@ const CascadePickerView = (props) => {
   const {
     options
   } = props, pickerProps = __rest(props, ["options"]);
-  const {
-    depth,
-    subOptionsRecord
-  } = useCascadePickerOptions(options);
+  const columnsFn = useColumnsFn(options);
   return React$1.createElement(PickerView, Object.assign({}, pickerProps, {
-    columns: (selected) => generateCascadePickerColumns(selected, options, depth, subOptionsRecord)
+    columns: columnsFn
   }));
 };
 var cascaderView = "";
@@ -10331,6 +10346,9 @@ const List$1 = (p) => {
     className: `${classPrefix$$}-body-inner`
   }, props.children))));
 };
+function isNodeWithContent(node) {
+  return node !== void 0 && node !== null && node !== false;
+}
 const classPrefix$_ = `adm-list-item`;
 const ListItem = (props) => {
   var _a;
@@ -10338,17 +10356,17 @@ const ListItem = (props) => {
   const arrow2 = props.arrow === void 0 ? clickable : props.arrow;
   const content = React$1.createElement("div", {
     className: `${classPrefix$_}-content`
-  }, props.prefix && React$1.createElement("div", {
+  }, isNodeWithContent(props.prefix) && React$1.createElement("div", {
     className: `${classPrefix$_}-content-prefix`
   }, props.prefix), React$1.createElement("div", {
     className: `${classPrefix$_}-content-main`
-  }, props.title && React$1.createElement("div", {
+  }, isNodeWithContent(props.title) && React$1.createElement("div", {
     className: `${classPrefix$_}-title`
-  }, props.title), props.children, props.description && React$1.createElement("div", {
+  }, props.title), props.children, isNodeWithContent(props.description) && React$1.createElement("div", {
     className: `${classPrefix$_}-description`
-  }, props.description)), props.extra && React$1.createElement("div", {
+  }, props.description)), isNodeWithContent(props.extra) && React$1.createElement("div", {
     className: `${classPrefix$_}-content-extra`
-  }, props.extra), arrow2 && React$1.createElement("div", {
+  }, props.extra), isNodeWithContent(arrow2) && React$1.createElement("div", {
     className: `${classPrefix$_}-content-arrow`
   }, arrow2 === true ? React$1.createElement(RightOutline, null) : arrow2));
   return withNativeProps(props, React$1.createElement(clickable ? "a" : "div", {
@@ -11391,6 +11409,7 @@ const DatePicker = (p) => {
     value: pickerValue,
     onCancel: props.onCancel,
     onClose: props.onClose,
+    closeOnMaskClick: props.closeOnMaskClick,
     visible: props.visible,
     confirmText: props.confirmText,
     cancelText: props.cancelText,
@@ -11476,23 +11495,9 @@ const DialogActionButton = (props) => {
   const {
     action
   } = props;
-  const [loading, setLoading] = useState(false);
-  function handleClick() {
-    return __awaiter(this, void 0, void 0, function* () {
-      setLoading(true);
-      try {
-        const promise = props.onAction();
-        yield promise;
-        setLoading(false);
-      } catch (e) {
-        setLoading(false);
-        throw e;
-      }
-    });
-  }
   return withNativeProps(props.action, React$1.createElement(Button, {
     key: action.key,
-    onClick: handleClick,
+    onClick: props.onAction,
     className: classNames("adm-dialog-button", {
       "adm-dialog-button-bold": action.bold
     }),
@@ -11500,7 +11505,7 @@ const DialogActionButton = (props) => {
     shape: "rectangular",
     block: true,
     color: action.danger ? "danger" : "primary",
-    loading,
+    loading: "auto",
     disabled: action.disabled
   }, action.text));
 };
@@ -12773,7 +12778,7 @@ const FloatingPanel = forwardRef((p, ref) => {
       tension: 300
     },
     onChange: (result2) => {
-      onHeightChange(result2.value.y, y2.isAnimating);
+      onHeightChange(-result2.value.y, y2.isAnimating);
     }
   }));
   useDrag((state) => {
@@ -12867,7 +12872,8 @@ const defaultFormContext = {
   name: void 0,
   hasFeedback: true,
   layout: "vertical",
-  requiredMarkStyle: "asterisk"
+  requiredMarkStyle: "asterisk",
+  disabled: false
 };
 const FormContext = React$1.createContext(defaultFormContext);
 const NoStyleItemContext = React$1.createContext(null);
@@ -12916,8 +12922,9 @@ const Form$1 = forwardRef((p, ref) => {
     layout,
     footer,
     mode,
+    disabled,
     requiredMarkStyle
-  } = props, formProps = __rest(props, ["className", "style", "hasFeedback", "children", "layout", "footer", "mode", "requiredMarkStyle"]);
+  } = props, formProps = __rest(props, ["className", "style", "hasFeedback", "children", "layout", "footer", "mode", "disabled", "requiredMarkStyle"]);
   const {
     locale
   } = useConfig();
@@ -12964,7 +12971,8 @@ const Form$1 = forwardRef((p, ref) => {
       name: formProps.name,
       hasFeedback,
       layout,
-      requiredMarkStyle
+      requiredMarkStyle,
+      disabled
     }
   }, lists), footer && React$1.createElement("div", {
     className: `${classPrefix$K}-footer`
@@ -13116,7 +13124,9 @@ var Context = /* @__PURE__ */ React.createContext({
       registerField: warningFunc,
       useSubscribe: warningFunc,
       setInitialValues: warningFunc,
+      destroyForm: warningFunc,
       setCallbacks: warningFunc,
+      registerWatch: warningFunc,
       getFields: warningFunc,
       setValidateMessages: warningFunc,
       setPreserve: warningFunc,
@@ -13391,6 +13401,7 @@ const MemoInput = React$1.memo(({
   children
 }) => children, (prev, next) => prev.value === next.value && prev.update === next.update);
 const FormItemLayout = (props) => {
+  var _a;
   const {
     className,
     style,
@@ -13398,7 +13409,6 @@ const FormItemLayout = (props) => {
     label,
     help,
     required,
-    disabled,
     children,
     htmlFor,
     hidden,
@@ -13411,6 +13421,7 @@ const FormItemLayout = (props) => {
   } = useConfig();
   const hasFeedback = props.hasFeedback !== void 0 ? props.hasFeedback : context.hasFeedback;
   const layout = props.layout || context.layout;
+  const disabled = (_a = props.disabled) !== null && _a !== void 0 ? _a : context.disabled;
   const requiredMark = (() => {
     const {
       requiredMarkStyle
@@ -13647,7 +13658,8 @@ var Form = attachPropertiesToComponent(Form$1, {
   Subscribe: FormSubscribe,
   Header,
   Array: FormArray,
-  useForm
+  useForm,
+  useWatch
 });
 var grid = "";
 const classPrefix$G = `adm-grid`;
@@ -14149,6 +14161,9 @@ const defaultProps$t = {
   imageFit: "cover"
 };
 const ImageUploader = (p) => {
+  const {
+    locale
+  } = useConfig();
   const props = mergeProps(defaultProps$t, p);
   const [value, setValue] = usePropsValue(props);
   const updateValue = useMemoizedFn((updater) => {
@@ -14305,7 +14320,8 @@ const ImageUploader = (p) => {
     className: `${classPrefix$z}-upload-button-wrap`
   }, props.children ? props.children : React$1.createElement("span", {
     className: `${classPrefix$z}-cell ${classPrefix$z}-upload-button`,
-    role: "button"
+    role: "button",
+    "aria-label": locale.ImageUploader.upload
   }, React$1.createElement("span", {
     className: `${classPrefix$z}-upload-button-icon`
   }, React$1.createElement(AddOutline, null))), !props.disableUpload && React$1.createElement("input", {
@@ -14314,7 +14330,8 @@ const ImageUploader = (p) => {
     multiple: props.multiple,
     type: "file",
     className: `${classPrefix$z}-input`,
-    onChange
+    onChange,
+    "aria-hidden": true
   })))));
 };
 var imageUploader = "";
@@ -14553,7 +14570,8 @@ const InfiniteScroll = (p) => {
 var input = "";
 const classPrefix$v = `adm-input`;
 const defaultProps$r = {
-  defaultValue: ""
+  defaultValue: "",
+  onlyShowClearWhenFocus: true
 };
 const Input = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps$r, p);
@@ -14602,6 +14620,15 @@ const Input = forwardRef((p, ref) => {
       setValue(nextValue);
     }
   }
+  const shouldShowClear = (() => {
+    if (!props.clearable || !value || props.readOnly)
+      return false;
+    if (props.onlyShowClearWhenFocus) {
+      return hasFocus;
+    } else {
+      return true;
+    }
+  })();
   return withNativeProps(props, React$1.createElement("div", {
     className: classNames(`${classPrefix$v}`, props.disabled && `${classPrefix$v}-disabled`)
   }, React$1.createElement("input", {
@@ -14642,7 +14669,7 @@ const Input = forwardRef((p, ref) => {
     onCompositionStart: props.onCompositionStart,
     onCompositionEnd: props.onCompositionEnd,
     onClick: props.onClick
-  }), props.clearable && !!value && !props.readOnly && hasFocus && React$1.createElement("div", {
+  }), shouldShowClear && React$1.createElement("div", {
     className: `${classPrefix$v}-clear`,
     onMouseDown: (e) => {
       e.preventDefault();
@@ -14755,23 +14782,9 @@ const ModalActionButton = (props) => {
   const {
     action
   } = props;
-  const [loading, setLoading] = useState(false);
-  function handleClick() {
-    return __awaiter(this, void 0, void 0, function* () {
-      setLoading(true);
-      try {
-        const promise = props.onAction();
-        yield promise;
-        setLoading(false);
-      } catch (e) {
-        setLoading(false);
-        throw e;
-      }
-    });
-  }
   return withNativeProps(props.action, React$1.createElement(Button, {
     key: action.key,
-    onClick: handleClick,
+    onClick: props.onAction,
     className: classNames("adm-modal-button", {
       "adm-modal-button-primary": props.action.primary
     }),
@@ -14779,7 +14792,7 @@ const ModalActionButton = (props) => {
     size: props.action.primary ? "large" : "middle",
     block: true,
     color: action.danger ? "danger" : "primary",
-    loading,
+    loading: "auto",
     disabled: action.disabled
   }, action.text));
 };
@@ -15756,6 +15769,7 @@ var searchBar = "";
 const classPrefix$i = `adm-search-bar`;
 const defaultProps$f = {
   clearable: true,
+  onlyShowClearWhenFocus: false,
   showCancelButton: false,
   defaultValue: "",
   clearOnCancel: true,
@@ -15835,6 +15849,7 @@ const SearchBar = forwardRef((p, ref) => {
     maxLength: props.maxLength,
     placeholder: props.placeholder,
     clearable: props.clearable,
+    onlyShowClearWhenFocus: props.onlyShowClearWhenFocus,
     onFocus: (e) => {
       var _a;
       setHasFocus(true);
@@ -17174,7 +17189,7 @@ const TextArea = forwardRef((p, ref) => {
       (_a = nativeTextAreaRef.current) === null || _a === void 0 ? void 0 : _a.blur();
     }
   }));
-  useEffect(() => {
+  useLayoutEffect(() => {
     if (!autoSize)
       return;
     const textArea2 = nativeTextAreaRef.current;
@@ -17810,7 +17825,8 @@ const VirtualInput = forwardRef((p, ref) => {
       var _a, _b, _c;
       (_a = rootRef.current) === null || _a === void 0 ? void 0 : _a.blur();
       (_c = (_b = keyboard.props).onClose) === null || _c === void 0 ? void 0 : _c.call(_b);
-    }
+    },
+    getContainer: null
   });
   return withNativeProps(props, React$1.createElement("div", {
     ref: rootRef,

package/bundle/style.css

@@ -398,10 +398,10 @@ div.adm-px-tester {
 .adm-calendar-cell.adm-calendar-cell-today {
   color: var(--adm-color-primary);
 }
-.adm-calendar-cell.adm-calendar-cell-out {
+.adm-calendar-cell.adm-calendar-cell-disabled {
   color: var(--adm-color-light);
 }
-.adm-calendar-cell.adm-calendar-cell-out .adm-calendar-cell-bottom {
+.adm-calendar-cell.adm-calendar-cell-disabled .adm-calendar-cell-bottom {
   color: var(--adm-color-light);
 }
 .adm-calendar-cell.adm-calendar-cell-selected.adm-calendar-cell.adm-calendar-cell-selected {
@@ -1553,7 +1553,7 @@ a.adm-list-item:active:not(.adm-list-item-disabled)::after {
 }
 .adm-form-item.adm-form-item-horizontal.adm-list-item {
   --align-items: stretch;
-  --prefix-width: 6em;
+  --prefix-width: 6.8em;
 }
 .adm-form-item.adm-form-item-horizontal .adm-list-item-content-prefix {
   padding-top: 12px;
@@ -2085,6 +2085,9 @@ a.adm-list-item:active:not(.adm-list-item-disabled)::after {
 .adm-input-element::-webkit-search-decoration {
   display: none;
 }
+.adm-input-element:disabled {
+  opacity: 1;
+}
 .adm-input-element[type='date'],
 .adm-input-element[type='time'],
 .adm-input-element[type='datetime-local'] {

package/cjs/components/button/button.d.ts

@@ -5,10 +5,11 @@ export declare type ButtonProps = {
     fill?: 'solid' | 'outline' | 'none';
     size?: 'mini' | 'small' | 'middle' | 'large';
     block?: boolean;
-    loading?: boolean;
+    loading?: boolean | 'auto';
     loadingText?: string;
+    loadingIcon?: React.ReactNode;
     disabled?: boolean;
-    onClick?: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
+    onClick?: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void | Promise<void>;
     type?: 'submit' | 'reset' | 'button';
     shape?: 'default' | 'rounded' | 'rectangular';
     children?: React.ReactNode;
@@ -21,10 +22,11 @@ export declare const Button: React.ForwardRefExoticComponent<{
     fill?: "none" | "solid" | "outline" | undefined;
     size?: "small" | "large" | "middle" | "mini" | undefined;
     block?: boolean | undefined;
-    loading?: boolean | undefined;
+    loading?: boolean | "auto" | undefined;
     loadingText?: string | undefined;
+    loadingIcon?: React.ReactNode;
     disabled?: boolean | undefined;
-    onClick?: ((event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void) | undefined;
+    onClick?: ((event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void | Promise<void>) | undefined;
     type?: "reset" | "submit" | "button" | undefined;
     shape?: "default" | "rounded" | "rectangular" | undefined;
     children?: React.ReactNode;

package/cjs/components/button/button.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Button = void 0;
 
+var _tslib = require("tslib");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -15,6 +17,8 @@ var _withDefaultProps = require("../../utils/with-default-props");
 
 var _nativeProps = require("../../utils/native-props");
 
+var _validate = require("../../utils/validate");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -27,24 +31,46 @@ const defaultProps = {
   fill: 'solid',
   block: false,
   loading: false,
+  loadingIcon: _react.default.createElement(_dotLoading.default, {
+    color: 'currentColor'
+  }),
   type: 'button',
   shape: 'default',
   size: 'middle'
 };
 const Button = (0, _react.forwardRef)((p, ref) => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  const disabled = props.disabled || props.loading;
+  const [innerLoading, setInnerLoading] = (0, _react.useState)(false);
   const nativeButtonRef = (0, _react.useRef)(null);
+  const loading = props.loading === 'auto' ? innerLoading : props.loading;
+  const disabled = props.disabled || loading;
   (0, _react.useImperativeHandle)(ref, () => ({
     get nativeElement() {
       return nativeButtonRef.current;
     }
 
   }));
+
+  const handleClick = e => (0, _tslib.__awaiter)(void 0, void 0, void 0, function* () {
+    if (!props.onClick) return;
+    const promise = props.onClick(e);
+
+    if ((0, _validate.isPromise)(promise)) {
+      try {
+        setInnerLoading(true);
+        yield promise;
+        setInnerLoading(false);
+      } catch (e) {
+        setInnerLoading(false);
+        throw e;
+      }
+    }
+  });
+
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("button", {
     ref: nativeButtonRef,
     type: props.type,
-    onClick: props.onClick,
+    onClick: handleClick,
     className: (0, _classnames.default)(classPrefix, props.color ? `${classPrefix}-${props.color}` : null, {
       [`${classPrefix}-block`]: props.block,
       [`${classPrefix}-disabled`]: disabled,
@@ -53,13 +79,11 @@ const Button = (0, _react.forwardRef)((p, ref) => {
       [`${classPrefix}-mini`]: props.size === 'mini',
       [`${classPrefix}-small`]: props.size === 'small',
       [`${classPrefix}-large`]: props.size === 'large',
-      [`${classPrefix}-loading`]: props.loading
+      [`${classPrefix}-loading`]: loading
     }, `${classPrefix}-shape-${props.shape}`),
     disabled: disabled
-  }, props.loading ? _react.default.createElement("div", {
+  }, loading ? _react.default.createElement("div", {
     className: `${classPrefix}-loading-wrapper`
-  }, _react.default.createElement(_dotLoading.default, {
-    color: 'currentColor'
-  }), props.loadingText) : props.children));
+  }, props.loadingIcon, props.loadingText) : props.children));
 });
 exports.Button = Button;