From b40b7fd2ac759c73aedb975752403262c737de9e Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:08:19 +0200 Subject: [PATCH 1/6] Update DateTimePicker.php --- packages/forms/src/Components/DateTimePicker.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/forms/src/Components/DateTimePicker.php b/packages/forms/src/Components/DateTimePicker.php index 2478c46027..9b95d67e45 100644 --- a/packages/forms/src/Components/DateTimePicker.php +++ b/packages/forms/src/Components/DateTimePicker.php @@ -431,7 +431,13 @@ class DateTimePicker extends Field implements Contracts\HasAffixActions public function getDefaultFocusedDate(): ?string { - return $this->evaluate($this->defaultFocusedDate); + $defaultFocusedDate = $this->evaluate($this->defaultFocusedDate); + + if ($timezone = $this->getTimezone()) { + $defaultFocusedDate->timezone($timezone); + } + + return $defaultFocusedDate; } /** From acb66949be6c02ed1f194c2e85424f1c4c1aab83 Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:10:05 +0200 Subject: [PATCH 2/6] Update DateTimePicker.php --- packages/forms/src/Components/DateTimePicker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/forms/src/Components/DateTimePicker.php b/packages/forms/src/Components/DateTimePicker.php index 9b95d67e45..6fcd86ef84 100644 --- a/packages/forms/src/Components/DateTimePicker.php +++ b/packages/forms/src/Components/DateTimePicker.php @@ -433,7 +433,7 @@ class DateTimePicker extends Field implements Contracts\HasAffixActions { $defaultFocusedDate = $this->evaluate($this->defaultFocusedDate); - if ($timezone = $this->getTimezone()) { + if (filled($defaultFocusedDate) && ($timezone = $this->getTimezone())) { $defaultFocusedDate->timezone($timezone); } From 29cbbc4c67ba318851c33923e9a7e3f1337cab5d Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:10:14 +0200 Subject: [PATCH 3/6] Update DateTimePicker.php --- packages/forms/src/Components/DateTimePicker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/forms/src/Components/DateTimePicker.php b/packages/forms/src/Components/DateTimePicker.php index 6fcd86ef84..af6c30f30b 100644 --- a/packages/forms/src/Components/DateTimePicker.php +++ b/packages/forms/src/Components/DateTimePicker.php @@ -434,7 +434,7 @@ class DateTimePicker extends Field implements Contracts\HasAffixActions $defaultFocusedDate = $this->evaluate($this->defaultFocusedDate); if (filled($defaultFocusedDate) && ($timezone = $this->getTimezone())) { - $defaultFocusedDate->timezone($timezone); + $defaultFocusedDate->setTimezone($timezone); } return $defaultFocusedDate; From 830460a24741f4a0e9bf871e1918c85e3ee9341d Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:11:21 +0200 Subject: [PATCH 4/6] Update DateTimePicker.php --- packages/forms/src/Components/DateTimePicker.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/forms/src/Components/DateTimePicker.php b/packages/forms/src/Components/DateTimePicker.php index af6c30f30b..6e556564bd 100644 --- a/packages/forms/src/Components/DateTimePicker.php +++ b/packages/forms/src/Components/DateTimePicker.php @@ -433,8 +433,8 @@ class DateTimePicker extends Field implements Contracts\HasAffixActions { $defaultFocusedDate = $this->evaluate($this->defaultFocusedDate); - if (filled($defaultFocusedDate) && ($timezone = $this->getTimezone())) { - $defaultFocusedDate->setTimezone($timezone); + if (filled($defaultFocusedDate)) { + $defaultFocusedDate->setTimezone($this->getTimezone()); } return $defaultFocusedDate; From d2c2683c5ac2af971b0c275df5d07748e43b98a8 Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:11:49 +0200 Subject: [PATCH 5/6] Update DateTimePicker.php --- packages/forms/src/Components/DateTimePicker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/forms/src/Components/DateTimePicker.php b/packages/forms/src/Components/DateTimePicker.php index 6e556564bd..53c8f42089 100644 --- a/packages/forms/src/Components/DateTimePicker.php +++ b/packages/forms/src/Components/DateTimePicker.php @@ -434,7 +434,7 @@ class DateTimePicker extends Field implements Contracts\HasAffixActions $defaultFocusedDate = $this->evaluate($this->defaultFocusedDate); if (filled($defaultFocusedDate)) { - $defaultFocusedDate->setTimezone($this->getTimezone()); + $defaultFocusedDate = $defaultFocusedDate->setTimezone($this->getTimezone()); } return $defaultFocusedDate; From 31d4164deba63976ea0750d2f3a9bb51c6048e8e Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:35:46 +0200 Subject: [PATCH 6/6] Update DateTimePicker.php --- packages/forms/src/Components/DateTimePicker.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/forms/src/Components/DateTimePicker.php b/packages/forms/src/Components/DateTimePicker.php index 53c8f42089..00da9cb3fe 100644 --- a/packages/forms/src/Components/DateTimePicker.php +++ b/packages/forms/src/Components/DateTimePicker.php @@ -434,6 +434,18 @@ class DateTimePicker extends Field implements Contracts\HasAffixActions $defaultFocusedDate = $this->evaluate($this->defaultFocusedDate); if (filled($defaultFocusedDate)) { + if (! $defaultFocusedDate instanceof CarbonInterface) { + try { + $defaultFocusedDate = Carbon::createFromFormat($this->getFormat(), (string) $defaultFocusedDate, config('app.timezone')); + } catch (InvalidFormatException $exception) { + try { + $defaultFocusedDate = Carbon::parse($defaultFocusedDate, config('app.timezone')); + } catch (InvalidFormatException $exception) { + return null; + } + } + } + $defaultFocusedDate = $defaultFocusedDate->setTimezone($this->getTimezone()); }