antd-mobile 5.13.0 → 5.14.1

package/2x/cjs/components/infinite-scroll/infinite-scroll.js

@@ -32,21 +32,26 @@ function isWindow(element) {
 }
 
 const classPrefix = `adm-infinite-scroll`;
-
-const InfiniteScrollContent = ({
-  hasMore
-}) => {
-  const {
-    locale
-  } = (0, _configProvider.useConfig)();
-  return _react.default.createElement(_react.default.Fragment, null, hasMore ? _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("span", null, locale.common.loading), _react.default.createElement(_dotLoading.default, null)) : _react.default.createElement("span", null, locale.InfiniteScroll.noMore));
+const defaultProps = {
+  threshold: 250,
+  children: (hasMore, failed, retry) => _react.default.createElement(InfiniteScrollContent, {
+    hasMore: hasMore,
+    failed: failed,
+    retry: retry
+  })
 };
 
 const InfiniteScroll = p => {
-  const props = (0, _withDefaultProps.mergeProps)({
-    threshold: 250
-  }, p);
-  const doLoadMore = (0, _ahooks.useLockFn)(() => props.loadMore());
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const [failed, setFailed] = (0, _react.useState)(false);
+  const doLoadMore = (0, _ahooks.useLockFn)(isRetry => (0, _tslib.__awaiter)(void 0, void 0, void 0, function* () {
+    try {
+      yield props.loadMore(isRetry);
+    } catch (e) {
+      setFailed(true);
+      throw e;
+    }
+  }));
   const elementRef = (0, _react.useRef)(null); // Prevent duplicated trigger of `check` function
 
   const [flag, setFlag] = (0, _react.useState)({});
@@ -68,7 +73,7 @@ const InfiniteScroll = p => {
     if (current >= elementTop - props.threshold) {
       const nextFlag = {};
       nextFlagRef.current = nextFlag;
-      yield doLoadMore();
+      yield doLoadMore(false);
       setFlag(nextFlag);
     }
   })); // 确保在内容不足时会自动触发加载事件
@@ -90,12 +95,38 @@ const InfiniteScroll = p => {
       scrollParent.removeEventListener('scroll', onScroll);
     };
   }, [scrollParent]);
+
+  function retry() {
+    setFailed(false);
+    doLoadMore(true);
+  }
+
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: classPrefix,
     ref: elementRef
-  }, props.children && props.children, !props.children && _react.default.createElement(InfiniteScrollContent, {
-    hasMore: props.hasMore
-  })));
+  }, typeof props.children === 'function' ? props.children(props.hasMore, failed, retry) : props.children));
 };
 
-exports.InfiniteScroll = InfiniteScroll;
+exports.InfiniteScroll = InfiniteScroll;
+
+const InfiniteScrollContent = props => {
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
+
+  if (!props.hasMore) {
+    return _react.default.createElement("span", null, locale.InfiniteScroll.noMore);
+  }
+
+  if (props.failed) {
+    return _react.default.createElement("span", null, _react.default.createElement("span", {
+      className: `${classPrefix}-failed-text`
+    }, locale.InfiniteScroll.failedToLoad), _react.default.createElement("a", {
+      onClick: () => {
+        props.retry();
+      }
+    }, locale.InfiniteScroll.retry));
+  }
+
+  return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("span", null, locale.common.loading), _react.default.createElement(_dotLoading.default, null));
+};

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

