antd-mobile 5.32.0 → 5.32.2

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

@@ -25,14 +25,14 @@ export const Steps = p => {
     if (!React.isValidElement(child)) {
       return child;
     }
-    const props = child.props;
-    let status = props.status || 'wait';
+    const childProps = child.props;
+    let status = childProps.status || 'wait';
     if (index < current) {
-      status = props.status || 'finish';
+      status = childProps.status || 'finish';
     } else if (index === current) {
-      status = props.status || 'process';
+      status = childProps.status || 'process';
     }
-    const icon = (_a = props.icon) !== null && _a !== void 0 ? _a : defaultIcon;
+    const icon = (_a = childProps.icon) !== null && _a !== void 0 ? _a : defaultIcon;
     return React.cloneElement(child, {
       status,
       icon

package/2x/es/components/swipe-action/swipe-action.d.ts

@@ -1,9 +1,10 @@
 import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { PropagationEvent } from '../../utils/with-stop-propagation';
+declare type SideType = 'left' | 'right';
 export declare type SwipeActionRef = {
     close: () => void;
-    show: (side?: 'left' | 'right') => void;
+    show: (side?: SideType) => void;
 };
 declare type ActionColor = 'light' | 'weak' | 'primary' | 'success' | 'warning' | 'danger';
 export declare type Action = {
@@ -20,7 +21,7 @@ export declare type SwipeActionProps = {
     closeOnAction?: boolean;
     children: ReactNode;
     stopPropagation?: PropagationEvent[];
-    onActionsReveal?: (side: 'left' | 'right') => void;
+    onActionsReveal?: (side: SideType) => void;
 } & NativeProps<'--background'>;
 export declare const SwipeAction: React.ForwardRefExoticComponent<{
     rightActions?: Action[] | undefined;
@@ -30,7 +31,7 @@ export declare const SwipeAction: React.ForwardRefExoticComponent<{
     closeOnAction?: boolean | undefined;
     children: ReactNode;
     stopPropagation?: "click"[] | undefined;
-    onActionsReveal?: ((side: 'left' | 'right') => void) | undefined;
+    onActionsReveal?: ((side: SideType) => void) | undefined;
 } & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--background", string>>) | undefined;

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

@@ -4,7 +4,7 @@ import { withNativeProps } from '../../utils/native-props';
 import classNames from 'classnames';
 const classPrefix = `adm-tag`;
 const colorRecord = {
-  default: '#666666',
+  default: 'var(--adm-color-text-secondary, #666666)',
   primary: 'var(--adm-color-primary, #1677ff)',
   success: 'var(--adm-color-success, #00b578)',
   warning: 'var(--adm-color-warning, #ff8f1f)',

package/2x/es/components/text-area/text-area.js

@@ -77,12 +77,21 @@ export const TextArea = forwardRef((p, ref) => {
       className: `${classPrefix}-count`
     }, maxLength === undefined ? valueLength : valueLength + '/' + maxLength);
   }
+  let rows = props.rows;
+  if (typeof autoSize === 'object') {
+    if (autoSize.maxRows && rows > autoSize.maxRows) {
+      rows = autoSize.maxRows;
+    }
+    if (autoSize.minRows && rows < autoSize.minRows) {
+      rows = autoSize.minRows;
+    }
+  }
   return withNativeProps(props, React.createElement("div", {
     className: classPrefix
   }, React.createElement("textarea", {
     ref: nativeTextAreaRef,
     className: `${classPrefix}-element`,
-    rows: props.rows,
+    rows: rows,
     value: value,
     placeholder: props.placeholder,
     onChange: e => {
@@ -119,7 +128,7 @@ export const TextArea = forwardRef((p, ref) => {
     ref: hiddenTextAreaRef,
     className: `${classPrefix}-element ${classPrefix}-element-hidden`,
     value: value,
-    rows: props.rows,
+    rows: rows,
     "aria-hidden": true,
     readOnly: true
   })));

package/2x/es/components/toast/toast.css

@@ -4,14 +4,14 @@
   left: 0;
   width: 100%;
   height: 100%;
+  text-align: center;
 }
 
 .adm-toast-mask .adm-toast-main {
   display: inline-block;
   position: relative;
   top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
+  transform: translateY(-50%);
   width: auto;
   max-width: 408px;
   max-height: 70%;

package/2x/es/components/tree-select/tree-select.css

@@ -20,7 +20,7 @@
 
 .adm-tree-select-column:nth-child(2),
 .adm-tree-select-multiple-column:nth-child(2) {
-  background-color: #fafafa;
+  background-color: var(--adm-color-box);
 }
 
 .adm-tree-select-item,

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

@@ -9,7 +9,7 @@ const defaultProps = {
 export const WaterMark = p => {
   const props = mergeProps(defaultProps, p);
   const {
-    zIndex = 2000,
+    zIndex,
     gapX = 24,
     gapY = 48,
     width = 120,

package/2x/es/global/global.css

@@ -16,12 +16,16 @@
   --adm-color-success: #00b578;
   --adm-color-warning: #ff8f1f;
   --adm-color-danger: #ff3141;
+  --adm-color-yellow: #ff9f18;
+  --adm-color-orange: #ff6430;
+  --adm-color-wathet: #e7f1ff;
   --adm-color-text: #333333;
   --adm-color-text-secondary: #666666;
   --adm-color-weak: #999999;
   --adm-color-light: #cccccc;
   --adm-color-border: #eeeeee;
   --adm-color-background: #ffffff;
+  --adm-color-highlight: var(--adm-color-danger);
   --adm-color-white: #ffffff;
   --adm-color-box: #f5f5f5;
   --adm-color-text-light-solid: var(--adm-color-white);
@@ -39,6 +43,9 @@ html[data-prefers-color-scheme='dark'] {
   --adm-color-success: #34b368;
   --adm-color-warning: #ffa930;
   --adm-color-danger: #ff4a58;
+  --adm-color-yellow: #ffa930;
+  --adm-color-orange: #e65a2b;
+  --adm-color-wathet: #0d2543;
   --adm-color-text: #e6e6e6;
   --adm-color-text-secondary: #b3b3b3;
   --adm-color-weak: #808080;
@@ -57,6 +64,7 @@ body {
   color: var(--adm-color-text);
   font-size: var(--adm-font-size-main);
   font-family: var(--adm-font-family);
+  background-color: var(--adm-color-background);
 }
 
 a,

package/2x/es/global/theme-dark.css

@@ -3,6 +3,9 @@ html[data-prefers-color-scheme='dark'] {
   --adm-color-success: #34b368;
   --adm-color-warning: #ffa930;
   --adm-color-danger: #ff4a58;
+  --adm-color-yellow: #ffa930;
+  --adm-color-orange: #e65a2b;
+  --adm-color-wathet: #0d2543;
   --adm-color-text: #e6e6e6;
   --adm-color-text-secondary: #b3b3b3;
   --adm-color-weak: #808080;

package/2x/es/global/theme-default.css

@@ -16,12 +16,16 @@
   --adm-color-success: #00b578;
   --adm-color-warning: #ff8f1f;
   --adm-color-danger: #ff3141;
+  --adm-color-yellow: #ff9f18;
+  --adm-color-orange: #ff6430;
+  --adm-color-wathet: #e7f1ff;
   --adm-color-text: #333333;
   --adm-color-text-secondary: #666666;
   --adm-color-weak: #999999;
   --adm-color-light: #cccccc;
   --adm-color-border: #eeeeee;
   --adm-color-background: #ffffff;
+  --adm-color-highlight: var(--adm-color-danger);
   --adm-color-white: #ffffff;
   --adm-color-box: #f5f5f5;
   --adm-color-text-light-solid: var(--adm-color-white);

package/2x/es/locales/base.d.ts

@@ -8,7 +8,7 @@ export declare const base: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/base.js

@@ -9,7 +9,7 @@ export const base = {
   },
   Calendar: {
     markItems: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-    renderYearAndMonth: (year, month) => `${year}/${month}`
+    yearAndMonth: '${year}/${month}'
   },
   Cascader: {
     placeholder: 'Selecting'

package/2x/es/locales/da-DK.d.ts

@@ -8,7 +8,7 @@ declare const daDK: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/da-DK.js

@@ -11,7 +11,7 @@ const daDK = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['ma', 'ti', 'on', 'to', 'fr', 'lø', 'sø'],
-    renderYearAndMonth: (year, month) => `${month}.${year}`
+    yearAndMonth: '${month}.${year}'
   },
   Cascader: {
     placeholder: 'Vælger'

package/2x/es/locales/en-US.d.ts

@@ -8,7 +8,7 @@ declare const enUS: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/es-ES.d.ts

@@ -8,7 +8,7 @@ declare const esES: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/es-ES.js

@@ -10,7 +10,7 @@ const esES = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab', 'Dom'],
-    renderYearAndMonth: (year, month) => `${year}/${month}`
+    yearAndMonth: '${year}/${month}'
   },
   Cascader: {
     placeholder: 'Seleccionando'

package/2x/es/locales/fa-IR.d.ts

@@ -8,7 +8,7 @@ declare const faIR: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/fa-IR.js

@@ -9,7 +9,7 @@ const faIR = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['شنبه', 'یک‌شنبه', 'دو‌شنبه', 'سه‌شنبه', 'چهار‌شنبه', 'پنج‌نشبه', 'جمعه'],
-    renderYearAndMonth: (year, month) => `${year}/${month}`
+    yearAndMonth: '${year}/${month}'
   },
   Cascader: {
     placeholder: 'انتخاب کنید'

package/2x/es/locales/fr-FR.d.ts

@@ -8,7 +8,7 @@ declare const frFR: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/fr-FR.js

@@ -10,7 +10,7 @@ const frFR = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['un', 'deux', 'trois', 'quatre', 'cinq', 'six', 'sept'],
-    renderYearAndMonth: (year, month) => `${year}Année ${month}Mois`
+    yearAndMonth: '${year}Année ${month}Mois'
   },
   Cascader: {
     placeholder: 'Veuillez sélectionner'

package/2x/es/locales/id-ID.d.ts

@@ -8,7 +8,7 @@ declare const idID: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/id-ID.js

@@ -10,7 +10,7 @@ const idID = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Senin', 'Selasa', 'Rabu', 'Kamis', 'Jumat', 'Sabtu', 'Minggu'],
-    renderYearAndMonth: (year, month) => `${year} Tahun ${month} Bulan`
+    yearAndMonth: '${year} Tahun ${month} Bulan'
   },
   Cascader: {
     placeholder: 'Silahkan Pilih'

package/2x/es/locales/it-IT.d.ts

@@ -8,7 +8,7 @@ declare const itIT: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/it-IT.js

@@ -11,7 +11,7 @@ const itIT = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['lun', 'mar', 'mer', 'gio', 'ven', 'sab', 'dom'],
-    renderYearAndMonth: (year, month) => `${month}/${year}`
+    yearAndMonth: '${month}/${year}'
   },
   Cascader: {
     placeholder: 'Si prega di selezionare'

package/2x/es/locales/ja-JP.d.ts

@@ -8,7 +8,7 @@ declare const jaJP: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/ja-JP.js

@@ -10,7 +10,7 @@ const jaJP = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['月', '火', '水', '木', '金', '土', '日'],
-    renderYearAndMonth: (year, month) => ` ${year}年${month}月`
+    yearAndMonth: '${year}年${month}月'
   },
   Cascader: {
     placeholder: '選択下さい'

package/2x/es/locales/kk-KZ.d.ts

@@ -8,7 +8,7 @@ declare const kkKZ: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/kk-KZ.js

@@ -10,7 +10,7 @@ const kkKZ = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Дү', 'Се', 'Сә', 'Бе', 'Жұ', 'Се', 'Же'],
-    renderYearAndMonth: (year, month) => `${year}жыл${month}-ші ай`
+    yearAndMonth: '${year}жыл${month}-ші ай'
   },
   Cascader: {
     placeholder: 'Таңдаңыз'

package/2x/es/locales/ko-KR.d.ts

@@ -8,7 +8,7 @@ declare const koKR: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/ko-KR.js

@@ -11,7 +11,7 @@ const koKR = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['월', '화', '수', '목', '금', '토', '일'],
-    renderYearAndMonth: (year, month) => `${year}년 ${month}월`
+    yearAndMonth: '${year}년 ${month}월'
   },
   Cascader: {
     placeholder: '선택됨'

package/2x/es/locales/nb-NO.d.ts

@@ -8,7 +8,7 @@ declare const nbNO: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/nb-NO.js

@@ -11,7 +11,7 @@ const nbNO = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør', 'Søn'],
-    renderYearAndMonth: (year, month) => `${month}.${year}`
+    yearAndMonth: '${month}.${year}'
   },
   Cascader: {
     placeholder: 'Velg'

package/2x/es/locales/nl-NL.d.ts

@@ -8,7 +8,7 @@ declare const nlNL: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/nl-NL.js

@@ -11,7 +11,7 @@ const nlNL = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za', 'Zo'],
-    renderYearAndMonth: (year, month) => `${month}-${year}`
+    yearAndMonth: '${month}-${year}'
   },
   Cascader: {
     placeholder: 'Selecteren'

package/2x/es/locales/ru-RU.d.ts

@@ -8,7 +8,7 @@ declare const ruRU: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/ru-RU.js

@@ -11,7 +11,7 @@ const ruRU = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'],
-    renderYearAndMonth: (year, month) => `${year}/${month}`
+    yearAndMonth: '${year}/${month}'
   },
   Cascader: {
     placeholder: 'Выбор'

package/2x/es/locales/zh-CN.d.ts

@@ -8,7 +8,7 @@ declare const zhCN: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/zh-CN.js

@@ -11,7 +11,7 @@ const zhCN = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['一', '二', '三', '四', '五', '六', '日'],
-    renderYearAndMonth: (year, month) => `${year}年${month}月`
+    yearAndMonth: '${year}年${month}月'
   },
   Cascader: {
     placeholder: '请选择'

package/2x/es/locales/zh-HK.d.ts

@@ -8,7 +8,7 @@ declare const zhHK: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/zh-HK.js

@@ -11,7 +11,7 @@ const zhHK = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['一', '二', '三', '四', '五', '六', '日'],
-    renderYearAndMonth: (year, month) => `${year}年${month}月`
+    yearAndMonth: '${year}年${month}月'
   },
   Cascader: {
     placeholder: '請選擇'

package/2x/es/locales/zh-TW.d.ts

@@ -8,7 +8,7 @@ declare const zhTW: {
     };
     Calendar: {
         markItems: string[];
-        renderYearAndMonth: (year: number, month: number) => string;
+        yearAndMonth: string;
     };
     Cascader: {
         placeholder: string;

package/2x/es/locales/zh-TW.js

@@ -11,7 +11,7 @@ const zhTW = mergeLocale(base, {
   },
   Calendar: {
     markItems: ['一', '二', '三', '四', '五', '六', '日'],
-    renderYearAndMonth: (year, month) => `${year}年${month}月`
+    yearAndMonth: '${year}年${month}月'
   },
   Cascader: {
     placeholder: '請選擇'

package/2x/es/utils/replace-message.d.ts

@@ -0,0 +1 @@
+export declare function replaceMessage(template: string, kv: Record<string, string>): string;

package/2x/es/utils/replace-message.js

@@ -0,0 +1,7 @@
+// 移植自 field-form https://github.com/react-component/field-form/blob/master/src/utils/validateUtil.ts#L21
+export function replaceMessage(template, kv) {
+  return template.replace(/\$\{\w+\}/g, str => {
+    const key = str.slice(2, -1);
+    return kv[key];
+  });
+}

package/2x/es/utils/use-lock-scroll.js

@@ -35,14 +35,18 @@ export function useLockScroll(rootRef, shouldLock) {
       offsetHeight,
       scrollTop
     } = el;
+    const {
+      height
+    } = el.getBoundingClientRect();
     let status = '11';
     if (scrollTop === 0) {
       status = offsetHeight >= scrollHeight ? '00' : '01';
-    } else if (scrollTop + offsetHeight >= scrollHeight) {
+    } else if (scrollHeight <= Math.round(height + scrollTop)) {
       status = '10';
     }
     if (status !== '11' && touch.isVertical() && !(parseInt(status, 2) & parseInt(direction, 2))) {
-      if (event.cancelable) {
+      if (event.cancelable && supportsPassive) {
+        // https://github.com/ant-design/ant-design-mobile/issues/6282
         event.preventDefault();
       }
     }

package/2x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.32.0",
+  "version": "5.32.2",
   "dependencies": {
     "@floating-ui/dom": "^1.4.2",
     "@rc-component/mini-decimal": "^1.1.0",