From 6c9e7b6f2e6594b4500ff4e44b3124802d3905c0 Mon Sep 17 00:00:00 2001
From: Aleks Andrs <59065138+aleksanm@users.noreply.github.com>
Date: Tue, 1 Jul 2025 15:06:59 +0300
Subject: [PATCH 1/3] Update date-time-picker.blade.php

Fix DatePicker in SPA mode
---
 .../forms/resources/views/components/date-time-picker.blade.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/forms/resources/views/components/date-time-picker.blade.php b/packages/forms/resources/views/components/date-time-picker.blade.php
index 1d198279af..16597af8f0 100644
--- a/packages/forms/resources/views/components/date-time-picker.blade.php
+++ b/packages/forms/resources/views/components/date-time-picker.blade.php
@@ -80,6 +80,7 @@
                             shouldCloseOnDateSelection: @js($shouldCloseOnDateSelection()),
                             state: $wire.{{ $applyStateBindingModifiers("\$entangle('{$statePath}')") }},
                         })"
+                wire:ignore
                 x-on:keydown.esc="isOpen() && $event.stopPropagation()"
                 {{
                     $attributes

From cf9b07bd8c148f9f10d71cdd0a9a90aa7f51df57 Mon Sep 17 00:00:00 2001
From: Aleks Andrs <59065138+aleksanm@users.noreply.github.com>
Date: Tue, 1 Jul 2025 15:08:34 +0300
Subject: [PATCH 2/3] Update DateTimePicker.php

Fix DatePicker in SPA mode
---
 .../forms/src/Components/DateTimePicker.php     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/forms/src/Components/DateTimePicker.php b/packages/forms/src/Components/DateTimePicker.php
index 02ccdb5135..4241bf7ff2 100644
--- a/packages/forms/src/Components/DateTimePicker.php
+++ b/packages/forms/src/Components/DateTimePicker.php
@@ -522,4 +522,21 @@ class DateTimePicker extends Field implements Contracts\HasAffixActions
 
         return 'datetime-local';
     }
+    
+    public function getKey(bool $isAbsolute = true): ?string
+    {
+        if ($this->isNative() || $this->key !== null) {
+            return parent::getKey($isAbsolute);
+        }
+
+        $values = [
+            'minDate' => $this->getMinDate(),
+            'maxDate' => $this->getMaxDate(),
+            'disabledDates' => $this->getDisabledDates(),
+        ];
+
+        $this->key = substr(md5(serialize($values)), 0, 8);
+
+        return parent::getKey($isAbsolute);
+    }
 }

From 1614e55b274caf8284ea774108caadce29a03f4e Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Thu, 3 Jul 2025 09:00:34 +0100
Subject: [PATCH 3/3] make consistent with 4.x

---
 .../views/components/date-time-picker.blade.php | 10 +++++++++-
 .../forms/src/Components/DateTimePicker.php     | 17 -----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/packages/forms/resources/views/components/date-time-picker.blade.php b/packages/forms/resources/views/components/date-time-picker.blade.php
index 16597af8f0..946b06e2d3 100644
--- a/packages/forms/resources/views/components/date-time-picker.blade.php
+++ b/packages/forms/resources/views/components/date-time-picker.blade.php
@@ -17,6 +17,7 @@
     $suffixIcon = $getSuffixIcon();
     $suffixLabel = $getSuffixLabel();
     $statePath = $getStatePath();
+    $disabledDates = $getDisabledDates();
 @endphp
 
 <x-dynamic-component
@@ -81,6 +82,13 @@
                             state: $wire.{{ $applyStateBindingModifiers("\$entangle('{$statePath}')") }},
                         })"
                 wire:ignore
+                wire:key="{{ $this->getId() }}.{{ $statePath }}.{{ $field::class }}.{{
+                    substr(md5(serialize([
+                        'disabledDates' => $disabledDates,
+                        'maxDate' => $maxDate,
+                        'minDate' => $minDate,
+                    ])), 0, 64)
+                }}"
                 x-on:keydown.esc="isOpen() && $event.stopPropagation()"
                 {{
                     $attributes
@@ -96,7 +104,7 @@
                 <input
                     x-ref="disabledDates"
                     type="hidden"
-                    value="{{ json_encode($getDisabledDates()) }}"
+                    value="{{ json_encode($disabledDates) }}"
                 />
 
                 <button
diff --git a/packages/forms/src/Components/DateTimePicker.php b/packages/forms/src/Components/DateTimePicker.php
index 4241bf7ff2..02ccdb5135 100644
--- a/packages/forms/src/Components/DateTimePicker.php
+++ b/packages/forms/src/Components/DateTimePicker.php
@@ -522,21 +522,4 @@ class DateTimePicker extends Field implements Contracts\HasAffixActions
 
         return 'datetime-local';
     }
-    
-    public function getKey(bool $isAbsolute = true): ?string
-    {
-        if ($this->isNative() || $this->key !== null) {
-            return parent::getKey($isAbsolute);
-        }
-
-        $values = [
-            'minDate' => $this->getMinDate(),
-            'maxDate' => $this->getMaxDate(),
-            'disabledDates' => $this->getDisabledDates(),
-        ];
-
-        $this->key = substr(md5(serialize($values)), 0, 8);
-
-        return parent::getKey($isAbsolute);
-    }
 }