fix when switching between writing and reading

diff --git a/frontend/src/lib/Datepicker.svelte b/frontend/src/lib/Datepicker.svelte
index 173585018894006b74b91554e0ffc152576721c7..96fb60d816a5d7bce262737afee028f9de8b7edf 100644 (file)
--- a/frontend/src/lib/Datepicker.svelte
+++ b/frontend/src/lib/Datepicker.svelte
@@ -1,5 +1,6 @@
 <script>
        import { cal, selectedDate, readingDate } from '$lib/calendarStore.js';
+       import { readingMode } from '$lib/settingsStore.js';
        import { onMount } from 'svelte';
        import { fly } from 'svelte/transition';
        import * as bootstrap from 'bootstrap';
@@ -192,7 +193,9 @@
                                                                {$cal.daysWithLogs.includes(day.day) ? 'mark-background' : ''} 
                                                                {$cal.daysWithFiles.includes(day.day) ? 'mark-dot' : ''} 
                                                                {$cal.daysBookmarked.includes(day.day) ? 'mark-circle' : ''}
-                                                               {(!$readingDate && sameDate($selectedDate, day)) || sameDate($readingDate, day) ? 'selected' : ''}"
+                                                               {(!$readingMode && sameDate($selectedDate, day)) || ($readingMode && sameDate($readingDate, day))
+                                                               ? 'selected'
+                                                               : ''}"
                                                        onclick={() => onDateClick(day)}
                                                >
                                                        {day.day}

diff --git a/frontend/src/routes/(authed)/write/+page.svelte b/frontend/src/routes/(authed)/write/+page.svelte
index 459dabeab7deea370e40b07e3752dbcdd2706bac..2c9cfb1bee415a965f59f8b6c3d118368e91ea37 100644 (file)
--- a/frontend/src/routes/(authed)/write/+page.svelte
+++ b/frontend/src/routes/(authed)/write/+page.svelte
@@ -48,6 +48,10 @@
 
        let tinyMDE;
        onMount(() => {
+               // If we come from read mode, keep the last visible day as the active selected day
+               if ($readingDate) {
+                       $selectedDate = $readingDate; // promote readingDate to selectedDate when switching to write mode
+               }
                $readingDate = null; // no reading-highlighting when in write mode
 
                tinyMDE = new TinyMDE.Editor({ element: 'editor', content: '' });