Merge pull request #120 from uvarov-frontend/hotfix/year_selection_in…

…_type_multiple

Fix year selection in type: 'multiple'

package/src/scripts/helpers/getColumnID.ts

@@ -2,17 +2,11 @@ import { IVanillaCalendar } from '../../types';
 
 const getColumnID = (self: IVanillaCalendar, columnClass: string, personalClass: string, id: number, dataAttr: string) => {
 	const columnEls = (self.HTMLElement as HTMLElement).querySelectorAll(`.${self.CSSClasses.column}`) as NodeListOf<HTMLElement>;
-	const firstColumnID = Number((columnEls[0].querySelector(`.${personalClass}`) as HTMLElement).getAttribute(dataAttr));
-	const lastColumnID = Number((columnEls[columnEls.length - 1].querySelector(`.${personalClass}`) as HTMLElement).getAttribute(dataAttr));
 	const indexColumn = [...columnEls].findIndex((column) => column.classList.contains(columnClass));
+	const currentValue = Number((columnEls[indexColumn].querySelector(`.${personalClass}`) as HTMLElement).getAttribute(dataAttr));
 
-	if (firstColumnID === lastColumnID || indexColumn < 0) {
-		return id;
-	}
-
-	if (firstColumnID < lastColumnID || (self.currentType !== 'year' && firstColumnID > lastColumnID)) {
-		return id - indexColumn;
-	}
+	if (self.currentType === 'month' && indexColumn >= 0) return id - indexColumn;
+	if (self.currentType === 'year' && self.selectedYear !== currentValue) return id - 1;
 
 	return id;
 };