@@ -1,5 +1,5 @@
 .adm-input {
-  --font-size: 34px;
+  --font-size: var(--adm-font-size-9);
   --color: var(--adm-color-text);
   --placeholder-color: var(--adm-color-light);
   --text-align: left;
@@ -100,5 +100,5 @@
 
 .adm-input-clear .antd-mobile-icon {
   display: block;
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
 }

package/2x/cjs/components/jumbo-tabs/jumbo-tabs.css

@@ -6,7 +6,7 @@
 
 .adm-jumbo-tabs-header {
   position: relative;
-  border-bottom: solid 2px var(--adm-border-color);
+  border-bottom: solid 2px var(--adm-color-border);
 }
 
 .adm-jumbo-tabs-tab-list {
@@ -39,7 +39,7 @@
   margin: 0 auto;
   padding: 24px 0;
   cursor: pointer;
-  font-size: 34px;
+  font-size: var(--adm-font-size-9);
   white-space: nowrap;
 }
 
@@ -54,7 +54,7 @@
   border-radius: 20px;
   color: var(--adm-color-weak);
   font-size: var(--adm-font-size-main);
-  background-color: #f5f5f5;
+  background-color: var(--adm-color-box);
 }
 
 .adm-jumbo-tabs-tab-active {
@@ -62,7 +62,7 @@
 }
 
 .adm-jumbo-tabs-tab-active .adm-jumbo-tabs-tab-description {
-  color: #fff;
+  color: var(--adm-color-white);
   background-color: var(--adm-color-primary);
 }
 
@@ -73,24 +73,4 @@
 
 .adm-jumbo-tabs-content {
   padding: 24px;
-}
-
-.adm-jumbo-tabs-header-mask {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  z-index: 1;
-  width: 60px;
-  height: 100%;
-  pointer-events: none;
-}
-
-.adm-jumbo-tabs-header-mask-left {
-  left: 0;
-  background: linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
-}
-
-.adm-jumbo-tabs-header-mask-right {
-  right: 0;
-  background: linear-gradient(to left, #fff, rgba(255, 255, 255, 0));
 }

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

@@ -1,15 +1,15 @@
 .adm-list {
-  --header-font-size: 30px;
+  --header-font-size: var(--adm-font-size-7);
   --prefix-width: 'auto';
   --prefix-padding-right: 24px;
   --align-items: center;
-  --active-background-color: var(--adm-border-color);
-  --border-inner: solid 2px var(--adm-border-color);
-  --border-top: solid 2px var(--adm-border-color);
-  --border-bottom: solid 2px var(--adm-border-color);
+  --active-background-color: var(--adm-color-border);
+  --border-inner: solid 2px var(--adm-color-border);
+  --border-top: solid 2px var(--adm-color-border);
+  --border-bottom: solid 2px var(--adm-color-border);
   --padding-left: 24px;
   --padding-right: 24px;
-  --font-size: 34px;
+  --font-size: var(--adm-font-size-9);
 }
 
 .adm-list-header {
@@ -19,7 +19,7 @@
 }
 
 .adm-list-body {
-  background-color: #ffffff;
+  background-color: var(--adm-color-background);
   overflow: hidden;
   font-size: var(--font-size);
 }
@@ -49,14 +49,14 @@
   display: block;
   padding-left: var(--padding-left);
   position: relative;
-  background-color: #ffffff;
+  background-color: var(--adm-color-background);
   line-height: 1.5;
 }
 
 .adm-list-item-title,
 .adm-list-item-description {
   color: var(--adm-color-weak);
-  font-size: 26px;
+  font-size: var(--adm-font-size-main);
 }
 
 .adm-list-item-content {
@@ -79,9 +79,8 @@
 }
 
 .adm-list-item-content-extra {
-  flex: none;
   padding-left: 24px;
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
   color: var(--adm-color-weak);
 }
 

package/2x/cjs/components/mask/mask.patch.css

@@ -0,0 +1,3 @@
+.adm-mask {
+  z-index: 1000;
+}

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

