Skip to content

Commit 5384c6d

Browse files
MohsinQKmschwemer
authored andcommitted
[BUGFIX] Aria-required not necessary when native required present
Related: #1238 Related: #1229
1 parent 6e12af2 commit 5384c6d

3 files changed

Lines changed: 5 additions & 9 deletions

File tree

Classes/ViewHelpers/Validation/AbstractValidationViewHelper.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ protected function addMandatoryAttributes(array $additionalAttributes, ?Field $f
5353
$additionalAttributes['data-powermail-required'] = 'true';
5454
}
5555

56-
$additionalAttributes['aria-required'] = 'true';
57-
5856
if ($this->isClientValidationEnabled()) {
5957
$mandatoryText = $field->getMandatoryText() !== ''
6058
? $field->getMandatoryText()

Classes/ViewHelpers/Validation/ValidationDataAttributeViewHelper.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ protected function addMandatoryAttributesForMultipleFields(
8181
if ($field->isMandatory()) {
8282
if ($this->isNativeValidationEnabled()) {
8383
$additionalAttributes['required'] = 'required';
84-
$additionalAttributes['aria-required'] = 'true';
84+
8585
// remove required attribute if more checkboxes than 1
8686
if ($field->getType() === 'check' && $iteration['total'] > 1) {
8787
unset($additionalAttributes['required']);
88-
unset($additionalAttributes['aria-required']);
8988
}
90-
} elseif ($this->isClientValidationEnabled()) {
91-
$additionalAttributes['data-powermail-required'] = 'true';
92-
$additionalAttributes['aria-required'] = 'true';
89+
} else {
90+
if ($this->isClientValidationEnabled()) {
91+
$additionalAttributes['data-powermail-required'] = 'true';
92+
}
9393
}
9494

9595
if ($this->isClientValidationEnabled()) {
@@ -110,7 +110,6 @@ protected function addMandatoryAttributesForMultipleFields(
110110
}
111111
if ($field->getType() === 'check') {
112112
$additionalAttributes['data-powermail-required'] = 'true';
113-
$additionalAttributes['aria-required'] = 'true';
114113
}
115114
}
116115
}

Tests/Unit/ViewHelpers/Validation/DatepickerDataAttributeViewHelperTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public static function renderReturnsArrayDataProvider(): array
5656
'data-datepicker-format' => 'YYYY-MM-DD HH:mm',
5757
'data-date-value' => 'anyvalue',
5858
'required' => 'required',
59-
'aria-required' => 'true',
6059
'data-powermail-required-message' => 'validationerror_mandatory',
6160
],
6261
],

0 commit comments

Comments
 (0)