antd-mobile 5.0.0-rc.1 → 5.0.0-rc.5

package/2x/cjs/components/dropdown/item.js

@@ -13,12 +13,14 @@ var _nativeProps = require("../../utils/native-props");
 
 var _useShouldRender = require("../../utils/use-should-render");
 
+var _antdMobileIcons = require("antd-mobile-icons");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var classPrefix = "adm-dropdown-item";
 
 var Item = function Item(props) {
-  var _classNames;
+  var _classNames, _classNames2;
 
   var cls = (0, _classnames["default"])(classPrefix, (_classNames = {}, _classNames[classPrefix + "-active"] = props.active, _classNames[classPrefix + "-highlight"] = props.highlight, _classNames));
   return (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
@@ -26,19 +28,23 @@ var Item = function Item(props) {
     onClick: props.onClick
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: classPrefix + "-title"
-  }, /*#__PURE__*/_react["default"].createElement("span", null, props.title))));
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: classPrefix + "-title-text"
+  }, props.title), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])(classPrefix + "-title-arrow", (_classNames2 = {}, _classNames2[classPrefix + "-title-arrow-active"] = props.active, _classNames2))
+  }, props.arrow === undefined ? /*#__PURE__*/_react["default"].createElement(_antdMobileIcons.DownFill, null) : props.arrow))));
 };
 
 var _default = Item;
 exports["default"] = _default;
 
 var ItemChildrenWrap = function ItemChildrenWrap(props) {
-  var _classNames2;
+  var _classNames3;
 
   var _props$active = props.active,
       active = _props$active === void 0 ? false : _props$active;
   var shouldRender = (0, _useShouldRender.useShouldRender)(active, props.forceRender, props.destroyOnClose);
-  var cls = (0, _classnames["default"])(classPrefix + "-content", (_classNames2 = {}, _classNames2[classPrefix + "-content-hidden"] = !active, _classNames2));
+  var cls = (0, _classnames["default"])(classPrefix + "-content", (_classNames3 = {}, _classNames3[classPrefix + "-content-hidden"] = !active, _classNames3));
   return shouldRender ? /*#__PURE__*/_react["default"].createElement("div", {
     className: cls,
     onClick: props.onClick

package/2x/cjs/components/form/form-item.css

@@ -7,10 +7,13 @@
   height: 100%;
   box-sizing: border-box;
   color: #666;
+  position: relative;
 }
 
 .adm-form-item-label-required {
-  margin-left: 8px;
+  position: absolute;
+  left: -0.6em;
+  top: 0.2em;
   color: var(--adm-color-danger);
   user-select: none;
 }

package/2x/cjs/components/form/form.css

@@ -1,3 +1,7 @@
+.adm-form .adm-list {
+  --padding-left: 40px;
+}
+
 .adm-form .adm-form-footer {
   padding: 24px;
 }

package/2x/cjs/components/form/form.d.ts

@@ -1,13 +1,16 @@
 import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
+import { ListProps } from '../list';
 import type { FormProps as RcFormProps, FormInstance } from 'rc-field-form';
 import { FormContextType } from './context';
 import type { FormLayout } from '.';
 export declare type FormProps = RcFormProps & NativeProps & Partial<FormContextType> & {
     footer?: ReactNode;
     layout?: FormLayout;
+    mode?: ListProps['mode'];
 };
 export declare const Form: React.ForwardRefExoticComponent<RcFormProps<any> & NativeProps<never> & Partial<FormContextType> & {
     footer?: ReactNode;
     layout?: "horizontal" | "vertical" | undefined;
+    mode?: ListProps['mode'];
 } & React.RefAttributes<FormInstance<any>>>;

package/2x/cjs/components/form/form.js

@@ -50,13 +50,15 @@ var Form = /*#__PURE__*/(0, _react.forwardRef)(function (p, ref) {
       children = props.children,
       layout = props.layout,
       footer = props.footer,
-      formProps = __rest(props, ["className", "style", "hasFeedback", "children", "layout", "footer"]);
+      mode = props.mode,
+      formProps = __rest(props, ["className", "style", "hasFeedback", "children", "layout", "footer", "mode"]);
 
   return /*#__PURE__*/_react["default"].createElement(_rcFieldForm["default"], Object.assign({
     className: (0, _classnames["default"])(classPrefix, classPrefix + "-" + layout, className),
     style: style,
     ref: ref
   }, formProps), /*#__PURE__*/_react["default"].createElement(_list["default"], {
+    mode: mode,
     style: {
       '--prefix-width': '6em',
       '--align-items': 'stretch'

package/2x/cjs/components/form/index.css

@@ -1,3 +1,7 @@
+.adm-form .adm-list {
+  --padding-left: 40px;
+}
+
 .adm-form .adm-form-footer {
   padding: 24px;
 }
@@ -11,10 +15,13 @@
   height: 100%;
   box-sizing: border-box;
   color: #666;
+  position: relative;
 }
 
 .adm-form-item-label-required {
-  margin-left: 8px;
+  position: absolute;
+  left: -0.6em;
+  top: 0.2em;
   color: var(--adm-color-danger);
   user-select: none;
 }

package/2x/cjs/components/form/index.d.ts

@@ -7,6 +7,7 @@ export type { FormInstance } from 'rc-field-form';
 declare const _default: import("react").ForwardRefExoticComponent<import("rc-field-form").FormProps<any> & import("../../utils/native-props").NativeProps<never> & Partial<import("./context").FormContextType> & {
     footer?: import("react").ReactNode;
     layout?: "horizontal" | "vertical" | undefined;
+    mode?: "default" | "card" | undefined;
 } & import("react").RefAttributes<import("rc-field-form").FormInstance<any>>> & {
     Item: import("react").FC<import("./form-item").FormItemProps>;
     useForm: typeof useForm;

package/2x/cjs/components/image-uploader/image-uploader.d.ts

@@ -1,13 +1,16 @@
 import { FC, InputHTMLAttributes } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type TaskStatus = 'pending' | 'fail';
-export interface FileItem {
+export interface ImageUploadItem {
+    key?: string | number;
     url: string;
+    thumbnailUrl?: string;
+    extra?: any;
 }
 export declare type ImageUploaderProps = {
-    defaultValue?: FileItem[];
-    value?: FileItem[];
-    onChange?: (fileList: FileItem[]) => void;
+    defaultValue?: ImageUploadItem[];
+    value?: ImageUploadItem[];
+    onChange?: (items: ImageUploadItem[]) => void;
     accept?: string;
     multiple?: boolean;
     maxCount?: number;
@@ -18,7 +21,7 @@ export declare type ImageUploaderProps = {
     capture?: InputHTMLAttributes<unknown>['capture'];
     onPreview?: (index: number) => void;
     beforeUpload?: (file: File[]) => Promise<File[]> | File[];
-    upload: (file: File) => Promise<FileItem>;
-    onDelete?: (file: FileItem) => boolean | Promise<boolean> | void;
+    upload: (file: File) => Promise<ImageUploadItem>;
+    onDelete?: (item: ImageUploadItem) => boolean | Promise<boolean> | void;
 } & NativeProps<'--cell-size'>;
 export declare const ImageUploader: FC<ImageUploaderProps>;

package/2x/cjs/components/image-uploader/image-uploader.js

@@ -255,23 +255,25 @@ var ImageUploader = function ImageUploader(p) {
     className: classPrefix + "-space",
     wrap: true
   }, value.map(function (fileItem, index) {
+    var _a, _b;
+
     return /*#__PURE__*/_react["default"].createElement(_previewItem["default"], {
-      key: fileItem.url,
-      url: fileItem.url,
+      key: (_a = fileItem.key) !== null && _a !== void 0 ? _a : index,
+      url: (_b = fileItem.thumbnailUrl) !== null && _b !== void 0 ? _b : fileItem.url,
       deletable: props.deletable,
       onClick: function onClick() {
         return previewImage(index);
       },
       onDelete: function onDelete() {
         return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-          var _a, canDelete;
+          var _c, canDelete;
 
           return regeneratorRuntime.wrap(function _callee3$(_context3) {
             while (1) {
               switch (_context3.prev = _context3.next) {
                 case 0:
                   _context3.next = 2;
-                  return (_a = props.onDelete) === null || _a === void 0 ? void 0 : _a.call(props, fileItem);
+                  return (_c = props.onDelete) === null || _c === void 0 ? void 0 : _c.call(props, fileItem);
 
                 case 2:
                   canDelete = _context3.sent;
@@ -284,8 +286,8 @@ var ImageUploader = function ImageUploader(p) {
                   return _context3.abrupt("return");
 
                 case 5:
-                  setValue(value.filter(function (x) {
-                    return x.url !== fileItem.url;
+                  setValue(value.filter(function (x, i) {
+                    return i !== index;
                   }));
 
                 case 6:

package/2x/cjs/components/image-uploader/index.d.ts

@@ -1,4 +1,4 @@
 import { ImageUploader } from './image-uploader';
 import './image-uploader.less';
-export type { FileItem, ImageUploaderProps } from './image-uploader';
+export type { ImageUploadItem, ImageUploaderProps } from './image-uploader';
 export default ImageUploader;

package/2x/cjs/components/image-viewer/image-viewer.d.ts

@@ -1,5 +1,5 @@
-import { GetContainer } from '../../utils/render-to-container';
 import { FC } from 'react';
+import { GetContainer } from '../../utils/render-to-container';
 export declare type ImageViewerProps = {
     image?: string;
     maxZoom?: number;
@@ -15,9 +15,3 @@ export declare type MultiImageViewerProps = Omit<ImageViewerProps, 'image'> & {
     onIndexChange?: (index: number) => void;
 };
 export declare const MultiImageViewer: FC<MultiImageViewerProps>;
-export declare function showImageViewer(props: Omit<ImageViewerProps, 'visible'>): {
-    close: () => void;
-};
-export declare function showMultiImageViewer(props: Omit<MultiImageViewerProps, 'visible'>): {
-    close: () => void;
-};

package/2x/cjs/components/image-viewer/image-viewer.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MultiImageViewer = exports.ImageViewer = void 0;
-exports.showImageViewer = showImageViewer;
-exports.showMultiImageViewer = showMultiImageViewer;
+
+var _react = _interopRequireDefault(require("react"));
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
@@ -17,14 +17,6 @@ var _slide = require("./slide");
 
 var _slides = require("./slides");
 
-var _react = _interopRequireWildcard(require("react"));
-
-var _renderToBody = require("../../utils/render-to-body");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var classPrefix = "adm-image-viewer";
@@ -87,94 +79,4 @@ var MultiImageViewer = function MultiImageViewer(p) {
   return (0, _renderToContainer.renderToContainer)(props.getContainer, node);
 };
 
-exports.MultiImageViewer = MultiImageViewer;
-
-function showImageViewer(props) {
-  var Wrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_, ref) {
-    var _useState = (0, _react.useState)(false),
-        visible = _useState[0],
-        setVisible = _useState[1];
-
-    (0, _react.useEffect)(function () {
-      setVisible(true);
-    }, []);
-    (0, _react.useImperativeHandle)(ref, function () {
-      return {
-        close: function close() {
-          setVisible(false);
-        }
-      };
-    });
-    return /*#__PURE__*/_react["default"].createElement(ImageViewer, Object.assign({}, props, {
-      visible: visible,
-      onClose: function onClose() {
-        var _a;
-
-        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        setVisible(false);
-      },
-      afterClose: function afterClose() {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
-    }));
-  });
-  var ref = /*#__PURE__*/(0, _react.createRef)();
-  var unmount = (0, _renderToBody.renderToBody)( /*#__PURE__*/_react["default"].createElement(Wrapper, {
-    ref: ref
-  }));
-  return {
-    close: function close() {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
-}
-
-function showMultiImageViewer(props) {
-  var Wrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_, ref) {
-    var _useState2 = (0, _react.useState)(false),
-        visible = _useState2[0],
-        setVisible = _useState2[1];
-
-    (0, _react.useEffect)(function () {
-      setVisible(true);
-    }, []);
-    (0, _react.useImperativeHandle)(ref, function () {
-      return {
-        close: function close() {
-          setVisible(false);
-        }
-      };
-    });
-    return /*#__PURE__*/_react["default"].createElement(MultiImageViewer, Object.assign({}, props, {
-      visible: visible,
-      onClose: function onClose() {
-        var _a;
-
-        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        setVisible(false);
-      },
-      afterClose: function afterClose() {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
-    }));
-  });
-  var ref = /*#__PURE__*/(0, _react.createRef)();
-  var unmount = (0, _renderToBody.renderToBody)( /*#__PURE__*/_react["default"].createElement(Wrapper, {
-    ref: ref
-  }));
-  return {
-    close: function close() {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
-}
+exports.MultiImageViewer = MultiImageViewer;

package/2x/cjs/components/image-viewer/index.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="react" />
 import './image-viewer.less';
-import { showImageViewer, showMultiImageViewer } from './image-viewer';
+import { showMultiImageViewer, showImageViewer, clearImageViewer } from './methods';
 export type { ImageViewerProps, MultiImageViewerProps } from './image-viewer';
 declare const _default: import("react").FC<import("./image-viewer").ImageViewerProps> & {
     Multi: import("react").FC<import("./image-viewer").MultiImageViewerProps> & {
         show: typeof showMultiImageViewer;
     };
     show: typeof showImageViewer;
+    clear: typeof clearImageViewer;
 };
 export default _default;

package/2x/cjs/components/image-viewer/index.js

@@ -11,13 +11,16 @@ var _attachPropertiesToComponent = require("../../utils/attach-properties-to-com
 
 var _imageViewer2 = require("./image-viewer");
 
+var _methods = require("./methods");
+
 var Multi = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_imageViewer2.MultiImageViewer, {
-  show: _imageViewer2.showMultiImageViewer
+  show: _methods.showMultiImageViewer
 });
 
 var _default = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_imageViewer2.ImageViewer, {
   Multi: Multi,
-  show: _imageViewer2.showImageViewer
+  show: _methods.showImageViewer,
+  clear: _methods.clearImageViewer
 });
 
 exports["default"] = _default;

package/2x/cjs/components/image-viewer/methods.d.ts

@@ -1 +1,8 @@
-
+import { ImageViewerProps, MultiImageViewerProps } from './image-viewer';
+export declare function showImageViewer(props: Omit<ImageViewerProps, 'visible'>): {
+    close: () => void;
+};
+export declare function showMultiImageViewer(props: Omit<MultiImageViewerProps, 'visible'>): {
+    close: () => void;
+};
+export declare function clearImageViewer(): void;

package/2x/cjs/components/image-viewer/methods.js

@@ -1 +1,129 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clearImageViewer = clearImageViewer;
+exports.showImageViewer = showImageViewer;
+exports.showMultiImageViewer = showMultiImageViewer;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _renderToBody = require("../../utils/render-to-body");
+
+var _imageViewer = require("./image-viewer");
+
+var _ahooks = require("ahooks");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var handlerSet = new Set();
+
+function showImageViewer(props) {
+  clearImageViewer();
+  var Wrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_, ref) {
+    var _useState = (0, _react.useState)(false),
+        visible = _useState[0],
+        setVisible = _useState[1];
+
+    (0, _react.useEffect)(function () {
+      setVisible(true);
+    }, []);
+    var isUnmountedRef = (0, _ahooks.useUnmountedRef)();
+    (0, _react.useImperativeHandle)(ref, function () {
+      return {
+        close: function close() {
+          if (isUnmountedRef.current) return;
+          setVisible(false);
+        }
+      };
+    });
+    return /*#__PURE__*/_react["default"].createElement(_imageViewer.ImageViewer, Object.assign({}, props, {
+      visible: visible,
+      onClose: function onClose() {
+        var _a;
+
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        setVisible(false);
+      },
+      afterClose: function afterClose() {
+        var _a;
+
+        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        unmount();
+      }
+    }));
+  });
+  var ref = /*#__PURE__*/(0, _react.createRef)();
+  var unmount = (0, _renderToBody.renderToBody)( /*#__PURE__*/_react["default"].createElement(Wrapper, {
+    ref: ref
+  }));
+  var handler = {
+    close: function close() {
+      var _a;
+
+      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+    }
+  };
+  handlerSet.add(handler);
+  return handler;
+}
+
+function showMultiImageViewer(props) {
+  clearImageViewer();
+  var Wrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_, ref) {
+    var _useState2 = (0, _react.useState)(false),
+        visible = _useState2[0],
+        setVisible = _useState2[1];
+
+    (0, _react.useEffect)(function () {
+      setVisible(true);
+    }, []);
+    var isUnmountedRef = (0, _ahooks.useUnmountedRef)();
+    (0, _react.useImperativeHandle)(ref, function () {
+      return {
+        close: function close() {
+          if (isUnmountedRef.current) return;
+          setVisible(false);
+        }
+      };
+    });
+    return /*#__PURE__*/_react["default"].createElement(_imageViewer.MultiImageViewer, Object.assign({}, props, {
+      visible: visible,
+      onClose: function onClose() {
+        var _a;
+
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        setVisible(false);
+      },
+      afterClose: function afterClose() {
+        var _a;
+
+        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        unmount();
+      }
+    }));
+  });
+  var ref = /*#__PURE__*/(0, _react.createRef)();
+  var unmount = (0, _renderToBody.renderToBody)( /*#__PURE__*/_react["default"].createElement(Wrapper, {
+    ref: ref
+  }));
+  var handler = {
+    close: function close() {
+      var _a;
+
+      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+    }
+  };
+  handlerSet.add(handler);
+  return handler;
+}
+
+function clearImageViewer() {
+  handlerSet.forEach(function (handler) {
+    handler.close();
+  });
+  handlerSet.clear();
+}

package/2x/cjs/components/list/list.css

@@ -5,15 +5,12 @@
   --border-inner: solid 2px var(--adm-border-color);
   --border-top: solid 2px var(--adm-border-color);
   --border-bottom: solid 2px var(--adm-border-color);
+  --padding-left: 24px;
   background-color: #ffffff;
   overflow: hidden;
   font-size: 34px;
 }
 
-.adm-list-inner {
-  margin-bottom: -2px;
-}
-
 .adm-list-default {
   border-top: var(--border-top);
   border-bottom: var(--border-bottom);
@@ -25,8 +22,13 @@
 }
 
 .adm-list-item {
+  margin-bottom: -2px;
   display: block;
-  padding-left: 24px;
+  padding-left: var(--padding-left);
+}
+
+.adm-list-item:not(:first-child) {
+  padding-top: 2px;
 }
 
 .adm-list-item-title,

package/2x/cjs/components/list/list.d.ts

@@ -2,5 +2,5 @@ import { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ListProps = {
     mode?: 'default' | 'card';
-} & NativeProps<'--prefix-width' | '--align-items' | '--active-background-color' | '--border-inner' | '--border-top' | '--border-bottom'>;
+} & NativeProps<'--prefix-width' | '--align-items' | '--active-background-color' | '--border-inner' | '--border-top' | '--border-bottom' | '--padding-left'>;
 export declare const List: FC<ListProps>;

package/2x/cjs/components/list/list.js

@@ -24,9 +24,7 @@ var List = function List(p) {
   var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   return (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(classPrefix, classPrefix + "-" + props.mode)
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-inner"
-  }, props.children)));
+  }, props.children));
 };
 
 exports.List = List;

package/2x/cjs/components/mask/mask.js

@@ -9,6 +9,8 @@ var _nativeProps = require("../../utils/native-props");
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _ahooks = require("ahooks");
+
 var _useLockScroll = require("../../utils/use-lock-scroll");
 
 var _web = require("@react-spring/web");
@@ -64,6 +66,8 @@ var Mask = function Mask(p) {
       active = _useState[0],
       setActive = _useState[1];
 
+  var unmountedRef = (0, _ahooks.useUnmountedRef)();
+
   var _useSpring = (0, _web.useSpring)({
     opacity: props.visible ? 1 : 0,
     config: {
@@ -79,6 +83,7 @@ var Mask = function Mask(p) {
     onRest: function onRest() {
       var _a, _b;
 
+      if (unmountedRef.current) return;
       setActive(props.visible);
 
       if (props.visible) {

package/2x/cjs/components/modal/alert.d.ts

@@ -0,0 +1,7 @@
+import { ModalProps } from './index';
+import { ReactNode } from 'react';
+export declare type ModalAlertProps = Omit<ModalProps, 'visible' | 'closeOnAction' | 'actions'> & {
+    confirmText?: ReactNode;
+    onConfirm?: () => void | Promise<void>;
+};
+export declare function alert(p: ModalAlertProps): Promise<void>;

package/2x/cjs/components/modal/alert.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.alert = alert;
+
+var _show = require("./show");
+
+var _withDefaultProps = require("../../utils/with-default-props");
+
+var _configProvider = require("../config-provider");
+
+function alert(p) {
+  var defaultProps = {
+    confirmText: (0, _configProvider.getDefaultConfig)().locale.Modal.ok
+  };
+  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  return new Promise(function (resolve) {
+    (0, _show.show)(Object.assign(Object.assign({}, props), {
+      closeOnAction: true,
+      actions: [{
+        key: 'confirm',
+        text: props.confirmText,
+        primary: true
+      }],
+      onAction: props.onConfirm,
+      onClose: function onClose() {
+        resolve();
+      }
+    }));
+  });
+}

package/2x/cjs/components/modal/confirm.d.ts

@@ -0,0 +1,9 @@
+import { ModalProps } from './index';
+import { ReactNode } from 'react';
+export declare type ModalConfirmProps = Omit<ModalProps, 'visible' | 'closeOnAction' | 'actions'> & {
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
+    onConfirm?: () => void | Promise<void>;
+    onCancel?: () => void | Promise<void>;
+};
+export declare function confirm(p: ModalConfirmProps): Promise<boolean>;