@@ -14,18 +14,17 @@ import {
14
14
ViewChild ,
15
15
ViewChildren
16
16
} from '@angular/core' ;
17
- import { Subject , Subscription } from 'rxjs' ;
18
- import { DataType } from '../data-operations/data-util' ;
19
- import { IgxToggleDirective , IgxOverlayOutletDirective } from '../directives/toggle/toggle.directive' ;
20
- import { IGridAPIService } from './api.service' ;
21
- import { IGridComponent } from './grid-interfaces' ;
22
- import { FilteringExpressionsTree } from '../data-operations/filtering-expressions-tree' ;
23
- import { IgxButtonGroupComponent } from '../buttonGroup/buttonGroup.component' ;
17
+ import { Subscription } from 'rxjs' ;
18
+ import { DataType } from '../../ data-operations/data-util' ;
19
+ import { IgxToggleDirective } from '../ ../directives/toggle/toggle.directive' ;
20
+ import { IGridAPIService } from '.. /api.service' ;
21
+ import { IGridComponent } from '.. /grid-interfaces' ;
22
+ import { FilteringExpressionsTree } from '../../ data-operations/filtering-expressions-tree' ;
23
+ import { IgxButtonGroupComponent } from '../../ buttonGroup/buttonGroup.component' ;
24
24
import { IgxGridFilterExpressionComponent } from './grid-filtering-expression.component' ;
25
- import { FilteringLogic , IFilteringExpression } from '../data-operations/filtering-expression.interface' ;
26
- import { OverlaySettings , HorizontalAlignment } from '../services/overlay/utilities' ;
27
- import { ConnectedPositioningStrategy } from '../services/overlay/position/connected-positioning-strategy' ;
28
- import { IgxBooleanFilteringOperand } from '../data-operations/filtering-condition' ;
25
+ import { FilteringLogic , IFilteringExpression } from '../../data-operations/filtering-expression.interface' ;
26
+ import { OverlaySettings , HorizontalAlignment } from '../../services/overlay/utilities' ;
27
+ import { ConnectedPositioningStrategy } from '../../services/overlay/position/connected-positioning-strategy' ;
29
28
/**
30
29
*@hidden
31
30
*/
@@ -272,14 +271,18 @@ export class IgxGridFilterComponent implements OnInit, OnDestroy, DoCheck {
272
271
}
273
272
274
273
protected isFilteringApplied ( ) : boolean {
275
- const expr = this . gridAPI . get ( this . gridID ) . filteringExpressionsTree . find ( this . column . field ) ;
274
+ const grid = this . gridAPI . get ( this . gridID ) ;
275
+ if ( grid ) {
276
+ const expr = this . gridAPI . get ( this . gridID ) . filteringExpressionsTree . find ( this . column . field ) ;
276
277
277
- if ( expr ) {
278
- if ( expr instanceof FilteringExpressionsTree ) {
279
- return expr . filteringOperands . length > 0 ;
278
+ if ( expr ) {
279
+ if ( expr instanceof FilteringExpressionsTree ) {
280
+ return expr . filteringOperands . length > 0 ;
281
+ }
282
+ return true ;
280
283
}
281
- return true ;
282
284
}
285
+
283
286
return false ;
284
287
}
285
288
0 commit comments