From 251fb763038eb440f291beafd5b64d8e77ce8e0d Mon Sep 17 00:00:00 2001
From: Matthew Holloway <matthew@staff.ietf.org>
Date: Thu, 1 Aug 2024 10:44:42 +1200
Subject: [PATCH] Scroll to Now on Init

---
 client/agenda/AgendaQuickAccess.vue  | 19 ++++++++++++++++---
 client/agenda/AgendaScheduleList.vue | 28 +---------------------------
 client/agenda/store.js               |  1 -
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/client/agenda/AgendaQuickAccess.vue b/client/agenda/AgendaQuickAccess.vue
index 99adc1027ed..4ba06ab2cca 100644
--- a/client/agenda/AgendaQuickAccess.vue
+++ b/client/agenda/AgendaQuickAccess.vue
@@ -205,9 +205,7 @@ function scrollToDay (dayId, ev) {
   document.getElementById(`agenda-day-${dayId}`)?.scrollIntoView(true)
 }
 
-function scrollToNow (ev) {
-  ev.preventDefault()
-
+function scrollToNow () {
   const lastEventId = agendaStore.findCurrentEventId()
 
   if (lastEventId) {
@@ -217,6 +215,21 @@ function scrollToNow (ev) {
   }
 }
 
+/**
+ * Scrolls to now on page load when browser location hash is "#now"
+ */
+(function scrollToNowHashInit() {
+  if (window.location.hash !== "#now") return
+
+  const unsubscribe = agendaStore.$subscribe((mutation, agendaStoreState) => {
+    if (agendaStoreState.schedule.length === 0) {
+      return
+    }
+    scrollToNow()
+    unsubscribe() // we only need to scroll once, so unsubscribe from future updates
+  })
+})()
+
 </script>
 
 <style lang="scss">
diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue
index 2991f3f79dc..9db763b74e0 100644
--- a/client/agenda/AgendaScheduleList.vue
+++ b/client/agenda/AgendaScheduleList.vue
@@ -182,7 +182,7 @@
 </template>
 
 <script setup>
-import { computed, h, onBeforeUnmount, onMounted, onUpdated, reactive } from 'vue'
+import { computed, h, onBeforeUnmount, onMounted, reactive } from 'vue'
 import { DateTime } from 'luxon'
 import find from 'lodash/find'
 import sortBy from 'lodash/sortBy'
@@ -575,38 +575,12 @@ function recalculateRedLine () {
   }
 }
 
-/**
- * Scrolls to #now
- */
-function scrollToNowInit() {
-  console.log("scrollToNowInit ()", window.location.hash)
-
-  let hasScrolledToNow = false;
-
-  if (window.location.hash !== "#now") return
-
-  agendaStore.$subscribe((mutation, agendaStoreState) => {
-    console.log("agendaStoreState.schedule.length", agendaStoreState.schedule.length)
-    console.log("state.redhandOffset", state.redhandOffset)
-    if (hasScrolledToNow === true ||
-        agendaStoreState.schedule.length === 0 ||
-        state.redhandOffset === 0) {
-      return
-    }
-    window.scrollTo(0, state.redhandOffset)
-    hasScrolledToNow = true;
-  })
-
-}
 // MOUNTED
 
 onMounted(() => {
   // -> Update Redhand Position
   recalculateRedLine()
   redhandScheduler = setInterval(recalculateRedLine, 5000)
-
-  
-  scrollToNowInit()
 })
 
 // BEFORE UNMOUNT
diff --git a/client/agenda/store.js b/client/agenda/store.js
index 7fa0b448afe..95d0894520f 100644
--- a/client/agenda/store.js
+++ b/client/agenda/store.js
@@ -86,7 +86,6 @@ export const useAgendaStore = defineStore('agenda', {
       }).map(s => {
         // -> Adjust times to selected timezone
         let eventStartDate = DateTime.fromISO(s.startDateTime, { zone: state.meeting.timezone }).setZone(state.timezone)
-        eventStartDate = eventStartDate.plus({ days: 6.5 })
         const eventEndDate = eventStartDate.plus({ seconds: s.duration })
 
         // -> Find remote call-in URL