fix: Move current date back to singleton

src/calendar/ui/Day.svelte

@@ -13,7 +13,7 @@
     const ephemeral = getTypedContext("ephemeralStore");
     $: index = month.index;
     $: year = month.year;
-    $: current = ephemeral.current;
+    $: current = $store.current;
     $: eventCache = $store.eventCache;
     $: viewing = ephemeral.viewing;
     $: events = eventCache.getItemsOrRecalculate({
@@ -48,7 +48,7 @@
         }
         menu.addItem((item) => {
             item.setTitle("Set as Today").onClick(async () => {
-                ephemeral.setCurrentDate({
+                $store.setCurrentDate({
                     day: number,
                     month: $index,
                     year: year.year,

src/calendar/ui/Month.svelte

@@ -19,7 +19,6 @@
     $: ({ lastDay: previousLastDay, days: previousDays } = $previousMonth);
 
     $: extraWeek = $weekdays.length - $lastDay <= 3 ? 1 : 0;
-    $: total = $weeks + extraWeek;
     const tbody = (node: HTMLElement) => {
         let row = node.createEl("tr");
         if ($staticConfiguration.overflow) {

src/calendar/ui/Nav.svelte

@@ -7,8 +7,8 @@
     const ephemeral = getTypedContext("ephemeralStore");
     const plugin = getTypedContext("plugin");
     const store = $global;
-    const { displayingMonth, displayingYear, currentDisplay } = ephemeral;
-    const { staticStore } = store;
+    const { displayingMonth, displayingYear } = ephemeral;
+    const { staticStore, currentDisplay } = store;
     const { staticConfiguration } = staticStore;
     const left = (node: HTMLElement) => {
         new ExtraButtonComponent(node).setIcon("left-arrow");

src/calendar/view.ts

@@ -37,6 +37,7 @@ export default class FantasyCalendarView extends ItemView {
         this.plugin.onSettingsLoad(() => this.display());
     }
     async display() {
+        //todo: inject store here, subscribe to 
         new CalendarUI({
             target: this.contentEl,
             props: {

src/stores/calendar.store.ts

@@ -51,6 +51,15 @@ export function createCalendarStore(
         update,
         subscribe,
 
+        current,
+        currentDisplay: derived([current, store], ([current, calendar]) => {
+            return dateString(current, calendar);
+        }),
+        setCurrentDate: (date: FcDate) =>
+            store.update((cal) => {
+                cal.current = { ...date };
+                return cal;
+            }),
         updateCalendar: (calendar: Calendar) => update((cal) => calendar),
         eventCache,
         addEvent: (date: FcDate) => {
@@ -87,21 +96,13 @@ export function getEphemeralStore(
     base: Calendar,
     yearCalculator: YearStoreCache
 ) {
-    const current = writable({ ...base.current });
-
     const displaying = writable({ ...base.current });
     const viewing = writable<FcDate | null>();
     return {
-        current,
-        currentDisplay: derived([current, store], ([current, calendar]) => {
-            return dateString(current, calendar);
-        }),
-        setCurrentDate: (date: FcDate) => current.set({ ...date }),
-
         //Displayed Date
         displaying,
-        goToToday: () => displaying.set({ ...get(current) }),
-        displayDate: (date: FcDate = get(current)) =>
+        goToToday: () => displaying.set({ ...base.current }),
+        displayDate: (date: FcDate = base.current) =>
             displaying.set({ ...date }),
         displayingDisplay: derived(
             [displaying, store],