From 213605ecdf1de0bd7d30f8917df41f2d30be7396 Mon Sep 17 00:00:00 2001
From: Jon Staab <jstaab@protonmail.com>
Date: Fri, 3 Jul 2026 14:07:53 -0700
Subject: [PATCH] Fix date picker initial value

---
 src/lib/components/DateTimeInput.svelte | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/lib/components/DateTimeInput.svelte b/src/lib/components/DateTimeInput.svelte
index cfd89a35..182b766a 100644
--- a/src/lib/components/DateTimeInput.svelte
+++ b/src/lib/components/DateTimeInput.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import {onMount} from "svelte"
   import {DateInput} from "date-picker-svelte"
   import {secondsToDate, dateToSeconds} from "@welshman/lib"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
@@ -48,6 +49,16 @@
   let minutes: string = $state(initialMinutes)
   let element: HTMLElement
 
+  // When mounted during a reactive flush (e.g. inside a modal), DateInput's legacy
+  // `$:` chain runs against a stale inner store and writes null back through the
+  // binding, wiping the initial date. It can't happen legitimately this early, so
+  // restore it after mount.
+  onMount(() => {
+    if (initialDate && !date) {
+      date = initialDate
+    }
+  })
+
   // Sync date to time and value
   $effect(() => {
     if (date) {