diff --git a/projects/angular/components/ui-grid/src/ui-grid.component.html b/projects/angular/components/ui-grid/src/ui-grid.component.html index e0c1d3ccb..437394dae 100644 --- a/projects/angular/components/ui-grid/src/ui-grid.component.html +++ b/projects/angular/components/ui-grid/src/ui-grid.component.html @@ -633,6 +633,7 @@ [disabled]="column.dropdown?.disabled || disabled" [attr.data-column-name]="getColumnName(column)" [expandedTranslation]="intl.menuExpanded" + (menuOpened)="focusActiveFilterItem()" uiCustomMatMenuTriggerFor mat-button type="button" diff --git a/projects/angular/components/ui-grid/src/ui-grid.component.ts b/projects/angular/components/ui-grid/src/ui-grid.component.ts index 83b97d036..eac809b91 100644 --- a/projects/angular/components/ui-grid/src/ui-grid.component.ts +++ b/projects/angular/components/ui-grid/src/ui-grid.component.ts @@ -1063,6 +1063,11 @@ export class UiGridComponent extends ResizableGrid this.focusedColumnHeader = false; } + focusActiveFilterItem() { + const activeItem: HTMLElement | null = document.querySelector('.cdk-overlay-container .active[role="menuitem"]'); + activeItem?.focus(); + } + private _announceGridHeaderActions() { this._queuedAnnouncer.enqueue(this.intl.gridHeaderActionsNotice); }