Skip to content

Commit 50845d5

Browse files
authored
Merge pull request #13608 from IgniteUI/dmdimitrov/fix-esf-conditional-filter-dropdown-15.1.x
fix(esf): conditional filter drop down items focus - 15.1.x
2 parents b33459f + 3a28c1f commit 50845d5

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-conditional-filter.component.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
(click)="onTextFilterClick($event)"
66
[igxDropDownItemNavigation]="subMenu"
77
role="menuitem"
8-
aria-haspopup="true">
8+
aria-haspopup="true"
9+
[attr.aria-controls]="this.subMenu.listId"
10+
[attr.aria-activedescendant]="!this.subMenu.collapsed ? this.subMenu.focusedItem?.id : null">
911
<span>{{ subMenuText }}</span>
1012
<igx-icon>keyboard_arrow_right</igx-icon>
1113
</div>
@@ -15,8 +17,7 @@
1517
[maxHeight]="'397px'"
1618
[displayDensity]="esf.grid.displayDensity"
1719
(selectionChanging)="onSubMenuSelection($event)"
18-
(closed)="onSubMenuClosed()"
19-
[allowItemsFocus]="true">
20+
(closed)="onSubMenuClosed()">
2021
<div>
2122
<igx-drop-down-item
2223
*ngFor="let condition of conditions"

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-conditional-filter.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ export class IgxExcelStyleConditionalFilterComponent implements OnDestroy {
7171
public onTextFilterKeyDown(eventArgs: KeyboardEvent) {
7272
if (eventArgs.key === this.platform.KEYMAP.ENTER) {
7373
this.onTextFilterClick(eventArgs);
74+
} else if (eventArgs.key === this.platform.KEYMAP.TAB) {
75+
this.subMenu.close();
7476
}
7577
}
7678

0 commit comments

Comments
 (0)