diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html index 3ff2b8a118..5748cfd9c2 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.html @@ -1,40 +1,65 @@ - + {{ category.name | translate }}:  {{ displayValue | translate }} -  {{ 'SEARCH.FILTER.ANY' | translate }} +  {{ 'SEARCH.FILTER.ANY' | translate }} - -
- - + +
+ - {{ category.name | translate }} ({{category.component.settings.unit}}) + {{ category.name | translate }} + ({{ category.component.settings.unit }}) - + diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts index f0fddd2cf5..b50258f57e 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts @@ -105,4 +105,8 @@ describe('SearchWidgetChipComponent', () => { expect(focusTrap.destroy).toHaveBeenCalled(); expect(component.focusTrap).toBeNull(); }); + + it('should set aria-haspopup to "dialog" for matMenu trigger on initialization', () => { + expect(component.menuTriggerEl.nativeElement.getAttribute('aria-haspopup')).toBe('dialog'); + }); }); diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts index e94e06c99d..6e8166e125 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.ts @@ -57,6 +57,9 @@ export class SearchWidgetChipComponent implements AfterViewInit { @ViewChild('menuContainer', { static: false }) menuContainer: ElementRef; + @ViewChild('menuTrigger', { read: ElementRef, static: false }) + menuTriggerEl: ElementRef; + @ViewChild('menuTrigger', { static: false }) menuTrigger: MatMenuTrigger; @@ -78,6 +81,10 @@ export class SearchWidgetChipComponent implements AfterViewInit { .subscribe(() => { this.cd.detectChanges(); }); + + if (this.menuTriggerEl) { + this.menuTriggerEl.nativeElement.setAttribute('aria-haspopup', 'dialog'); + } } onMenuOpen() {