Skip to content

fix(query-builder): prevent aria-hidden error on the edit icon - 17.2.x #14718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 17, 2024
Merged

fix(query-builder): prevent aria-hidden error on the edit icon - 17.2.x #14718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a174951
fix(query-builder): prevent aria-hidden error on the edit icon
georgianastasov Sep 4, 2024
b6219c7
test(query-builder): remove unnecessary line break
georgianastasov Sep 4, 2024
9709a50
test(query-builder): adjust spacing for consistent formatting
georgianastasov Sep 4, 2024
90c5159
Merge branch '17.2.x' into ganastasov/fix-14650-17.2.x
georgianastasov Sep 10, 2024
acd7f38
Merge branch '17.2.x' into ganastasov/fix-14650-17.2.x
georgianastasov Sep 10, 2024
221de47
Merge branch '17.2.x' into ganastasov/fix-14650-17.2.x
georgianastasov Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2125,6 +2125,34 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
expect(consoleSpy).not.toHaveBeenCalled();
}));

it('should not trigger accessibility errors when interacting with the edit icon in the advanced filtering expression chip', fakeAsync(() => {
// Apply advanced filter through API to generate chips.
const tree = new FilteringExpressionsTree(FilteringLogic.Or);
tree.filteringOperands.push({
fieldName: 'Downloads', searchVal: 1, condition: IgxNumberFilteringOperand.instance().condition('equals')
});
grid.advancedFilteringExpressionsTree = tree;
fix.detectChanges();

// Open Advanced Filtering dialog.
GridFunctions.clickAdvancedFilteringButton(fix);
tick(50);
fix.detectChanges();

// Hover over the first visible expression chip to show edit icon.
const expressionItem = fix.nativeElement.querySelectorAll(`.${ADVANCED_FILTERING_EXPRESSION_ITEM_CLASS}`)[0];
expressionItem.dispatchEvent(new MouseEvent('mouseenter'));
tick(50);
fix.detectChanges();

// Click the edit icon on the hovered and focused edit icon.
const editIcon = GridFunctions.getAdvancedFilteringTreeExpressionEditIcon(fix, [0]);
tick(50);
fix.detectChanges();
expect(editIcon.getAttribute('aria-hidden')).toBe('true');
expect(editIcon.getAttribute('tabIndex')).toBeFalsy();
}));

describe('Context Menu - ', () => {
it('Should discard added group when clicking its operator line without having a single expression.', fakeAsync(() => {
// Open Advanced Filtering dialog.
Expand Down
46 changes: 24 additions & 22 deletions projects/igniteui-angular/src/lib/query-builder/query-builder.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,28 +147,30 @@ <h6 class="igx-filter-empty__title">
expressionItem.hovered
"
>
<igx-icon
tabindex="0"
(keydown)="invokeClick($event)"
(click)="enterExpressionEdit(expressionItem)"
>
edit
</igx-icon>
<igx-icon
tabindex="0"
(keydown)="invokeClick($event)"
(click)="enterExpressionAdd(expressionItem)"
*ngIf="
!expressionItem.inAddMode &&
(expressionItem.parent !== currentGroup ||
expressionItem !==
currentGroup.children[
currentGroup.children.length - 1
])
"
>
add
</igx-icon>
<span tabindex="0">
<igx-icon
(keydown)="invokeClick($event)"
(click)="enterExpressionEdit(expressionItem)"
>
edit
</igx-icon>
</span>
<span tabindex="0">
<igx-icon
(keydown)="invokeClick($event)"
(click)="enterExpressionAdd(expressionItem)"
*ngIf="
!expressionItem.inAddMode &&
(expressionItem.parent !== currentGroup ||
expressionItem !==
currentGroup.children[
currentGroup.children.length - 1
])
"
>
add
</igx-icon>
</span>
</div>
</div>

Expand Down
Loading