antd-mobile 5.12.7 → 5.14.0

package/es/components/infinite-scroll/infinite-scroll.js

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

package/es/components/input/input.css

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

package/es/components/input/input.js

@@ -6,6 +6,7 @@ import { mergeProps } from '../../utils/with-default-props';
 import classNames from 'classnames';
 import { useIsomorphicLayoutEffect } from 'ahooks';
 import { bound } from '../../utils/bound';
+import { isIOS } from '../../utils/validate';
 const classPrefix = `adm-input`;
 const defaultProps = {
   defaultValue: '',
@@ -15,6 +16,7 @@ export const Input = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps, p);
   const [value, setValue] = usePropsValue(props);
   const [hasFocus, setHasFocus] = useState(false);
+  const compositionStartRef = useRef(false);
   const nativeInputRef = useRef(null);
   useImperativeHandle(ref, () => ({
     clear: () => {
@@ -121,8 +123,18 @@ export const Input = forwardRef((p, ref) => {
     autoCorrect: props.autoCorrect,
     onKeyDown: handleKeydown,
     onKeyUp: props.onKeyUp,
-    onCompositionStart: props.onCompositionStart,
-    onCompositionEnd: props.onCompositionEnd,
+    onCompositionStart: e => {
+      var _a;
+
+      compositionStartRef.current = true;
+      (_a = props.onCompositionStart) === null || _a === void 0 ? void 0 : _a.call(props, e);
+    },
+    onCompositionEnd: e => {
+      var _a;
+
+      compositionStartRef.current = false;
+      (_a = props.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(props, e);
+    },
     onClick: props.onClick
   }), shouldShowClear && React.createElement("div", {
     className: `${classPrefix}-clear`,
@@ -130,10 +142,15 @@ export const Input = forwardRef((p, ref) => {
       e.preventDefault();
     },
     onClick: () => {
-      var _a;
+      var _a, _b;
 
       setValue('');
-      (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props);
+      (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props); // https://github.com/ant-design/ant-design-mobile/issues/5212
+
+      if (isIOS() && compositionStartRef.current) {
+        compositionStartRef.current = false;
+        (_b = nativeInputRef.current) === null || _b === void 0 ? void 0 : _b.blur();
+      }
     }
   }, React.createElement(CloseCircleFill, null))));
 });

package/es/components/jumbo-tabs/jumbo-tabs.css

@@ -5,7 +5,7 @@
 }
 .adm-jumbo-tabs-header {
   position: relative;
-  border-bottom: solid 1px var(--adm-border-color);
+  border-bottom: solid 1px var(--adm-color-border);
 }
 .adm-jumbo-tabs-tab-list {
   display: flex;
@@ -34,7 +34,7 @@
   margin: 0 auto;
   padding: 12px 0;
   cursor: pointer;
-  font-size: 17px;
+  font-size: var(--adm-font-size-9);
   white-space: nowrap;
 }
 .adm-jumbo-tabs-tab-title {
@@ -47,13 +47,13 @@
   border-radius: 10px;
   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 {
   color: var(--adm-color-primary);
 }
 .adm-jumbo-tabs-tab-active .adm-jumbo-tabs-tab-description {
-  color: #fff;
+  color: var(--adm-color-white);
   background-color: var(--adm-color-primary);
 }
 .adm-jumbo-tabs-tab-disabled {
@@ -63,20 +63,3 @@
 .adm-jumbo-tabs-content {
   padding: 12px;
 }
-.adm-jumbo-tabs-header-mask {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  z-index: 1;
-  width: 30px;
-  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/es/components/list/list.css

@@ -1,15 +1,15 @@
 .adm-list {
-  --header-font-size: 15px;
+  --header-font-size: var(--adm-font-size-7);
   --prefix-width: 'auto';
   --prefix-padding-right: 12px;
   --align-items: center;
-  --active-background-color: var(--adm-border-color);
-  --border-inner: solid 1px var(--adm-border-color);
-  --border-top: solid 1px var(--adm-border-color);
-  --border-bottom: solid 1px var(--adm-border-color);
+  --active-background-color: var(--adm-color-border);
+  --border-inner: solid 1px var(--adm-color-border);
+  --border-top: solid 1px var(--adm-color-border);
+  --border-bottom: solid 1px var(--adm-color-border);
   --padding-left: 12px;
   --padding-right: 12px;
-  --font-size: 17px;
+  --font-size: var(--adm-font-size-9);
 }
 .adm-list-header {
   color: var(--adm-color-weak);
@@ -17,7 +17,7 @@
   padding: 8px var(--padding-right) 8px var(--padding-left);
 }
 .adm-list-body {
-  background-color: #ffffff;
+  background-color: var(--adm-color-background);
   overflow: hidden;
   font-size: var(--font-size);
 }
@@ -41,13 +41,13 @@
   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: 13px;
+  font-size: var(--adm-font-size-main);
 }
 .adm-list-item-content {
   display: flex;
@@ -66,9 +66,8 @@
   padding: 12px 0;
 }
 .adm-list-item-content-extra {
-  flex: none;
   padding-left: 12px;
-  font-size: 15px;
+  font-size: var(--adm-font-size-7);
   color: var(--adm-color-weak);
 }
 .adm-list-item-content-arrow {

package/es/components/mask/mask.js

@@ -6,7 +6,7 @@ import { useSpring, animated } from '@react-spring/web';
 import { renderToContainer } from '../../utils/render-to-container';
 import { mergeProps } from '../../utils/with-default-props';
 import { useConfig } from '../config-provider';
-import { useShouldRender } from '../../utils/should-render';
+import { ShouldRender } from '../../utils/should-render';
 import { withStopPropagation } from '../../utils/with-stop-propagation';
 const classPrefix = `adm-mask`;
 const opacityRecord = {
@@ -47,7 +47,7 @@ export const Mask = p => {
     config: {
       precision: 0.01,
       mass: 1,
-      tension: 200,
+      tension: 250,
       friction: 30,
       clamp: true
     },
@@ -67,14 +67,12 @@ export const Mask = p => {
       }
     }
   });
-  const shouldRender = useShouldRender(active, props.forceRender, props.destroyOnClose);
   const node = withStopPropagation(props.stopPropagation, withNativeProps(props, React.createElement(animated.div, {
     className: classPrefix,
     ref: ref,
-    style: Object.assign(Object.assign({
+    style: Object.assign(Object.assign({}, props.style), {
       background,
-      opacity
-    }, props.style), {
+      opacity,
       display: active ? undefined : 'none'
     }),
     onClick: e => {
@@ -91,6 +89,10 @@ export const Mask = p => {
     onClick: props.onMaskClick
   }), React.createElement("div", {
     className: `${classPrefix}-content`
-  }, shouldRender && props.children))));
-  return renderToContainer(props.getContainer, node);
+  }, props.children))));
+  return React.createElement(ShouldRender, {
+    active: active,
+    forceRender: props.forceRender,
+    destroyOnClose: props.destroyOnClose
+  }, renderToContainer(props.getContainer, node));
 };

