diff --git a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.html b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.html index 4ba67d75a7..ed95b31ae7 100644 --- a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.html +++ b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.html @@ -8,11 +8,9 @@ class="adf-site-dropdown-list-element" id="site-dropdown" placeholder="{{placeholder | translate}}" - [aria-label]="ariaLabel" floatPlaceholder="never" [(value)]="selected" - (selectionChange)="selectedSite($event)" - role="listbox"> + (selectionChange)="selectedSite($event)"> {{ site.entry.title | translate}} diff --git a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts index d1630274bf..d002a342f8 100644 --- a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts +++ b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.ts @@ -76,7 +76,6 @@ export class DropdownSitesComponent implements OnInit { private loading = true; private skipCount = 0; - private _ariaLabel = ''; selected: SiteEntry = null; MY_FILES_VALUE = '-my-'; @@ -88,16 +87,11 @@ export class DropdownSitesComponent implements OnInit { } ngOnInit() { - this.updateAriaLabel(this.selected); if (!this.siteList) { this.loadSiteList(); } } - get ariaLabel(): string { - return this._ariaLabel; - } - loadAllOnScroll() { if (this.isInfiniteScrollingEnabled()) { this.loading = true; @@ -106,7 +100,6 @@ export class DropdownSitesComponent implements OnInit { } selectedSite(event: MatSelectChange) { - this.updateAriaLabel(event.value); this.liveAnnouncer.announce(this.translateService.instant('ADF_DROPDOWN.SELECTION_ARIA_LABEL', { placeholder: this.translateService.instant(this.placeholder), selectedOption: this.translateService.instant(event.value.entry.title) @@ -155,7 +148,6 @@ export class DropdownSitesComponent implements OnInit { } this.selected = this.siteList.list.entries.find((site: SiteEntry) => site.entry.id === this.value); - this.updateAriaLabel(this.selected); if (this.value && !this.selected && this.siteListHasMoreItems()) { this.loadSiteList(); @@ -190,8 +182,4 @@ export class DropdownSitesComponent implements OnInit { return site.entry.visibility === 'PUBLIC' || !!site.relations.members.list.entries.find((member) => member.entry.id.toLowerCase() === loggedUserName.toLowerCase()); } - - private updateAriaLabel(site: SiteEntry): void { - this._ariaLabel = `${this.translateService.instant(this.placeholder)} ${site ? this.translateService.instant(site.entry.title) : ''}`; - } } diff --git a/lib/core/src/lib/i18n/en.json b/lib/core/src/lib/i18n/en.json index f2fc0adc3e..654378d23b 100644 --- a/lib/core/src/lib/i18n/en.json +++ b/lib/core/src/lib/i18n/en.json @@ -582,6 +582,6 @@ }, "ADF_DROPDOWN": { "LOADING": "Loading...", - "SELECTION_ARIA_LABEL": "{{placeholder}} listbox {{selectedOption}}" + "SELECTION_ARIA_LABEL": "{{placeholder}} combobox {{selectedOption}}" } }