antd-mobile 5.2.1 → 5.3.1

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

@@ -19,56 +19,61 @@
   transform: translate(-50%, -50%);
 }
 
-.adm-modal-main {
+.adm-modal-body {
   width: 100%;
   max-height: 70vh;
   box-sizing: border-box;
   font-size: 28px;
   background-color: white;
   border-radius: 16px;
-  overflow-x: hidden;
-  overflow-y: auto;
+  overflow: hidden;
   display: flex;
   flex-direction: column;
 }
 
-.adm-modal-main > * {
+.adm-modal-body > * {
   flex: none;
 }
 
-.adm-modal-main > .adm-modal-image-container {
+.adm-modal-body > .adm-modal-content {
   flex: auto;
 }
 
-.adm-modal-main .adm-modal-body {
-  padding: 40px 24px 24px;
-  display: flex;
-  flex-direction: column;
+.adm-modal-body:not(.adm-modal-with-image) {
+  padding-top: 40px;
 }
 
-.adm-modal-main .adm-modal-body > * + * {
-  margin-top: 16px;
+.adm-modal-body .adm-modal-image-container {
+  margin-bottom: 24px;
+  max-height: 40vh;
+  overflow-y: scroll;
 }
 
-.adm-modal-main .adm-modal-body-header-wrapper {
-  display: flex;
-  justify-content: center;
+.adm-modal-body .adm-modal-header {
+  margin-bottom: 16px;
+  padding: 0 24px;
 }
 
-.adm-modal-main .adm-modal-body-title {
+.adm-modal-body .adm-modal-title {
+  margin-bottom: 16px;
+  padding: 0 24px;
   font-weight: bold;
   font-size: 36px;
   line-height: 50px;
   text-align: center;
 }
 
-.adm-modal-main .adm-modal-body-content {
+.adm-modal-body .adm-modal-content {
+  padding: 0 24px 24px;
+  max-height: 70vh;
+  overflow-x: hidden;
+  overflow-y: auto;
   font-size: 30px;
   line-height: 1.4;
   color: #333;
 }
 
-.adm-modal-main .adm-modal-close {
+.adm-modal-body .adm-modal-close {
   position: absolute;
   right: 16px;
   top: 16px;
@@ -82,6 +87,11 @@
   padding: 16px 24px 24px;
 }
 
+.adm-modal-footer-empty {
+  padding: 0;
+  height: 16px;
+}
+
 .adm-modal-footer.adm-space {
   --gap-vertical: 40px;
 }
@@ -102,8 +112,4 @@
 
 .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
   opacity: 0.7;
-}
-
-.adm-modal-image-container {
-  overflow-y: auto;
 }

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

@@ -52,49 +52,28 @@ export const Modal = p => {
     }
   });
   const [active, setActive] = useState(props.visible);
-  const node = withStopPropagation(props.stopPropagation, withNativeProps(props, React.createElement("div", {
-    className: classPrefix,
-    style: {
-      display: active ? 'unset' : 'none'
-    }
-  }, React.createElement(Mask, {
-    visible: props.visible,
-    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
-    style: props.maskStyle,
-    className: classNames(`${classPrefix}-mask`, props.maskClassName)
-  }), React.createElement("div", {
-    className: `${classPrefix}-wrap`,
-    style: {
-      pointerEvents: props.visible ? 'unset' : 'none'
-    }
-  }, React.createElement(animated.div, {
-    style: Object.assign({}, style),
-    onClick: e => e.stopPropagation(),
-    className: `${classPrefix}-main`
+  const body = React.createElement("div", {
+    className: classNames(cls('body'), props.image && cls('with-image'), props.bodyClassName),
+    style: props.bodyStyle
   }, props.showCloseButton && React.createElement("a", {
-    className: classNames(`${classPrefix}-close`, 'adm-plain-anchor'),
+    className: classNames(cls('close'), 'adm-plain-anchor'),
     onClick: props.onClose
   }, React.createElement(CloseOutline, null)), !!props.image && React.createElement("div", {
-    className: `${classPrefix}-image-container`
+    className: cls('image-container')
   }, React.createElement(Image, {
     src: props.image,
     alt: 'modal header image',
     width: '100%'
-  })), React.createElement("div", {
-    style: props.bodyStyle,
-    className: classNames(`${classPrefix}-body`, props.bodyClassName)
-  }, !!props.header && React.createElement("div", {
-    className: `${classPrefix}-body-header-wrapper`
-  }, React.createElement("div", {
-    className: `${classPrefix}-body-header`
-  }, props.header)), !!props.title && React.createElement("div", {
-    className: `${classPrefix}-body-title`
-  }, props.title), !!props.content && React.createElement("div", {
-    className: `${classPrefix}-body-content`
-  }, typeof props.content === 'string' ? React.createElement(AutoCenter, null, props.content) : props.content)), React.createElement(Space, {
+  })), !!props.header && React.createElement("div", {
+    className: cls('header')
+  }, React.createElement(AutoCenter, null, props.header)), !!props.title && React.createElement("div", {
+    className: cls('title')
+  }, props.title), React.createElement("div", {
+    className: cls('content')
+  }, typeof props.content === 'string' ? React.createElement(AutoCenter, null, props.content) : props.content), React.createElement(Space, {
     direction: 'vertical',
     block: true,
-    className: `${classPrefix}-footer`
+    className: classNames(cls('footer'), props.actions.length === 0 && cls('footer-empty'))
   }, props.actions.map((action, index) => {
     return React.createElement(ModalActionButton, {
       key: action.key,
@@ -109,6 +88,28 @@ export const Modal = p => {
         }
       })
     });
-  })))))));
+  })));
+  const node = withStopPropagation(props.stopPropagation, withNativeProps(props, React.createElement("div", {
+    className: cls(),
+    style: {
+      display: active ? 'unset' : 'none'
+    }
+  }, React.createElement(Mask, {
+    visible: props.visible,
+    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
+    style: props.maskStyle,
+    className: classNames(cls('mask'), props.maskClassName)
+  }), React.createElement("div", {
+    className: cls('wrap'),
+    style: {
+      pointerEvents: props.visible ? 'unset' : 'none'
+    }
+  }, React.createElement(animated.div, {
+    style: style
+  }, body)))));
   return renderToContainer(props.getContainer, node);
-};
+};
+
+function cls(name = '') {
+  return 'adm-modal' + (name && '-') + name;
+}