package/es/components/mask/mask.patch.css

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

package/es/components/modal/modal.css

@@ -1,28 +1,14 @@
 .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%);
+  ---z-index: var(--z-index);
+}
+.adm-modal .adm-center-popup {
+  --z-index: var(---z-index);
 }
 .adm-modal-body {
   width: 100%;
   max-height: 70vh;
-  box-sizing: border-box;
-  font-size: 14px;
-  background-color: white;
-  border-radius: 8px;
+  font-size: var(--adm-font-size-6);
   overflow: hidden;
   display: flex;
   flex-direction: column;
@@ -36,39 +22,39 @@
 .adm-modal-body:not(.adm-modal-with-image) {
   padding-top: 20px;
 }
-.adm-modal-body .adm-modal-image-container {
+.adm-modal-image-container {
   margin-bottom: 12px;
   max-height: 40vh;
   overflow-y: scroll;
 }
-.adm-modal-body .adm-modal-header {
+.adm-modal-header {
   margin-bottom: 8px;
   padding: 0 12px;
 }
-.adm-modal-body .adm-modal-title {
+.adm-modal-title {
   margin-bottom: 8px;
   padding: 0 12px;
   font-weight: bold;
-  font-size: 18px;
+  font-size: var(--adm-font-size-10);
   line-height: 25px;
   text-align: center;
 }
-.adm-modal-body .adm-modal-content {
+.adm-modal-content {
   padding: 0 12px 12px;
   max-height: 70vh;
   overflow-x: hidden;
   overflow-y: auto;
-  font-size: 15px;
+  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: 8px;
   top: 8px;
   color: var(--adm-color-weak);
   padding: 4px;
-  font-size: 18px;
+  font-size: var(--adm-font-size-10);
 }
 .adm-modal-footer {
   user-select: none;
@@ -82,7 +68,7 @@
   --gap-vertical: 20px;
 }
 .adm-modal-footer .adm-modal-button {
-  font-size: 18px;
+  font-size: var(--adm-font-size-10);
   line-height: 25px;
 }
 .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary) {

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

@@ -1,29 +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;
 } & NativeProps;
 export declare const Modal: FC<ModalProps>;

package/es/components/modal/modal.js

@@ -1,61 +1,21 @@
 import { __awaiter } from "tslib";
-import React, { useState } from 'react';
+import React 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 { renderToContainer } from '../../utils/render-to-container';
-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';
+import CenterPopup from '../center-popup';
 const defaultProps = {
-  visible: false,
   actions: [],
   closeOnAction: false,
-  closeOnMaskClick: false,
-  stopPropagation: ['click'],
-  showCloseButton: false,
-  getContainer: null,
-  disableBodyScroll: true
+  closeOnMaskClick: false
 };
 export const Modal = p => {
   const props = mergeProps(defaultProps, p);
-  const unmountedRef = useUnmountedRef();
-  const style = useSpring({
-    scale: props.visible ? 1 : 0.8,
-    opacity: props.visible ? 1 : 0,
-    config: {
-      mass: 1.2,
-      tension: 200,
-      friction: 25,
-      clamp: true
-    },
-    onStart: () => {
-      setActive(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] = useState(props.visible);
-  const body = React.createElement("div", {
-    className: classNames(cls('body'), props.image && cls('with-image'), props.bodyClassName),
-    style: props.bodyStyle
-  }, props.showCloseButton && React.createElement("a", {
+  const element = React.createElement(React.Fragment, null, props.showCloseButton && React.createElement("a", {
     className: classNames(cls('close'), 'adm-plain-anchor'),
     onClick: props.onClose
   }, React.createElement(CloseOutline, null)), !!props.image && React.createElement("div", {
@@ -89,26 +49,25 @@ export const Modal = p => {
       })
     });
   })));
-  const node = withStopPropagation(props.stopPropagation, withNativeProps(props, React.createElement("div", {
-    className: cls(),
-    style: {
-      display: active ? undefined : 'none'
-    }
-  }, React.createElement(Mask, {
+  return React.createElement(CenterPopup, {
+    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,
-    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
-    style: props.maskStyle,
-    className: classNames(cls('mask'), props.maskClassName),
-    disableBodyScroll: props.disableBodyScroll
-  }), React.createElement("div", {
-    className: cls('wrap'),
-    style: {
-      pointerEvents: props.visible ? undefined : 'none'
-    }
-  }, React.createElement(animated.div, {
-    style: style
-  }, body)))));
-  return renderToContainer(props.getContainer, node);
+    getContainer: props.getContainer,
+    bodyStyle: props.bodyStyle,
+    bodyClassName: classNames(cls('body'), props.image && cls('with-image'), props.bodyClassName),
+    maskStyle: props.maskStyle,
+    maskClassName: props.maskClassName,
+    stopPropagation: props.stopPropagation,
+    disableBodyScroll: props.disableBodyScroll,
+    destroyOnClose: props.destroyOnClose,
+    forceRender: props.forceRender
+  }, element);
 };
 
 function cls(name = '') {

package/es/components/modal/modal.patch.css

@@ -0,0 +1,23 @@
+.adm-modal-body {
+  font-size: 14px;
+}
+.adm-modal-title {
+  font-size: 18px;
+}
+.adm-modal-content {
+  font-size: 15px;
+  color: #333333;
+}
+.adm-modal-close {
+  color: #999999;
+  font-size: 18px;
+}
+.adm-modal-footer.adm-space.adm-space-vertical > .adm-space-item.adm-space-item {
+  margin-bottom: 20px;
+}
+.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: 18px;
+}

package/es/components/nav-bar/nav-bar.css

@@ -30,7 +30,7 @@
   margin-right: 4px;
 }
 .adm-nav-bar-left {
-  font-size: 15px;
+  font-size: var(--adm-font-size-7);
   display: flex;
   justify-content: flex-start;
   align-items: center;
@@ -38,7 +38,7 @@
 .adm-nav-bar-title {
   justify-content: center;
   white-space: nowrap;
-  font-size: 18px;
+  font-size: var(--adm-font-size-10);
   padding: 0 12px;
 }
 .adm-nav-bar-right {

package/es/components/notice-bar/notice-bar.css

@@ -1,9 +1,9 @@
 .adm-notice-bar {
   --background-color: #ababab;
   --border-color: #999999;
-  --text-color: #ffffff;
-  --font-size: 15px;
-  --icon-font-size: 18px;
+  --text-color: var(--adm-color-white);
+  --font-size: var(--adm-font-size-7);
+  --icon-font-size: var(--adm-font-size-10);
   --height: 38px;
   height: var(--height);
   box-sizing: border-box;
@@ -62,5 +62,5 @@
   margin-left: 12px;
 }
 .adm-notice-bar-close-icon {
-  font-size: 18px;
+  font-size: var(--adm-font-size-10);
 }

package/es/components/number-keyboard/number-keyboard.css

@@ -12,7 +12,7 @@
   z-index: 1050;
 }
 .adm-number-keyboard-popup.adm-popup .adm-popup-body {
-  background-color: #f5f5f5;
+  background-color: var(--adm-color-box);
 }
 .adm-number-keyboard-wrapper {
   display: flex;
@@ -20,7 +20,7 @@
 .adm-number-keyboard-header {
   height: 34px;
   line-height: 34px;
-  border-top: solid 1px #f5f5f5;
+  border-top: solid 1px var(--adm-color-border);
   display: flex;
   justify-content: center;
   align-items: center;
@@ -58,7 +58,7 @@
   height: 48px;
   font-size: 22px;
   box-sizing: border-box;
-  border: solid 1px #f5f5f5;
+  border: solid 1px var(--adm-color-border);
   border-bottom: none;
   border-left: none;
 }
@@ -88,7 +88,7 @@
   opacity: 0.1;
 }
 .adm-number-keyboard-key.extra-key {
-  border-left: solid 1px #f5f5f5;
+  border-left: solid 1px var(--adm-color-border);
   border-right: none;
 }
 .adm-number-keyboard-key.extra-key,

package/es/components/page-indicator/page-indicator.patch.css

@@ -0,0 +1,25 @@
+.adm-page-indicator-dot {
+  width: 3px;
+  height: 3px;
+  border-radius: 1px;
+  background: rgba(0, 0, 0, 0.2);
+}
+.adm-page-indicator-dot-active {
+  border-radius: 1px;
+  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: 3px;
+}
+.adm-page-indicator-horizontal .adm-page-indicator-dot-active {
+  width: 13px;
+}
+.adm-page-indicator-vertical .adm-page-indicator-dot {
+  margin-bottom: 3px;
+}
+.adm-page-indicator-vertical .adm-page-indicator-dot-active {
+  height: 13px;
+}