[stable6.5] fix(calendar): focus today in list view

src/components/AppNavigation/AppNavigationHeader/AppNavigationHeaderTodayButton.vue

@@ -12,12 +12,7 @@
 const route = useRoute()
 const router = useRouter()
 
 async function today(): Promise<void> {
-	// Don't push new route when day didn't change
-	if (route.params.firstDay === 'now') {
-		return
-	}
-
 	const name = route.name!
 	const params = {
 		...route.params,

src/components/CalendarGrid.vue

@@ -23,6 +23,7 @@ import { DateTimeValue } from '@nextcloud/calendar-js'
 // Import other dependencies
 import debounce from 'debounce'
 import { mapState, mapStores } from 'pinia'
+import { isNavigationFailure, NavigationFailureType } from 'vue-router'
 // Import event sources
 import eventSource from '../fullcalendar/eventSources/eventSource.js'
 // Import interaction handlers
@@ -302,6 +303,13 @@ export default {
 				next()
 			})
 
+			// Navigating to the current route skips beforeEach but still triggers afterEach
+			this.$router.afterEach((to, from, failure) => {
+				if (isNavigationFailure(failure, NavigationFailureType.duplicated) && to.params.firstDay === 'now') {
+					this.scrollViewToToday(false)
+				}
+			})
+
 			// Trigger the select event programmatically on initial page load to show the new event
 			// in the grid. Wait for the next tick because the ref isn't available right away.
 			await this.$nextTick()
@@ -335,8 +343,15 @@ export default {
 			}
 			this.$nextTick(() => {
 				const todayEl = this.$refs.fullCalendar.$el.querySelector('.fc-day-today')
-				if (todayEl) {
-					todayEl.scrollIntoView({ block: 'nearest', behavior: 'smooth' })
+				if (calendarApi.view.type === 'dayGridMonth') {
+					if (todayEl) {
+						todayEl.scrollIntoView({ block: 'nearest', behavior: 'smooth' })
+					}
+				}
+				if (calendarApi.view.type === 'listMonth') {
+					if (todayEl) {
+						todayEl.scrollIntoView({ block: 'start', behavior: 'smooth' })
+					}
 				}
 			})
 		},