Skip to content

Commit 07a3261

Browse files
committed
fix(grid): Addressing some PR comments #6260
1 parent 6d393f7 commit 07a3261

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

projects/igniteui-angular/src/lib/core/grid-selection.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Injectable, EventEmitter, NgZone } from '@angular/core';
22
import { IGridEditEventArgs, IgxGridBaseComponent } from '../grids/grid-base.component';
3+
import { FilteringExpressionsTree } from '../data-operations/filtering-expressions-tree';
34

45
export interface GridSelectionRange {
56
rowStart: number;
@@ -689,8 +690,8 @@ export class IgxGridSelectionService {
689690

690691
private isFilteringApplied(): boolean {
691692
const grid = this.grid as IgxGridBaseComponent;
692-
return grid.filteringExpressionsTree.filteringOperands.length > 0 ||
693-
grid.advancedFilteringExpressionsTree && grid.advancedFilteringExpressionsTree.filteringOperands.length > 0;
693+
return !FilteringExpressionsTree.empty(grid.filteringExpressionsTree) ||
694+
!FilteringExpressionsTree.empty(grid.advancedFilteringExpressionsTree);
694695
}
695696

696697
private isRowDeleted(rowID): boolean {

projects/igniteui-angular/src/lib/grids/grid/grid-row-selection.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,7 +1691,6 @@ describe('IgxGrid - Row Selection #grid', () => {
16911691
grid.advancedFilteringExpressionsTree = tree;
16921692
GridSelectionFunctions.headerCheckboxClick(grid);
16931693
fix.detectChanges();
1694-
grid.cdr.detectChanges();
16951694
await wait();
16961695

16971696
expect(grid.rowList.length).toBe(9);
@@ -1700,7 +1699,6 @@ describe('IgxGrid - Row Selection #grid', () => {
17001699

17011700
grid.advancedFilteringExpressionsTree = null;
17021701
fix.detectChanges();
1703-
grid.cdr.detectChanges();
17041702
await wait();
17051703

17061704
expect(grid.rowList.length).toBe(19);

0 commit comments

Comments
 (0)