From 0fb0a23ab2fa48a6ca8bdc6ead7211a0cd2a444d Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 13 Nov 2025 16:40:28 +0000
Subject: [PATCH 1/4] "Now" needs to be figured out in JavaScript...

So that when we get midnight, we're getting midnight in the user's timezone and not midnight in UTC.
---
 resources/js/components/fieldtypes/DateFieldtype.vue | 11 ++++++++++-
 src/Fieldtypes/Date.php                              |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/fieldtypes/DateFieldtype.vue b/resources/js/components/fieldtypes/DateFieldtype.vue
index b70324ac400..6cb8e459abb 100644
--- a/resources/js/components/fieldtypes/DateFieldtype.vue
+++ b/resources/js/components/fieldtypes/DateFieldtype.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="datetime min-w-[145px]">
+    <div v-if="mounted" class="datetime min-w-[145px]">
         <Button :text="__('Add Date')" icon="calendar" v-if="!isReadOnly && !isInline && !hasDate" @click="addDate" />
 
         <Component
@@ -35,6 +35,7 @@ export default {
 
     data() {
         return {
+            mounted: false,
             containerWidth: null,
             focusedField: null,
             localValue: null,
@@ -102,6 +103,14 @@ export default {
         this.$events.$on(`container.${this.publishContainer.name}.saving`, this.triggerChangeOnFocusedField);
     },
 
+    mounted() {
+        if (this.value === 'now') {
+            this.addDate();
+        }
+
+        this.mounted = true;
+    },
+
     unmounted() {
         this.$events.$off(`container.${this.publishContainer.name}.saving`, this.triggerChangeOnFocusedField);
     },
diff --git a/src/Fieldtypes/Date.php b/src/Fieldtypes/Date.php
index 7fa4d95a565..a589ec897f6 100644
--- a/src/Fieldtypes/Date.php
+++ b/src/Fieldtypes/Date.php
@@ -137,7 +137,7 @@ private function preProcessSingle($value)
         }
 
         if ($value === 'now') {
-            return now('UTC')->toIso8601ZuluString('millisecond');
+            return 'now';
         }
 
         // If the value is an array, this field probably used to be a range. In this case, we'll use the start date.

From 23aa7ebe7ac288b9f3232d88b7f90fd0850c247c Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 13 Nov 2025 16:41:02 +0000
Subject: [PATCH 2/4] Avoid the date being set messing with dirty state.

---
 resources/js/components/fieldtypes/DateFieldtype.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/js/components/fieldtypes/DateFieldtype.vue b/resources/js/components/fieldtypes/DateFieldtype.vue
index 6cb8e459abb..68ed4775338 100644
--- a/resources/js/components/fieldtypes/DateFieldtype.vue
+++ b/resources/js/components/fieldtypes/DateFieldtype.vue
@@ -105,7 +105,15 @@ export default {
 
     mounted() {
         if (this.value === 'now') {
+            let originalNames = Statamic.$dirty.names();
+
             this.addDate();
+
+            this.$nextTick(() => {
+                Statamic.$dirty.names()
+                    .filter((name) => !originalNames.includes(name))
+                    .forEach((name) => Statamic.$dirty.remove(name));
+            });
         }
 
         this.mounted = true;

From c8d8297458a00284cc2145cc0ebd705680ee64af Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 13 Nov 2025 16:44:36 +0000
Subject: [PATCH 3/4] This way is cleaner.

---
 resources/js/components/fieldtypes/DateFieldtype.vue | 9 +--------
 resources/js/components/ui/Publish/Container.vue     | 1 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/fieldtypes/DateFieldtype.vue b/resources/js/components/fieldtypes/DateFieldtype.vue
index 68ed4775338..445ebd35ef0 100644
--- a/resources/js/components/fieldtypes/DateFieldtype.vue
+++ b/resources/js/components/fieldtypes/DateFieldtype.vue
@@ -105,15 +105,8 @@ export default {
 
     mounted() {
         if (this.value === 'now') {
-            let originalNames = Statamic.$dirty.names();
-
             this.addDate();
-
-            this.$nextTick(() => {
-                Statamic.$dirty.names()
-                    .filter((name) => !originalNames.includes(name))
-                    .forEach((name) => Statamic.$dirty.remove(name));
-            });
+            this.$nextTick(() => this.injectedPublishContainer.clearDirtyState());
         }
 
         this.mounted = true;
diff --git a/resources/js/components/ui/Publish/Container.vue b/resources/js/components/ui/Publish/Container.vue
index 73539aa422e..6c94088c151 100644
--- a/resources/js/components/ui/Publish/Container.vue
+++ b/resources/js/components/ui/Publish/Container.vue
@@ -238,6 +238,7 @@ const provided = {
     setRevealerField,
     unsetRevealerField,
     setHiddenField,
+    clearDirtyState,
 };
 
 provideContainerContext({ ...provided, container: provided });

From b668077379883d676e78a8969b51fef61fa36e5c Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 13 Nov 2025 17:20:21 +0000
Subject: [PATCH 4/4] Fix test

---
 tests/Fieldtypes/DateTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Fieldtypes/DateTest.php b/tests/Fieldtypes/DateTest.php
index d2d535c636c..8a2d51a7242 100644
--- a/tests/Fieldtypes/DateTest.php
+++ b/tests/Fieldtypes/DateTest.php
@@ -239,7 +239,7 @@ public static function preProcessProvider()
                 'UTC',
                 [],
                 'now', // this would happen if the value was null, but default was "now"
-                '2010-12-25T13:43:00.000Z', // current date
+                'now', // handled on the frontend
             ],
             'date without time' => [
                 'UTC',