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

package/2x/es/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/es/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/es/components/list/list.js

@@ -10,7 +10,5 @@ export var List = function List(p) {
   var props = mergeProps(defaultProps, p);
   return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
     className: classNames(classPrefix, classPrefix + "-" + props.mode)
-  }, /*#__PURE__*/React.createElement("div", {
-    className: classPrefix + "-inner"
-  }, props.children)));
+  }, props.children));
 };

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

@@ -1,5 +1,6 @@
 import { withNativeProps } from '../../utils/native-props';
 import React, { useMemo, useRef, useState } from 'react';
+import { useUnmountedRef } from 'ahooks';
 import { useLockScroll } from '../../utils/use-lock-scroll';
 import { useSpring, animated } from '@react-spring/web';
 import { renderToContainer } from '../../utils/render-to-container';
@@ -43,6 +44,8 @@ export var Mask = function Mask(p) {
       active = _useState[0],
       setActive = _useState[1];
 
+  var unmountedRef = useUnmountedRef();
+
   var _useSpring = useSpring({
     opacity: props.visible ? 1 : 0,
     config: {
@@ -58,6 +61,7 @@ export var Mask = function Mask(p) {
     onRest: function onRest() {
       var _a, _b;
 
+      if (unmountedRef.current) return;
       setActive(props.visible);
 
       if (props.visible) {

package/2x/es/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/es/components/modal/alert.js

@@ -0,0 +1,23 @@
+import { show } from './show';
+import { mergeProps } from '../../utils/with-default-props';
+import { getDefaultConfig } from '../config-provider';
+export function alert(p) {
+  var defaultProps = {
+    confirmText: getDefaultConfig().locale.Modal.ok
+  };
+  var props = mergeProps(defaultProps, p);
+  return new Promise(function (resolve) {
+    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/es/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>;

package/2x/es/components/modal/confirm.js

@@ -0,0 +1,106 @@
+var __awaiter = this && this.__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());
+  });
+};
+
+import { show } from './show';
+import { mergeProps } from '../../utils/with-default-props';
+var defaultProps = {
+  confirmText: '确认',
+  cancelText: '取消'
+};
+export function confirm(p) {
+  var _this = this;
+
+  var props = mergeProps(defaultProps, p);
+  return new Promise(function (resolve) {
+    show(Object.assign(Object.assign({}, props), {
+      closeOnAction: true,
+      onClose: function onClose() {
+        var _a;
+
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        resolve(false);
+      },
+      actions: [{
+        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);
+
+                  case 2:
+                    resolve(true);
+
+                  case 3:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }));
+        }
+      }, {
+        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);
+
+                  case 3:
+                  case "end":
+                    return _context2.stop();
+                }
+              }
+            }, _callee2);
+          }));
+        }
+      }]
+    }));
+  });
+}

package/2x/es/components/modal/index.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import './modal.less';
+import { show } from './show';
+import { alert } from './alert';
+import { confirm } from './confirm';
+export type { ModalProps } from './modal';
+export type { Action } from './modal-action-button';
+export type { ModalShowProps, ModalShowRef } from './show';
+export type { ModalAlertProps } from './alert';
+export type { ModalConfirmProps } from './confirm';
+declare const _default: import("react").FC<import("./modal").ModalProps> & {
+    show: typeof show;
+    alert: typeof alert;
+    confirm: typeof confirm;
+};
+export default _default;

package/2x/es/components/modal/index.js

@@ -0,0 +1,11 @@
+import "./modal.css";
+import { show } from './show';
+import { alert } from './alert';
+import { confirm } from './confirm';
+import { attachPropertiesToComponent } from '../../utils/attach-properties-to-component';
+import { Modal } from './modal';
+export default attachPropertiesToComponent(Modal, {
+  show: show,
+  alert: alert,
+  confirm: confirm
+});

package/2x/es/components/modal/modal-action-button.d.ts

@@ -0,0 +1,14 @@
+import { FC } from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare type Action = {
+    key: string | number;
+    text: string;
+    disabled?: boolean;
+    danger?: boolean;
+    primary?: boolean;
+    onClick?: () => void | Promise<void>;
+} & NativeProps;
+export declare const ModalActionButton: FC<{
+    action: Action;
+    onAction: () => void | Promise<void>;
+}>;

package/2x/es/components/modal/modal-action-button.js

