blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

fix(Calendar): disable the previous month button correctly when the minDate is the current time (#13006)

Browse Source
This commit is contained in:
inottn 2024-07-18 21:56:29 +08:00 committed by GitHub
parent 95b22e1583
commit 2a6b90b4f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import { createNamespace, HAPTICS_FEEDBACK, makeStringProp } from '../utils';
import { import {
t, t,
bem, bem,
compareMonth,
getPrevMonth, getPrevMonth,
getPrevYear, getPrevYear,
getNextMonth, getNextMonth,
@ -39,22 +40,22 @@ export default defineComponent({
setup(props, { slots, emit }) { setup(props, { slots, emit }) {
const prevMonthDisabled = computed(() => { const prevMonthDisabled = computed(() => {
const prevMonth = getPrevMonth(props.date!); const prevMonth = getPrevMonth(props.date!);
return props.minDate && prevMonth < props.minDate; return props.minDate && compareMonth(prevMonth, props.minDate) < 0;
}); });
const prevYearDisabled = computed(() => { const prevYearDisabled = computed(() => {
const prevYear = getPrevYear(props.date!); const prevYear = getPrevYear(props.date!);
return props.minDate && prevYear < props.minDate; return props.minDate && compareMonth(prevYear, props.minDate) < 0;
}); });
const nextMonthDisabled = computed(() => { const nextMonthDisabled = computed(() => {
const nextMonth = getNextMonth(props.date!); const nextMonth = getNextMonth(props.date!);
return props.maxDate && nextMonth > props.maxDate; return props.maxDate && compareMonth(nextMonth, props.maxDate) > 0;
}); });
const nextYearDisabled = computed(() => { const nextYearDisabled = computed(() => {
const nextYear = getNextYear(props.date!); const nextYear = getNextYear(props.date!);
return props.maxDate && nextYear > props.maxDate; return props.maxDate && compareMonth(nextYear, props.maxDate) > 0;
}); });
const renderTitle = () => { const renderTitle = () => {

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

@ -62,6 +62,29 @@ test('disable previous and next month buttons', async () => {
expect(nextMonth.classes()).not.toContain(disabledActionClass); expect(nextMonth.classes()).not.toContain(disabledActionClass);
}); });
test('disable the previous month button correctly when the minDate is the current time', async () => {
const wrapper = mount(Calendar, {
props: {
minDate: new Date(),
poppable: false,
switchMode: 'month',
},
});
await later();
const [prevMonth, nextMonth] = wrapper.findAll(
'.van-calendar__header-action',
);
expect(prevMonth.classes()).toContain(disabledActionClass);
await nextMonth.trigger('click');
expect(prevMonth.classes()).not.toContain(disabledActionClass);
await prevMonth.trigger('click');
expect(prevMonth.classes()).toContain(disabledActionClass);
});
test('disable previous and next year buttons', async () => { test('disable previous and next year buttons', async () => {
const maxDate = getNextYear(minDate); const maxDate = getNextYear(minDate);
const wrapper = mount(Calendar, { const wrapper = mount(Calendar, {