Skip to content

Commit aeea1cd

Browse files
committed
Fix ARIA labels on submission form relationship button and dynamic dropdowns
1 parent 53d521a commit aeea1cd

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
<button class="btn btn-secondary"
4646
type="button"
4747
ngbTooltip="{{'form.lookup-help' | translate}}"
48+
[attr.aria-label]="'form.lookup-help' | translate"
4849
placement="top"
50+
data-test="lookup-button"
4951
(click)="openLookup(); $event.stopPropagation();"><i class="fa fa-search"></i>
5052
</button>
5153
</div>

src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
<div class="position-relative right-addon"
33
role="combobox"
44
[attr.aria-label]="model.label"
5-
[attr.aria-owns]="'combobox_' + id + '_listbox'">
5+
[attr.aria-owns]="'combobox_' + id + '_listbox'"
6+
[attr.aria-expanded]="sdRef.isOpen()"
7+
[attr.aria-activedescendant]="(currentValue | async) ? 'combobox_' + id + '_selected' : null">
68
<i *ngIf="!model.readOnly" ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
79
aria-hidden="true"></i>
810
<i *ngIf="model.readOnly" class="dropdown-toggle position-absolute toggle-icon"
911
aria-hidden="true"></i>
1012
<input class="form-control"
1113
[attr.aria-controls]="'combobox_' + id + '_listbox'"
12-
[attr.aria-activedescendant]="'combobox_' + id + '_selected'"
1314
[attr.aria-label]="model.placeholder"
1415
[attr.autoComplete]="model.autoComplete"
1516
[class.is-invalid]="showErrorMessages"
@@ -28,8 +29,6 @@
2829

2930
<div ngbDropdownMenu
3031
class="dropdown-menu scrollable-dropdown-menu w-100"
31-
aria-haspopup="true"
32-
aria-expanded="false"
3332
[attr.aria-label]="model.placeholder">
3433
<div class="scrollable-menu"
3534
role="listbox"

0 commit comments

Comments
 (0)