npm - antd-mobile - Versions diffs - 5.32.0 → 5.32.2 - Mend

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

@@ -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'

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

@@ -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'

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

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

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

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

@@ -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];
+  });
+}

@@ -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();
       }
     }

@@ -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",

antd-mobile 5.32.0 → 5.32.2