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

PR: [Accessibility] Image Picker : wrong value for aria-label in the hidden input of the choices #9468

Merged
merged 4 commits into from
Feb 19, 2025
Merged

PR: [Accessibility] Image Picker : wrong value for aria-label in the hidden input of the choices #9468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16c49db
work for the https://github.com/surveyjs/survey-library/issues/9454
dmitry-kurmanov Feb 17, 2025
608dd3a
work for the https://github.com/surveyjs/survey-library/issues/9454
dmitry-kurmanov Feb 18, 2025
f0ac2e6
Merge branch 'master' into bug/9454-a11y-imagepicker
dmitry-kurmanov Feb 18, 2025
fc98001
work for the https://github.com/surveyjs/survey-library/issues/9454
dmitry-kurmanov Feb 18, 2025
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 packages/survey-angular-ui/src/questions/imagepicker-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ng-template #template>
<div [class]="question.getItemClass(model)">
<label [class]="question.cssClasses.label">
<input [type]="question.inputType" [attr.name]="question.questionName" [attr.value]="model.value" [id]="question.getItemId(model)" [attr.aria-required]="question.ariaRequired" [attr.aria-label]="question.ariaLabel" [attr.aria-invalid]="question.ariaInvalid" [attr.aria-errormessage]="question.ariaErrormessage"
<input [type]="question.inputType" [attr.name]="question.questionName" [attr.value]="model.value" [id]="question.getItemId(model)" [attr.aria-required]="question.ariaRequired" [attr.aria-label]="model.locText.renderedHtml" [attr.aria-invalid]="question.ariaInvalid" [attr.aria-errormessage]="question.ariaErrormessage"
(change)="onChange($event)" [checked]="question.isItemSelected(model)" [disabled]="!question.getItemEnabled(model)" [readonly]="question.isReadOnlyAttr" [class]="question.cssClasses.itemControl"
/>
<div [class]="question.cssClasses.itemDecorator">
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-react-ui/src/imagepicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export class SurveyQuestionImagePickerItem extends ReactSurveyElement {
readOnly={this.question.isReadOnlyAttr}
onChange={this.handleOnChange}
aria-required={this.question.ariaRequired}
aria-label={this.question.ariaLabel}
aria-label={item.locText.renderedHtml}
aria-invalid={this.question.ariaInvalid}
aria-errormessage={this.question.ariaErrormessage}
/>
Expand Down
4 changes: 2 additions & 2 deletions packages/survey-vue3-ui/src/ImagepickerItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
:disabled="!question.getItemEnabled(item)"
:readonly="question.isReadOnlyAttr"
v-bind:aria-required="question.ariaRequired"
:aria-label="question.ariaLabel"
:aria-label="item.locText.renderedHtml"
:aria-invalid="question.ariaInvalid"
:aria-errormessage="question.ariaErrormessage"
:class="question.cssClasses.itemControl"
Expand All @@ -26,7 +26,7 @@
:disabled="!question.getItemEnabled(item)"
:readonly="question.isReadOnlyAttr"
v-bind:aria-required="question.ariaRequired"
:aria-label="question.ariaLabel"
:aria-label="item.locText.renderedHtml"
:aria-invalid="question.ariaInvalid"
:aria-errormessage="question.ariaErrormessage"
:class="question.cssClasses.itemControl"
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker-colCount-1-v2.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<legend class="sv-hidden">question1</legend>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sv-q-col-1">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -18,7 +18,7 @@
</div>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sv-q-col-1">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker-colCount-2-v2.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="sd-imagepicker__column sd-selectbase__column sv-q-column-2" role="presentation">
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -21,7 +21,7 @@
<div class="sd-imagepicker__column sd-selectbase__column sv-q-column-2" role="presentation">
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker-disabled.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<legend class="sv-hidden">question1</legend>
<div class="sd-imagepicker__item sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -21,7 +21,7 @@
</div>
<div class="sd-imagepicker__item sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker-labels.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<legend class="sv-hidden">question1</legend>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -21,7 +21,7 @@
</div>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker-multi.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<legend class="sv-hidden">question1</legend>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="checkbox" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="checkbox" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -18,7 +18,7 @@
</div>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="checkbox" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="checkbox" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker-no-image-v2.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<legend class="sv-hidden">question1</legend>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -23,7 +23,7 @@
</div>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker-no-image.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<legend class="sv-hidden">question1</legend>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -23,7 +23,7 @@
</div>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" disabled="" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker-readonly.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<legend class="sv-hidden">question1</legend>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline sd-imagepicker__item--readonly">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" readonly="" type="radio" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" readonly="" type="radio" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -21,7 +21,7 @@
</div>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline sd-imagepicker__item--readonly">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" readonly="" type="radio" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" readonly="" type="radio" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker-video.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<legend class="sv-hidden">question1</legend>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -22,7 +22,7 @@
</div>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/imagepicker.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<legend class="sv-hidden">question1</legend>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<input aria-invalid="false" aria-label="item1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_0" name="question1_testid0" type="radio" value="item1">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand All @@ -18,7 +18,7 @@
</div>
<div class="sd-imagepicker__item sd-imagepicker__item--allowhover sd-imagepicker__item--inline">
<label class="sd-imagepicker__label">
<input aria-invalid="false" aria-label="question1" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<input aria-invalid="false" aria-label="item2" aria-required="false" class="sd-imagepicker__control sd-visuallyhidden" id="testid0i_1" name="question1_testid0" type="radio" value="item2">
<div class="sd-imagepicker__item-decorator">
<div class="sd-imagepicker__image-container">
<span aria-hidden="true" class="sd-imagepicker__check-decorator">
Expand Down