antd-mobile 5.37.0 → 5.37.1

package/2x/bundle/style.css

@@ -661,51 +661,6 @@ div.adm-px-tester {
   text-align: center;
 }
 
-.adm-divider-horizontal {
-  display: flex;
-  align-items: center;
-  margin: 32px 0;
-  border-width: 0;
-  border-color: var(--adm-color-border);
-  border-style: solid;
-  color: var(--adm-color-weak);
-  font-size: 28px;
-}
-
-.adm-divider-left.adm-divider-horizontal:before {
-  max-width: 10%;
-}
-
-.adm-divider-right.adm-divider-horizontal:after {
-  max-width: 10%;
-}
-
-.adm-divider-horizontal:after,
-.adm-divider-horizontal:before {
-  flex: auto;
-  display: block;
-  content: "";
-  border-style: inherit;
-  border-color: inherit;
-  border-width: 2px 0 0;
-}
-
-.adm-divider-horizontal .adm-divider-content {
-  flex: none;
-  padding: 0 32px;
-}
-
-.adm-divider-vertical {
-  position: relative;
-  top: -.06em;
-  display: inline-block;
-  height: .9em;
-  margin: 0 32px;
-  vertical-align: middle;
-  border-top: 0;
-  border-left: 2px solid var(--adm-color-border);
-}
-
 .adm-calendar-picker .adm-calendar-picker-title,
 .adm-calendar-picker .adm-calendar-picker-view-title,
 .adm-calendar-picker .adm-calendar-picker-popup-title,
@@ -1321,6 +1276,51 @@ div.adm-px-tester {
   text-align: center;
 }
 
+.adm-divider-horizontal {
+  display: flex;
+  align-items: center;
+  margin: 32px 0;
+  border-width: 0;
+  border-color: var(--adm-color-border);
+  border-style: solid;
+  color: var(--adm-color-weak);
+  font-size: 28px;
+}
+
+.adm-divider-left.adm-divider-horizontal:before {
+  max-width: 10%;
+}
+
+.adm-divider-right.adm-divider-horizontal:after {
+  max-width: 10%;
+}
+
+.adm-divider-horizontal:after,
+.adm-divider-horizontal:before {
+  flex: auto;
+  display: block;
+  content: "";
+  border-style: inherit;
+  border-color: inherit;
+  border-width: 2px 0 0;
+}
+
+.adm-divider-horizontal .adm-divider-content {
+  flex: none;
+  padding: 0 32px;
+}
+
+.adm-divider-vertical {
+  position: relative;
+  top: -.06em;
+  display: inline-block;
+  height: .9em;
+  margin: 0 32px;
+  vertical-align: middle;
+  border-top: 0;
+  border-left: 2px solid var(--adm-color-border);
+}
+
 .adm-capsule-tabs {
   position: relative;
   min-width: 0;

package/2x/cjs/components/calendar-picker/calendar-picker.js

@@ -5,18 +5,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CalendarPicker = void 0;
 var _tslib = require("tslib");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _nativeProps = require("../../utils/native-props");
-var _classnames = _interopRequireDefault(require("classnames"));
+var _withDefaultProps = require("../../utils/with-default-props");
 var _button = _interopRequireDefault(require("../button"));
+var _calendarPickerView = _interopRequireDefault(require("../calendar-picker-view"));
+var _calendarPickerView2 = require("../calendar-picker-view/calendar-picker-view");
+var _configProvider = require("../config-provider");
 var _divider = _interopRequireDefault(require("../divider"));
 var _popup = _interopRequireDefault(require("../popup"));
-var _withDefaultProps = require("../../utils/with-default-props");
-var _configProvider = require("../config-provider");
-var _calendarPickerView = _interopRequireDefault(require("../calendar-picker-view"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = 'adm-calendar-picker';
 const defaultProps = {
   weekStartsOn: 'Sunday',
@@ -45,6 +46,9 @@ const CalendarPicker = (0, _react.forwardRef)((p, ref) => {
       getContainer
     } = props,
     calendarViewProps = (0, _tslib.__rest)(props, ["visible", "confirmText", "popupClassName", "popupStyle", "popupBodyStyle", "forceRender", "closeOnMaskClick", "onClose", "onConfirm", "onMaskClick", "getContainer"]);
+  const viewContext = _react.default.useMemo(() => ({
+    visible: !!visible
+  }), [visible]);
   const footer = _react.default.createElement("div", {
     className: `${classPrefix}-footer`
   }, _react.default.createElement(_divider.default, null), _react.default.createElement("div", {
@@ -84,8 +88,10 @@ const CalendarPicker = (0, _react.forwardRef)((p, ref) => {
       }
     },
     getContainer: getContainer
+  }, _react.default.createElement(_calendarPickerView2.Context.Provider, {
+    value: viewContext
   }, _react.default.createElement(_calendarPickerView.default, Object.assign({
     ref: calendarRef
-  }, calendarViewProps)), footer)));
+  }, calendarViewProps))), footer)));
 });
 exports.CalendarPicker = CalendarPicker;