package/2x/es/components/popover/arrow.js

@@ -4,9 +4,8 @@ export const Arrow = memo(props => {
   return withNativeProps(props, React.createElement("svg", {
     viewBox: '0 0 30 16'
   }, React.createElement("g", {
-    transform: 'translate(-1300.000000, -841.000000)',
     fill: 'currentColor'
   }, React.createElement("path", {
-    d: 'M1300,841 L1330,841 L1318.07289,855.312538 C1316.65863,857.009645 1314.13637,857.238942 1312.43926,855.824685 C1312.25341,855.669808 1312.08199,855.49839 1311.92711,855.312538 L1300,841 L1300,841 Z'
+    d: 'M0,0 L30,0 L18.07289,14.312538 C16.65863,16.009645 14.13637,16.238942 12.43926,14.824685 C12.25341,14.669808 12.08199,14.49839 11.92711,14.312538 L0,0 L0,0 Z'
   }))));
 });

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

@@ -108,7 +108,7 @@ export const PullToRefresh = p => {
       if (!element) return;
       const scrollParent = getScrollParent(element);
       if (!scrollParent) return;
-      const top = 'scrollTop' in scrollParent ? scrollParent.scrollTop : scrollParent.pageYOffset;
+      const top = 'scrollTop' in scrollParent ? scrollParent.scrollTop : scrollParent.scrollY;
 
       if (top <= 0 && y > 0) {
         pullingRef.current = true;

package/2x/es/components/switch/spin-icon.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare const SpinIcon: React.NamedExoticComponent<NativeProps<never>>;

package/2x/es/components/switch/spin-icon.js

@@ -0,0 +1,23 @@
+import React, { memo } from 'react';
+import { withNativeProps } from '../../utils/native-props';
+export const SpinIcon = memo(props => {
+  return withNativeProps(props, React.createElement("svg", {
+    width: '28px',
+    height: '28px',
+    viewBox: '0 0 28 28'
+  }, React.createElement("g", {
+    stroke: 'none',
+    strokeWidth: '1',
+    fill: 'none',
+    fillRule: 'evenodd'
+  }, React.createElement("g", {
+    transform: 'translate(-137.000000, -840.000000)',
+    fill: '#1576FE'
+  }, React.createElement("g", {
+    transform: 'translate(80.000000, 823.000000)'
+  }, React.createElement("g", {
+    transform: 'translate(53.000000, 13.000000)'
+  }, React.createElement("path", {
+    d: 'M17.9996753,31.5 C10.5556724,31.5 4.5,25.4443275 4.5,18.0003247 C4.5,10.5563219 10.5556724,4.5 17.9996753,4.5 C18.5355492,4.5 18.9702974,4.93474816 18.9702974,5.47062208 C18.9702974,6.006496 18.5355492,6.44124416 17.9996753,6.44124416 C11.6261524,6.44124416 6.44124416,11.6267709 6.44124416,18.0002938 C6.44124416,24.3738167 11.6261524,29.5587249 17.9996753,29.5587249 C24.3731982,29.5587249 29.5587249,24.3738167 29.5587249,18.0002938 C29.5587249,14.7964616 28.2778291,11.8169616 25.9523687,9.61220279 C25.5637302,9.24317094 25.5473089,8.62893223 25.9157222,8.23967523 C26.2841356,7.84976878 26.8989928,7.83461537 27.2882498,8.20302872 C30.0042351,10.7787368 31.5,14.2580826 31.5,18.0002938 C31.5,25.4443275 25.4436781,31.5 17.9996753,31.5 Z'
+  })))))));
+});

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

@@ -101,7 +101,7 @@
   opacity: 0.4;
 }
 
-.adm-switch-icon {
+.adm-switch-spin-icon {
   width: 28px;
   height: 28px;
   animation: loading-rotate 1s linear infinite;

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

@@ -1,10 +1,10 @@
 import { __awaiter } from "tslib";
 import classNames from 'classnames';
 import React, { useState } from 'react';
-import SpinIcon from '../../assets/spin.svg';
 import { withNativeProps } from '../../utils/native-props';
 import { usePropsValue } from '../../utils/use-props-value';
 import { mergeProps } from '../../utils/with-default-props';
+import { SpinIcon } from './spin-icon';
 const classPrefix = `adm-switch`;
 const defaultProps = {
   defaultChecked: false
@@ -54,10 +54,8 @@ export const Switch = p => {
     className: `${classPrefix}-checkbox`
   }, React.createElement("div", {
     className: `${classPrefix}-handle`
-  }, (props.loading || changing) && React.createElement("img", {
-    src: SpinIcon,
-    className: `${classPrefix}-icon`,
-    alt: 'switch-handle'
+  }, (props.loading || changing) && React.createElement(SpinIcon, {
+    className: `${classPrefix}-spin-icon`
   })), React.createElement("div", {
     className: `${classPrefix}-inner`
   }, checked ? props.checkedText : props.uncheckedText))));

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

@@ -31,6 +31,57 @@ export declare const base: {
             description: string;
         };
     };
+    Form: {
+        required: string;
+        optional: string;
+        defaultValidateMessages: {
+            default: string;
+            required: string;
+            enum: string;
+            whitespace: string;
+            date: {
+                format: string;
+                parse: string;
+                invalid: string;
+            };
+            types: {
+                string: string;
+                method: string;
+                array: string;
+                object: string;
+                number: string;
+                date: string;
+                boolean: string;
+                integer: string;
+                float: string;
+                regexp: string;
+                email: string;
+                url: string;
+                hex: string;
+            };
+            string: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            number: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            array: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            pattern: {
+                mismatch: string;
+            };
+        };
+    };
     ImageUploader: {
         uploading: string;
     };

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

@@ -1,3 +1,4 @@
+const typeTemplate = '${label} is not a valid ${type}';
 export const base = {
   common: {
     confirm: 'Confirm',
@@ -31,6 +32,57 @@ export const base = {
       description: 'Want to try a new search?'
     }
   },
+  Form: {
+    required: 'Required',
+    optional: 'Optional',
+    defaultValidateMessages: {
+      default: 'Field validation error for ${label}',
+      required: 'Please enter ${label}',
+      enum: '${label} must be one of [${enum}]',
+      whitespace: '${label} cannot be a blank character',
+      date: {
+        format: '${label} date format is invalid',
+        parse: '${label} cannot be converted to a date',
+        invalid: '${label} is an invalid date'
+      },
+      types: {
+        string: typeTemplate,
+        method: typeTemplate,
+        array: typeTemplate,
+        object: typeTemplate,
+        number: typeTemplate,
+        date: typeTemplate,
+        boolean: typeTemplate,
+        integer: typeTemplate,
+        float: typeTemplate,
+        regexp: typeTemplate,
+        email: typeTemplate,
+        url: typeTemplate,
+        hex: typeTemplate
+      },
+      string: {
+        len: '${label} must be ${len} characters',
+        min: '${label} must be at least ${min} characters',
+        max: '${label} must be up to ${max} characters',
+        range: '${label} must be between ${min}-${max} characters'
+      },
+      number: {
+        len: '${label} must be equal to ${len}',
+        min: '${label} must be minimum ${min}',
+        max: '${label} must be maximum ${max}',
+        range: '${label} must be between ${min}-${max}'
+      },
+      array: {
+        len: 'Must be ${len} ${label}',
+        min: 'At least ${min} ${label}',
+        max: 'At most ${max} ${label}',
+        range: 'The amount of ${label} must be between ${min}-${max}'
+      },
+      pattern: {
+        mismatch: '${label} does not match the pattern ${pattern}'
+      }
+    }
+  },
   ImageUploader: {
     uploading: 'Uploading...'
   },

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

@@ -31,6 +31,57 @@ declare const enUS: {
             description: string;
         };
     };
+    Form: {
+        required: string;
+        optional: string;
+        defaultValidateMessages: {
+            default: string;
+            required: string;
+            enum: string;
+            whitespace: string;
+            date: {
+                format: string;
+                parse: string;
+                invalid: string;
+            };
+            types: {
+                string: string;
+                method: string;
+                array: string;
+                object: string;
+                number: string;
+                date: string;
+                boolean: string;
+                integer: string;
+                float: string;
+                regexp: string;
+                email: string;
+                url: string;
+                hex: string;
+            };
+            string: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            number: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            array: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            pattern: {
+                mismatch: string;
+            };
+        };
+    };
     ImageUploader: {
         uploading: string;
     };

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

@@ -31,6 +31,57 @@ declare const zhCN: {
             description: string;
         };
     };
