From 67769fe5bfd32db36c938935ae8ed0f5ea9c3f7a Mon Sep 17 00:00:00 2001 From: damyanpetev Date: Fri, 20 Nov 2026 18:50:39 +0200 Subject: [PATCH] fix(query-builder): close the group menu on a second button click Co-Authored-By: Claude Opus 5.5 --- .../query-builder-tree.component.ts | 1 + .../query-builder.component.spec.ts | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/projects/igniteui-angular/query-builder/src/query-builder/query-builder-tree.component.ts b/projects/igniteui-angular/query-builder/src/query-builder/query-builder-tree.component.ts index e092202f7f4..33174258279 100644 --- a/projects/igniteui-angular/query-builder/src/query-builder/query-builder-tree.component.ts +++ b/projects/igniteui-angular/query-builder/src/query-builder/query-builder-tree.component.ts @@ -1196,6 +1196,7 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy { this.groupContextMenuDropDown = groupContextMenuDropDown; this.groupContextMenuDropDownOverlaySettings.target = targetButton; + this.groupContextMenuDropDownOverlaySettings.excludeFromOutsideClick = [targetButton]; this.groupContextMenuDropDownOverlaySettings.positionStrategy = new ConnectedPositioningStrategy({ horizontalDirection: HorizontalAlignment.Right, horizontalStartPoint: HorizontalAlignment.Left, diff --git a/projects/igniteui-angular/query-builder/src/query-builder/query-builder.component.spec.ts b/projects/igniteui-angular/query-builder/src/query-builder/query-builder.component.spec.ts index dc70950d545..9aba5b4e9a1 100644 --- a/projects/igniteui-angular/query-builder/src/query-builder/query-builder.component.spec.ts +++ b/projects/igniteui-angular/query-builder/src/query-builder/query-builder.component.spec.ts @@ -3,6 +3,7 @@ import { FilteringExpressionsTree, FilteringLogic, IExpressionTree, IFilteringEx import { IBaseChipEventArgs, IgxChipComponent } from 'igniteui-angular/chips'; import { IDragBaseEventArgs } from 'igniteui-angular/directives'; import { IgxComboComponent } from 'igniteui-angular/combo'; +import { IgxDropDownComponent } from 'igniteui-angular/drop-down'; import { IgxIconComponent } from 'igniteui-angular/icon'; import { IgxInputGroupComponent } from 'igniteui-angular/input-group'; import { IgxSelectComponent } from 'igniteui-angular/select'; @@ -17,6 +18,7 @@ import { QueryBuilderFunctions, SampleEntities } from './query-builder-functions import { UIInteractions } from '../../../test-utils/ui-interactions.spec'; import { advance, useFakeClock } from '../../../test-utils/helper-utils.spec'; import { FormsModule } from '@angular/forms'; +import { firstValueFrom } from 'rxjs'; import { NgTemplateOutlet } from '@angular/common'; import { ExpressionGroupItem, ExpressionOperandItem, QueryBuilderSelectors } from './query-builder.common'; import { IgxQueryBuilderComponent } from './query-builder.component'; @@ -2151,6 +2153,30 @@ describe('IgxQueryBuilder', () => { QueryBuilderFunctions.verifyContextMenuItemDisabled(fix, 1, false); }); + it('Should close the open group context menu when its button is clicked.', async () => { + queryBuilder.expressionTree = QueryBuilderFunctions.generateExpressionTreeWithSubGroup(); + fix.detectChanges(); + const dropDown: IgxDropDownComponent = QueryBuilderFunctions.getQueryBuilderGroupContextMenus(fix)[2] + .query(By.directive(IgxDropDownComponent)).componentInstance; + + const opened = firstValueFrom(dropDown.opened); + QueryBuilderFunctions.clickQueryBuilderGroupContextMenu(fix, 2); + fix.detectChanges(); + await opened; + expect(queryBuilder.isContextMenuVisible).toBe(true); + + const closed = firstValueFrom(dropDown.closed); + const opening = vi.fn(); + dropDown.opening.subscribe(opening); + QueryBuilderFunctions.clickQueryBuilderGroupContextMenu(fix, 2); + fix.detectChanges(); + await closed; + fix.detectChanges(); + + expect(opening).not.toHaveBeenCalled(); + expect(queryBuilder.isContextMenuVisible).toBe(false); + }); + it(`Should insert a reversed group after the expression when 'Add group' is chosen from its add menu.`, async () => { queryBuilder.expressionTree = QueryBuilderFunctions.generateExpressionTree(); fix.detectChanges();