@@ -1,31 +1,16 @@
 .adm-modal {
   --z-index: var(--adm-modal-z-index, 1000);
-  position: fixed;
-  z-index: var(--z-index);
+  ---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 .adm-center-popup {
+  --z-index: var(---z-index);
 }
 
 .adm-modal-body {
   width: 100%;
   max-height: 70vh;
-  box-sizing: border-box;
-  font-size: 28px;
-  background-color: white;
-  border-radius: 16px;
+  font-size: var(--adm-font-size-6);
   overflow: hidden;
   display: flex;
   flex-direction: column;
@@ -43,43 +28,43 @@
   padding-top: 40px;
 }
 
-.adm-modal-body .adm-modal-image-container {
+.adm-modal-image-container {
   margin-bottom: 24px;
   max-height: 40vh;
   overflow-y: scroll;
 }
 
-.adm-modal-body .adm-modal-header {
+.adm-modal-header {
   margin-bottom: 16px;
   padding: 0 24px;
 }
 
-.adm-modal-body .adm-modal-title {
+.adm-modal-title {
   margin-bottom: 16px;
   padding: 0 24px;
   font-weight: bold;
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
   line-height: 50px;
   text-align: center;
 }
 
-.adm-modal-body .adm-modal-content {
+.adm-modal-content {
   padding: 0 24px 24px;
   max-height: 70vh;
   overflow-x: hidden;
   overflow-y: auto;
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
   line-height: 1.4;
-  color: #333;
+  color: var(--adm-color-text);
 }
 
-.adm-modal-body .adm-modal-close {
+.adm-modal-close {
   position: absolute;
   right: 16px;
   top: 16px;
   color: var(--adm-color-weak);
   padding: 8px;
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
 }
 
 .adm-modal-footer {
@@ -97,7 +82,7 @@
 }
 
 .adm-modal-footer .adm-modal-button {
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
   line-height: 50px;
 }
 

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

@@ -1,31 +1,17 @@
-import React, { FC, ReactNode } from 'react';
-import type { MaskProps } from '../mask';
+import { 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;
-    afterShow?: () => void;
+import { CenterPopupProps } from '../center-popup';
+export declare type ModalProps = Pick<CenterPopupProps, 'afterClose' | 'afterShow' | 'bodyClassName' | 'bodyStyle' | 'destroyOnClose' | 'disableBodyScroll' | 'forceRender' | 'getContainer' | 'maskClassName' | 'maskStyle' | 'stopPropagation' | 'visible'> & {
     image?: string;
     header?: ReactNode;
     title?: ReactNode;
     content?: ReactNode;
     actions?: Action[];
     onAction?: (action: Action, index: number) => void | Promise<void>;
-    closeOnAction?: boolean;
     onClose?: () => void;
+    closeOnAction?: boolean;
     closeOnMaskClick?: boolean;
-    visible?: boolean;
-    getContainer?: GetContainer;
-    bodyStyle?: React.CSSProperties;
-    bodyClassName?: string;
-    maskStyle?: MaskProps['style'];
-    maskClassName?: string;
-    stopPropagation?: PropagationEvent[];
     showCloseButton?: boolean;
-    disableBodyScroll?: boolean;
-    destroyOnClose?: boolean;
-    forceRender?: boolean;
 } & NativeProps;
 export declare const Modal: FC<ModalProps>;

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

@@ -7,94 +7,36 @@ exports.Modal = void 0;
 
 var _tslib = require("tslib");
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _ahooks = require("ahooks");
-
-var _mask = _interopRequireDefault(require("../mask"));
-
 var _modalActionButton = require("./modal-action-button");
 
 var _image = _interopRequireDefault(require("../image"));
 
 var _space = _interopRequireDefault(require("../space"));
 
-var _renderToContainer = require("../../utils/render-to-container");
-
-var _withStopPropagation = require("../../utils/with-stop-propagation");
-
 var _autoCenter = _interopRequireDefault(require("../auto-center"));
 
-var _web = require("@react-spring/web");
-
-var _nativeProps = require("../../utils/native-props");
-
 var _antdMobileIcons = require("antd-mobile-icons");
 
-var _shouldRender = require("../../utils/should-render");
-
-var _useInnerVisible = require("../../utils/use-inner-visible");
+var _centerPopup = _interopRequireDefault(require("../center-popup"));
 
 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); }
-
-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; }
-
 const defaultProps = {
-  visible: false,
   actions: [],
   closeOnAction: false,
-  closeOnMaskClick: false,
-  stopPropagation: ['click'],
-  showCloseButton: false,
-  getContainer: null,
-  disableBodyScroll: true,
-  destroyOnClose: false,
-  forceRender: false
+  closeOnMaskClick: false
 };
 
 const Modal = p => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  const unmountedRef = (0, _ahooks.useUnmountedRef)();
-  const style = (0, _web.useSpring)({
-    scale: props.visible ? 1 : 0.8,
-    opacity: props.visible ? 1 : 0,
-    config: {
-      mass: 1.2,
-      tension: 200,
-      friction: 25,
-      clamp: true
-    },
-    onRest: () => {
-      var _a, _b;
-
-      if (unmountedRef.current) return;
-      setActive(props.visible);
-
-      if (props.visible) {
-        (_a = props.afterShow) === null || _a === void 0 ? void 0 : _a.call(props);
-      } else {
-        (_b = props.afterClose) === null || _b === void 0 ? void 0 : _b.call(props);
-      }
-    }
-  });
-  const [active, setActive] = (0, _react.useState)(props.visible);
-  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
-    if (props.visible) {
-      setActive(true);
-    }
-  }, [props.visible]);
-  const maskVisible = (0, _useInnerVisible.useInnerVisible)(active && props.visible);
-
-  const body = _react.default.createElement("div", {
-    className: (0, _classnames.default)(cls('body'), props.image && cls('with-image'), props.bodyClassName),
-    style: props.bodyStyle
-  }, props.showCloseButton && _react.default.createElement("a", {
+
+  const element = _react.default.createElement(_react.default.Fragment, null, props.showCloseButton && _react.default.createElement("a", {
     className: (0, _classnames.default)(cls('close'), 'adm-plain-anchor'),
     onClick: props.onClose
   }, _react.default.createElement(_antdMobileIcons.CloseOutline, null)), !!props.image && _react.default.createElement("div", {
@@ -129,30 +71,27 @@ const Modal = p => {
     });
   })));
 
-  const node = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-    className: cls(),
-    style: {
-      display: active ? undefined : 'none',
-      pointerEvents: active ? undefined : 'none'
-    }
-  }, _react.default.createElement(_mask.default, {
-    visible: maskVisible,
-    forceRender: props.forceRender,
+  return _react.default.createElement(_centerPopup.default, {
+    className: (0, _classnames.default)(cls(), props.className),
+    style: props.style,
+    afterClose: props.afterClose,
+    afterShow: props.afterShow,
+    onMaskClick: props.closeOnMaskClick ? () => {
+      var _a;
+
+      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+    } : undefined,
+    visible: props.visible,
+    getContainer: props.getContainer,
+    bodyStyle: props.bodyStyle,
+    bodyClassName: (0, _classnames.default)(cls('body'), props.image && cls('with-image'), props.bodyClassName),
+    maskStyle: props.maskStyle,
+    maskClassName: props.maskClassName,
+    stopPropagation: props.stopPropagation,
+    disableBodyScroll: props.disableBodyScroll,
     destroyOnClose: props.destroyOnClose,
-    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
-    style: props.maskStyle,
-    className: (0, _classnames.default)(cls('mask'), props.maskClassName),
-    disableBodyScroll: props.disableBodyScroll
-  }), _react.default.createElement("div", {
-    className: cls('wrap')
-  }, _react.default.createElement(_web.animated.div, {
-    style: style
-  }, body)))));
-  return _react.default.createElement(_shouldRender.ShouldRender, {
-    active: active,
-    forceRender: props.forceRender,
-    destroyOnClose: props.destroyOnClose
-  }, (0, _renderToContainer.renderToContainer)(props.getContainer, node));
+    forceRender: props.forceRender
+  }, element);
 };
 
 exports.Modal = Modal;

