Merge pull request #17110 from ralphjsmit/rjs/fix-default-focused-date-timezone

fix: convert `defaultFocusedDate()` to correct timezone
This commit is contained in:
Dan Harrin
2025-07-28 12:38:49 +01:00
committed by GitHub
@@ -431,7 +431,25 @@ class DateTimePicker extends Field implements Contracts\HasAffixActions
public function getDefaultFocusedDate(): ?string
{
return $this->evaluate($this->defaultFocusedDate);
$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());
}
return $defaultFocusedDate;
}
/**