@@ -23,7 +23,8 @@ import {
2323 ViewContainerRef ,
2424 Injector ,
2525 NgModuleRef ,
26- ApplicationRef } from '@angular/core' ;
26+ ApplicationRef
27+ } from '@angular/core' ;
2728import { IgxGridBaseDirective } from '../grid-base.directive' ;
2829import { IgxFilteringService } from '../filtering/grid-filtering.service' ;
2930import { IgxGridSelectionService } from '../selection/selection.service' ;
@@ -648,7 +649,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
648649 dropdown . overlayComponentId = id ;
649650 return { id, ref : undefined } ;
650651 }
651- return { id : dropdown . overlayComponentId , ref : undefined } ;
652+ return { id : dropdown . overlayComponentId , ref : undefined } ;
652653 }
653654 }
654655
@@ -1144,7 +1145,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
11441145 if ( dimType === PivotDimensionType . Column ) {
11451146 this . setupColumns ( ) ;
11461147 }
1147- if ( ! dimension . enabled ) {
1148+ if ( ! dimension . enabled && dimension . filter ) {
11481149 this . filteringService . clearFilter ( dimension . memberName ) ;
11491150 }
11501151 this . pipeTrigger ++ ;
@@ -1264,9 +1265,9 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
12641265 protected rowDimensionContentCollection : QueryList < IgxPivotRowDimensionContentComponent > ;
12651266
12661267 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 ;
12701271 }
12711272
12721273 protected getLargesContentWidth ( contents : ElementRef [ ] ) : string {
@@ -1509,8 +1510,8 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
15091510 const factoryColumnGroup = this . resolver . resolveComponentFactory ( IgxColumnGroupComponent ) ;
15101511 const key = value . value ;
15111512 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 ) ;
15141515 ref . instance . header = parent != null ? key . split ( parent . header + this . pivotKeys . columnDimensionSeparator ) [ 1 ] : key ;
15151516 ref . instance . field = key ;
15161517 ref . instance . parent = parent ;
0 commit comments