+    Form: {
+        required: string;
+        optional: string;
+        defaultValidateMessages: {
+            default: string;
+            required: string;
+            enum: string;
+            whitespace: string;
+            date: {
+                format: string;
+                parse: string;
+                invalid: string;
+            };
+            types: {
+                string: string;
+                method: string;
+                array: string;
+                object: string;
+                number: string;
+                date: string;
+                boolean: string;
+                integer: string;
+                float: string;
+                regexp: string;
+                email: string;
+                url: string;
+                hex: string;
+            };
+            string: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            number: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            array: {
+                len: string;
+                min: string;
+                max: string;
+                range: string;
+            };
+            pattern: {
+                mismatch: string;
+            };
+        };
+    };
     ImageUploader: {
         uploading: string;
     };

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

@@ -1,5 +1,6 @@
 import { mergeLocale } from '../utils/merge-locale';
 import { base } from './base';
+const typeTemplate = '${label}不是一个有效的${type}';
 const zhCN = mergeLocale(base, {
   common: {
     confirm: '确定',
@@ -33,6 +34,57 @@ const zhCN = mergeLocale(base, {
       description: '找找其他的吧'
     }
   },
+  Form: {
+    required: '必填',
+    optional: '选填',
+    defaultValidateMessages: {
+      default: '字段验证错误${label}',
+      required: '请输入${label}',
+      enum: '${label}必须是其中一个[${enum}]',
+      whitespace: '${label}不能为空字符',
+      date: {
+        format: '${label}日期格式无效',
+        parse: '${label}不能转换为日期',
+        invalid: '${label}是一个无效日期'
+      },
+      types: {
+        string: typeTemplate,
+        method: typeTemplate,
+        array: typeTemplate,
+        object: typeTemplate,
+        number: typeTemplate,
+        date: typeTemplate,
+        boolean: typeTemplate,
+        integer: typeTemplate,
+        float: typeTemplate,
+        regexp: typeTemplate,
+        email: typeTemplate,
+        url: typeTemplate,
+        hex: typeTemplate
+      },
+      string: {
+        len: '${label}须为${len}个字符',
+        min: '${label}最少${min}个字符',
+        max: '${label}最多${max}个字符',
+        range: '${label}须在${min}-${max}字符之间'
+      },
+      number: {
+        len: '${label}必须等于${len}',
+        min: '${label}最小值为${min}',
+        max: '${label}最大值为${max}',
+        range: '${label}须在${min}-${max}之间'
+      },
+      array: {
+        len: '须为${len}个${label}',
+        min: '最少${min}个${label}',
+        max: '最多${max}个${label}',
+        range: '${label}数量须在${min}-${max}之间'
+      },
+      pattern: {
+        mismatch: '${label}与模式不匹配${pattern}'
+      }
+    }
+  },
   ImageUploader: {
     uploading: '上传中...'
   },

package/2x/package.json

@@ -1,17 +1,17 @@
 {
   "name": "antd-mobile",
-  "version": "5.2.1",
+  "version": "5.3.1",
   "dependencies": {
     "@react-spring/web": "^9.4.3",
     "@types/resize-observer-browser": "^0.1.7",
-    "@use-gesture/react": "^10.2.6",
+    "@use-gesture/react": "^10.2.7",
     "ahooks": "^3.1.10",
     "antd-mobile-icons": "^0.2.2",
     "antd-mobile-v5-count": "^1.0.1",
     "classnames": "^2.3.1",
-    "dayjs": "^1.10.7",
+    "dayjs": "^1.10.8",
     "lodash": "^4.17.21",
-    "rc-field-form": "^1.23.0",
+    "rc-field-form": "^1.23.1",
     "rc-tooltip": "^5.1.1",
     "staged-components": "^1.1.2",
     "tslib": "^2.3.1",

package/cjs/components/avatar/avatar.js

@@ -32,6 +32,7 @@ const Avatar = p => {
     placeholder: props.fallback,
     alt: props.alt,
     lazy: props.lazy,
+    fit: props.fit,
     onClick: props.onClick,
     onError: props.onError
   }));

package/cjs/components/calendar/calendar.js

@@ -50,7 +50,29 @@ const Calendar = (0, _react.forwardRef)((p, ref) => {
     if (item) markItems.unshift(item);
   }
 
-  const [current, setCurrent] = (0, _react.useState)(() => (0, _dayjs.default)().date(1));
+  const dateRange = (0, _react.useMemo)(() => {
+    var _a, _b, _c, _d;
+
+    if (props.selectionMode === 'single') {
+      const value = (_b = (_a = props.value) !== null && _a !== void 0 ? _a : props.defaultValue) !== null && _b !== void 0 ? _b : null;
+      return [value, value];
+    } else if (props.selectionMode === 'range') {
+      return (_d = (_c = props.value) !== null && _c !== void 0 ? _c : props.defaultValue) !== null && _d !== void 0 ? _d : [null, null];
+    } else {
+      return [null, null];
+    }
+  }, [props.selectionMode, props.value, props.defaultValue]);
+  const [begin, setBegin] = (0, _react.useState)(null);
+  const [end, setEnd] = (0, _react.useState)(null);
+  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
+    setBegin(dateRange[0] ? (0, _dayjs.default)(dateRange[0]) : null);
+    setEnd(dateRange[1] ? (0, _dayjs.default)(dateRange[1]) : null);
+  }, [dateRange[0], dateRange[1]]);
+  const [current, setCurrent] = (0, _react.useState)(() => {
+    var _a;
+
+    return (0, _dayjs.default)((_a = dateRange[0]) !== null && _a !== void 0 ? _a : today).date(1);
+  });
   (0, _ahooks.useUpdateEffect)(() => {
     var _a;
 
@@ -102,25 +124,6 @@ const Calendar = (0, _react.forwardRef)((p, ref) => {
     }
   }, _react.default.createElement(_arrowLeftDouble.ArrowLeftDouble, null)));
 
-  const dateRange = (0, _react.useMemo)(() => {
-    var _a, _b, _c, _d;
-
-    if (props.selectionMode === 'single') {
-      const value = (_b = (_a = props.value) !== null && _a !== void 0 ? _a : props.defaultValue) !== null && _b !== void 0 ? _b : null;
-      return [value, value];
-    } else if (props.selectionMode === 'range') {
-      return (_d = (_c = props.value) !== null && _c !== void 0 ? _c : props.defaultValue) !== null && _d !== void 0 ? _d : [null, null];
-    } else {
-      return [null, null];
-    }
-  }, [props.selectionMode, props.value, props.defaultValue]);
-  const [begin, setBegin] = (0, _react.useState)(null);
-  const [end, setEnd] = (0, _react.useState)(null);
-  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
-    setBegin(dateRange[0] ? (0, _dayjs.default)(dateRange[0]) : null);
-    setEnd(dateRange[1] ? (0, _dayjs.default)(dateRange[1]) : null);
-  }, [dateRange[0], dateRange[1]]);
-
   function renderCells() {
     var _a;