antd-mobile 5.32.0 → 5.32.1

package/2x/cjs/components/picker-view/wheel.js

@@ -78,17 +78,66 @@ const Wheel = (0, _react.memo)(props => {
     if (!item) return;
     onSelect(item.value);
   }
+  const handleGestureState = state => {
+    const {
+      direction: [, direction],
+      distance: [, distance],
+      velocity: [, velocity],
+      offset: [, offset],
+      last
+    } = state;
+    return {
+      direction,
+      distance,
+      velocity,
+      offset,
+      last
+    };
+  };
   const handleDrag = state => {
     draggingRef.current = true;
     const min = -((column.length - 1) * itemHeight.current);
     const max = 0;
-    if (state.last) {
+    const {
+      direction,
+      last,
+      velocity,
+      offset
+    } = handleGestureState(state);
+    if (last) {
+      draggingRef.current = false;
+      const position = offset + velocity * direction * 50;
+      const boundNum = (0, _bound.bound)(position, min, max);
+      const targetIndex = -Math.round(boundNum / itemHeight.current);
+      scrollSelect(targetIndex);
+    } else {
+      const position = offset;
+      api.start({
+        y: (0, _rubberband.rubberbandIfOutOfBounds)(position, min, max, itemHeight.current * 50, 0.2)
+      });
+    }
+  };
+  const handleWheel = state => {
+    draggingRef.current = true;
+    const min = -((column.length - 1) * itemHeight.current);
+    const max = 0;
+    const {
+      direction,
+      last,
+      velocity,
+      distance
+    } = handleGestureState(state);
+    const whellDir = -direction; // 取反
+    const scrollY = y.get();
+    if (last) {
       draggingRef.current = false;
-      const position = state.offset[1] + state.velocity[1] * state.direction[1] * 50;
-      const targetIndex = min < max ? -Math.round((0, _bound.bound)(position, min, max) / itemHeight.current) : 0;
+      const speed = velocity * whellDir * 50;
+      const position = scrollY + distance * whellDir + speed;
+      const boundNum = (0, _bound.bound)(position, min, max);
+      const targetIndex = -Math.round(boundNum / itemHeight.current);
       scrollSelect(targetIndex);
     } else {
-      const position = state.offset[1];
+      const position = scrollY + distance * whellDir;
       api.start({
         y: (0, _rubberband.rubberbandIfOutOfBounds)(position, min, max, itemHeight.current * 50, 0.2)
       });
@@ -108,15 +157,15 @@ const Wheel = (0, _react.memo)(props => {
   });
   (0, _react2.useWheel)(state => {
     state.event.stopPropagation();
-    handleDrag(state);
+    handleWheel(state);
   }, {
+    target: props.mouseWheel ? rootRef : undefined,
     axis: 'y',
     from: () => [0, y.get()],
     preventDefault: true,
-    target: props.mouseWheel ? rootRef : undefined,
     eventOptions: _supportsPassive.supportsPassive ? {
       passive: false
-    } : false
+    } : undefined
   });
   let selectedIndex = null;
   function renderAccessible() {
@@ -129,13 +178,13 @@ const Wheel = (0, _react.memo)(props => {
     const previous = column[previousIndex];
     const next = column[nextIndex];
     return _react.default.createElement("div", {
-      className: 'adm-picker-view-column-accessible'
+      className: `${classPrefix}-column-accessible`
     }, _react.default.createElement("div", {
-      className: 'adm-picker-view-column-accessible-current',
+      className: `${classPrefix}-column-accessible-current`,
       role: 'button',
       "aria-label": current ? `当前选择的是：${current.label}` : '当前未选择'
     }, "-"), _react.default.createElement("div", {
-      className: 'adm-picker-view-column-accessible-button',
+      className: `${classPrefix}-column-accessible-button`,
       onClick: () => {
         if (!previous) return;
         scrollSelect(previousIndex);
@@ -143,7 +192,7 @@ const Wheel = (0, _react.memo)(props => {
       role: previous ? 'button' : 'text',
       "aria-label": !previous ? '没有上一项' : `选择上一项：${previous.label}`
     }, "-"), _react.default.createElement("div", {
-      className: 'adm-picker-view-column-accessible-button',
+      className: `${classPrefix}-column-accessible-button`,
       onClick: () => {
         if (!next) return;
         scrollSelect(nextIndex);
@@ -189,9 +238,7 @@ const Wheel = (0, _react.memo)(props => {
   if (prev.onSelect !== next.onSelect) return false;
   if (prev.renderLabel !== next.renderLabel) return false;
   if (prev.mouseWheel !== next.mouseWheel) return false;
-  if (!(0, _isEqual.default)(prev.column, next.column)) {
-    return false;
-  }
+  if (!(0, _isEqual.default)(prev.column, next.column)) return false;
   return true;
 });
 exports.Wheel = Wheel;

package/2x/cjs/components/popover/popover-menu.css

@@ -1,5 +1,5 @@
 .adm-popover-menu {
-  --border-color: #eeeeee;
+  --border-color: var(--adm-color-border);
 }
 
 .adm-popover-menu.adm-popover {
@@ -58,6 +58,6 @@
 }
 
 .adm-popover.adm-popover-dark.adm-popover-menu {
-  --border-color: #333333;
+  --border-color: var(--adm-color-text);
   --background: rgba(0, 0, 0, 0.9);
 }

package/2x/cjs/components/progress-bar/progress-bar.css

@@ -24,7 +24,7 @@
   flex: none;
   width: calc(var(--text-width) + 16px);
   padding-left: 16px;
-  color: #999999;
+  color: var(--adm-color-weak);
 }
 
 .adm-progress-bar-rounded .adm-progress-bar-trail,

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

@@ -149,7 +149,7 @@ const PullToRefresh = p => {
     enabled: !props.disabled,
     eventOptions: _supportsPassive.supportsPassive ? {
       passive: false
-    } : false
+    } : undefined
   });
   const renderStatusText = () => {
     var _a;

package/2x/cjs/components/rate/rate.d.ts

@@ -9,5 +9,5 @@ export declare type RateProps = {
     readOnly?: boolean;
     value?: number;
     onChange?: (value: number) => void;
-} & NativeProps<'--star-size' | '--active-color' | '--inactive-color'>;
+} & NativeProps<'--star-size' | '--active-color' | '--inactive-color' | '--inactive-color-half'>;
 export declare const Rate: FC<RateProps>;

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

@@ -32,14 +32,14 @@ const Steps = p => {
     if (!_react.default.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.default.cloneElement(child, {
       status,
       icon

package/2x/cjs/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/cjs/components/tag/tag.js

@@ -11,7 +11,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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/cjs/components/text-area/text-area.js

@@ -86,12 +86,21 @@ const TextArea = (0, _react.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 (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: classPrefix
   }, _react.default.createElement("textarea", {
     ref: nativeTextAreaRef,
     className: `${classPrefix}-element`,
-    rows: props.rows,
+    rows: rows,
     value: value,
     placeholder: props.placeholder,
     onChange: e => {
@@ -128,7 +137,7 @@ const TextArea = (0, _react.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/cjs/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/cjs/components/water-mark/water-mark.js

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

package/2x/cjs/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/cjs/locales/base.js

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

package/2x/cjs/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/cjs/locales/da-DK.js

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

package/2x/cjs/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/cjs/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/cjs/locales/es-ES.js

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

package/2x/cjs/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/cjs/locales/fa-IR.js

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

package/2x/cjs/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/cjs/locales/fr-FR.js

@@ -16,7 +16,7 @@ const frFR = (0, _mergeLocale.mergeLocale)(_base.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/cjs/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/cjs/locales/id-ID.js

@@ -16,7 +16,7 @@ const idID = (0, _mergeLocale.mergeLocale)(_base.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/cjs/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/cjs/locales/it-IT.js

@@ -17,7 +17,7 @@ const itIT = (0, _mergeLocale.mergeLocale)(_base.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/cjs/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/cjs/locales/ja-JP.js

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

package/2x/cjs/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/cjs/locales/kk-KZ.js

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

package/2x/cjs/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/cjs/locales/ko-KR.js

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

package/2x/cjs/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/cjs/locales/nb-NO.js

@@ -17,7 +17,7 @@ const nbNO = (0, _mergeLocale.mergeLocale)(_base.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/cjs/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/cjs/locales/nl-NL.js

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

package/2x/cjs/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/cjs/locales/ru-RU.js

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

package/2x/cjs/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/cjs/locales/zh-CN.js

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

package/2x/cjs/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/cjs/locales/zh-HK.js

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

package/2x/cjs/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/cjs/locales/zh-TW.js

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

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

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

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

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