Skip to content

Commit 010676b

Browse files
committed
chore(*): minor refactoring #6520
1 parent be7de3e commit 010676b

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ export class IgxColumnComponent implements AfterContentInit {
251251
this.grid.endEdit(false);
252252
this.grid.summaryService.resetSummaryHeight();
253253
this.grid.filteringService.refreshExpressions();
254+
this.grid.filteringService.hideFilteringRowOnColumnVisibilityChange(this);
254255
this.grid.notifyChanges();
255-
this.grid.filteringService.hideColumnFilteringRowOnVisibilityChange(this);
256256
}
257257
}
258258
}

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
@@ -122,10 +122,10 @@ export class IgxFilteringService implements OnDestroy {
122122
/**
123123
* Close filtering row if a column is hidden.
124124
*/
125-
public hideColumnFilteringRowOnVisibilityChange(col: IgxColumnComponent) {
126-
const filteringRow = col.grid.filteringRow;
125+
public hideFilteringRowOnColumnVisibilityChange(col: IgxColumnComponent) {
126+
const filteringRow = this.grid.filteringRow;
127127

128-
if (filteringRow && filteringRow.column) {
128+
if (filteringRow && filteringRow.column && filteringRow.column === col) {
129129
filteringRow.close();
130130
}
131131
}

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
@@ -2148,6 +2148,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => {
21482148
// Check that the filterRow is closed
21492149
filterUIRow = fix.debugElement.query(By.css(FILTER_UI_ROW));
21502150
expect(filterUIRow).toBeNull();
2151+
expect(grid.rowList.length).toBe(3, 'filter is not applied');
21512152
}));
21522153

21532154
it('Should keep existing column filter after hiding another column.', fakeAsync(() => {

0 commit comments

Comments
 (0)