Skip to content

Fix form render crash and invalid Flatpickr locale #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coolsam726 merged 2 commits into from
Jun 13, 2026
Merged

Fix form render crash and invalid Flatpickr locale #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2b5947
Fix form render crash and invalid Flatpickr locale.
coolsam726 Jun 13, 2026
d771244
Merge branch 'main' into fix/form-render-and-locale
coolsam726 Jun 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/dist/components/flatpickr.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions resources/js/components/flatpickr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import localeData from 'dayjs/plugin/localeData'
import timezone from 'dayjs/plugin/timezone'
import utc from 'dayjs/plugin/utc'
import flatpickr from 'flatpickr'
import flatpickrLocales from 'flatpickr/dist/l10n'
import flatpickrLocalesImport from 'flatpickr/dist/l10n'

const flatpickrLocales = flatpickrLocalesImport.default ?? flatpickrLocalesImport

import MonthSelect from 'flatpickr/dist/esm/plugins/monthSelect/index.js'
import WeekSelect from 'flatpickr/dist/esm/plugins/weekSelect/weekSelect.js'
Expand All @@ -31,9 +33,11 @@ function resolveLocale(localeConfig) {
const localeCode = localeConfig.locale ?? 'en'
const baseLocale = flatpickrLocales[localeCode] ?? flatpickrLocales.en

const { locale: _locale, ...overrides } = localeConfig

return {
...baseLocale,
...localeConfig,
...overrides,
}
}

Expand Down
4 changes: 2 additions & 2 deletions resources/views/forms/components/flatpickr.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
'max' => $hasTime ? $maxDate : ($maxDate ? \Carbon\Carbon::parse($maxDate)->toDateString() : null),
'min' => $hasTime ? $minDate : ($minDate ? \Carbon\Carbon::parse($minDate)->toDateString() : null),
'placeholder' => $getPlaceholder(),
'readonly' => $isReadOnly(),
'readonly' => $isReadOnly,
'required' => $isRequired() && (! $isConcealed()),
'step' => $getStep(),
'type' => $getType(),
Expand Down Expand Up @@ -128,7 +128,7 @@
'max' => $hasTime ? $maxDate : ($maxDate ? \Carbon\Carbon::parse($maxDate)->toDateString() : null),
'min' => $hasTime ? $minDate : ($minDate ? \Carbon\Carbon::parse($minDate)->toDateString() : null),
'placeholder' => $getPlaceholder(),
'readonly' => $isReadOnly(),
'readonly' => $isReadOnly,
'required' => $isRequired() && (! $isConcealed()),
$applyStateBindingModifiers('wire:model') => $statePath,
'x-data' => count($extraAlpineAttributes) ? '{}' : null,
Expand Down
Loading