Merge pull request #78 from uvarov-frontend/hotfix/update_method

hotfix/update method

docs/en/reference/main/initialize-and-update.mdx

@@ -9,14 +9,13 @@ calendar.init();
 
 You can also update the calendar with the new settings at any time using the `update()` method.
 
+The `update()` method, unlike `reset()`, saves the user's selected dates, month, and year after the update.
+
 ```js
 calendar.settings.lang = 'de-AT';
 calendar.settings.iso8601 = false;
-calendar.update();
-```
 
-Or reset using the `reset()` method.
-
-```js
+calendar.update();
+// or
 calendar.reset();
 ```

docs/ru/reference/main/initialize-and-update.mdx

@@ -7,16 +7,15 @@ const calendar = new VanillaCalendar(element, params);
 calendar.init();
 ```
 
-Вы также можете обновить календарь с новыми настройками в любое время, используя метод `update()`.
+Вы также можете обновить календарь с новыми настройками в любое время, используя метод `update()` или `reset()`.
+
+Метод `update()`, в отличие от `reset()`, сохраняет выбранные пользователем даты, месяц и год после обновления.
 
 ```js
 calendar.settings.lang = 'de-AT';
 calendar.settings.iso8601 = false;
-calendar.update();
-```
 
-Или сбросить, используя метод `reset()`.
-
-```js
+calendar.update();
+// or
 calendar.reset();
 ```

package/src/scripts/methods/clickCalendar.ts

@@ -4,7 +4,7 @@ import createDays from './createDays';
 import createMonths from './createMonths';
 import createYears from './createYears';
 import generateDate from '../helpers/generateDate';
-import update from './updateCalendar';
+import mainMethod from './mainMethod';
 import handlerMultipleRanged from './handlerMultipleRanged';
 
 const clickCalendar = (self: IVanillaCalendar) => {
@@ -154,7 +154,7 @@ const clickCalendar = (self: IVanillaCalendar) => {
 				createYears(self);
 			} else if (self.currentType === 'year' && yearHeaderEl) {
 				self.currentType = self.type;
-				update(self);
+				mainMethod(self);
 			} else if (yearItemEl) {
 				if (self.selectedMonth === undefined || !self.dateMin || !self.dateMax) return;
 				self.selectedYear = Number(yearItemEl.dataset.calendarYear);
@@ -166,7 +166,7 @@ const clickCalendar = (self: IVanillaCalendar) => {
 					self.selectedMonth = self.dateMax.getMonth();
 				}
 				if (self.actions.clickYear) self.actions.clickYear(e, self.selectedYear);
-				update(self);
+				mainMethod(self);
 			}
 		};
 
@@ -176,12 +176,12 @@ const clickCalendar = (self: IVanillaCalendar) => {
 				createMonths(self);
 			} else if (self.currentType === 'month' && monthHeaderEl) {
 				self.currentType = self.type;
-				update(self);
+				mainMethod(self);
 			} else if (monthItemEl) {
 				self.selectedMonth = Number(monthItemEl.dataset.calendarMonth);
 				self.currentType = self.type;
 				if (self.actions.clickMonth) self.actions.clickMonth(e, self.selectedMonth);
-				update(self);
+				mainMethod(self);
 			}
 		};
 

package/src/scripts/methods/handlerMultipleRanged.ts

@@ -1,6 +1,6 @@
 import { IVanillaCalendar } from 'src/types';
 import generateDate from '../helpers/generateDate';
-import update from './updateCalendar';
+import mainMethod from './mainMethod';
 
 let currentSelf: null | IVanillaCalendar = null;
 
@@ -63,7 +63,7 @@ const cancelSelectionDays = (e: KeyboardEvent) => {
 	currentSelf.selectedDates = [];
 	(currentSelf.HTMLElement as HTMLElement).removeEventListener('mousemove', hoverDaysEvent);
 	document.removeEventListener('keydown', cancelSelectionDays);
-	update(currentSelf);
+	mainMethod(currentSelf);
 };
 
 const setDisabledDates = () => {

package/src/scripts/methods/initCalendar.ts

@@ -1,15 +1,13 @@
 import { IVanillaCalendar } from 'src/types';
-import setVariablesDates from './setVariablesDates';
-import updateCalendar from './updateCalendar';
+import resetCalendar from './resetCalendar';
 import handlerInput from './handlerInput';
 import clickCalendar from './clickCalendar';
 import createCalendarToInput from './createCalendarToInput';
 
 const initCalendar = (self: IVanillaCalendar) => {
 	if (!self.HTMLElement) return;
 	createCalendarToInput(self);
-	setVariablesDates(self);
-	updateCalendar(self);
+	resetCalendar(self);
 	handlerInput(self);
 	clickCalendar(self);
 };

package/src/scripts/methods/mainMethod.ts

@@ -0,0 +1,33 @@
+import { IVanillaCalendar } from 'src/types';
+import controlArrows from './controlArrows';
+import createDays from './createDays';
+import createDOM from './createDOM';
+import showMonth from './showMonth';
+import showYear from './showYear';
+import createMonths from './createMonths';
+import createTime from './createTime';
+import createWeek from './createWeek';
+import createYears from './createYears';
+import getLocale from './getLocale';
+import setTheme from './setTheme';
+
+const mainMethod = (self: IVanillaCalendar) => {
+	setTheme(self);
+	getLocale(self);
+	createDOM(self);
+	showMonth(self);
+	showYear(self);
+	controlArrows(self);
+	createTime(self);
+
+	if (self.currentType === 'default' || self.currentType === 'multiple') {
+		createWeek(self);
+		createDays(self);
+	} else if (self.currentType === 'month') {
+		createMonths(self);
+	} else if (self.currentType === 'year') {
+		createYears(self);
+	}
+};
+
+export default mainMethod;

package/src/scripts/methods/resetCalendar.ts

@@ -1,10 +1,10 @@
 import { IVanillaCalendar } from 'src/types';
 import setVariablesDates from './setVariablesDates';
-import updateCalendar from './updateCalendar';
+import mainMethod from './mainMethod';
 
 const resetCalendar = (self: IVanillaCalendar) => {
 	setVariablesDates(self);
-	updateCalendar(self);
+	mainMethod(self);
 };
 
 export default resetCalendar;

package/src/scripts/methods/updateCalendar.ts

@@ -1,33 +1,29 @@
 import { IVanillaCalendar } from 'src/types';
-import controlArrows from './controlArrows';
-import createDays from './createDays';
-import createDOM from './createDOM';
-import showMonth from './showMonth';
-import showYear from './showYear';
-import createMonths from './createMonths';
-import createTime from './createTime';
-import createWeek from './createWeek';
-import createYears from './createYears';
-import getLocale from './getLocale';
-import setTheme from './setTheme';
+import setVariablesDates from './setVariablesDates';
+import mainMethod from './mainMethod';
 
 const updateCalendar = (self: IVanillaCalendar) => {
-	setTheme(self);
-	getLocale(self);
-	createDOM(self);
-	showMonth(self);
-	showYear(self);
-	controlArrows(self);
-	createTime(self);
+	let tempSelectedDates = null;
+	let tempSelectedMonth = null;
+	let tempSelectedYear = null;
 
-	if (self.currentType === 'default' || self.currentType === 'multiple') {
-		createWeek(self);
-		createDays(self);
-	} else if (self.currentType === 'month') {
-		createMonths(self);
-	} else if (self.currentType === 'year') {
-		createYears(self);
+	if (!self.settings.selected.dates?.[0]) {
+		tempSelectedDates = self.settings.selected.dates;
+		self.settings.selected.dates = self.selectedDates;
 	}
+	if (!self.settings.selected.month) {
+		tempSelectedMonth = self.settings.selected.month;
+		self.settings.selected.month = self.selectedMonth as number;
+	}
+	if (!self.settings.selected.year) {
+		tempSelectedYear = self.settings.selected.year;
+		self.settings.selected.year = self.selectedYear as number;
+	}
+	setVariablesDates(self);
+	mainMethod(self);
+	self.settings.selected.dates = tempSelectedDates;
+	self.settings.selected.month = tempSelectedMonth;
+	self.settings.selected.year = tempSelectedYear;
 };
 
 export default updateCalendar;