fix bug with calendar offset
This commit is contained in:
Vendored
+7
-1
@@ -684,7 +684,12 @@
|
||||
date.setFullYear(year);
|
||||
date.setMonth(month - 1);
|
||||
date.setDate(1);
|
||||
const offset = date.getDay() - parseInt(this.settingsModel.firstDayOfWeek);
|
||||
const firstWeekdayOfMonth = date.getDay();
|
||||
const firstDayOfWeekSetting = parseInt(
|
||||
this.settingsModel.firstDayOfWeek
|
||||
);
|
||||
console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
|
||||
const offset = firstWeekdayOfMonth == 0 ? 7 - firstDayOfWeekSetting : firstWeekdayOfMonth - firstDayOfWeekSetting;
|
||||
date.setMonth(month);
|
||||
date.setDate(-1);
|
||||
const daysInMonth = date.getDate() + 1;
|
||||
@@ -3176,6 +3181,7 @@
|
||||
if (currentWeekday == 7) currentWeekday = 0;
|
||||
}
|
||||
const offsetElements = [];
|
||||
console.log(monthGrid.offset);
|
||||
for (let i = 0; i < monthGrid.offset; i++) {
|
||||
offsetElements.push(/* @__PURE__ */ createElement("div", null));
|
||||
}
|
||||
|
||||
@@ -64,14 +64,22 @@ export default class CalendarModel {
|
||||
const isCurrentMonth: boolean =
|
||||
year == date.getFullYear() && month == date.getMonth() + 1;
|
||||
|
||||
// get first day of month
|
||||
// get data for offset
|
||||
date.setFullYear(year);
|
||||
date.setMonth(month - 1);
|
||||
date.setDate(1);
|
||||
|
||||
// get offset
|
||||
const firstWeekdayOfMonth = date.getDay();
|
||||
const firstDayOfWeekSetting: number = parseInt(
|
||||
this.settingsModel.firstDayOfWeek
|
||||
);
|
||||
|
||||
console.log(firstWeekdayOfMonth, firstDayOfWeekSetting);
|
||||
|
||||
const offset: number =
|
||||
date.getDay() - parseInt(this.settingsModel.firstDayOfWeek);
|
||||
firstWeekdayOfMonth == 0
|
||||
? 7 - firstDayOfWeekSetting
|
||||
: firstWeekdayOfMonth - firstDayOfWeekSetting;
|
||||
|
||||
// get total day count
|
||||
date.setMonth(month);
|
||||
|
||||
@@ -25,6 +25,7 @@ export function MonthGrid<T>(
|
||||
}
|
||||
|
||||
const offsetElements: HTMLElement[] = [];
|
||||
console.log(monthGrid.offset);
|
||||
for (let i = 0; i < monthGrid.offset; i++) {
|
||||
offsetElements.push(<div></div>);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user