antd-mobile 5.25.1 → 5.26.0

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

@@ -1,18 +1,23 @@
 import { __awaiter } from "tslib";
 import React, { useRef, useState } from 'react';
-import { AddOutline } from 'antd-mobile-icons';
+import { AddOutline, CloseOutline } from 'antd-mobile-icons';
 import { mergeProps } from '../../utils/with-default-props';
 import ImageViewer from '../image-viewer';
 import PreviewItem from './preview-item';
 import { usePropsValue } from '../../utils/use-props-value';
-import { useIsomorphicLayoutEffect, useUnmount } from 'ahooks';
+import { useIsomorphicLayoutEffect, useUnmount, useSize } from 'ahooks';
 import Space from '../space';
 import { withNativeProps } from '../../utils/native-props';
+import { measureCSSLength } from '../../utils/measure-css-length';
 import { useConfig } from '../config-provider';
+import Grid from '../grid';
 const classPrefix = `adm-image-uploader`;
 const defaultProps = {
   disableUpload: false,
   deletable: true,
+  deleteIcon: React.createElement(CloseOutline, {
+    className: `${classPrefix}-cell-delete-icon`
+  }),
   showUpload: true,
   multiple: false,
   maxCount: 0,
@@ -27,8 +32,26 @@ export const ImageUploader = p => {
     locale
   } = useConfig();
   const props = mergeProps(defaultProps, p);
+  const {
+    columns
+  } = props;
   const [value, setValue] = usePropsValue(props);
   const [tasks, setTasks] = useState([]);
+  const containerRef = useRef(null);
+  const containerSize = useSize(containerRef);
+  const gapMeasureRef = useRef(null);
+  const [cellSize, setCellSize] = useState(80);
+  useIsomorphicLayoutEffect(() => {
+    const gapMeasure = gapMeasureRef.current;
+    if (columns && containerSize && gapMeasure) {
+      const width = containerSize.width;
+      const gap = measureCSSLength(window.getComputedStyle(gapMeasure).getPropertyValue('height'));
+      setCellSize((width - gap * (columns - 1)) / columns);
+    }
+  }, [containerSize === null || containerSize === void 0 ? void 0 : containerSize.width]);
+  const style = {
+    '--cell-size': cellSize + 'px'
+  };
   useIsomorphicLayoutEffect(() => {
     setTasks(prev => prev.filter(task => {
       if (task.url === undefined) return true;
@@ -152,6 +175,7 @@ export const ImageUploader = p => {
         key: (_a = fileItem.key) !== null && _a !== void 0 ? _a : index,
         url: (_b = fileItem.thumbnailUrl) !== null && _b !== void 0 ? _b : fileItem.url,
         deletable: props.deletable,
+        deleteIcon: props.deleteIcon,
         imageFit: props.imageFit,
         onClick: () => {
           if (props.preview) {
@@ -169,21 +193,19 @@ export const ImageUploader = p => {
       return renderItem ? renderItem(originNode, fileItem, value) : originNode;
     });
   };
-  return withNativeProps(props, React.createElement("div", {
-    className: classPrefix
-  }, React.createElement(Space, {
-    className: `${classPrefix}-space`,
-    wrap: true,
-    block: true
-  }, renderImages(), finalTasks.map(task => {
+  const contentNode = React.createElement(React.Fragment, null, renderImages(), tasks.map(task => {
+    if (!props.showFailed && task.status === 'fail') {
+      return null;
+    }
     return React.createElement(PreviewItem, {
       key: task.id,
       file: task.file,
       deletable: task.status !== 'pending',
+      deleteIcon: props.deleteIcon,
       status: task.status,
       imageFit: props.imageFit,
       onDelete: () => {
-        setTasks(prev => prev.filter(x => x.id !== task.id));
+        setTasks(tasks.filter(x => x.id !== task.id));
       }
     });
   }), showUpload && React.createElement("div", {
@@ -202,5 +224,20 @@ export const ImageUploader = p => {
     className: `${classPrefix}-input`,
     onChange: onChange,
     "aria-hidden": true
-  })))));
+  })));
+  return withNativeProps(props, React.createElement("div", {
+    className: classPrefix,
+    ref: containerRef
+  }, columns ? React.createElement(Grid, {
+    className: `${classPrefix}-grid`,
+    columns: columns,
+    style: style
+  }, React.createElement("div", {
+    className: `${classPrefix}-gap-measure`,
+    ref: gapMeasureRef
+  }), contentNode.props.children) : React.createElement(Space, {
+    className: `${classPrefix}-space`,
+    wrap: true,
+    block: true
+  }, contentNode.props.children)));
 };

package/es/components/image-uploader/preview-item.d.ts

@@ -1,10 +1,11 @@
-import { FC } from 'react';
+import React, { FC } from 'react';
 import { TaskStatus } from './image-uploader';
 import type { ImageProps } from '../image';
 declare type Props = {
     onClick?: () => void;
     onDelete?: () => void;
     deletable: boolean;
+    deleteIcon: React.ReactNode;
     url?: string;
     file?: File;
     status?: TaskStatus;

package/es/components/image-uploader/preview-item.js

@@ -1,5 +1,4 @@
-import React, { useLayoutEffect, useMemo } from 'react';
-import { CloseOutline } from 'antd-mobile-icons';
+import React, { useEffect, useMemo } from 'react';
 import classNames from 'classnames';
 import Image from '../image';
 import SpinLoading from '../spin-loading';
@@ -13,6 +12,7 @@ const PreviewItem = props => {
     url,
     file,
     deletable,
+    deleteIcon,
     onDelete,
     imageFit
   } = props;
@@ -25,11 +25,11 @@ const PreviewItem = props => {
     }
     return '';
   }, [url, file]);
-  useLayoutEffect(() => {
+  useEffect(() => {
     return () => {
-      URL.revokeObjectURL(src);
+      if (file) URL.revokeObjectURL(src);
     };
-  }, [src]);
+  }, [src, file]);
   function renderLoading() {
     return props.status === 'pending' && React.createElement("div", {
       className: `${classPrefix}-cell-mask`
@@ -45,9 +45,7 @@ const PreviewItem = props => {
     return deletable && React.createElement("span", {
       className: `${classPrefix}-cell-delete`,
       onClick: onDelete
-    }, React.createElement(CloseOutline, {
-      className: `${classPrefix}-cell-delete-icon`
-    }));
+    }, deleteIcon);
   }
   return React.createElement("div", {
     className: classNames(`${classPrefix}-cell`, props.status === 'fail' && `${classPrefix}-cell-fail`)

package/es/components/mask/mask.d.ts

@@ -8,7 +8,7 @@ export declare type MaskProps = {
     destroyOnClose?: boolean;
     forceRender?: boolean;
     disableBodyScroll?: boolean;
-    color?: 'black' | 'white';
+    color?: 'white' | 'black' | (string & {});
     opacity?: 'default' | 'thin' | 'thick' | number;
     getContainer?: GetContainer;
     afterShow?: () => void;

package/es/components/mask/mask.js

@@ -14,6 +14,10 @@ const opacityRecord = {
   thin: 0.35,
   thick: 0.75
 };
+const colorRecord = {
+  black: '0, 0, 0',
+  white: '255, 255, 255'
+};
 const defaultProps = {
   visible: true,
   destroyOnClose: false,
@@ -34,8 +38,8 @@ export const Mask = p => {
   const background = useMemo(() => {
     var _a;
     const opacity = (_a = opacityRecord[props.opacity]) !== null && _a !== void 0 ? _a : props.opacity;
-    const rgb = props.color === 'white' ? '255, 255, 255' : '0, 0, 0';
-    return `rgba(${rgb}, ${opacity})`;
+    const rgb = colorRecord[props.color];
+    return rgb ? `rgba(${rgb}, ${opacity})` : props.color;
   }, [props.color, props.opacity]);
   const [active, setActive] = useState(props.visible);
   const unmountedRef = useUnmountedRef();

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

@@ -4,11 +4,10 @@
   --text-color: var(--adm-color-white);
   --font-size: var(--adm-font-size-7);
   --icon-font-size: var(--adm-font-size-10);
-  --height: 38px;
+  --height: 40px;
   height: var(--height);
   box-sizing: border-box;
   font-size: var(--font-size);
-  line-height: var(--height);
   padding: 0 12px;
   display: flex;
   align-items: center;
@@ -41,7 +40,6 @@
   flex-shrink: 0;
   margin-right: 8px;
   font-size: var(--icon-font-size);
-  line-height: var(--height);
 }
 .adm-notice-bar .adm-notice-bar-content {
   flex: 1;
@@ -54,9 +52,11 @@
 .adm-notice-bar .adm-notice-bar-content .adm-notice-bar-content-inner {
   width: auto;
   transition-timing-function: linear;
-  position: absolute;
   white-space: nowrap;
 }
+.adm-notice-bar-wrap.adm-notice-bar .adm-notice-bar-content .adm-notice-bar-content-inner {
+  white-space: normal;
+}
 .adm-notice-bar .adm-notice-bar-right {
   flex-shrink: 0;
   margin-left: 12px;
@@ -72,3 +72,10 @@
 .adm-notice-bar-close-icon {
   font-size: var(--adm-font-size-10);
 }
+.adm-notice-bar-wrap {
+  height: auto;
+  align-items: flex-start;
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: 22px;
+}

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

@@ -1,21 +1,23 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type NoticeBarProps = {
-    /** 通告栏的类型 */
+    /** The type of the NoticeBar */
     color?: 'default' | 'alert' | 'error' | 'info';
-    /** 开始滚动的延迟，单位 ms */
+    /** TDelay to start scrolling, unit ms */
     delay?: number;
-    /** 滚动速度，单位 px/s */
+    /** Scroll speed, unit px/s */
     speed?: number;
-    /** 公告内容 */
+    /** The content of the NoticeBar */
     content: React.ReactNode;
-    /** 是否可关闭 */
+    /** Whether it can be closed */
     closeable?: boolean;
-    /** 关闭时的回调 */
+    /** Callback when closed */
     onClose?: () => void;
-    /** 额外操作区域，显示在关闭按钮左侧 */
+    /** Additional operating area, displayed to the left of the close button */
     extra?: React.ReactNode;
-    /** 左侧广播图标 */
+    /** Radio icon on the left */
     icon?: React.ReactNode;
+    /** Whether to display multiple lines */
+    wrap?: boolean;
 } & NativeProps<'--background-color' | '--border-color' | '--text-color' | '--font-size' | '--icon-font-size' | '--height'>;
 export declare const NoticeBar: React.NamedExoticComponent<NoticeBarProps>;

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

@@ -11,6 +11,7 @@ const defaultProps = {
   color: 'default',
   delay: 2000,
   speed: 50,
+  wrap: false,
   icon: React.createElement(SoundOutline, null)
 };
 export const NoticeBar = memo(p => {
@@ -22,7 +23,7 @@ export const NoticeBar = memo(p => {
   const delayLockRef = useRef(true);
   const animatingRef = useRef(false);
   function start() {
-    if (delayLockRef.current) return;
+    if (delayLockRef.current || props.wrap) return;
     const container = containerRef.current;
     const text = textRef.current;
     if (!container || !text) return;
@@ -61,7 +62,9 @@ export const NoticeBar = memo(p => {
   });
   if (!visible) return null;
   return withNativeProps(props, React.createElement("div", {
-    className: classNames(classPrefix, `${classPrefix}-${props.color}`)
+    className: classNames(classPrefix, `${classPrefix}-${props.color}`, {
+      [`${classPrefix}-wrap`]: props.wrap
+    })
   }, props.icon && React.createElement("span", {
     className: `${classPrefix}-left`
   }, props.icon), React.createElement("span", {

package/es/components/stepper/stepper.d.ts

@@ -20,6 +20,8 @@ export declare type StepperProps = Pick<InputProps, 'onFocus' | 'onBlur'> & (Val
     digits?: number;
     disabled?: boolean;
     inputReadOnly?: boolean;
+    parser?: (text: string) => number;
+    formatter?: (value?: number) => string;
 } & NativeProps<'--height' | '--input-width' | '--input-font-size' | '--input-background-color' | '--border-radius' | '--border' | '--border-inner' | '--active-border' | '--button-font-size' | '--button-background-color' | '--button-width' | '--input-font-color' | '--button-text-color'>;
 export declare const Stepper: FC<StepperProps>;
 export {};

package/es/components/stepper/stepper.js

@@ -23,35 +23,45 @@ export const Stepper = p => {
     step,
     max,
     min,
-    inputReadOnly
+    inputReadOnly,
+    digits,
+    formatter,
+    parser
   } = props;
   const {
     locale
   } = useConfig();
+  // ========================== Parse / Format ==========================
+  const parseValue = text => {
+    if (text === '') return null;
+    return parser ? parser(text) : parseFloat(text);
+  };
+  const formatValue = value => {
+    if (value === null) return '';
+    if (formatter) {
+      return formatter(value);
+    } else if (digits !== undefined) {
+      return value.toFixed(digits);
+    } else {
+      return value.toString();
+    }
+  };
+  // ======================== Value & InputValue ========================
   const [value, setValue] = usePropsValue(props);
-  const [inputValue, setInputValue] = useState(() => convertValueToText(value, props.digits));
+  const [inputValue, setInputValue] = useState(() => formatValue(value));
+  // >>>>> Value
   function setValueWithCheck(v) {
     if (isNaN(v)) return;
     let target = bound(v, props.min, props.max);
-    if (props.digits !== undefined) {
-      target = parseFloat(target.toFixed(props.digits));
+    if (digits !== undefined) {
+      target = parseFloat(target.toFixed(digits));
     }
     setValue(target);
   }
-  const [hasFocus, setHasFocus] = useState(false);
-  useEffect(() => {
-    if (!hasFocus) {
-      setInputValue(convertValueToText(value, props.digits));
-    }
-  }, [hasFocus]);
-  useEffect(() => {
-    if (!hasFocus) {
-      setInputValue(convertValueToText(value, props.digits));
-    }
-  }, [value, props.digits]);
+  // >>>>> Input
   const handleInputChange = v => {
     setInputValue(v);
-    const value = convertTextToValue(v);
+    const value = parseValue(v);
     if (value === null) {
       if (props.allowEmpty) {
         setValue(null);
@@ -62,6 +72,29 @@ export const Stepper = p => {
       setValueWithCheck(value);
     }
   };
+  // ============================== Focus ===============================
+  const [focused, setFocused] = useState(false);
+  const inputRef = React.useRef(null);
+  function triggerFocus(nextFocus) {
+    setFocused(nextFocus);
+    // We will convert value to original text when focus
+    if (nextFocus) {
+      setInputValue(typeof value === 'number' ? String(value) : '');
+    }
+  }
+  useEffect(() => {
+    var _a, _b, _c;
+    if (focused) {
+      (_c = (_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.nativeElement) === null || _b === void 0 ? void 0 : _b.select) === null || _c === void 0 ? void 0 : _c.call(_b);
+    }
+  }, [focused]);
+  // Focus change to format value
+  useEffect(() => {
+    if (!focused) {
+      setInputValue(formatValue(value));
+    }
+  }, [focused, value, digits]);
+  // ============================ Operations ============================
   const handleMinus = () => {
     setValueWithCheck(Big(value !== null && value !== void 0 ? value : 0).minus(step).toNumber());
   };
@@ -84,9 +117,10 @@ export const Stepper = p => {
     }
     return false;
   };
+  // ============================== Render ==============================
   return withNativeProps(props, React.createElement("div", {
     className: classNames(classPrefix, {
-      [`${classPrefix}-active`]: hasFocus
+      [`${classPrefix}-active`]: focused
     })
   }, React.createElement(Button, {
     className: `${classPrefix}-minus`,
@@ -99,10 +133,11 @@ export const Stepper = p => {
   }, React.createElement(MinusOutline, null)), React.createElement("div", {
     className: `${classPrefix}-middle`
   }, React.createElement(Input, {
+    ref: inputRef,
     className: `${classPrefix}-input`,
     onFocus: e => {
       var _a;
-      setHasFocus(true);
+      triggerFocus(true);
       (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props, e);
     },
     value: inputValue,
@@ -112,7 +147,7 @@ export const Stepper = p => {
     disabled: disabled,
     onBlur: e => {
       var _a;
-      setHasFocus(false);
+      triggerFocus(false);
       (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
     },
     readOnly: inputReadOnly,
@@ -130,16 +165,4 @@ export const Stepper = p => {
     color: 'primary',
     "aria-label": locale.Stepper.increase
   }, React.createElement(AddOutline, null))));
-};
-function convertValueToText(value, digits) {
-  if (value === null) return '';
-  if (digits !== undefined) {
-    return value.toFixed(digits);
-  } else {
-    return value.toString();
-  }
-}
-function convertTextToValue(text) {
-  if (text === '') return null;
-  return parseFloat(text);
-}
+};

package/es/components/water-mark/water-mark.d.ts

@@ -10,7 +10,7 @@ export declare type WaterMarkProps = {
     image?: string;
     imageWidth?: number;
     imageHeight?: number;
-    content?: string;
+    content?: string | string[];
     fontColor?: string;
     fontStyle?: 'none' | 'normal' | 'italic' | 'oblique';
     fontFamily?: string;

package/es/components/water-mark/water-mark.js

@@ -58,7 +58,11 @@ export const WaterMark = p => {
         const markSize = Number(fontSize) * ratio;
         ctx.font = `${fontStyle} normal ${fontWeight} ${markSize}px/${markHeight}px ${fontFamily}`;
         ctx.fillStyle = fontColor;
-        ctx.fillText(content, 0, 0);
+        if (Array.isArray(content)) {
+          content.forEach((item, index) => ctx.fillText(item, 0, index * markSize));
+        } else {
+          ctx.fillText(content, 0, 0);
+        }
         ctx.restore();
         setBase64Url(canvas.toDataURL());
       }

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "antd-mobile",
-  "version": "5.25.1",
+  "version": "5.26.0",
   "dependencies": {
-    "@floating-ui/dom": "^1.0.0",
-    "@react-spring/web": "^9.4.5",
+    "@floating-ui/dom": "^1.0.6",
+    "@react-spring/web": "^9.5.5",
     "@use-gesture/react": "10.2.20",
-    "ahooks": "^3.7.0",
+    "ahooks": "^3.7.2",
     "antd-mobile-icons": "^0.3.0",
     "antd-mobile-v5-count": "^1.0.1",
     "big.js": "^6.2.1",
-    "classnames": "^2.3.1",
-    "dayjs": "^1.11.4",
+    "classnames": "^2.3.2",
+    "dayjs": "^1.11.6",
     "lodash": "^4.17.21",
-    "rc-field-form": "~1.27.0",
+    "rc-field-form": "~1.27.3",
     "react-is": "^17.0.2",
     "runes": "^0.4.3",
     "staged-components": "^1.1.3",
-    "tslib": "^2.4.0",
-    "use-sync-external-store": "^1.1.0"
+    "tslib": "^2.4.1",
+    "use-sync-external-store": "^1.2.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"