Skip to content

Commit ce4527e

Browse files
committed
chore(*): minor refactoring #6520
1 parent 838900d commit ce4527e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

projects/igniteui-angular/src/lib/grids/column.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy {
252252
this.grid.endEdit(false);
253253
this.grid.summaryService.resetSummaryHeight();
254254
this.grid.filteringService.refreshExpressions();
255+
this.grid.filteringService.hideFilteringRowOnColumnVisibilityChange(this);
255256
this.grid.notifyChanges();
256-
this.grid.filteringService.hideColumnFilteringRowOnVisibilityChange(this);
257257
// this.grid.refreshSearch(true);
258258
}
259259
}

projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ export class IgxFilteringService implements OnDestroy {
120120
/**
121121
* Close filtering row if a column is hidden.
122122
*/
123-
public hideColumnFilteringRowOnVisibilityChange(col: IgxColumnComponent) {
124-
const filteringRow = col.grid.filteringRow;
123+
public hideFilteringRowOnColumnVisibilityChange(col: IgxColumnComponent) {
124+
const filteringRow = this.grid.filteringRow;
125125

126-
if (filteringRow && filteringRow.column) {
126+
if (filteringRow && filteringRow.column && filteringRow.column === col) {
127127
filteringRow.close();
128128
}
129129
}

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3368,6 +3368,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
33683368
// Check that the filterRow is closed
33693369
filterUIRow = fix.debugElement.query(By.css(FILTER_UI_ROW));
33703370
expect(filterUIRow).toBeNull();
3371+
expect(grid.rowList.length).toBe(3, 'filter is not applied');
33713372
}));
33723373

33733374
it('Unary conditions should be committable', fakeAsync(() => {

0 commit comments

Comments
 (0)