@@ -23,7 +23,8 @@ import {
23
23
ViewContainerRef ,
24
24
Injector ,
25
25
NgModuleRef ,
26
- ApplicationRef } from '@angular/core' ;
26
+ ApplicationRef
27
+ } from '@angular/core' ;
27
28
import { IgxGridBaseDirective } from '../grid-base.directive' ;
28
29
import { IgxFilteringService } from '../filtering/grid-filtering.service' ;
29
30
import { IgxGridSelectionService } from '../selection/selection.service' ;
@@ -648,7 +649,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
648
649
dropdown . overlayComponentId = id ;
649
650
return { id, ref : undefined } ;
650
651
}
651
- return { id : dropdown . overlayComponentId , ref : undefined } ;
652
+ return { id : dropdown . overlayComponentId , ref : undefined } ;
652
653
}
653
654
}
654
655
@@ -1144,7 +1145,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
1144
1145
if ( dimType === PivotDimensionType . Column ) {
1145
1146
this . setupColumns ( ) ;
1146
1147
}
1147
- if ( ! dimension . enabled ) {
1148
+ if ( ! dimension . enabled && dimension . filter ) {
1148
1149
this . filteringService . clearFilter ( dimension . memberName ) ;
1149
1150
}
1150
1151
this . pipeTrigger ++ ;
@@ -1264,9 +1265,9 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
1264
1265
protected rowDimensionContentCollection : QueryList < IgxPivotRowDimensionContentComponent > ;
1265
1266
1266
1267
protected getDimensionType ( dimension : IPivotDimension ) : PivotDimensionType {
1267
- return PivotUtil . flatten ( this . rowDimensions ) . indexOf ( dimension ) !== - 1 ? PivotDimensionType . Row :
1268
- PivotUtil . flatten ( this . columnDimensions ) . indexOf ( dimension ) !== - 1 ? PivotDimensionType . Column :
1269
- PivotUtil . flatten ( this . filterDimensions ) . indexOf ( dimension ) !== - 1 ? PivotDimensionType . Filter : null ;
1268
+ return PivotUtil . flatten ( this . pivotConfiguration . rows ) . indexOf ( dimension ) !== - 1 ? PivotDimensionType . Row :
1269
+ PivotUtil . flatten ( this . pivotConfiguration . columns ) . indexOf ( dimension ) !== - 1 ? PivotDimensionType . Column :
1270
+ PivotUtil . flatten ( this . pivotConfiguration . filters ) . indexOf ( dimension ) !== - 1 ? PivotDimensionType . Filter : null ;
1270
1271
}
1271
1272
1272
1273
protected getLargesContentWidth ( contents : ElementRef [ ] ) : string {
@@ -1509,8 +1510,8 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
1509
1510
const factoryColumnGroup = this . resolver . resolveComponentFactory ( IgxColumnGroupComponent ) ;
1510
1511
const key = value . value ;
1511
1512
const ref = isGroup ?
1512
- factoryColumnGroup . create ( this . viewRef . injector ) :
1513
- factoryColumn . create ( this . viewRef . injector ) ;
1513
+ factoryColumnGroup . create ( this . viewRef . injector ) :
1514
+ factoryColumn . create ( this . viewRef . injector ) ;
1514
1515
ref . instance . header = parent != null ? key . split ( parent . header + this . pivotKeys . columnDimensionSeparator ) [ 1 ] : key ;
1515
1516
ref . instance . field = key ;
1516
1517
ref . instance . parent = parent ;
0 commit comments