package/2x/cjs/components/modal/modal.patch.css

@@ -0,0 +1,29 @@
+.adm-modal-body {
+  font-size: 28px;
+}
+
+.adm-modal-title {
+  font-size: 36px;
+}
+
+.adm-modal-content {
+  font-size: 30px;
+  color: #333333;
+}
+
+.adm-modal-close {
+  color: #999999;
+  font-size: 36px;
+}
+
+.adm-modal-footer.adm-space.adm-space-vertical > .adm-space-item.adm-space-item {
+  margin-bottom: 40px;
+}
+
+.adm-modal-footer.adm-space.adm-space-vertical > .adm-space-item.adm-space-item:last-child {
+  margin-bottom: 0;
+}
+
+.adm-modal-footer .adm-modal-button {
+  font-size: 36px;
+}

package/2x/cjs/components/nav-bar/nav-bar.css

@@ -35,7 +35,7 @@
 }
 
 .adm-nav-bar-left {
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
   display: flex;
   justify-content: flex-start;
   align-items: center;
@@ -44,7 +44,7 @@
 .adm-nav-bar-title {
   justify-content: center;
   white-space: nowrap;
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
   padding: 0 24px;
 }
 

package/2x/cjs/components/notice-bar/notice-bar.css

@@ -1,9 +1,9 @@
 .adm-notice-bar {
   --background-color: #ababab;
   --border-color: #999999;
-  --text-color: #ffffff;
-  --font-size: 30px;
-  --icon-font-size: 36px;
+  --text-color: var(--adm-color-white);
+  --font-size: var(--adm-font-size-7);
+  --icon-font-size: var(--adm-font-size-10);
   --height: 76px;
   height: var(--height);
   box-sizing: border-box;
@@ -71,5 +71,5 @@
 }
 
 .adm-notice-bar-close-icon {
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
 }

package/2x/cjs/components/number-keyboard/number-keyboard.css

@@ -15,7 +15,7 @@
 }
 
 .adm-number-keyboard-popup.adm-popup .adm-popup-body {
-  background-color: #f5f5f5;
+  background-color: var(--adm-color-box);
 }
 
 .adm-number-keyboard-wrapper {
@@ -25,7 +25,7 @@
 .adm-number-keyboard-header {
   height: 68px;
   line-height: 68px;
-  border-top: solid 2px #f5f5f5;
+  border-top: solid 2px var(--adm-color-border);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -70,7 +70,7 @@
   height: 96px;
   font-size: 44px;
   box-sizing: border-box;
-  border: solid 2px #f5f5f5;
+  border: solid 2px var(--adm-color-border);
   border-bottom: none;
   border-left: none;
 }
@@ -105,7 +105,7 @@
 }
 
 .adm-number-keyboard-key.extra-key {
-  border-left: solid 2px #f5f5f5;
+  border-left: solid 2px var(--adm-color-border);
   border-right: none;
 }
 

package/2x/cjs/components/page-indicator/page-indicator.patch.css

@@ -0,0 +1,31 @@
+.adm-page-indicator-dot {
+  width: 6px;
+  height: 6px;
+  border-radius: 2px;
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.adm-page-indicator-dot-active {
+  border-radius: 2px;
+  background: #1677ff;
+}
+
+.adm-page-indicator-color-white .adm-page-indicator-dot-active.adm-page-indicator-dot-active {
+  background: #ffffff;
+}
+
+.adm-page-indicator-horizontal .adm-page-indicator-dot {
+  margin-right: 6px;
+}
+
+.adm-page-indicator-horizontal .adm-page-indicator-dot-active {
+  width: 26px;
+}
+
+.adm-page-indicator-vertical .adm-page-indicator-dot {
+  margin-bottom: 6px;
+}
+
+.adm-page-indicator-vertical .adm-page-indicator-dot-active {
+  height: 26px;
+}

package/2x/cjs/components/passcode-input/passcode-input.css

@@ -19,7 +19,7 @@
   align-items: center;
   justify-content: center;
   box-sizing: border-box;
-  font-size: 36px;
+  font-size: var(--adm-font-size-10);
   width: var(--cell-size);
   height: var(--cell-size);
   background: var(--adm-color-white);