Skip to content

Commit 02d106c

Browse files
sakuraeel30053176zombieJ
authored
fix: 修改disableDate属性在YearPanel的错误视图 (#850)
* 修改yearPanel中的disabled显示试图的问题 * Update index.tsx 修改拼写错误 * test: update test case --------- Co-authored-by: l30053176 <[email protected]> Co-authored-by: 二货机器人 <[email protected]>
1 parent 9e4b0a7 commit 02d106c

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

src/PickerPanel/YearPanel/index.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,9 @@ export default function YearPanel<DateType extends object = any>(
6666
const startDate = generateConfig.setDate(startMonth, 1);
6767

6868
// End
69-
const endMonth = generateConfig.setMonth(
70-
currentDate,
71-
generateConfig.getMonth(currentDate) + 1,
72-
);
73-
const enDate = generateConfig.addDate(endMonth, -1);
74-
75-
return disabledDate(startDate, disabledInfo) && disabledDate(enDate, disabledInfo);
69+
const endMonth = generateConfig.addYear(startDate, 1);
70+
const endDate = generateConfig.addDate(endMonth, -1);
71+
return disabledDate(startDate, disabledInfo) && disabledDate(endDate, disabledInfo);
7672
}
7773
: null;
7874

tests/panel.spec.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -715,4 +715,15 @@ describe('Picker.Panel', () => {
715715
expect(container.querySelector('.rc-picker-header-view').textContent).toEqual('01:02:03 AM');
716716
});
717717

718+
it('year panel disabled check', () => {
719+
const { container } = render(
720+
<DayPickerPanel
721+
picker="year"
722+
disabledDate={(date) => date.isBefore(getDay('1990-12-25'))}
723+
defaultValue={getDay('1990-01-01')}
724+
/>,
725+
);
726+
727+
expect(container.querySelector('.rc-picker-cell-selected').textContent).toEqual('1990');
728+
});
718729
});

0 commit comments

Comments
 (0)