From e882b7cabd12b03c962ecd049c283ef85f37603e Mon Sep 17 00:00:00 2001
From: sallto <68823230+sallto@users.noreply.github.com>
Date: Tue, 15 Nov 2022 03:36:01 +0100
Subject: [PATCH] fix: Scheduled date picker always points to today, regardless
 of a previous date (#7329)

* fix: Scheduled date picker always points to today, regardless if a previous date was already set
fixes #6985

* fix: e2e-test flakyness for datepicker
---
 e2e-tests/basic.spec.ts                    | 19 +++++++++++++++++++
 src/main/frontend/components/datetime.cljs |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/e2e-tests/basic.spec.ts b/e2e-tests/basic.spec.ts
index 1b62326e2..a4a8a603a 100644
--- a/e2e-tests/basic.spec.ts
+++ b/e2e-tests/basic.spec.ts
@@ -228,3 +228,22 @@ test('invalid page props #3944', async ({ page, block }) => {
   // Force rendering property block
   await block.enterNext()
 })
+
+test('Scheduled date picker should point to the already specified Date #6985', async({page,block})=>{
+  await createRandomPage(page)
+
+  await block.mustFill('testTask \n SCHEDULED: <2000-05-06 Sat>')
+  await block.enterNext()
+  await page.waitForTimeout(500)
+  await block.escapeEditing()
+
+  // Open date picker
+  await page.click('a.opacity-80')
+  await page.waitForTimeout(500)
+  expect(page.locator('text=May 2000')).toBeVisible()
+  expect(page.locator('td:has-text("6").active')).toBeVisible()
+
+  // Close date picker
+  await page.click('a.opacity-80')
+  await page.waitForTimeout(500)
+})
\ No newline at end of file
diff --git a/src/main/frontend/components/datetime.cljs b/src/main/frontend/components/datetime.cljs
index 06995f269..6d381aeb0 100644
--- a/src/main/frontend/components/datetime.cljs
+++ b/src/main/frontend/components/datetime.cljs
@@ -136,7 +136,7 @@
                (reset! *timestamp {:time ""
                                    :repeater {}}))
              (when-not (:date-picker/date @state/state)
-               (state/set-state! :date-picker/date (t/today))))
+               (state/set-state! :date-picker/date (get ts :date (t/today)))))
            state)
    :will-unmount (fn [state]
                    (clear-timestamp!)