Merge pull request #348 from uvarov-frontend/fix/344_navigation_by_month

Fix navigation by month
uvarov-frontend · Dec 17, 2024 · 3687d04 · 3687d04
2 parents 7f049cf + 5178a93
commit 3687d04
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 42 deletions.
diff --git a/demo/pages/lang/main.ts b/demo/pages/lang/main.ts
@@ -7,10 +7,12 @@ const options: Options = {
   selectionDatesMode: 'multiple-ranged',
   disableDatesGaps: true,
   // disableDatesPast: true,
+  dateMin: '2021-02-01',
+  dateMax: '2025-11-30',
   displayDatesOutside: false,
   selectionTimeMode: 12,
-  selectedMonth: 5,
-  selectedYear: 2024,
+  selectedMonth: 9,
+  selectedYear: 2025,
   timeMinHour: 2,
   timeMaxHour: 20,
   timeMinMinute: 10,
@@ -63,12 +65,12 @@ const options: Options = {
 };
 
 document.addEventListener('DOMContentLoaded', () => {
-  const calendar = new Calendar('#calendar');
+  const calendar = new Calendar('#calendar', options);
   calendar.init();
 
-  const btnSetEl = document.querySelector('#set-options');
-  btnSetEl?.addEventListener('click', () => {
-    calendar.set(options, { dates: false });
-    console.log(calendar);
-  });
+  // const btnSetEl = document.querySelector('#set-options');
+  // btnSetEl?.addEventListener('click', () => {
+  //   calendar.set(options, { dates: false });
+  //   console.log(calendar);
+  // });
 });
diff --git a/package/src/scripts/creators/createMonths.ts b/package/src/scripts/creators/createMonths.ts
@@ -1,17 +1,11 @@
 import createLayouts from '@scripts/creators/createLayouts';
 import setMonthOrYearModifier from '@scripts/creators/setMonthOrYearModifier';
 import visibilityTitle from '@scripts/creators/visibilityTitle';
+import getColumnID from '@scripts/utils/getColumnID';
 import getDate from '@scripts/utils/getDate';
 import setContext from '@scripts/utils/setContext';
 import type { Calendar } from '@src/index';
 
-const relationshipID = (self: Calendar) => {
-  if (self.type !== 'multiple') return 0;
-  const columnEls = self.context.mainElement.querySelectorAll<HTMLElement>('[data-vc="column"]');
-  const indexColumn = Array.from(columnEls).findIndex((column) => column.closest('[data-vc-column="month"]'));
-  return indexColumn > 0 ? indexColumn : 0;
-};
-
 const createMonthEl = (
   self: Calendar,
   templateEl: HTMLButtonElement,
@@ -60,10 +54,13 @@ const createMonths = (self: Calendar, target?: HTMLElement) => {
   for (let i = 0; i < 12; i++) {
     const dateMin = getDate(self.context.dateMin);
     const dateMax = getDate(self.context.dateMax);
+    const monthCount = self.context.displayMonthsCount - 1;
+    const { columnID } = getColumnID(self, 'month');
 
     const monthDisabled =
-      (i < dateMin.getMonth() + relationshipID(self) && selectedYear <= dateMin.getFullYear()) ||
-      (i > dateMax.getMonth() + relationshipID(self) && selectedYear >= dateMax.getFullYear()) ||
+      (selectedYear <= dateMin.getFullYear() && i < dateMin.getMonth() + columnID) ||
+      (selectedYear >= dateMax.getFullYear() && i > dateMax.getMonth() - monthCount + columnID) ||
+      selectedYear > dateMax.getFullYear() ||
       (i !== selectedMonth && !activeMonthsID.includes(i));
     const monthEl = createMonthEl(
       self,
@@ -78,7 +75,7 @@ const createMonths = (self: Calendar, target?: HTMLElement) => {
     if (self.onCreateMonthEls) self.onCreateMonthEls(self, monthEl);
   }
 
-  self.context.mainElement.querySelector<HTMLElement>(`[data-vc-months-month]`)?.focus();
+  self.context.mainElement.querySelector<HTMLElement>(`[data-vc-months-month]:not([disabled])`)?.focus();
 };
 
 export default createMonths;
diff --git a/package/src/scripts/creators/createYears.ts b/package/src/scripts/creators/createYears.ts
@@ -43,7 +43,7 @@ const createYears = (self: Calendar, target?: HTMLElement) => {
     if (self.onCreateYearEls) self.onCreateYearEls(self, yearEl);
   }
 
-  self.context.mainElement.querySelector<HTMLElement>(`[data-vc-years-year]`)?.focus();
+  self.context.mainElement.querySelector<HTMLElement>(`[data-vc-years-year]:not([disabled])`)?.focus();
 };
 
 export default createYears;
diff --git a/package/src/scripts/creators/visibilityArrows.ts b/package/src/scripts/creators/visibilityArrows.ts
@@ -29,7 +29,7 @@ const handleDefaultType = (self: Calendar, arrowPrevEl: HTMLElement, arrowNextEl
   const isArrowNextHidden =
     !self.selectionMonthsMode ||
     jumpDateMax.getFullYear() > dateMax.getFullYear() ||
-    (jumpDateMax.getFullYear() === dateMax.getFullYear() && jumpDateMax.getMonth() > dateMax.getMonth());
+    (jumpDateMax.getFullYear() === dateMax.getFullYear() && jumpDateMax.getMonth() > dateMax.getMonth() - (self.context.displayMonthsCount - 1));
 
   setVisibilityArrows(arrowPrevEl, arrowNextEl, isArrowPrevHidden, isArrowNextHidden);
 };

diff --git a/package/src/scripts/handles/handleClick/handleClickMonthOrYear.ts b/package/src/scripts/handles/handleClick/handleClickMonthOrYear.ts
@@ -2,50 +2,49 @@ import create from '@scripts/creators/create';
 import createMonths from '@scripts/creators/createMonths';
 import createYears from '@scripts/creators/createYears';
 import setMonthOrYearModifier from '@scripts/creators/setMonthOrYearModifier';
+import getColumnID from '@scripts/utils/getColumnID';
 import getDate from '@scripts/utils/getDate';
 import setContext from '@scripts/utils/setContext';
 import type { Calendar, Range } from '@src/index';
 
 const typeClick = ['month', 'year'] as const;
 
-const getColumnID = (self: Calendar, type: (typeof typeClick)[number], id: number) => {
-  const columnEls: NodeListOf<HTMLElement> = self.context.mainElement.querySelectorAll('[data-vc="column"]');
-  const indexColumn = Array.from(columnEls).findIndex((column) => column.closest(`[data-vc-column="${type}"]`));
-  const currentValue = Number((columnEls[indexColumn].querySelector(`[data-vc="${type}"]`) as HTMLElement).getAttribute(`data-vc-${type}`));
+const getValue = (self: Calendar, type: (typeof typeClick)[number], id: number) => {
+  const { currentValue, columnID } = getColumnID(self, type);
 
-  return self.context.currentType === 'month' && indexColumn >= 0
-    ? id - indexColumn
-    : self.context.currentType === 'year' && self.context.selectedYear !== currentValue
-      ? id - 1
-      : id;
+  if (self.context.currentType === 'month' && columnID >= 0) return id - columnID;
+  if (self.context.currentType === 'year' && self.context.selectedYear !== currentValue) return id - 1;
+  return id;
 };
 
 const handleMultipleYearSelection = (self: Calendar, itemEl: HTMLElement) => {
-  const selectedYear = getColumnID(self, 'year', Number(itemEl.dataset.vcYearsYear));
+  const selectedYear = getValue(self, 'year', Number(itemEl.dataset.vcYearsYear));
   const dateMin = getDate(self.context.dateMin);
   const dateMax = getDate(self.context.dateMax);
+  const monthCount = self.context.displayMonthsCount - 1;
+  const { columnID } = getColumnID(self, 'year');
 
   const isBeforeMinDate = self.context.selectedMonth < dateMin.getMonth() && selectedYear <= dateMin.getFullYear();
-  const isAfterMaxDate = self.context.selectedMonth > dateMax.getMonth() && selectedYear >= dateMax.getFullYear();
+  const isAfterMaxDate = self.context.selectedMonth > dateMax.getMonth() - monthCount + columnID && selectedYear >= dateMax.getFullYear();
   const isBeforeMinYear = selectedYear < dateMin.getFullYear();
   const isAfterMaxYear = selectedYear > dateMax.getFullYear();
 
-  setContext(
-    self,
-    'selectedYear',
-    isBeforeMinDate || isBeforeMinYear ? dateMin.getFullYear() : isAfterMaxDate || isAfterMaxYear ? dateMax.getFullYear() : selectedYear,
-  );
-  setContext(
-    self,
-    'selectedMonth',
-    (isBeforeMinDate || isBeforeMinYear ? dateMin.getMonth() : isAfterMaxDate || isAfterMaxYear ? dateMax.getMonth() : self.context.selectedMonth) as Range<12>,
-  );
+  const newSelectedYear = isBeforeMinDate || isBeforeMinYear ? dateMin.getFullYear() : isAfterMaxDate || isAfterMaxYear ? dateMax.getFullYear() : selectedYear;
+  const newSelectedMonth =
+    isBeforeMinDate || isBeforeMinYear
+      ? dateMin.getMonth()
+      : isAfterMaxDate || isAfterMaxYear
+        ? dateMax.getMonth() - monthCount + columnID
+        : self.context.selectedMonth;
+
+  setContext(self, 'selectedYear', newSelectedYear);
+  setContext(self, 'selectedMonth', newSelectedMonth as Range<12>);
 };
 
 const handleMultipleMonthSelection = (self: Calendar, itemEl: HTMLElement) => {
   const column = itemEl.closest('[data-vc-column="month"]') as HTMLElement;
   const yearEl = column.querySelector('[data-vc="year"]') as HTMLElement;
-  const selectedMonth = getColumnID(self, 'month', Number(itemEl.dataset.vcMonthsMonth));
+  const selectedMonth = getValue(self, 'month', Number(itemEl.dataset.vcMonthsMonth));
   const selectedYear = Number(yearEl.dataset.vcYear);
   const dateMin = getDate(self.context.dateMin);
   const dateMax = getDate(self.context.dateMax);

diff --git a/package/src/scripts/utils/getColumnID.ts b/package/src/scripts/utils/getColumnID.ts
@@ -0,0 +1,15 @@
+import type { Calendar } from '@src/index';
+
+const getColumnID = (self: Calendar, type: string) => {
+  if (self.type !== 'multiple') return { currentValue: null, columnID: 0 };
+
+  const columnEls = self.context.mainElement.querySelectorAll<HTMLElement>('[data-vc="column"]');
+  const columnID = Array.from(columnEls).findIndex((col) => col.closest(`[data-vc-column="${type}"]`));
+
+  return {
+    currentValue: columnID >= 0 ? Number(columnEls[columnID].querySelector<HTMLElement>(`[data-vc="${type}"]`)?.getAttribute(`data-vc-${type}`)) : null,
+    columnID: Math.max(columnID, 0),
+  };
+};
+
+export default getColumnID;