Skip to content
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

Jump to bottom

[5.x] Ensure default config values are available in form tag #10088

Merged
merged 9 commits into from
May 15, 2024
Merged

[5.x] Ensure default config values are available in form tag #10088

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2ba30f2
Ensure default config values are available in form tag
duncanmcclean May 15, 2024
5edb075
Include defaults in `Field@toArray`
duncanmcclean May 15, 2024
1a001e3
improve test
jasonvarga May 15, 2024
dc66482
ensure type is inlined
jasonvarga May 15, 2024
ba6e5e4
don't filter anything out
jasonvarga May 15, 2024
30b58a3
use the dedicated method to ensure fieldtype defaults get inherited
jasonvarga May 15, 2024
f33f73e
higher order
jasonvarga May 15, 2024
c781f56
nitpick
jasonvarga May 15, 2024
bb05d73
revert back to essentially what duncan had. there were a few knock on…
jasonvarga May 15, 2024
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
9 changes: 9 additions & 0 deletions src/Fields/Fieldtype.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,15 @@ public function configFields(): Fields
return new ConfigFields($fields);
}

public function defaultConfigValues(): array
{
return Field::commonFieldOptions()->all()
->merge($this->configFields()->all())
->filter(fn (ConfigField $configField) => $configField->get('default'))
->map(fn (ConfigField $configField) => $configField->get('default'))
->all();
}

protected function configFieldItems(): array
{
return $this->configFields;
Expand Down
2 changes: 1 addition & 1 deletion src/Tags/Concerns/RendersForms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ protected function getRenderableField($field, $errorBag = 'default', $manipulate
$default = $field->value() ?? $field->defaultValue();
$value = $old === $missing ? $default : $old;

$data = array_merge($field->toArray(), [
$data = array_merge($field->fieldtype()->defaultConfigValues(), $field->toArray(), [
'instructions' => $field->instructions(),
'error' => $errors->first($field->handle()) ?: null,
'default' => $field->value() ?? $field->defaultValue(),
Expand Down
Loading