Skip to content

Commit ccd4c4f

Browse files
committed
fix year body select logic
1 parent a7cb227 commit ccd4c4f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/RangePicker.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,6 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
624624

625625
const showDoublePanel = currentMode === picker;
626626

627-
console.log('=>', viewDate);
628-
629627
return (
630628
<>
631629
{renderPanel(showDoublePanel ? 'left' : false, {

src/panels/YearPanel/YearBody.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ export interface YearBodyProps<DateType> {
1111
prefixCls: string;
1212
locale: Locale;
1313
generateConfig: GenerateConfig<DateType>;
14+
value: DateType;
1415
viewDate: DateType;
1516
disabledDate?: (date: DateType) => boolean;
1617
onSelect: (value: DateType) => void;
1718
}
1819

1920
function YearBody<DateType>({
2021
prefixCls,
22+
value,
2123
viewDate,
2224
locale,
2325
generateConfig,
@@ -27,6 +29,7 @@ function YearBody<DateType>({
2729
const yearPrefixCls = `${prefixCls}-cell`;
2830
const rows: React.ReactNode[] = [];
2931

32+
const valueYearNumber = value ? generateConfig.getYear(value) : null;
3033
const yearNumber = generateConfig.getYear(viewDate);
3134
const startYear =
3235
Math.floor(yearNumber / YEAR_DECADE_COUNT) * YEAR_DECADE_COUNT;
@@ -54,7 +57,8 @@ function YearBody<DateType>({
5457
[`${yearPrefixCls}-disabled`]: disabled,
5558
[`${yearPrefixCls}-in-view`]:
5659
startYear <= currentYearNumber && currentYearNumber <= endYear,
57-
[`${yearPrefixCls}-selected`]: currentYearNumber === yearNumber,
60+
[`${yearPrefixCls}-selected`]:
61+
currentYearNumber === valueYearNumber,
5862
})}
5963
onClick={() => {
6064
if (disabled) {

0 commit comments

Comments
 (0)