From 6c1a336dd4c449bd1113ff63f86106f4e3a199bd Mon Sep 17 00:00:00 2001 From: Yury Uvarov Date: Wed, 20 Sep 2023 00:37:38 +0300 Subject: [PATCH] fix jumpDate --- package/src/scripts/methods/changeMonth.ts | 3 ++- package/src/scripts/methods/controlArrows.ts | 15 +++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package/src/scripts/methods/changeMonth.ts b/package/src/scripts/methods/changeMonth.ts index 510d6f15..23b71eab 100644 --- a/package/src/scripts/methods/changeMonth.ts +++ b/package/src/scripts/methods/changeMonth.ts @@ -1,4 +1,5 @@ import { IVanillaCalendar } from '../../types'; +import generateDate from '../helpers/generateDate'; import controlArrows from './controlArrows'; import createDays from './createDays'; import showMonth from './showMonth'; @@ -6,7 +7,7 @@ import showYear from './showYear'; const changeMonth = (self: IVanillaCalendar, route: string | undefined) => { if (self.selectedMonth === undefined || self.selectedYear === undefined) return; - const jumpDate = new Date(self.selectedYear, self.selectedMonth, 1); + const jumpDate = new Date(generateDate(new Date(self.selectedYear, self.selectedMonth, 1))); switch (route) { case 'prev': diff --git a/package/src/scripts/methods/controlArrows.ts b/package/src/scripts/methods/controlArrows.ts index 5eb81d67..c09ce0d7 100644 --- a/package/src/scripts/methods/controlArrows.ts +++ b/package/src/scripts/methods/controlArrows.ts @@ -1,4 +1,5 @@ import { IVanillaCalendar } from '../../types'; +import generateDate from '../helpers/generateDate'; const controlArrows = (self: IVanillaCalendar) => { if (!['default', 'multiple', 'year'].includes(self.currentType)) return; @@ -11,17 +12,23 @@ const controlArrows = (self: IVanillaCalendar) => { const defaultControl = () => { if (!self.dateMin || !self.dateMax) return; - const jumpDateMin = new Date(self.selectedYear as number, self.selectedMonth as number, 1); - const jumpDateMax = new Date(self.selectedYear as number, self.selectedMonth as number, 1); + const jumpDateMin = new Date(generateDate(new Date(self.selectedYear as number, self.selectedMonth as number, 1))); + const jumpDateMax = new Date(jumpDateMin.getTime()); jumpDateMin.setMonth(jumpDateMin.getMonth() - self.jumpMonths); jumpDateMax.setMonth(jumpDateMax.getMonth() + self.jumpMonths); - if (jumpDateMin < self.dateMin || !self.settings.selection.month) { + if (!self.settings.selection.month + || jumpDateMin.getFullYear() < self.dateMin.getFullYear() + || (jumpDateMin.getFullYear() === self.dateMin.getFullYear() + && (jumpDateMin.getMonth() < self.dateMin.getMonth()))) { arrowPrev.style.visibility = 'hidden'; } else { arrowPrev.style.visibility = ''; } - if (jumpDateMax > self.dateMax || !self.settings.selection.month) { + if (!self.settings.selection.month + || jumpDateMax.getFullYear() > self.dateMax.getFullYear() + || (jumpDateMax.getFullYear() === self.dateMax.getFullYear() + && jumpDateMax.getMonth() > self.dateMax.getMonth())) { arrowNext.style.visibility = 'hidden'; } else { arrowNext.style.visibility = '';