Skip to content

Commit 09992ca

Browse files
committed
refactor(query-builder): drag restriction when child in edit mode removed
1 parent 5a53e12 commit 09992ca

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@
140140
>
141141
<igx-chip
142142
#expressionChip
143-
[draggable]="canBeDragged()"
143+
[draggable]="true"
144144
[hideBaseOnDrag]="false"
145145
[animateOnRelease]="false"
146-
(moveStart)="canBeDragged() ? dragService.onMoveStart(dragRef, expressionItem, false): null"
146+
(moveStart)="dragService.onMoveStart(dragRef, expressionItem, false)"
147147
(moveEnd)="dragService.onMoveEnd()"
148148
(dragEnter)="dragService.onChipEnter(dragRef, expressionItem)"
149149
(dragOver)="dragService.onChipOver(dragRef)"

projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,11 +1030,6 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
10301030

10311031
public dragService: IgxQueryBuilderDragService = new IgxQueryBuilderDragService(this, this.el, this.deleteItem, this.focusChipAfterDrag);
10321032

1033-
//Chip can be dragged if its tree is in edit mode and there is no inner query that's been edited
1034-
public canBeDragged(): boolean {
1035-
return this.isInEditMode && (!this.innerQueries || this.innerQueries.length == 0 || !this.innerQueries?.some(q => q.isInEditMode()))
1036-
}
1037-
10381033
/**
10391034
* @hidden @internal
10401035
*/

projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,15 +2873,15 @@ describe('IgxQueryBuilder', () => {
28732873
expect(QueryBuilderFunctions.getChipContent(chipComponents[2].nativeElement)).toBe("OrderDate Today");
28742874
}));
28752875

2876-
it('should prevent dragging a top-level condition while a sub-query is expanded.', () => {
2876+
it('should be able to drag a top-level condition while a sub-query is expanded.', () => {
28772877
chipComponents[1].nativeElement.click();
28782878

28792879
const draggedChip = chipComponents[0].componentInstance;
28802880
const draggedChipElem = draggedChip.nativeElement;
28812881

2882-
expect(draggedChip.draggable).toBeFalse();
2882+
expect(draggedChip.draggable).toBeTrue();
28832883
UIInteractions.moveDragDirective(fix, draggedChip.dragDirective, 0, draggedChipElem.offsetHeight, false);
2884-
expect(QueryBuilderFunctions.getDropGhost(fix)).toBe(null);
2884+
expect(QueryBuilderFunctions.getDropGhost(fix)).not.toBe(null);
28852885
});
28862886

28872887
it('should allow dragging a sub-query condition while a sub-query is expanded.', () => {

0 commit comments

Comments
 (0)