fix: address comments

Author: hinzzx

packages/main/cypress/specs/Calendar.cy.tsx

@@ -136,8 +136,6 @@ describe("Calendar general interaction", () => {
 		cy.ui5CalendarGetDay("#calendar1", "974851200")
 			.realClick();
 
-		cy.focused().realPress("Tab");
-		cy.focused().realPress("Tab");
 		cy.focused().realPress("Tab");
 		cy.focused().realPress("Tab");
 		cy.focused().realPress("Space");

packages/main/src/Calendar.ts

@@ -755,12 +755,12 @@ class Calendar extends CalendarPart {
 		if (this._currentPicker !== "year") {
 			this._currentPicker = "year";
 			this.fireDecoratorEvent("show-year-view");
-			this._focusCurrentPicker();
 		} else {
 			this._currentPicker = "yearrange";
 			this.fireDecoratorEvent("show-year-range-view");
-			this._focusCurrentPicker();
 		}
+
+		this._focusCurrentPicker();
 	}
 
 	_onLegendFocusOut() {

packages/main/src/DayPicker.ts

@@ -403,7 +403,8 @@ class DayPicker extends CalendarPart implements ICalendarPicker {
 		return dayNames.some(dayName => dayName.length > 4);
 	}
 
-	_focusCorrectDay() {
+	async _focusCorrectDay() {
+		await renderFinished();
 		if (this._shouldFocusDay) {
 			this._focusableDay.focus();
 		}
@@ -413,8 +414,7 @@ class DayPicker extends CalendarPart implements ICalendarPicker {
 		return document.activeElement !== this._focusableDay && this._specialCalendarDates.length === 0;
 	}
 
-	async _onfocusin() {
-		await renderFinished();
+	_onfocusin() {
 		this._focusCorrectDay();
 	}
 
@@ -727,19 +727,17 @@ class DayPicker extends CalendarPart implements ICalendarPicker {
 	 * Called by the Calendar component.
 	 * @protected
 	 */
-	async _showPreviousPage() {
+	_showPreviousPage() {
 		this._modifyTimestampBy(-1, "month", false);
-		await renderFinished();
 		this._focusCorrectDay();
 	}
 
 	/**
 	 * Called by the Calendar component.
 	 * @protected
 	 */
-	async _showNextPage() {
+	_showNextPage() {
 		this._modifyTimestampBy(1, "month", false);
-		await renderFinished();
 		this._focusCorrectDay();
 	}
 
@@ -750,15 +748,14 @@ class DayPicker extends CalendarPart implements ICalendarPicker {
 	 * @param preserveDate whether to preserve the day of the month (f.e. 15th of March + 1 month = 15th of April)
 	 * @private
 	 */
-	async _modifyTimestampBy(amount: number, unit: string, preserveDate?: boolean) {
+	_modifyTimestampBy(amount: number, unit: string, preserveDate?: boolean) {
 		// Modify the current timestamp
 		this._safelyModifyTimestampBy(amount, unit, preserveDate);
 		this._updateSecondTimestamp();
 
 		// Notify the calendar to update its timestamp
 		this.fireDecoratorEvent("navigate", { timestamp: this.timestamp! });
 
-		await renderFinished();
 		this._focusCorrectDay();
 	}