blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-05 19:41:42 +08:00
Code Issues Projects Releases Wiki Activity

fix(Calendar): correctly change the panelDate when the selected date is the last day of month (#13008)

Browse Source
This commit is contained in:
inottn 2024-07-20 21:46:14 +08:00 committed by GitHub
parent a474ca9006
commit d1070e010c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 67 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/vant/src/calendar/CalendarHeader.tsx
View File

@ -38,25 +38,33 @@ export default defineComponent({
emits: ['clickSubtitle', 'panelChange'],
setup(props, { slots, emit }) {
const prevMonthDisabled = computed(() => {
const prevMonth = getPrevMonth(props.date!);
return props.minDate && compareMonth(prevMonth, props.minDate) < 0;
});
const prevMonthDisabled = computed(
() =>
props.date &&
props.minDate &&
compareMonth(getPrevMonth(props.date), props.minDate) < 0,
);
const prevYearDisabled = computed(() => {
const prevYear = getPrevYear(props.date!);
return props.minDate && compareMonth(prevYear, props.minDate) < 0;
});
const prevYearDisabled = computed(
() =>
props.date &&
props.minDate &&
compareMonth(getPrevYear(props.date), props.minDate) < 0,
);
const nextMonthDisabled = computed(() => {
const nextMonth = getNextMonth(props.date!);
return props.maxDate && compareMonth(nextMonth, props.maxDate) > 0;
});
const nextMonthDisabled = computed(
() =>
props.date &&
props.maxDate &&
compareMonth(getNextMonth(props.date), props.maxDate) > 0,
);
const nextYearDisabled = computed(() => {
const nextYear = getNextYear(props.date!);
return props.maxDate && compareMonth(nextYear, props.maxDate) > 0;
});
const nextYearDisabled = computed(
() =>
props.date &&
props.maxDate &&
compareMonth(getNextYear(props.date), props.maxDate) > 0,
);
const renderTitle = () => {
if (props.showTitle) {

33
packages/vant/src/calendar/test/switch-mode.spec.ts
View File

@ -226,3 +226,36 @@ test('should emit panelChange event', async () => {
currentDate = getNextMonth(currentDate);
expect(onPanelChange).toHaveBeenLastCalledWith({ date: currentDate });
});
test('correctly change the panelDate when the selected date is the last day of each month', async () => {
let defaultDate = new Date(2024, 4, 31);
const onPanelChange = vi.fn();
const wrapper = mount(Calendar, {
props: {
defaultDate,
poppable: false,
switchMode: 'month',
onPanelChange,
},
});
await later();
const nextMonth = wrapper.findAll('.van-calendar__header-action')[1];
await nextMonth.trigger('click');
let panelDate = getNextMonth(defaultDate);
expect(panelDate).toEqual(new Date(2024, 5, 30));
expect(onPanelChange).toHaveBeenLastCalledWith({ date: panelDate });
defaultDate = new Date(2024, 1, 29);
await wrapper.setProps({
defaultDate,
switchMode: 'year-month',
});
const nextYear = wrapper.findAll('.van-calendar__header-action')[3];
await nextYear.trigger('click');
panelDate = getNextYear(defaultDate);
expect(panelDate).toEqual(new Date(2025, 1, 28));
expect(onPanelChange).toHaveBeenLastCalledWith({ date: panelDate });
});

10
packages/vant/src/calendar/utils.ts
View File

@ -46,12 +46,22 @@ export function getDayByOffset(date: Date, offset: number) {
export function getMonthByOffset(date: Date, offset: number) {
const cloned = cloneDate(date);
cloned.setMonth(cloned.getMonth() + offset);
if (cloned.getDate() !== date.getDate()) {
cloned.setDate(0);
}
return cloned;
}
export function getYearByOffset(date: Date, offset: number) {
const cloned = cloneDate(date);
cloned.setFullYear(cloned.getFullYear() + offset);
if (cloned.getDate() !== date.getDate()) {
cloned.setDate(0);
}
return cloned;
}