package/2x/cjs/components/calendar-picker-view/calendar-picker-view.d.ts

@@ -1,6 +1,9 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { DateRange, Page } from './convert';
+export declare const Context: React.Context<{
+    visible: boolean;
+}>;
 export declare type CalendarPickerViewRef = {
     jumpTo: (page: Page | ((page: Page) => Page)) => void;
     jumpToToday: () => void;

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

@@ -3,23 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CalendarPickerView = void 0;
+exports.Context = exports.CalendarPickerView = void 0;
+var _classnames = _interopRequireDefault(require("classnames"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
+var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
 var _react = _interopRequireWildcard(require("react"));
 var _nativeProps = require("../../utils/native-props");
-var _dayjs = _interopRequireDefault(require("dayjs"));
-var _classnames = _interopRequireDefault(require("classnames"));
+var _usePropsValue = require("../../utils/use-props-value");
 var _withDefaultProps = require("../../utils/with-default-props");
 var _configProvider = require("../config-provider");
-var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
-var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
-var _usePropsValue = require("../../utils/use-props-value");
 var _convert = require("./convert");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _useSyncScroll = _interopRequireDefault(require("./useSyncScroll"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _dayjs.default.extend(_isoWeek.default);
 _dayjs.default.extend(_isSameOrBefore.default);
 const classPrefix = 'adm-calendar-picker-view';
+const Context = _react.default.createContext({
+  visible: false
+});
+exports.Context = Context;
 const defaultProps = {
   weekStartsOn: 'Sunday',
   defaultValue: null,
@@ -29,6 +34,7 @@ const defaultProps = {
 };
 const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
   var _a;
+  const bodyRef = (0, _react.useRef)(null);
   const today = (0, _dayjs.default)();
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const {
@@ -53,6 +59,13 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
   });
   const [intermediate, setIntermediate] = (0, _react.useState)(false);
   const [current, setCurrent] = (0, _react.useState)(() => (0, _dayjs.default)(dateRange ? dateRange[0] : today).date(1));
+  // =============================== Scroll ===============================
+  const context = (0, _react.useContext)(Context);
+  const scrollTo = (0, _useSyncScroll.default)(current, context.visible, bodyRef);
+  // ============================== Boundary ==============================
+  const maxDay = (0, _react.useMemo)(() => props.max ? (0, _dayjs.default)(props.max) : current.add(6, 'month'), [props.max, current]);
+  const minDay = (0, _react.useMemo)(() => props.min ? (0, _dayjs.default)(props.min) : current, [props.min, current]);
+  // ================================ Refs ================================
   (0, _react.useImperativeHandle)(ref, () => ({
     jumpTo: pageOrPageGenerator => {
       let page;
@@ -64,20 +77,23 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
       } else {
         page = pageOrPageGenerator;
       }
-      setCurrent((0, _convert.convertPageToDayjs)(page));
+      const next = (0, _convert.convertPageToDayjs)(page);
+      setCurrent(next);
+      scrollTo(next);
     },
     jumpToToday: () => {
-      setCurrent((0, _dayjs.default)().date(1));
+      const next = (0, _dayjs.default)().date(1);
+      setCurrent(next);
+      scrollTo(next);
     },
     getDateRange: () => dateRange
   }));
+  // =============================== Render ===============================
   const header = _react.default.createElement("div", {
     className: `${classPrefix}-header`
   }, _react.default.createElement("div", {
     className: `${classPrefix}-title`
   }, (_a = props.title) !== null && _a !== void 0 ? _a : locale.Calendar.title));
-  const maxDay = (0, _react.useMemo)(() => props.max ? (0, _dayjs.default)(props.max) : current.add(6, 'month'), [props.max, current]);
-  const minDay = (0, _react.useMemo)(() => props.min ? (0, _dayjs.default)(props.min) : current, [props.min, current]);
   function renderBody() {
     var _a;
     const cells = [];
@@ -85,13 +101,21 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
     // 遍历月份
     while (monthIterator.isSameOrBefore(maxDay, 'month')) {
       const year = monthIterator.year();
-      const month = monthIterator.month();
+      const month = monthIterator.month() + 1;
       const renderMap = {
         year,
-        month: month + 1
+        month
       };
+      const yearMonth = `${year}-${month}`;
+      // 获取需要预先填充的空格，如果是 7 天则不需要填充
+      const presetEmptyCellCount = props.weekStartsOn === 'Monday' ? monthIterator.date(1).isoWeekday() - 1 : monthIterator.date(1).isoWeekday();
+      const presetEmptyCells = presetEmptyCellCount == 7 ? null : Array(presetEmptyCellCount).fill(null).map((_, index) => _react.default.createElement("div", {
+        key: index,
+        className: `${classPrefix}-cell`
+      }));
       cells.push(_react.default.createElement("div", {
-        key: `${year}-${month}`
+        key: yearMonth,
+        "data-year-month": yearMonth
       }, _react.default.createElement("div", {
         className: `${classPrefix}-title`
       }, (_a = locale.Calendar.yearAndMonth) === null || _a === void 0 ? void 0 : _a.replace(/\${(.*?)}/g, (_, variable) => {
@@ -99,10 +123,7 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
         return (_a = renderMap[variable]) === null || _a === void 0 ? void 0 : _a.toString();
       })), _react.default.createElement("div", {
         className: `${classPrefix}-cells`
-      }, Array(props.weekStartsOn === 'Monday' ? monthIterator.date(1).isoWeekday() - 1 : monthIterator.date(1).isoWeekday()).fill(null).map((_, index) => _react.default.createElement("div", {
-        key: index,
-        className: `${classPrefix}-cell`
-      })), Array(monthIterator.daysInMonth()).fill(null).map((_, index) => {
+      }, presetEmptyCells, Array(monthIterator.daysInMonth()).fill(null).map((_, index) => {
         var _a;
         const d = monthIterator.date(index + 1);
         let isSelect = false;
@@ -200,7 +221,8 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
     return cells;
   }
   const body = _react.default.createElement("div", {
-    className: `${classPrefix}-body`
+    className: `${classPrefix}-body`,
+    ref: bodyRef
   }, renderBody());
   const mark = _react.default.createElement("div", {
     className: `${classPrefix}-mark`

package/2x/cjs/components/calendar-picker-view/useSyncScroll.d.ts

@@ -0,0 +1,2 @@
+import type { Dayjs } from 'dayjs';
+export default function useSyncScroll(current: Dayjs, visible: boolean, bodyRef: React.RefObject<HTMLDivElement>): (date: Dayjs) => void;

package/2x/cjs/components/calendar-picker-view/useSyncScroll.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = useSyncScroll;
+var _rcUtil = require("rc-util");
+var _react = require("react");
+function useSyncScroll(current, visible, bodyRef) {
+  const rafRef = (0, _react.useRef)();
+  const clean = () => {
+    if (rafRef.current) {
+      cancelAnimationFrame(rafRef.current);
+    }
+  };
+  const scrollTo = (0, _rcUtil.useEvent)(date => {
+    clean();
+    rafRef.current = requestAnimationFrame(() => {
+      if (bodyRef.current) {
+        const yearMonth = date.format('YYYY-M');
+        const target = bodyRef.current.querySelector(`[data-year-month="${yearMonth}"]`);
+        if (target) {
+          // Scroll to the top of view
+          target.scrollIntoView({
+            block: 'start',
+            inline: 'nearest'
+          });
+        }
+      }
+    });
+  });
+  (0, _react.useEffect)(() => {
+    if (visible && current) {
+      scrollTo(current);
+      return clean;
+    }
+  }, [current, visible]);
+  return scrollTo;
+}

package/2x/cjs/components/nav-bar/nav-bar.js

@@ -12,19 +12,19 @@ var _withDefaultProps = require("../../utils/with-default-props");
 var _configProvider = require("../config-provider");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = `adm-nav-bar`;
-const defaultProps = {
-  backIcon: true
-};
+const defaultBackIcon = _react.default.createElement(_antdMobileIcons.LeftOutline, null);
 const NavBar = props => {
   const {
     navBar: componentConfig = {}
   } = (0, _configProvider.useConfig)();
-  const mergedProps = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, props);
+  const mergedProps = (0, _withDefaultProps.mergeProps)(componentConfig, props);
   const {
     back,
     backIcon,
     backArrow
   } = mergedProps;
+  const mergedDefaultBackIcon = componentConfig.backIcon || defaultBackIcon;
+  const mergedBackIcon = (0, _withDefaultProps.mergeProp)(defaultBackIcon, componentConfig.backIcon, backArrow === true ? mergedDefaultBackIcon : backArrow, backIcon === true ? mergedDefaultBackIcon : backIcon);
   return (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
     className: (0, _classnames.default)(classPrefix)
   }, _react.default.createElement("div", {
@@ -33,9 +33,9 @@ const NavBar = props => {
   }, back !== null && _react.default.createElement("div", {
     className: `${classPrefix}-back`,
     onClick: mergedProps.onBack
-  }, (backIcon || backArrow) && _react.default.createElement("span", {
+  }, mergedBackIcon && _react.default.createElement("span", {
     className: `${classPrefix}-back-arrow`
-  }, backIcon === true || backArrow === true ? componentConfig.backIcon || _react.default.createElement(_antdMobileIcons.LeftOutline, null) : backIcon || backArrow), _react.default.createElement("span", {
+  }, mergedBackIcon), _react.default.createElement("span", {
     "aria-hidden": 'true'
   }, back)), mergedProps.left), _react.default.createElement("div", {
     className: `${classPrefix}-title`

package/2x/es/components/calendar-picker/calendar-picker.js

@@ -1,13 +1,14 @@
 import { __rest } from "tslib";
+import classNames from 'classnames';
 import React, { forwardRef, useRef } from 'react';
 import { withNativeProps } from '../../utils/native-props';
-import classNames from 'classnames';
+import { mergeProps } from '../../utils/with-default-props';
 import Button from '../button';
+import CalendarPickerView from '../calendar-picker-view';
+import { Context } from '../calendar-picker-view/calendar-picker-view';
+import { useConfig } from '../config-provider';
 import Divider from '../divider';
 import Popup from '../popup';
-import { mergeProps } from '../../utils/with-default-props';
-import { useConfig } from '../config-provider';
-import CalendarPickerView from '../calendar-picker-view';
 const classPrefix = 'adm-calendar-picker';
 const defaultProps = {
   weekStartsOn: 'Sunday',
@@ -36,6 +37,9 @@ export const CalendarPicker = forwardRef((p, ref) => {
       getContainer
     } = props,
     calendarViewProps = __rest(props, ["visible", "confirmText", "popupClassName", "popupStyle", "popupBodyStyle", "forceRender", "closeOnMaskClick", "onClose", "onConfirm", "onMaskClick", "getContainer"]);
+  const viewContext = React.useMemo(() => ({
+    visible: !!visible
+  }), [visible]);
   const footer = React.createElement("div", {
     className: `${classPrefix}-footer`
   }, React.createElement(Divider, null), React.createElement("div", {
@@ -75,7 +79,9 @@ export const CalendarPicker = forwardRef((p, ref) => {
       }
     },
     getContainer: getContainer
+  }, React.createElement(Context.Provider, {
+    value: viewContext
   }, React.createElement(CalendarPickerView, Object.assign({
     ref: calendarRef
-  }, calendarViewProps)), footer)));
+  }, calendarViewProps))), footer)));
 });

package/2x/es/components/calendar-picker-view/calendar-picker-view.d.ts

@@ -1,6 +1,9 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { DateRange, Page } from './convert';
+export declare const Context: React.Context<{
+    visible: boolean;
+}>;
 export declare type CalendarPickerViewRef = {
     jumpTo: (page: Page | ((page: Page) => Page)) => void;
     jumpToToday: () => void;

package/2x/es/components/calendar-picker-view/calendar-picker-view.js

@@ -1,16 +1,20 @@
-import React, { forwardRef, useState, useImperativeHandle, useMemo } from 'react';
-import { withNativeProps } from '../../utils/native-props';
-import dayjs from 'dayjs';
 import classNames from 'classnames';
-import { mergeProps } from '../../utils/with-default-props';
-import { useConfig } from '../config-provider';
-import isoWeek from 'dayjs/plugin/isoWeek';
+import dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
+import isoWeek from 'dayjs/plugin/isoWeek';
+import React, { forwardRef, useContext, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { withNativeProps } from '../../utils/native-props';
 import { usePropsValue } from '../../utils/use-props-value';
-import { convertValueToRange, convertPageToDayjs } from './convert';
+import { mergeProps } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
+import { convertPageToDayjs, convertValueToRange } from './convert';
+import useSyncScroll from './useSyncScroll';
 dayjs.extend(isoWeek);
 dayjs.extend(isSameOrBefore);
 const classPrefix = 'adm-calendar-picker-view';
+export const Context = React.createContext({
+  visible: false
+});
 const defaultProps = {
   weekStartsOn: 'Sunday',
   defaultValue: null,
@@ -20,6 +24,7 @@ const defaultProps = {
 };
 export const CalendarPickerView = forwardRef((p, ref) => {
   var _a;
+  const bodyRef = useRef(null);
   const today = dayjs();
   const props = mergeProps(defaultProps, p);
   const {
@@ -44,6 +49,13 @@ export const CalendarPickerView = forwardRef((p, ref) => {
   });
   const [intermediate, setIntermediate] = useState(false);
   const [current, setCurrent] = useState(() => dayjs(dateRange ? dateRange[0] : today).date(1));
+  // =============================== Scroll ===============================
+  const context = useContext(Context);
+  const scrollTo = useSyncScroll(current, context.visible, bodyRef);
+  // ============================== Boundary ==============================
+  const maxDay = useMemo(() => props.max ? dayjs(props.max) : current.add(6, 'month'), [props.max, current]);
+  const minDay = useMemo(() => props.min ? dayjs(props.min) : current, [props.min, current]);
+  // ================================ Refs ================================
   useImperativeHandle(ref, () => ({
     jumpTo: pageOrPageGenerator => {
       let page;
@@ -55,20 +67,23 @@ export const CalendarPickerView = forwardRef((p, ref) => {
       } else {
         page = pageOrPageGenerator;
       }
-      setCurrent(convertPageToDayjs(page));
+      const next = convertPageToDayjs(page);
+      setCurrent(next);
+      scrollTo(next);
     },
     jumpToToday: () => {
-      setCurrent(dayjs().date(1));
+      const next = dayjs().date(1);
+      setCurrent(next);
+      scrollTo(next);
     },
     getDateRange: () => dateRange
   }));
+  // =============================== Render ===============================
   const header = React.createElement("div", {
     className: `${classPrefix}-header`
   }, React.createElement("div", {
     className: `${classPrefix}-title`
   }, (_a = props.title) !== null && _a !== void 0 ? _a : locale.Calendar.title));
-  const maxDay = useMemo(() => props.max ? dayjs(props.max) : current.add(6, 'month'), [props.max, current]);
-  const minDay = useMemo(() => props.min ? dayjs(props.min) : current, [props.min, current]);
   function renderBody() {
     var _a;
     const cells = [];
@@ -76,13 +91,21 @@ export const CalendarPickerView = forwardRef((p, ref) => {
     // 遍历月份
     while (monthIterator.isSameOrBefore(maxDay, 'month')) {
       const year = monthIterator.year();
-      const month = monthIterator.month();
+      const month = monthIterator.month() + 1;
       const renderMap = {
         year,
-        month: month + 1
+        month
       };
+      const yearMonth = `${year}-${month}`;
+      // 获取需要预先填充的空格，如果是 7 天则不需要填充
+      const presetEmptyCellCount = props.weekStartsOn === 'Monday' ? monthIterator.date(1).isoWeekday() - 1 : monthIterator.date(1).isoWeekday();
+      const presetEmptyCells = presetEmptyCellCount == 7 ? null : Array(presetEmptyCellCount).fill(null).map((_, index) => React.createElement("div", {
+        key: index,
+        className: `${classPrefix}-cell`
+      }));
       cells.push(React.createElement("div", {
-        key: `${year}-${month}`
+        key: yearMonth,
+        "data-year-month": yearMonth
       }, React.createElement("div", {
         className: `${classPrefix}-title`
       }, (_a = locale.Calendar.yearAndMonth) === null || _a === void 0 ? void 0 : _a.replace(/\${(.*?)}/g, (_, variable) => {
@@ -90,10 +113,7 @@ export const CalendarPickerView = forwardRef((p, ref) => {
         return (_a = renderMap[variable]) === null || _a === void 0 ? void 0 : _a.toString();
       })), React.createElement("div", {
         className: `${classPrefix}-cells`
-      }, Array(props.weekStartsOn === 'Monday' ? monthIterator.date(1).isoWeekday() - 1 : monthIterator.date(1).isoWeekday()).fill(null).map((_, index) => React.createElement("div", {
-        key: index,
-        className: `${classPrefix}-cell`
-      })), Array(monthIterator.daysInMonth()).fill(null).map((_, index) => {
+      }, presetEmptyCells, Array(monthIterator.daysInMonth()).fill(null).map((_, index) => {
         var _a;
         const d = monthIterator.date(index + 1);
         let isSelect = false;
@@ -191,7 +211,8 @@ export const CalendarPickerView = forwardRef((p, ref) => {
     return cells;
   }
   const body = React.createElement("div", {
-    className: `${classPrefix}-body`
+    className: `${classPrefix}-body`,
+    ref: bodyRef
   }, renderBody());
   const mark = React.createElement("div", {
     className: `${classPrefix}-mark`

package/2x/es/components/calendar-picker-view/useSyncScroll.d.ts

@@ -0,0 +1,2 @@
+import type { Dayjs } from 'dayjs';
+export default function useSyncScroll(current: Dayjs, visible: boolean, bodyRef: React.RefObject<HTMLDivElement>): (date: Dayjs) => void;

package/2x/es/components/calendar-picker-view/useSyncScroll.js

@@ -0,0 +1,33 @@
+import { useEvent } from 'rc-util';
+import { useEffect, useRef } from 'react';
+export default function useSyncScroll(current, visible, bodyRef) {
+  const rafRef = useRef();
+  const clean = () => {
+    if (rafRef.current) {
+      cancelAnimationFrame(rafRef.current);
+    }
+  };
+  const scrollTo = useEvent(date => {
+    clean();
+    rafRef.current = requestAnimationFrame(() => {
+      if (bodyRef.current) {
+        const yearMonth = date.format('YYYY-M');
+        const target = bodyRef.current.querySelector(`[data-year-month="${yearMonth}"]`);
+        if (target) {
+          // Scroll to the top of view
+          target.scrollIntoView({
+            block: 'start',
+            inline: 'nearest'
+          });
+        }
+      }
+    });
+  });
+  useEffect(() => {
+    if (visible && current) {
+      scrollTo(current);
+      return clean;
+    }
+  }, [current, visible]);
+  return scrollTo;
+}

package/2x/es/components/nav-bar/nav-bar.js

@@ -2,22 +2,22 @@ import { LeftOutline } from 'antd-mobile-icons';
 import classNames from 'classnames';
 import React from 'react';
 import { withNativeProps } from '../../utils/native-props';
-import { mergeProps } from '../../utils/with-default-props';
+import { mergeProp, mergeProps } from '../../utils/with-default-props';
 import { useConfig } from '../config-provider';
 const classPrefix = `adm-nav-bar`;
-const defaultProps = {
-  backIcon: true
-};
+const defaultBackIcon = React.createElement(LeftOutline, null);
 export const NavBar = props => {
   const {
     navBar: componentConfig = {}
   } = useConfig();
-  const mergedProps = mergeProps(defaultProps, componentConfig, props);
+  const mergedProps = mergeProps(componentConfig, props);
   const {
     back,
     backIcon,
     backArrow
   } = mergedProps;
+  const mergedDefaultBackIcon = componentConfig.backIcon || defaultBackIcon;
+  const mergedBackIcon = mergeProp(defaultBackIcon, componentConfig.backIcon, backArrow === true ? mergedDefaultBackIcon : backArrow, backIcon === true ? mergedDefaultBackIcon : backIcon);
   return withNativeProps(mergedProps, React.createElement("div", {
     className: classNames(classPrefix)
   }, React.createElement("div", {
@@ -26,9 +26,9 @@ export const NavBar = props => {
   }, back !== null && React.createElement("div", {
     className: `${classPrefix}-back`,
     onClick: mergedProps.onBack
-  }, (backIcon || backArrow) && React.createElement("span", {
+  }, mergedBackIcon && React.createElement("span", {
     className: `${classPrefix}-back-arrow`
-  }, backIcon === true || backArrow === true ? componentConfig.backIcon || React.createElement(LeftOutline, null) : backIcon || backArrow), React.createElement("span", {
+  }, mergedBackIcon), React.createElement("span", {
     "aria-hidden": 'true'
   }, back)), mergedProps.left), React.createElement("div", {
     className: `${classPrefix}-title`

package/2x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.37.0",
+  "version": "5.37.1",
   "homepage": "https://github.com/ant-design/ant-design-mobile#readme",
   "bugs": {
     "url": "https://github.com/ant-design/ant-design-mobile/issues"