antd-mobile 5.30.0 → 5.31.0

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

@@ -19,6 +19,8 @@ const defaultProps = {
 export const Ellipsis = p => {
   const props = mergeProps(defaultProps, p);
   const rootRef = useRef(null);
+  const expandElRef = useRef(null);
+  const collapseElRef = useRef(null);
   const [ellipsised, setEllipsised] = useState({});
   const [expanded, setExpanded] = useState(props.defaultExpanded);
   const [exceeded, setExceeded] = useState(false);
@@ -27,19 +29,18 @@ export const Ellipsis = p => {
     return chars.slice(start, end).join('');
   }
   function calcEllipsised() {
+    var _a, _b;
     const root = rootRef.current;
     if (!root) return;
-    if (!root.offsetParent) return;
+    const originDisplay = root.style.display;
+    root.style.display = 'block';
     const originStyle = window.getComputedStyle(root);
     const container = document.createElement('div');
     const styleNames = Array.prototype.slice.apply(originStyle);
     styleNames.forEach(name => {
       container.style.setProperty(name, originStyle.getPropertyValue(name));
     });
-    container.style.position = 'fixed';
-    container.style.left = '999999px';
-    container.style.top = '999999px';
-    container.style.zIndex = '-1000';
+    root.style.display = originDisplay;
     container.style.height = 'auto';
     container.style.minHeight = 'auto';
     container.style.maxHeight = 'auto';
@@ -56,7 +57,9 @@ export const Ellipsis = p => {
     } else {
       setExceeded(true);
       const end = props.content.length;
-      const actionText = expanded ? props.collapseText : props.expandText;
+      const collapseEl = typeof props.collapseText === 'string' ? props.collapseText : (_a = collapseElRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML;
+      const expandEl = typeof props.expandText === 'string' ? props.expandText : (_b = expandElRef.current) === null || _b === void 0 ? void 0 : _b.innerHTML;
+      const actionText = expanded ? collapseEl : expandEl;
       function check(left, right) {
         if (right - left <= 1) {
           if (props.direction === 'end') {
@@ -71,9 +74,9 @@ export const Ellipsis = p => {
         }
         const middle = Math.round((left + right) / 2);
         if (props.direction === 'end') {
-          container.innerText = getSubString(0, middle) + '...' + actionText;
+          container.innerHTML = getSubString(0, middle) + '...' + actionText;
         } else {
-          container.innerText = actionText + '...' + getSubString(middle, end);
+          container.innerHTML = actionText + '...' + getSubString(middle, end);
         }
         if (container.offsetHeight <= maxHeight) {
           if (props.direction === 'end') {
@@ -98,7 +101,7 @@ export const Ellipsis = p => {
         }
         const leftPartMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
         const rightPartMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
-        container.innerText = getSubString(0, leftPartMiddle) + '...' + actionText + '...' + getSubString(rightPartMiddle, end);
+        container.innerHTML = getSubString(0, leftPartMiddle) + '...' + actionText + '...' + getSubString(rightPartMiddle, end);
         if (container.offsetHeight <= maxHeight) {
           return checkMiddle([leftPartMiddle, leftPart[1]], [rightPart[0], rightPartMiddle]);
         } else {
@@ -116,24 +119,21 @@ export const Ellipsis = p => {
     calcEllipsised();
   }, [props.content, props.direction, props.rows, props.expandText, props.collapseText]);
   const expandActionElement = exceeded && props.expandText ? withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
+    ref: expandElRef,
     onClick: () => {
       setExpanded(true);
     }
   }, props.expandText)) : null;
   const collapseActionElement = exceeded && props.collapseText ? withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
+    ref: collapseElRef,
     onClick: () => {
       setExpanded(false);
     }
   }, props.collapseText)) : null;
   const renderContent = () => {
-    if (!exceeded) {
-      return props.content;
-    }
-    if (expanded) {
-      return React.createElement(React.Fragment, null, props.content, collapseActionElement);
-    } else {
-      return React.createElement(React.Fragment, null, ellipsised.leading, expandActionElement, ellipsised.tailing);
-    }
+    if (!exceeded) return props.content;
+    if (expanded) return React.createElement(React.Fragment, null, props.content, collapseActionElement);
+    return React.createElement(React.Fragment, null, ellipsised.leading, expandActionElement, ellipsised.tailing);
   };
   return withNativeProps(props, React.createElement("div", {
     ref: rootRef,

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

@@ -14,5 +14,5 @@ export declare type ImageProps = {
     onError?: (event: React.SyntheticEvent<HTMLImageElement, Event>) => void;
     onLoad?: (event: React.SyntheticEvent<HTMLImageElement, Event>) => void;
     onContainerClick?: (event: React.MouseEvent<HTMLDivElement, Event>) => void;
-} & NativeProps<'--width' | '--height'> & Pick<React.ImgHTMLAttributes<HTMLImageElement>, 'crossOrigin' | 'decoding' | 'loading' | 'referrerPolicy' | 'sizes' | 'srcSet' | 'useMap'>;
+} & NativeProps<'--width' | '--height'> & Pick<React.ImgHTMLAttributes<HTMLImageElement>, 'crossOrigin' | 'decoding' | 'loading' | 'referrerPolicy' | 'sizes' | 'srcSet' | 'useMap' | 'id'>;
 export declare const Image: React.FC<ImageProps>;

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

@@ -47,6 +47,7 @@ export const Image = staged(p => {
     }
     const img = React.createElement("img", {
       ref: imgRef,
+      id: props.id,
       className: `${classPrefix}-img`,
       src: src,
       alt: props.alt,

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

@@ -4,7 +4,7 @@ declare type NativeInputProps = React.DetailedHTMLProps<React.InputHTMLAttribute
 declare type AriaProps = {
     role?: string;
 };
-export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'name' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick' | 'step'> & {
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'name' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick' | 'step' | 'id'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -14,7 +14,6 @@ export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength
     clearable?: boolean;
     onlyShowClearWhenFocus?: boolean;
     onClear?: () => void;
-    id?: string;
     onEnterPress?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
     enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';
     min?: number;
@@ -26,7 +25,7 @@ export declare type InputRef = {
     blur: () => void;
     nativeElement: HTMLInputElement | null;
 };
-export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "onClick" | "name" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoFocus" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "maxLength" | "minLength" | "step"> & {
+export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "id" | "onClick" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "type" | "step" | "autoFocus" | "autoCapitalize" | "autoCorrect" | "inputMode" | "name" | "autoComplete" | "maxLength" | "minLength"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;
@@ -36,7 +35,6 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProp
     clearable?: boolean | undefined;
     onlyShowClearWhenFocus?: boolean | undefined;
     onClear?: (() => void) | undefined;
-    id?: string | undefined;
     onEnterPress?: ((e: React.KeyboardEvent<HTMLInputElement>) => void) | undefined;
     enterKeyHint?: "search" | "enter" | "done" | "go" | "next" | "previous" | "send" | undefined;
     min?: number | undefined;

package/2x/es/components/list/list-item.d.ts

@@ -9,6 +9,6 @@ export declare type ListItemProps = {
     clickable?: boolean;
     arrow?: boolean | ReactNode;
     disabled?: boolean;
-    onClick?: (e: React.MouseEvent) => void;
+    onClick?: (e: React.MouseEvent<HTMLElement>) => void;
 } & NativeProps<'--prefix-width' | '--align-items' | '--active-background-color'>;
 export declare const ListItem: FC<ListItemProps>;

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

@@ -13,6 +13,8 @@ export declare type NoticeBarProps = {
     closeable?: boolean;
     /** Callback when closed */
     onClose?: () => void;
+    /** Event when click */
+    onClick?: () => void;
     /** Additional operating area, displayed to the left of the close button */
     extra?: React.ReactNode;
     /** Radio icon on the left */

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

@@ -64,7 +64,8 @@ export const NoticeBar = memo(p => {
   return withNativeProps(props, React.createElement("div", {
     className: classNames(classPrefix, `${classPrefix}-${props.color}`, {
       [`${classPrefix}-wrap`]: props.wrap
-    })
+    }),
+    onClick: props.onClick
   }, props.icon && React.createElement("span", {
     className: `${classPrefix}-left`
   }, props.icon), React.createElement("span", {

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

@@ -3,5 +3,6 @@ import { NativeProps } from '../../utils/native-props';
 import { PopupBaseProps } from './popup-base-props';
 export declare type PopupProps = PopupBaseProps & PropsWithChildren<{
     position?: 'bottom' | 'top' | 'left' | 'right';
+    closeOnSwipe?: boolean;
 }> & NativeProps<'--z-index'>;
 export declare const Popup: FC<PopupProps>;

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

@@ -16,6 +16,7 @@ import { useConfig } from '../config-provider';
 import { useDrag } from '@use-gesture/react';
 const classPrefix = `adm-popup`;
 const defaultProps = Object.assign(Object.assign({}, defaultPopupBaseProps), {
+  closeOnSwipe: false,
   position: 'bottom'
 });
 export const Popup = p => {
@@ -58,6 +59,7 @@ export const Popup = p => {
     swipe: [, swipeY]
   }) => {
     var _a;
+    if (!props.closeOnSwipe) return;
     if (swipeY === 1 && props.position === 'bottom' || swipeY === -1 && props.position === 'top') {
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
     }

package/2x/es/components/pull-to-refresh/pull-to-refresh.js

@@ -40,6 +40,7 @@ export const PullToRefresh = p => {
     config: {
       tension: 300,
       friction: 30,
+      round: true,
       clamp: true
     }
   }));
@@ -99,7 +100,8 @@ export const PullToRefresh = p => {
       return;
     }
     const [, y] = state.movement;
-    if (state.first && y > 0) {
+    const parsedY = Math.ceil(y);
+    if (state.first && parsedY > 0) {
       const target = state.event.target;
       if (!target || !(target instanceof Element)) return;
       let scrollParent = getScrollParent(target);
@@ -124,7 +126,7 @@ export const PullToRefresh = p => {
       event.preventDefault();
     }
     event.stopPropagation();
-    const height = Math.max(rubberbandIfOutOfBounds(y, 0, 0, headHeight * 5, 0.5), 0);
+    const height = Math.max(rubberbandIfOutOfBounds(parsedY, 0, 0, headHeight * 5, 0.5), 0);
     api.start({
       height
     });

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

@@ -78,13 +78,14 @@ export const Slider = p => {
   const pointList = useMemo(() => {
     if (marks) {
       return Object.keys(marks).map(parseFloat).sort((a, b) => a - b);
-    } else {
+    } else if (ticks) {
       const points = [];
       for (let i = getMiniDecimal(min); i.lessEquals(getMiniDecimal(max)); i = i.add(step)) {
         points.push(i.toNumber());
       }
       return points;
     }
+    return [];
   }, [marks, ticks, step, min, max]);
   function getValueByPosition(position) {
     const newPosition = position < min ? min : position > max ? max : position;
@@ -93,9 +94,10 @@ export const Slider = p => {
     if (pointList.length) {
       value = nearest(pointList, newPosition);
     } else {
-      const lengthPerStep = 100 / ((max - min) / step);
-      const steps = Math.round(newPosition / lengthPerStep);
-      value = steps * lengthPerStep * (max - min) * 0.01 + min;
+      // 使用 MiniDecimal 避免精度问题
+      const cell = Math.round((newPosition - min) / step);
+      const nextVal = getMiniDecimal(cell).multi(step);
+      value = getMiniDecimal(min).add(nextVal.toString()).toNumber();
     }
     return value;
   }

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

@@ -10,7 +10,7 @@ import PageIndicator from '../page-indicator';
 import { staged } from 'staged-components';
 import { useRefState } from '../../utils/use-ref-state';
 import { bound } from '../../utils/bound';
-import { useIsomorphicLayoutEffect } from 'ahooks';
+import { useIsomorphicLayoutEffect, useGetState } from 'ahooks';
 import { mergeFuncProps } from '../../utils/with-func-props';
 const classPrefix = `adm-swiper`;
 const eventToPropRecord = {
@@ -35,6 +35,7 @@ let currentUid;
 export const Swiper = forwardRef(staged((p, ref) => {
   const props = mergeProps(defaultProps, p);
   const [uid] = useState({});
+  const timeoutRef = useRef(null);
   const isVertical = props.direction === 'vertical';
   const slideRatio = props.slideSize / 100;
   const offsetRatio = props.trackOffset / 100;
@@ -73,7 +74,7 @@ export const Swiper = forwardRef(staged((p, ref) => {
       const trackPixels = isVertical ? track.offsetHeight : track.offsetWidth;
       return trackPixels * props.slideSize / 100;
     }
-    const [current, setCurrent] = useState(props.defaultIndex);
+    const [current, setCurrent, getCurrent] = useGetState(props.defaultIndex);
     const [dragging, setDragging, draggingRef] = useRefState(false);
     function boundIndex(current) {
       let min = 0;
@@ -172,7 +173,7 @@ export const Swiper = forwardRef(staged((p, ref) => {
       const roundedIndex = Math.round(index);
       const targetIndex = loop ? modulus(roundedIndex, count) : bound(roundedIndex, 0, count - 1);
       setCurrent(targetIndex);
-      if (targetIndex !== current) {
+      if (targetIndex !== getCurrent()) {
         (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, targetIndex);
       }
       api.start({
@@ -201,16 +202,17 @@ export const Swiper = forwardRef(staged((p, ref) => {
       autoplay,
       autoplayInterval
     } = props;
+    const runTimeSwiper = () => {
+      timeoutRef.current = window.setTimeout(() => {
+        swipeNext();
+        runTimeSwiper();
+      }, autoplayInterval);
+    };
     useEffect(() => {
       if (!autoplay || dragging) return;
-      let interval;
-      function tick() {
-        interval = window.setTimeout(tick, autoplayInterval);
-        swipeNext();
-      }
-      interval = window.setTimeout(tick, autoplayInterval);
+      runTimeSwiper();
       return () => {
-        if (interval) window.clearTimeout(interval);
+        if (timeoutRef.current) window.clearTimeout(timeoutRef.current);
       };
     }, [autoplay, autoplayInterval, dragging, count]);
     function renderTrackInner() {
@@ -240,9 +242,11 @@ export const Swiper = forwardRef(staged((p, ref) => {
           style: {
             [isVertical ? 'y' : 'x']: position.to(position => `${-position}%`)
           }
-        }, React.Children.map(validChildren, child => {
+        }, React.Children.map(validChildren, (child, index) => {
           return React.createElement("div", {
-            className: `${classPrefix}-slide`
+            className: classNames(`${classPrefix}-slide`, {
+              [`${classPrefix}-slide-active`]: current === index
+            })
           }, child);
         }));
       }

package/2x/es/components/text-area/text-area.d.ts

@@ -21,7 +21,7 @@ export declare type TextAreaRef = {
     blur: () => void;
     nativeElement: HTMLTextAreaElement | null;
 };
-export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "onClick" | "disabled" | "name" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoFocus" | "autoComplete" | "readOnly"> & {
+export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "onClick" | "disabled" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoFocus" | "name" | "readOnly" | "autoComplete"> & {
     onChange?: ((val: string) => void) | undefined;
     value?: string | undefined;
     defaultValue?: string | undefined;

package/2x/es/utils/reduce-and-restore-motion.js

@@ -31,5 +31,5 @@ function subscribe(onStoreChange) {
   };
 }
 export function useMotionReduced() {
-  return useSyncExternalStore(subscribe, isMotionReduced);
+  return useSyncExternalStore(subscribe, isMotionReduced, isMotionReduced);
 }

package/2x/package.json

@@ -1,9 +1,9 @@
 {
   "name": "antd-mobile",
-  "version": "5.30.0",
+  "version": "5.31.0",
   "dependencies": {
     "@floating-ui/dom": "^1.2.6",
-    "@rc-component/mini-decimal": "^1.0.1",
+    "@rc-component/mini-decimal": "^1.1.0",
     "@react-spring/web": "~9.6.1",
     "@use-gesture/react": "10.2.20",
     "ahooks": "^3.7.6",

package/README.md

@@ -16,7 +16,7 @@
   <span> · </span>
     <a href="https://discord.gg/jmNvw4WFYn">Discord</a>
   <span> · </span>
-    <a href="https://gw.alipayobjects.com/mdn/rms_25513e/afts/img/A*hBjlR4nUWjkAAAAAAAAAAAAAARQnAQ">钉钉</a>
+    <a href="https://user-images.githubusercontent.com/22469543/197447477-1f10603d-90e9-43ea-a023-6538c5cf40e2.jpeg">钉钉</a>
   </h4>
 </div>