Skip to content

[6.x] Only add the required attribute to checkboxes with a single option #15760

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

Open
mynetx wants to merge 1 commit into
base: 6.x
Choose a base branch
from
+47 −2
Open

[6.x] Only add the required attribute to checkboxes with a single option #15760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion resources/views/extend/forms/antlers/fields/checkboxes.antlers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
value="{{ option }}"
{{ if js_driver }}{{ js_attributes }}{{ /if }}
{{ if value|in_array:option }}checked{{ /if }}
{{ if validate|contains:required }}required{{ /if }}
{{ if validate|contains:required && options|count == 1 }}required{{ /if }}
{{ if error }}
aria-invalid="true" aria-describedby="{{ id }}-error"
{{ elseif instructions }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/extend/forms/blade/fields/checkboxes.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
value="{{ $option }}"
@if (isset($js_driver)) {!! $js_attributes !!} @endif
@checked(in_array($option, $value ?? []))
@required(in_array('required', $validate ?? []))
@required(in_array('required', $validate ?? []) && count($options) === 1)
@if ($error)
aria-invalid="true" aria-describedby="{{ $id }}-error"
@elseif ($instructions)
Expand Down
45 changes: 45 additions & 0 deletions tests/Tags/Form/FormCreateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Storage;
use Illuminate\Validation\ValidationException;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Test;
use Statamic\Facades\AssetContainer;
use Statamic\Facades\Form;
Expand Down Expand Up @@ -502,6 +503,50 @@ public function it_dynamically_renders_inline_checkboxes_field()
]);
}

#[Test]
#[DataProvider('templateLanguageProvider')]
public function it_only_renders_required_attribute_on_checkboxes_field_with_a_single_option($language)
{
config(['statamic.templates.language' => $language]);

$this->assertFieldRendersHtml([
'<label><input id="[[form-handle]]-form-favourite-animals-field-cat-option" type="checkbox" name="favourite_animals[]" value="cat">Cat</label>',
'<br>',
'<label><input id="[[form-handle]]-form-favourite-animals-field-armadillo-option" type="checkbox" name="favourite_animals[]" value="armadillo">Armadillo</label>',
], [
'handle' => 'favourite_animals',
'field' => [
'type' => 'checkboxes',
'validate' => ['required'],
'options' => [
'cat' => 'Cat',
'armadillo' => 'Armadillo',
],
],
]);

$this->assertFieldRendersHtml([
'<label><input id="[[form-handle]]-form-terms-field-yes-option" type="checkbox" name="terms[]" value="yes" required>I agree</label>',
], [
'handle' => 'terms',
'field' => [
'type' => 'checkboxes',
'validate' => ['required'],
'options' => [
'yes' => 'I agree',
],
],
]);
}

public static function templateLanguageProvider()
{
return [
'antlers' => ['antlers'],
'blade' => ['blade'],
];
}

#[Test]
public function it_dynamically_renders_radio_field()
{
Expand Down
Loading