antd-mobile 5.0.0-rc.9 → 5.0.0

package/cjs/components/loading/index.d.ts

@@ -1,4 +1,5 @@
-import './loading.less';
-import { Loading } from './loading';
-export type { LoadingProps } from './loading';
-export default Loading;
+import '../dot-loading/dot-loading.less';
+import { DotLoading } from '../dot-loading/dot-loading';
+import type { DotLoadingProps } from '../dot-loading';
+export declare type LoadingProps = DotLoadingProps;
+export default DotLoading;

package/cjs/components/loading/index.js

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
-require("./loading.css");
+require("../dot-loading/dot-loading.css");
 
-var _loading2 = require("./loading");
+var _dotLoading2 = require("../dot-loading/dot-loading");
 
-var _default = _loading2.Loading;
-exports["default"] = _default;
+// Deprecated
+var _default = _dotLoading2.DotLoading;
+exports.default = _default;

package/cjs/components/mask/index.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 require("./mask.css");
 
 var _mask2 = require("./mask");
 
 var _default = _mask2.Mask;
-exports["default"] = _default;
+exports.default = _default;

package/cjs/components/mask/mask.js

@@ -25,17 +25,17 @@ var _useShouldRender = require("../../utils/use-should-render");
 
 var _withStopPropagation = require("../../utils/with-stop-propagation");
 
-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 _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); }
 
