Calendar: Week views should not scroll to clicked date (#366)

mustang-im · Jan 10, 2025 · f43fd53 · f43fd53
1 parent e81fb2a
commit f43fd53
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/app/frontend/Calendar/CalendarApp.svelte b/app/frontend/Calendar/CalendarApp.svelte
@@ -1,6 +1,6 @@
 <vbox flex class="calendar-app">
   <vbox flex class="main">
-    <MainView {events} bind:start={$selectedDate} dateInterval={$selectedDateInterval}>
+    <MainView {events} bind:start={$startDate} dateInterval={$selectedDateInterval}>
       <TitleBarLeft on:addEvent={() => catchErrors(addEvent)} slot="top-left" />
       <ViewSelector bind:dateInterval={$selectedDateInterval} slot="top-right" />
     </MainView>
@@ -9,7 +9,7 @@
 
 <script lang="ts">
   import { Event } from "../../logic/Calendar/Event";
-  import { selectedCalendar, selectedDate, selectedDateInterval } from "./selected";
+  import { selectedCalendar, selectedDate, selectedDateInterval, startDate } from "./selected";
   import { calendarMustangApp } from "./CalendarMustangApp";
   import { appGlobal } from "../../logic/app";
   import MainView from "./MainView.svelte";

diff --git a/app/frontend/Calendar/DualView.svelte b/app/frontend/Calendar/DualView.svelte
@@ -1,8 +1,8 @@
 <hbox flex class="dual-view">
-  <WeekView bind:start {events} showDays={2}>
+  <WeekView bind:start={$selectedDate} {events} showDays={2}>
     <slot name="top-left" slot="top-left" />
   </WeekView>
-  <MonthView start={monthStart} {events} showDays={35}>
+  <MonthView {start} {events} showDays={35}>
     <slot name="top-right" slot="top-right" />
   </MonthView>
 </hbox>
@@ -12,16 +12,10 @@
   import type { Collection } from "svelte-collections";
   import WeekView from "./WeekView.svelte";
   import MonthView from "./MonthView.svelte";
+  import { selectedDate } from "./selected";
 
   export let start: Date;
   export let events: Collection<Event>;
-
-  let monthStart: Date;
-
-  $: start, syncMonth();
-  function syncMonth() {
-    monthStart = start;
-  }
 </script>
 
 <style>

diff --git a/app/frontend/Calendar/selected.ts b/app/frontend/Calendar/selected.ts
@@ -5,8 +5,8 @@ import { writable, type Writable } from "svelte/store";
 /** Which event is highlighted right now. */
 export let selectedEvent: Writable<Event> = writable(null);
 
-// TODO Move into observable prefs?
 export let selectedDate = writable(new Date());
 export type DateInterval = 0 | 1 | 2 | 7 | 31 | 28;
 export let selectedDateInterval = writable(2 as DateInterval);
+export let startDate = writable(new Date());
 export let selectedCalendar = writable<Calendar | null>(null);