antd-mobile 5.37.0 → 5.38.0

package/2x/bundle/css-vars-patch.css

@@ -316,6 +316,48 @@
     padding-bottom: 16px;
   }
 
+  .adm-segmented {
+    color: #666;
+    background-color: #f5f5f5;
+    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  }
+
+  .adm-segmented-item {
+    transition: color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  }
+
+  .adm-segmented-item-selected {
+    background-color: #fff;
+    box-shadow: 0 4px 16px -4px rgba(0, 0, 0, 0.05), 0 2px 8px -2px rgba(0, 0, 0, 0.07), 0 0 2px 0 rgba(0, 0, 0, 0.08);
+    color: #333;
+  }
+
+  .adm-segmented-item-disabled {
+    color: #999;
+  }
+
+  .adm-segmented-thumb {
+    background-color: #fff;
+    box-shadow: 0 4px 16px -4px rgba(0, 0, 0, 0.05), 0 2px 8px -2px rgba(0, 0, 0, 0.07), 0 0 2px 0 rgba(0, 0, 0, 0.08);
+  }
+
+  .adm-segmented-thumb-motion-appear-active {
+    transition: transform 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), width 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
+  }
+
+  /* ---- mixins part starts ---- */
+
+  .segmented-disabled-item {
+    color: #999;
+  }
+
+  .segmented-item-selected {
+    background-color: #fff;
+    box-shadow: 0 4px 16px -4px rgba(0, 0, 0, 0.05), 0 2px 8px -2px rgba(0, 0, 0, 0.07), 0 0 2px 0 rgba(0, 0, 0, 0.08);
+  }
+
+  /* ---- mixins part ends ---- */
+
   .adm-spin-loading {
     width: 64px;
     height: 64px;

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;
@@ -1408,6 +1408,7 @@ div.adm-px-tester {
   display: flex;
   justify-content: space-between;
   align-items: center;
+  gap: var(--adm-card-header-gap, 16px);
   box-sizing: border-box;
   padding: var(--adm-card-header-padding-block, 24px) 0;
 }
@@ -3577,6 +3578,8 @@ a.adm-list-item:active:not(.adm-list-item-disabled):after {
   --font-size: var(--adm-font-size-7);
   --icon-font-size: var(--adm-font-size-10);
   --height: 80px;
+  --adm-notice-bar-border-radius: 8px;
+  --adm-notice-bar-border-width: 2px;
   height: var(--height);
   box-sizing: border-box;
   font-size: var(--font-size);
@@ -3584,9 +3587,9 @@ a.adm-list-item:active:not(.adm-list-item-disabled):after {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  border: solid 2px var(--border-color);
-  border-left: none;
-  border-right: none;
+  border: solid var(--adm-notice-bar-border-width) var(--border-color);
+  border-left-width: 0;
+  border-right-width: 0;
   background-color: var(--background-color);
   color: var(--text-color);
 }
@@ -3604,7 +3607,7 @@ a.adm-list-item:active:not(.adm-list-item-disabled):after {
 .adm-notice-bar.adm-notice-bar-error {
   --background-color: var(--adm-color-danger);
   --border-color: #d9281e;
-  --text-color: #ffffff;
+  --text-color: #fff;
 }
 
 .adm-notice-bar.adm-notice-bar-info {
@@ -3613,6 +3616,12 @@ a.adm-list-item:active:not(.adm-list-item-disabled):after {
   --text-color: var(--adm-color-primary);
 }
 
+.adm-notice-bar.adm-notice-bar-success {
+  --background-color: #d1fff0;
+  --border-color: #a8f0d8;
+  --text-color: var(--adm-color-success);
+}
+
 .adm-notice-bar .adm-notice-bar-left {
   flex-shrink: 0;
   margin-right: 16px;
@@ -3663,6 +3672,24 @@ a.adm-list-item:active:not(.adm-list-item-disabled):after {
   line-height: 44px;
 }
 
+.adm-notice-bar-neutral {
+  border-radius: var(--adm-notice-bar-border-radius);
+}
+
+.adm-notice-bar-rounded {
+  border-radius: 2000px;
+}
+
+.adm-notice-bar-bordered {
+  border-left-width: var(--adm-notice-bar-border-width);
+  border-right-width: var(--adm-notice-bar-border-width);
+}
+
+.adm-notice-bar-without-border {
+  border-top-width: 0;
+  border-bottom-width: 0;
+}
+
 .adm-number-keyboard-main {
   display: flex;
   flex-wrap: wrap;
@@ -4467,6 +4494,116 @@ a.adm-list-item:active:not(.adm-list-item-disabled):after {
   background: var(--adm-color-background);
 }
 
+.adm-segmented {
+  --segmented-background: var(--adm-color-fill-content);
+  --segmented-item-color: var(--adm-color-text-secondary);
+  --segmented-item-selected-background: var(--adm-color-background);
+  --segmented-item-selected-color: var(--adm-color-text);
+  --segmented-item-disabled-color: var(--adm-color-weak);
+  --transition-time-function: cubic-bezier(.645, .045, .355, 1);
+  display: inline-block;
+  padding: 4px;
+  color: var(--segmented-item-color);
+  background-color: var(--segmented-background);
+  border-radius: 4px;
+  transition: all .3s var(--transition-time-function);
+}
+
+.adm-segmented-group {
+  position: relative;
+  display: flex;
+  align-items: stretch;
+  justify-items: flex-start;
+  width: 100%;
+}
+
+.adm-segmented.adm-segmented-block {
+  display: flex;
+}
+
+.adm-segmented.adm-segmented-block .adm-segmented-item {
+  flex: 1;
+  min-width: 0;
+}
+
+.adm-segmented-item {
+  position: relative;
+  text-align: center;
+  cursor: pointer;
+  transition: color .3s var(--transition-time-function);
+}
+
+.adm-segmented-item-selected {
+  background-color: var(--segmented-item-selected-background);
+  border-radius: 4px;
+  box-shadow: 0 4px 16px -4px rgba(0,0,0,.05),0 2px 8px -2px rgba(0,0,0,.07),0 0 2px rgba(0,0,0,.08);
+  color: var(--segmented-item-selected-color);
+}
+
+.adm-segmented-item-label {
+  min-height: 20px;
+  padding: 0 22px;
+  line-height: 56px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-break: keep-all;
+}
+
+.adm-segmented-item-icon+* {
+  margin-left: 12px;
+}
+
+.adm-segmented-item-input {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 0;
+  opacity: 0;
+  pointer-events: none;
+}
+
+.adm-segmented-item-disabled {
+  color: var(--segmented-item-disabled-color);
+  cursor: not-allowed;
+}
+
+.adm-segmented-thumb {
+  background-color: var(--segmented-item-selected-background);
+  border-radius: 4px;
+  box-shadow: 0 4px 16px -4px rgba(0,0,0,.05),0 2px 8px -2px rgba(0,0,0,.07),0 0 2px rgba(0,0,0,.08);
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 100%;
+  padding: 8px 0;
+}
+
+.adm-segmented-thumb-motion-appear-active {
+  transition: transform .3s var(--transition-time-function),width .3s var(--transition-time-function);
+  will-change: transform,width;
+}
+
+.segmented-disabled-item {
+  color: var(--segmented-item-disabled-color);
+  cursor: not-allowed;
+}
+
+.segmented-item-selected {
+  background-color: var(--segmented-item-selected-background);
+  border-radius: 4px;
+  box-shadow: 0 4px 16px -4px rgba(0,0,0,.05),0 2px 8px -2px rgba(0,0,0,.07),0 0 2px rgba(0,0,0,.08);
+}
+
+.segmented-text-ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-break: keep-all;
+}
+
 .adm-selector {
   --color: var(--adm-color-fill-content);
   --checked-color: var(--adm-color-wathet);

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,13 +1,16 @@
 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;
     getDateRange: () => DateRange;
 };
 export declare type CalendarPickerViewProps = {
-    title?: React.ReactNode;
+    title?: React.ReactNode | false;
     confirmText?: string;
     weekStartsOn?: 'Monday' | 'Sunday';
     renderTop?: (date: Date) => React.ReactNode;

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;
-var _react = _interopRequireWildcard(require("react"));
-var _nativeProps = require("../../utils/native-props");
-var _dayjs = _interopRequireDefault(require("dayjs"));
+exports.Context = exports.CalendarPickerView = void 0;
 var _classnames = _interopRequireDefault(require("classnames"));
-var _withDefaultProps = require("../../utils/with-default-props");
-var _configProvider = require("../config-provider");
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
 var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
+var _react = _interopRequireWildcard(require("react"));
+var _nativeProps = require("../../utils/native-props");
 var _usePropsValue = require("../../utils/use-props-value");
+var _withDefaultProps = require("../../utils/with-default-props");
+var _configProvider = require("../config-provider");
 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,34 @@ 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));
+  const onDateChange = v => {
+    if (v) {
+      setCurrent((0, _dayjs.default)(v[0]).date(1));
+    }
+    setDateRange(v);
+  };
+  const showHeader = props.title !== false;
+  // =============================== Scroll ===============================
+  const context = (0, _react.useContext)(Context);
+  const scrollTo = (0, _useSyncScroll.default)(current, context.visible, bodyRef);
+  // ============================== Boundary ==============================
+  // 记录默认的 min 和 max，并在外部的值超出边界时自动扩充
+  const [defaultMin, setDefaultMin] = (0, _react.useState)(current);
+  const [defaultMax, setDefaultMax] = (0, _react.useState)(() => current.add(6, 'month'));
+  (0, _react.useEffect)(() => {
+    if (dateRange) {
+      const [startDate, endDate] = dateRange;
+      if (!props.min && startDate && (0, _dayjs.default)(startDate).isBefore(defaultMin)) {
+        setDefaultMin((0, _dayjs.default)(startDate).date(1));
+      }
+      if (!props.max && endDate && (0, _dayjs.default)(endDate).isAfter(defaultMax)) {
+        setDefaultMax((0, _dayjs.default)(endDate).endOf('month'));
+      }
+    }
+  }, [dateRange]);
+  const maxDay = (0, _react.useMemo)(() => props.max ? (0, _dayjs.default)(props.max) : defaultMax, [props.max, defaultMax]);
+  const minDay = (0, _react.useMemo)(() => props.min ? (0, _dayjs.default)(props.min) : defaultMin, [props.min, defaultMin]);
+  // ================================ Refs ================================
   (0, _react.useImperativeHandle)(ref, () => ({
     jumpTo: pageOrPageGenerator => {
       let page;
@@ -64,20 +98,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 +122,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 +144,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;
@@ -162,27 +204,27 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
             }
             if (props.selectionMode === 'single') {
               if (props.allowClear && shouldClear()) {
-                setDateRange(null);
+                onDateChange(null);
                 return;
               }
-              setDateRange([date, date]);
+              onDateChange([date, date]);
             } else if (props.selectionMode === 'range') {
               if (!dateRange) {
-                setDateRange([date, date]);
+                onDateChange([date, date]);
                 setIntermediate(true);
                 return;
               }
               if (shouldClear()) {
-                setDateRange(null);
+                onDateChange(null);
                 setIntermediate(false);
                 return;
               }
               if (intermediate) {
                 const another = dateRange[0];
-                setDateRange(another > date ? [date, another] : [another, date]);
+                onDateChange(another > date ? [date, another] : [another, date]);
                 setIntermediate(false);
               } else {
-                setDateRange([date, date]);
+                onDateChange([date, date]);
                 setIntermediate(true);
               }
             }
@@ -200,7 +242,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`
@@ -210,6 +253,6 @@ const CalendarPickerView = (0, _react.forwardRef)((p, ref) => {
   }, item)));
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: classPrefix
-  }, header, mark, body));
+  }, showHeader && header, mark, body));
 });
 exports.CalendarPickerView = CalendarPickerView;

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/card/card.css

@@ -9,6 +9,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  gap: var(--adm-card-header-gap, 16px);
   box-sizing: border-box;
   padding: var(--adm-card-header-padding-block, 24px) 0;
 }

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

@@ -1,8 +1,9 @@
+import type { CSSProperties, FC, ReactNode } from 'react';
 import React from 'react';
-import type { FC, ReactNode, CSSProperties } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type CardProps = {
     title?: ReactNode;
+    icon?: ReactNode;
     extra?: ReactNode;
     headerStyle?: CSSProperties;
     headerClassName?: string;