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

package/es/components/image-viewer/image-viewer.js

@@ -1,10 +1,9 @@
+import React from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import { renderToContainer } from '../../utils/render-to-container';
 import Mask from '../mask';
 import { Slide } from './slide';
 import { Slides } from './slides';
-import React, { createRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
-import { renderToBody } from '../../utils/render-to-body';
 var classPrefix = "adm-image-viewer";
 var defaultProps = {
   maxZoom: 3,
@@ -55,92 +54,4 @@ export var MultiImageViewer = function MultiImageViewer(p) {
     maxZoom: props.maxZoom
   })));
   return renderToContainer(props.getContainer, node);
-};
-export function showImageViewer(props) {
-  var Wrapper = /*#__PURE__*/forwardRef(function (_, ref) {
-    var _useState = useState(false),
-        visible = _useState[0],
-        setVisible = _useState[1];
-
-    useEffect(function () {
-      setVisible(true);
-    }, []);
-    useImperativeHandle(ref, function () {
-      return {
-        close: function close() {
-          setVisible(false);
-        }
-      };
-    });
-    return /*#__PURE__*/React.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__*/createRef();
-  var unmount = renderToBody( /*#__PURE__*/React.createElement(Wrapper, {
-    ref: ref
-  }));
-  return {
-    close: function close() {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
-}
-export function showMultiImageViewer(props) {
-  var Wrapper = /*#__PURE__*/forwardRef(function (_, ref) {
-    var _useState2 = useState(false),
-        visible = _useState2[0],
-        setVisible = _useState2[1];
-
-    useEffect(function () {
-      setVisible(true);
-    }, []);
-    useImperativeHandle(ref, function () {
-      return {
-        close: function close() {
-          setVisible(false);
-        }
-      };
-    });
-    return /*#__PURE__*/React.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__*/createRef();
-  var unmount = renderToBody( /*#__PURE__*/React.createElement(Wrapper, {
-    ref: ref
-  }));
-  return {
-    close: function close() {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
-}
+};

package/es/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/es/components/image-viewer/index.js

@@ -1,10 +1,12 @@
 import "./image-viewer.css";
 import { attachPropertiesToComponent } from '../../utils/attach-properties-to-component';
-import { ImageViewer, MultiImageViewer, showImageViewer, showMultiImageViewer } from './image-viewer';
+import { ImageViewer, MultiImageViewer } from './image-viewer';
+import { showMultiImageViewer, showImageViewer, clearImageViewer } from './methods';
 var Multi = attachPropertiesToComponent(MultiImageViewer, {
   show: showMultiImageViewer
 });
 export default attachPropertiesToComponent(ImageViewer, {
   Multi: Multi,
-  show: showImageViewer
+  show: showImageViewer,
+  clear: clearImageViewer
 });

package/es/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/es/components/image-viewer/methods.js

@@ -0,0 +1,109 @@
+import React, { createRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import { renderToBody } from '../../utils/render-to-body';
+import { ImageViewer, MultiImageViewer } from './image-viewer';
+import { useUnmountedRef } from 'ahooks';
+var handlerSet = new Set();
+export function showImageViewer(props) {
+  clearImageViewer();
+  var Wrapper = /*#__PURE__*/forwardRef(function (_, ref) {
+    var _useState = useState(false),
+        visible = _useState[0],
+        setVisible = _useState[1];
+
+    useEffect(function () {
+      setVisible(true);
+    }, []);
+    var isUnmountedRef = useUnmountedRef();
+    useImperativeHandle(ref, function () {
+      return {
+        close: function close() {
+          if (isUnmountedRef.current) return;
+          setVisible(false);
+        }
+      };
+    });
+    return /*#__PURE__*/React.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__*/createRef();
+  var unmount = renderToBody( /*#__PURE__*/React.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;
+}
+export function showMultiImageViewer(props) {
+  clearImageViewer();
+  var Wrapper = /*#__PURE__*/forwardRef(function (_, ref) {
+    var _useState2 = useState(false),
+        visible = _useState2[0],
+        setVisible = _useState2[1];
+
+    useEffect(function () {
+      setVisible(true);
+    }, []);
+    var isUnmountedRef = useUnmountedRef();
+    useImperativeHandle(ref, function () {
+      return {
+        close: function close() {
+          if (isUnmountedRef.current) return;
+          setVisible(false);
+        }
+      };
+    });
+    return /*#__PURE__*/React.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__*/createRef();
+  var unmount = renderToBody( /*#__PURE__*/React.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;
+}
+export function clearImageViewer() {
+  handlerSet.forEach(function (handler) {
+    handler.close();
+  });
+  handlerSet.clear();
+}

package/es/components/list/list.css

@@ -5,13 +5,11 @@
   --border-inner: solid 1px var(--adm-border-color);
   --border-top: solid 1px var(--adm-border-color);
   --border-bottom: solid 1px var(--adm-border-color);
+  --padding-left: 12px;
   background-color: #ffffff;
   overflow: hidden;
   font-size: 17px;
 }
-.adm-list-inner {
-  margin-bottom: -1px;
-}
 .adm-list-default {
   border-top: var(--border-top);
   border-bottom: var(--border-bottom);
@@ -21,8 +19,12 @@
   border-radius: 8px;
 }
 .adm-list-item {
+  margin-bottom: -1px;
   display: block;
-  padding-left: 12px;
+  padding-left: var(--padding-left);
+}
+.adm-list-item:not(:first-child) {
+  padding-top: 1px;
 }
 .adm-list-item-title,
 .adm-list-item-description {

package/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/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/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/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/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/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/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/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/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/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/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/es/components/modal/modal.css

@@ -0,0 +1,75 @@
+.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: 280px;
+  max-width: 75vw;
+  transform: translate(-50%, -50%);
+}
+.adm-modal-main {
+  width: 100%;
+  font-size: 14px;
+  background-color: white;
+  border-radius: 8px;
+  overflow: hidden;
+}
+.adm-modal-main .adm-modal-body {
+  padding: 20px 12px 12px;
+}
+.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-header-wrapper {
+  display: flex;
+  justify-content: center;
+}
+.adm-modal-main .adm-modal-body-title {
+  font-weight: bold;
+  font-size: 18px;
+  line-height: 25px;
+  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 {
+  user-select: none;
+  padding: 8px 12px 12px;
+}
+.adm-modal-main .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) {
+  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;
+}