Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(CalendarDay): fix margin-bottom calculation wrong for calendar days #13271

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+42 −31
Open

fix(CalendarDay): fix margin-bottom calculation wrong for calendar days #13271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed3c1e7
fix(CalendarDay): fix margin calculation for calendar days at month end
phil668 Dec 17, 2024
b5a0d77
refactor(CalendarDay): improve margin-bottom calculations and add isL…
phil668 Dec 18, 2024
d3af070
test(calendar): remove wrong margin-bottom styles of calendar in snap…
phil668 Dec 18, 2024
82df7fe
Merge branch 'main' into fix/calendar-margin-calc
phil668 Dec 19, 2024
a1666cc
Merge branch 'main' into fix/calendar-margin-calc
phil668 Dec 21, 2024
90ac03d
Merge branch 'main' into fix/calendar-margin-calc
phil668 Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/vant/src/calendar/CalendarDay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
type CSSProperties,
} from 'vue';
import { makeNumberProp, createNamespace, makeRequiredProp } from '../utils';
import { bem } from './utils';
import { bem, isLastRowInMonth } from './utils';
import type { CalendarDayItem } from './types';

const [name] = createNamespace('calendar-day');
Expand Down Expand Up @@ -54,7 +54,7 @@ export default defineComponent({
}
}

if (offset + (item.date?.getDate() || 1) > 28) {
if (item.date && isLastRowInMonth(item.date, offset)) {
style.marginBottom = 0;
}

Expand Down
21 changes: 0 additions & 21 deletions packages/vant/src/calendar/test/__snapshots__/index.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,49 +202,42 @@ exports[`formatter prop 1`] = `
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
24
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
25
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
26
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
27
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
28
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
29
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
30
Expand Down Expand Up @@ -510,49 +503,42 @@ exports[`popup wrapper 2`] = `
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
24
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
25
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
26
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
27
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
28
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
29
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
30
Expand Down Expand Up @@ -811,49 +797,42 @@ exports[`should render title、footer、subtitle slot correctly 1`] = `
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
24
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
25
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
26
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
27
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
28
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
29
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
30
Expand Down
7 changes: 0 additions & 7 deletions packages/vant/src/calendar/test/__snapshots__/prop.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,49 +195,42 @@ exports[`lazy-render prop 1`] = `
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
24
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
25
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
26
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
27
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
28
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
29
</div>
<div
role="gridcell"
style="margin-bottom: 0px;"
class="van-calendar__day van-calendar__day--disabled"
>
30
Expand Down
27 changes: 26 additions & 1 deletion packages/vant/src/calendar/test/utils.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { compareDay, compareMonth, getNextDay, calcDateNum } from '../utils';
import {
compareDay,
compareMonth,
getNextDay,
calcDateNum,
isLastRowInMonth,
} from '../utils';

const date1 = new Date(2010, 0, 1);
const date2 = new Date(2010, 0, 2);
Expand Down Expand Up @@ -29,3 +35,22 @@ test('calcDateNum', () => {
expect(calcDateNum([date1, date2])).toEqual(2);
expect(calcDateNum([date1, date3])).toEqual(32);
});

test('isLastRowInMonth', () => {
// test first day of month
expect(isLastRowInMonth(new Date(2024, 0, 1), 0)).toEqual(false);

// test middle of month
expect(isLastRowInMonth(new Date(2024, 0, 22), 0)).toEqual(false);
expect(isLastRowInMonth(new Date(2024, 0, 28), 0)).toEqual(false);

// test last week of month
expect(isLastRowInMonth(new Date(2024, 0, 29), 0)).toEqual(true);
expect(isLastRowInMonth(new Date(2024, 0, 31), 0)).toEqual(true);

// test different offset
expect(isLastRowInMonth(new Date(2024, 0, 18), 4)).toEqual(false);
expect(isLastRowInMonth(new Date(2024, 0, 24), 4)).toEqual(false);
expect(isLastRowInMonth(new Date(2024, 0, 25), 4)).toEqual(true);
expect(isLastRowInMonth(new Date(2024, 0, 31), 4)).toEqual(true);
});
14 changes: 14 additions & 0 deletions packages/vant/src/calendar/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,17 @@ export function calcDateNum(date: [Date, Date]) {
const day2 = date[1].getTime();
return (day2 - day1) / (1000 * 60 * 60 * 24) + 1;
}

/**
* Checks if the given date is in the last row of its month in a calendar view
* @param date The date to check
* @param offset The offset of the first day of the month
* @returns boolean indicating whether the date is in the last row
*/
export function isLastRowInMonth(date: Date, offset: number = 0) {
const lastDay = new Date(date.getFullYear(), date.getMonth() + 1, 0);
const currentPos = offset + date.getDate() - 1;
const lastDayPos = offset + lastDay.getDate() - 1;

return Math.floor(currentPos / 7) === Math.floor(lastDayPos / 7);
}
Loading