@@ -0,0 +1,90 @@
+var __awaiter = this && this.__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());
+  });
+};
+
+import React, { useState } from 'react';
+import classNames from 'classnames';
+import Button from '../button';
+import { withNativeProps } from '../../utils/native-props';
+export var ModalActionButton = function ModalActionButton(props) {
+  var action = props.action;
+
+  var _useState = 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 withNativeProps(props.action, /*#__PURE__*/React.createElement(Button, {
+    key: action.key,
+    onClick: handleClick,
+    className: classNames('adm-modal-button', {
+      'adm-modal-button-primary': props.action.primary
+    }),
+    fill: props.action.primary ? 'solid' : 'none',
+    size: props.action.primary ? 'large' : 'middle',
+    block: true,
+    color: action.danger ? 'danger' : 'primary',
+    loading: loading,
+    disabled: action.disabled
+  }, action.text));
+};

package/2x/es/components/modal/modal.css

@@ -0,0 +1,89 @@
+.adm-modal {
+  --z-index: var(--adm-modal-z-index, 1000);
+  position: fixed;
+  z-index: var(--z-index);
+}
+
+.adm-modal .adm-modal-mask {
+  z-index: 0;
+}
+
+.adm-modal-wrap {
+  position: fixed;
+  z-index: 1;
+  top: 50%;
+  left: 50%;
+  width: auto;
+  min-width: 560px;
+  max-width: 75vw;
+  transform: translate(-50%, -50%);
+}
+
+.adm-modal-main {
+  width: 100%;
+  font-size: 28px;
+  background-color: white;
+  border-radius: 16px;
+  overflow: hidden;
+}
+
+.adm-modal-main .adm-modal-body {
+  padding: 40px 24px 24px;
+}
+
+.adm-modal-main .adm-modal-body .adm-modal-close {
+  position: absolute;
+  right: 24px;
+  top: 24px;
+  color: var(--adm-color-weak);
+  padding: 4px;
+}
+
+.adm-modal-main .adm-modal-body-header-wrapper {
+  display: flex;
+  justify-content: center;
+}
+
+.adm-modal-main .adm-modal-body-title {
+  font-weight: bold;
+  font-size: 36px;
+  line-height: 50px;
+  text-align: center;
+}
+
+.adm-modal-main .adm-modal-body-content {
+  max-height: 70vh;
+  overflow-x: hidden;
+  overflow-y: auto;
+  font-size: 30px;
+  line-height: 1.4;
+  color: #333;
+}
+
+.adm-modal-main .adm-modal-footer {
+  user-select: none;
+  padding: 16px 24px 24px;
+}
+
+.adm-modal-main .adm-modal-footer .adm-modal-button {
+  font-size: 36px;
+  line-height: 50px;
+  border-right: solid 1px 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) {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.adm-modal-main .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 {
+  opacity: 0.7;
+}

package/2x/es/components/modal/modal.d.ts

@@ -0,0 +1,26 @@
+import React, { FC, ReactNode } from 'react';
+import { Action } from './modal-action-button';
+import { GetContainer } from '../../utils/render-to-container';
+import { PropagationEvent } from '../../utils/with-stop-propagation';
+import { NativeProps } from '../../utils/native-props';
+export declare type ModalProps = {
+    afterClose?: () => void;
+    image?: string;
+    header?: ReactNode;
+    title?: ReactNode;
+    content?: ReactNode;
+    actions?: Action[];
+    onAction?: (action: Action, index: number) => void | Promise<void>;
+    closeOnAction?: boolean;
+    onClose?: () => void;
+    closeOnMaskClick?: boolean;
+    visible?: boolean;
+    getContainer?: GetContainer;
+    bodyStyle?: React.CSSProperties;
+    bodyClassName?: string;
+    maskStyle?: React.CSSProperties;
+    maskClassName?: string;
+    stopPropagation?: PropagationEvent[];
+    showCloseButton?: boolean;
+} & NativeProps;
+export declare const Modal: FC<ModalProps>;

package/2x/es/components/modal/modal.js

@@ -0,0 +1,164 @@
+var __awaiter = this && this.__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());
+  });
+};
+
+import React, { useState } from 'react';
+import { mergeProps } from '../../utils/with-default-props';
+import classNames from 'classnames';
+import { useUnmountedRef } from 'ahooks';
+import Mask from '../mask';
+import { ModalActionButton } from './modal-action-button';
+import Image from '../image';
+import Space from '../space';
+import { withStopPropagation } from '../../utils/with-stop-propagation';
+import AutoCenter from '../auto-center';
+import { useSpring, animated } from '@react-spring/web';
+import { withNativeProps } from '../../utils/native-props';
+import { CloseOutline } from 'antd-mobile-icons';
+var classPrefix = "adm-modal";
+var defaultProps = {
+  visible: false,
+  actions: [],
+  closeOnAction: false,
+  closeOnMaskClick: false,
+  stopPropagation: ['click'],
+  showCloseButton: false
+};
+export var Modal = function Modal(p) {
+  var props = mergeProps(defaultProps, p);
+  var unmountedRef = useUnmountedRef();
+  var style = useSpring({
+    scale: props.visible ? 1 : 0.8,
+    opacity: props.visible ? 1 : 0,
+    config: {
+      mass: 1,
+      tension: 200,
+      friction: 30,
+      clamp: true
+    },
+    onStart: function onStart() {
+      setActive(true);
+    },
+    onRest: function onRest() {
+      var _a;
+
+      if (unmountedRef.current) return;
+      setActive(props.visible);
+
+      if (!props.visible) {
+        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      }
+    }
+  });
+
+  var _useState = useState(props.visible),
+      active = _useState[0],
+      setActive = _useState[1];
+
+  return withStopPropagation(props.stopPropagation, withNativeProps(props, /*#__PURE__*/React.createElement("div", {
+    className: classPrefix,
+    style: {
+      display: active ? 'unset' : 'none'
+    }
+  }, /*#__PURE__*/React.createElement(Mask, {
+    visible: props.visible,
+    getContainer: props.getContainer,
+    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
+    style: props.maskStyle,
+    className: classNames(classPrefix + "-mask", props.maskClassName)
+  }), /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-wrap",
+    style: {
+      pointerEvents: props.visible ? 'unset' : 'none'
+    }
+  }, /*#__PURE__*/React.createElement(animated.div, {
+    style: Object.assign({}, style),
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    },
+    className: classPrefix + "-main"
+  }, !!props.image && /*#__PURE__*/React.createElement(Image, {
+    src: props.image,
+    alt: 'modal header image',
+    width: '100%'
+  }), /*#__PURE__*/React.createElement("div", {
+    style: props.bodyStyle,
+    className: classNames(classPrefix + "-body", props.bodyClassName)
+  }, props.showCloseButton && /*#__PURE__*/React.createElement("a", {
+    className: classNames(classPrefix + "-close", 'adm-plain-anchor'),
+    onClick: props.onClose
+  }, /*#__PURE__*/React.createElement(CloseOutline, null)), /*#__PURE__*/React.createElement(Space, {
+    direction: 'vertical',
+    block: true
+  }, !!props.header && /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-body-header-wrapper"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-body-header"
+  }, props.header)), !!props.title && /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-body-title"
+  }, props.title), !!props.content && /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-body-content"
+  }, typeof props.content === 'string' ? /*#__PURE__*/React.createElement(AutoCenter, null, props.content) : props.content))), /*#__PURE__*/React.createElement("div", {
+    className: classPrefix + "-footer"
+  }, /*#__PURE__*/React.createElement(Space, {
+    direction: 'vertical',
+    block: true
+  }, props.actions.map(function (action, index) {
+    return /*#__PURE__*/React.createElement(ModalActionButton, {
+      key: action.key,
+      action: action,
+      onAction: function onAction() {
+        return __awaiter(void 0, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var _a, _b, _c;
+
+          return regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 2;
+                  return Promise.all([(_a = action.onClick) === null || _a === void 0 ? void 0 : _a.call(action), (_b = props.onAction) === null || _b === void 0 ? void 0 : _b.call(props, action, index)]);
+
+                case 2:
+                  if (props.closeOnAction) {
+                    (_c = props.onClose) === null || _c === void 0 ? void 0 : _c.call(props);
+                  }
+
+                case 3:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+      }
+    });
+  }))))))));
+};

package/2x/es/components/modal/show.d.ts

@@ -0,0 +1,8 @@
+import { ModalProps } from './modal';
+export declare type ModalShowProps = Omit<ModalProps, 'visible'>;
+export declare type ModalShowRef = {
+    close: () => void;
+};
+export declare function show(props: ModalShowProps): {
+    close: () => void;
+};