-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 _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 classPrefix = "adm-mask";
-var opacityRecord = {
-  "default": 0.55,
+const classPrefix = `adm-mask`;
+const opacityRecord = {
+  default: 0.55,
   thin: 0.35,
   thick: 0.75
 };
-var defaultProps = {
+const defaultProps = {
   visible: true,
   destroyOnClose: false,
   forceRender: false,
@@ -46,29 +46,25 @@ var defaultProps = {
   stopPropagation: ['click']
 };
 
-var Mask = function Mask(p) {
-  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-
-  var _useConfig = (0, _configProvider.useConfig)(),
-      locale = _useConfig.locale;
-
-  var ref = (0, _react.useRef)(null);
+const Mask = p => {
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
+  const ref = (0, _react.useRef)(null);
   (0, _useLockScroll.useLockScroll)(ref, props.visible && props.disableBodyScroll);
-  var background = (0, _react.useMemo)(function () {
+  const background = (0, _react.useMemo)(() => {
     var _a;
 
-    var opacity = (_a = opacityRecord[props.opacity]) !== null && _a !== void 0 ? _a : props.opacity;
-    var rgb = props.color === 'white' ? '255, 255, 255' : '0, 0, 0';
-    return "rgba(" + rgb + ", " + opacity + ")";
+    const opacity = (_a = opacityRecord[props.opacity]) !== null && _a !== void 0 ? _a : props.opacity;
+    const rgb = props.color === 'white' ? '255, 255, 255' : '0, 0, 0';
+    return `rgba(${rgb}, ${opacity})`;
   }, [props.color, props.opacity]);
-
-  var _useState = (0, _react.useState)(props.visible),
-      active = _useState[0],
-      setActive = _useState[1];
-
-  var unmountedRef = (0, _ahooks.useUnmountedRef)();
-
-  var _useSpring = (0, _web.useSpring)({
+  const [active, setActive] = (0, _react.useState)(props.visible);
+  const unmountedRef = (0, _ahooks.useUnmountedRef)();
+  const {
+    opacity
+  } = (0, _web.useSpring)({
     opacity: props.visible ? 1 : 0,
     config: {
       precision: 0.01,
@@ -77,10 +73,10 @@ var Mask = function Mask(p) {
       friction: 30,
       clamp: true
     },
-    onStart: function onStart() {
+    onStart: () => {
       setActive(true);
     },
-    onRest: function onRest() {
+    onRest: () => {
       var _a, _b;
 
       if (unmountedRef.current) return;
@@ -92,26 +88,24 @@ var Mask = function Mask(p) {
         (_b = props.afterClose) === null || _b === void 0 ? void 0 : _b.call(props);
       }
     }
-  }),
-      opacity = _useSpring.opacity;
-
-  var shouldRender = (0, _useShouldRender.useShouldRender)(active, props.forceRender, props.destroyOnClose);
-  var node = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement(_web.animated.div, {
+  });
+  const shouldRender = (0, _useShouldRender.useShouldRender)(active, props.forceRender, props.destroyOnClose);
+  const node = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, (0, _nativeProps.withNativeProps)(props, _react.default.createElement(_web.animated.div, {
     className: classPrefix,
     ref: ref,
     style: Object.assign(Object.assign({
-      background: background,
-      opacity: opacity
+      background,
+      opacity
     }, props.style), {
       display: active ? 'unset' : 'none'
     })
-  }, props.onMaskClick && /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-aria-button",
+  }, props.onMaskClick && _react.default.createElement("div", {
+    className: `${classPrefix}-aria-button`,
     role: 'button',
     "aria-label": locale.Mask.name,
     onClick: props.onMaskClick
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-content"
+  }), _react.default.createElement("div", {
+    className: `${classPrefix}-content`
   }, shouldRender && props.children))));
   return (0, _renderToContainer.renderToContainer)(props.getContainer, node);
 };

package/cjs/components/modal/alert.js

@@ -12,11 +12,11 @@ var _withDefaultProps = require("../../utils/with-default-props");
 var _configProvider = require("../config-provider");
 
 function alert(p) {
-  var defaultProps = {
+  const defaultProps = {
     confirmText: (0, _configProvider.getDefaultConfig)().locale.Modal.ok
   };
-  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  return new Promise(function (resolve) {
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  return new Promise(resolve => {
     (0, _show.show)(Object.assign(Object.assign({}, props), {
       closeOnAction: true,
       actions: [{
@@ -25,7 +25,10 @@ function alert(p) {
         primary: true
       }],
       onAction: props.onConfirm,
-      onClose: function onClose() {
+      onClose: () => {
+        var _a;
+
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
         resolve();
       }
     }));

package/cjs/components/modal/confirm.js

@@ -5,55 +5,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.confirm = confirm;
 
+var _tslib = require("tslib");
+
 var _show = require("./show");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
-var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
-var defaultProps = {
+const defaultProps = {
   confirmText: '确认',
   cancelText: '取消'
 };
 
 function confirm(p) {
-  var _this = this;
-
-  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  return new Promise(function (resolve) {
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  return new Promise(resolve => {
     (0, _show.show)(Object.assign(Object.assign({}, props), {
       closeOnAction: true,
-      onClose: function onClose() {
+      onClose: () => {
         var _a;
 
         (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
@@ -63,53 +31,21 @@ function confirm(p) {
         key: 'confirm',
         text: props.confirmText,
         primary: true,
-        onClick: function onClick() {
-          return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-            var _a;
-
-            return regeneratorRuntime.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    _context.next = 2;
-                    return (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props);
+        onClick: () => (0, _tslib.__awaiter)(this, void 0, void 0, function* () {
+          var _a;
 
-                  case 2:
-                    resolve(true);
-
-                  case 3:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }));
-        }
+          yield (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props);
+          resolve(true);
+        })
       }, {
         key: 'cancel',
         text: props.cancelText,
-        onClick: function onClick() {
-          return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-            var _b;
-
-            return regeneratorRuntime.wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    _context2.next = 2;
-                    return (_b = props.onCancel) === null || _b === void 0 ? void 0 : _b.call(props);
-
-                  case 2:
-                    resolve(false);
+        onClick: () => (0, _tslib.__awaiter)(this, void 0, void 0, function* () {
+          var _b;
 
-                  case 3:
-                  case "end":
-                    return _context2.stop();
-                }
-              }
-            }, _callee2);
-          }));
-        }
+          yield (_b = props.onCancel) === null || _b === void 0 ? void 0 : _b.call(props);
+          resolve(false);
+        })
       }]
     }));
   });

package/cjs/components/modal/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 require("./modal.css");
 
@@ -23,4 +23,4 @@ var _default = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_mo
   confirm: _confirm.confirm
 });
 
-exports["default"] = _default;
+exports.default = _default;

package/cjs/components/modal/modal-action-button.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ModalActionButton = void 0;
 
+var _tslib = require("tslib");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -13,88 +15,37 @@ var _button = _interopRequireDefault(require("../button"));
 
 var _nativeProps = require("../../utils/native-props");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+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 _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+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); }
 
-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 _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 __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
+const ModalActionButton = props => {
+  const {
+    action
+  } = props;
+  const [loading, setLoading] = (0, _react.useState)(false);
 
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
+  function handleClick() {
+    return (0, _tslib.__awaiter)(this, void 0, void 0, function* () {
+      setLoading(true);
 
-    function rejected(value) {
       try {
-        step(generator["throw"](value));
+        const promise = props.onAction();
+        yield promise;
+        setLoading(false);
       } catch (e) {
-        reject(e);
+        setLoading(false);
+        throw e;
       }
-    }
-
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-
-var ModalActionButton = function ModalActionButton(props) {
-  var action = props.action;
-
-  var _useState = (0, _react.useState)(false),
-      loading = _useState[0],
-      setLoading = _useState[1];
-
-  function handleClick() {
-    return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var promise;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              setLoading(true);
-              _context.prev = 1;
-              promise = props.onAction();
-              _context.next = 5;
-              return promise;
-
-            case 5:
-              setLoading(false);
-              _context.next = 12;
-              break;
-
-            case 8:
-              _context.prev = 8;
-              _context.t0 = _context["catch"](1);
-              setLoading(false);
-              throw _context.t0;
-
-            case 12:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee, null, [[1, 8]]);
-    }));
+    });
   }
 
-  return (0, _nativeProps.withNativeProps)(props.action, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+  return (0, _nativeProps.withNativeProps)(props.action, _react.default.createElement(_button.default, {
     key: action.key,
     onClick: handleClick,
-    className: (0, _classnames["default"])('adm-modal-button', {
+    className: (0, _classnames.default)('adm-modal-button', {
       'adm-modal-button-primary': props.action.primary
     }),
     fill: props.action.primary ? 'solid' : 'none',

package/cjs/components/modal/modal.css

@@ -18,20 +18,29 @@
 }
 .adm-modal-main {
   width: 100%;
+  max-height: 70vh;
+  box-sizing: border-box;
   font-size: 14px;
   background-color: white;
   border-radius: 8px;
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+}
+.adm-modal-main > * {
+  flex: none;
+}
+.adm-modal-main > .adm-modal-image-container {
+  flex: auto;
 }
 .adm-modal-main .adm-modal-body {
   padding: 20px 12px 12px;
+  display: flex;
+  flex-direction: column;
 }
-.adm-modal-main .adm-modal-body .adm-modal-close {
-  position: absolute;
-  right: 12px;
-  top: 12px;
-  color: var(--adm-color-weak);
-  padding: 2px;
+.adm-modal-main .adm-modal-body > * + * {
+  margin-top: 8px;
 }
 .adm-modal-main .adm-modal-body-header-wrapper {
   display: flex;
@@ -44,32 +53,39 @@
   text-align: center;
 }
 .adm-modal-main .adm-modal-body-content {
-  max-height: 70vh;
-  overflow-x: hidden;
-  overflow-y: auto;
   font-size: 15px;
   line-height: 1.4;
   color: #333;
 }
-.adm-modal-main .adm-modal-footer {
+.adm-modal-main .adm-modal-close {
+  position: absolute;
+  right: 8px;
+  top: 8px;
+  color: var(--adm-color-weak);
+  padding: 4px;
+  font-size: 18px;
+}
+.adm-modal-footer {
   user-select: none;
   padding: 8px 12px 12px;
 }
-.adm-modal-main .adm-modal-footer .adm-modal-button {
+.adm-modal-footer.adm-space {
+  --gap-vertical: 20px;
+}
+.adm-modal-footer .adm-modal-button {
   font-size: 18px;
   line-height: 25px;
-  border-right: solid 0.5px var(--adm-border-color);
-}
-.adm-modal-main .adm-modal-footer .adm-modal-button:last-child {
-  border-right: none;
 }
-.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary) {
+.adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary) {
   padding-top: 0;
   padding-bottom: 0;
 }
-.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary)::before {
+.adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary)::before {
   display: none;
 }
-.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
+.adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
   opacity: 0.7;
 }
+.adm-modal-image-container {
+  overflow-y: auto;
+}