antd-mobile 5.12.7 → 5.14.0

package/2x/es/components/image-uploader/image-uploader.css

@@ -28,7 +28,7 @@
   background-color: rgba(0, 0, 0, 0.7);
   border-radius: 0 0 0 24px;
   font-size: 16px;
-  color: #fff;
+  color: var(--adm-color-white);
   cursor: pointer;
 }
 
@@ -44,7 +44,7 @@
   right: 0;
   bottom: 0;
   left: 0;
-  color: #fff;
+  color: var(--adm-color-white);
   background-color: rgba(50, 50, 51, 0.88);
 }
 
@@ -61,7 +61,7 @@
 .adm-image-uploader-cell-mask-message {
   display: inline-block;
   padding: 12px 8px;
-  font-size: 24px;
+  font-size: var(--adm-font-size-4);
 }
 
 .adm-image-uploader-cell-image {
@@ -74,7 +74,7 @@
 }
 
 .adm-image-uploader-upload-button-wrap .adm-image-uploader-upload-button {
-  background-color: #f5f5f5;
+  background-color: var(--adm-color-box);
   text-align: center;
   line-height: var(--cell-size);
   display: block;

package/2x/es/components/image-viewer/image-viewer.css

@@ -1,11 +1,17 @@
 .adm-image-viewer-content {
   width: 100vw;
   height: 100vh;
-  max-height: -webkit-fill-available;
   touch-action: none;
   user-select: none;
 }
 
+.adm-image-viewer-footer {
+  position: absolute;
+  width: 100%;
+  bottom: 0;
+  z-index: 1;
+}
+
 .adm-image-viewer-slides {
   height: 100%;
   position: relative;
@@ -62,5 +68,5 @@
   top: 24px;
   transform: translateX(-50%);
   color: #e6e6e6;
-  font-size: 28px;
+  font-size: var(--adm-font-size-6);
 }

package/2x/es/components/image-viewer/image-viewer.d.ts

@@ -8,16 +8,19 @@ export declare type ImageViewerProps = {
     visible?: boolean;
     onClose?: () => void;
     afterClose?: () => void;
+    renderFooter?: (image: string) => React.ReactNode;
 };
 export declare const ImageViewer: FC<ImageViewerProps>;
 export declare type MultiImageViewerRef = SlidesRef;
-export declare type MultiImageViewerProps = Omit<ImageViewerProps, 'image'> & {
+export declare type MultiImageViewerProps = Omit<ImageViewerProps, 'image' | 'renderFooter'> & {
     images?: string[];
     defaultIndex?: number;
     onIndexChange?: (index: number) => void;
+    renderFooter?: (image: string, index: number) => React.ReactNode;
 };
-export declare const MultiImageViewer: React.ForwardRefExoticComponent<Omit<ImageViewerProps, "image"> & {
+export declare const MultiImageViewer: React.ForwardRefExoticComponent<Omit<ImageViewerProps, "image" | "renderFooter"> & {
     images?: string[] | undefined;
     defaultIndex?: number | undefined;
     onIndexChange?: ((index: number) => void) | undefined;
+    renderFooter?: ((image: string, index: number) => React.ReactNode) | undefined;
 } & React.RefAttributes<SlidesRef>>;

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

@@ -1,7 +1,8 @@
-import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
+import React, { forwardRef, useImperativeHandle, useRef, useState, useCallback } from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import { renderToContainer } from '../../utils/render-to-container';
 import Mask from '../mask';
+import SafeArea from '../safe-area';
 import { Slide } from './slide';
 import { Slides } from './slides';
 const classPrefix = `adm-image-viewer`;
@@ -11,6 +12,8 @@ const defaultProps = {
   visible: false
 };
 export const ImageViewer = p => {
+  var _a;
+
   const props = mergeProps(defaultProps, p);
   const node = React.createElement(Mask, {
     visible: props.visible,
@@ -27,6 +30,10 @@ export const ImageViewer = p => {
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
     },
     maxZoom: props.maxZoom
+  })), props.image && React.createElement("div", {
+    className: `${classPrefix}-footer`
+  }, (_a = props.renderFooter) === null || _a === void 0 ? void 0 : _a.call(props, props.image), React.createElement(SafeArea, {
+    position: 'bottom'
   })));
   return renderToContainer(props.getContainer, node);
 };
@@ -34,17 +41,25 @@ const multiDefaultProps = Object.assign(Object.assign({}, defaultProps), {
   defaultIndex: 0
 });
 export const MultiImageViewer = forwardRef((p, ref) => {
+  var _a;
+
   const props = mergeProps(multiDefaultProps, p);
-  const [defaultIndex, setDefaultIndex] = useState(props.defaultIndex);
+  const [index, setIndex] = useState(props.defaultIndex);
   const slidesRef = useRef(null);
   useImperativeHandle(ref, () => ({
     swipeTo: (index, immediate) => {
       var _a;
 
-      setDefaultIndex(index);
+      setIndex(index);
       (_a = slidesRef.current) === null || _a === void 0 ? void 0 : _a.swipeTo(index, immediate);
     }
   }));
+  const onSlideChange = useCallback(index => {
+    var _a;
+
+    setIndex(index);
+    (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, index);
+  }, [props.onIndexChange]);
   const node = React.createElement(Mask, {
     visible: props.visible,
     disableBodyScroll: false,
@@ -54,8 +69,8 @@ export const MultiImageViewer = forwardRef((p, ref) => {
     className: `${classPrefix}-content`
   }, props.images && React.createElement(Slides, {
     ref: slidesRef,
-    defaultIndex: defaultIndex,
-    onIndexChange: props.onIndexChange,
+    defaultIndex: index,
+    onIndexChange: onSlideChange,
     images: props.images,
     onTap: () => {
       var _a;
@@ -63,6 +78,10 @@ export const MultiImageViewer = forwardRef((p, ref) => {
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
     },
     maxZoom: props.maxZoom
+  })), props.images && React.createElement("div", {
+    className: `${classPrefix}-footer`
+  }, (_a = props.renderFooter) === null || _a === void 0 ? void 0 : _a.call(props, props.images[index], index), React.createElement(SafeArea, {
+    position: 'bottom'
   })));
   return renderToContainer(props.getContainer, node);
 });

package/2x/es/components/image-viewer/index.d.ts

@@ -4,10 +4,11 @@ import { showMultiImageViewer, showImageViewer, clearImageViewer } from './metho
 export type { ImageViewerProps, MultiImageViewerProps, MultiImageViewerRef, } from './image-viewer';
 export type { ImageViewerShowHandler } from './methods';
 declare const _default: import("react").FC<import("./image-viewer").ImageViewerProps> & {
-    Multi: import("react").ForwardRefExoticComponent<Omit<import("./image-viewer").ImageViewerProps, "image"> & {
+    Multi: import("react").ForwardRefExoticComponent<Omit<import("./image-viewer").ImageViewerProps, "image" | "renderFooter"> & {
         images?: string[] | undefined;
         defaultIndex?: number | undefined;
         onIndexChange?: ((index: number) => void) | undefined;
+        renderFooter?: ((image: string, index: number) => import("react").ReactNode) | undefined;
     } & import("react").RefAttributes<import("./slides").SlidesRef>> & {
         show: typeof showMultiImageViewer;
     };

package/2x/es/components/index-bar/index-bar.css

@@ -24,8 +24,8 @@
   height: 70px;
   padding: 0 24px;
   color: var(--adm-color-weak);
-  font-size: 26px;
-  background-color: #f5f5f5;
+  font-size: var(--adm-font-size-main);
+  background-color: var(--adm-color-box);
 }
 
 .adm-index-bar-sidebar {
@@ -36,7 +36,7 @@
   z-index: 910;
   overflow: visible;
   color: var(--adm-color-weak);
-  font-size: 24px;
+  font-size: var(--adm-font-size-4);
   user-select: none;
   touch-action: none;
 }
@@ -78,7 +78,7 @@
 }
 
 .adm-index-bar-sidebar-item-active {
-  color: #fff;
+  color: var(--adm-color-white);
   background-color: var(--adm-color-primary);
   border-radius: 50%;
 }

package/2x/es/components/index-bar/index-bar.d.ts

@@ -2,6 +2,7 @@ import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type IndexBarProps = {
     sticky?: boolean;
+    onIndexChange?: (index: string) => void;
     children?: React.ReactNode;
 } & NativeProps<'--sticky-offset-top'>;
 export declare type IndexBarRef = {
@@ -9,5 +10,6 @@ export declare type IndexBarRef = {
 };
 export declare const IndexBar: React.ForwardRefExoticComponent<{
     sticky?: boolean | undefined;
+    onIndexChange?: ((index: string) => void) | undefined;
     children?: React.ReactNode;
 } & NativeProps<"--sticky-offset-top"> & React.RefAttributes<IndexBarRef>>;

package/2x/es/components/index-bar/index-bar.js

@@ -49,6 +49,8 @@ export const IndexBar = forwardRef((p, ref) => {
   }));
 
   function scrollTo(index) {
+    var _a;
+
     const body = bodyRef.current;
     if (!body) return;
     const children = body.children;
@@ -61,6 +63,7 @@ export const IndexBar = forwardRef((p, ref) => {
       if (panelIndex === index) {
         body.scrollTop = panel.offsetTop;
         setActiveIndex(index);
+        activeIndex !== index && ((_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, index));
         return;
       }
     }
@@ -69,6 +72,8 @@ export const IndexBar = forwardRef((p, ref) => {
   const {
     run: checkActiveIndex
   } = useThrottleFn(() => {
+    var _a;
+
     const body = bodyRef.current;
     if (!body) return;
     const scrollTop = body.scrollTop;
@@ -82,6 +87,7 @@ export const IndexBar = forwardRef((p, ref) => {
 
       if (panel.offsetTop + panel.clientHeight - titleHeight > scrollTop) {
         setActiveIndex(panelIndex);
+        activeIndex !== panelIndex && ((_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, panelIndex));
         return;
       }
     }

package/2x/es/components/index-bar/index.d.ts

@@ -4,6 +4,7 @@ export type { IndexBarProps, IndexBarRef } from './index-bar';
 export type { IndexBarPanelProps } from './panel';
 declare const _default: import("react").ForwardRefExoticComponent<{
     sticky?: boolean | undefined;
+    onIndexChange?: ((index: string) => void) | undefined;
     children?: import("react").ReactNode;
 } & import("../../utils/native-props").NativeProps<"--sticky-offset-top"> & import("react").RefAttributes<import("./index-bar").IndexBarRef>> & {
     Panel: import("react").FC<import("./panel").IndexBarPanelProps>;

package/2x/es/components/infinite-scroll/infinite-scroll.css

@@ -4,5 +4,10 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  font-size: 26px;
+  font-size: var(--adm-font-size-main);
+}
+
+.adm-infinite-scroll-failed-text {
+  display: inline-block;
+  margin-right: 16px;
 }

package/2x/es/components/infinite-scroll/infinite-scroll.d.ts

@@ -1,9 +1,9 @@
 import React, { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type InfiniteScrollProps = {
-    loadMore: () => Promise<void>;
+    loadMore: (isRetry: boolean) => Promise<void>;
     hasMore: boolean;
     threshold?: number;
-    children?: React.ReactNode;
+    children?: React.ReactNode | ((hasMore: boolean, failed: boolean, retry: () => void) => React.ReactNode);
 } & NativeProps;
 export declare const InfiniteScroll: FC<InfiniteScrollProps>;

package/2x/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/2x/es/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/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/2x/es/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/es/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/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/2x/es/components/mask/mask.patch.css

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