@@ -5,7 +5,7 @@ import { IGroupByExpandState } from '../../data-operations/groupby-expand-state.
55import { IGroupByResult } from '../../data-operations/grouping-result.interface' ;
66import { IFilteringExpressionsTree , FilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree' ;
77import { IGroupingExpression } from '../../data-operations/grouping-expression.interface' ;
8- import { GridType , IGX_GRID_BASE } from '../common/grid.interface' ;
8+ import { ColumnType , GridType , IGX_GRID_BASE } from '../common/grid.interface' ;
99import { FilterUtil , IFilteringStrategy } from '../../data-operations/filtering-strategy' ;
1010import { ISortingExpression } from '../../data-operations/sorting-strategy' ;
1111import { IGridSortingStrategy , IGridGroupingStrategy } from '../common/strategy' ;
@@ -85,10 +85,8 @@ export class IgxGridCellMergePipe implements PipeTransform {
8585
8686 constructor ( @Inject ( IGX_GRID_BASE ) private grid : GridType ) { }
8787
88- public transform ( collection : any , _pipeTrigger : number ) {
89- const mergeMode = this . grid . cellMergeMode ;
90- const sortExpr = this . grid . sortingExpressions ;
91- const columnToMerge = this . grid . visibleColumns . filter (
88+ public transform ( collection : any , visibleColumns : ColumnType [ ] , mergeMode : GridCellMergeMode , sortExpr : ISortingExpression [ ] , _pipeTrigger : number ) {
89+ const columnToMerge = visibleColumns . filter (
9290 x => x . merge && ( mergeMode === 'always' ||
9391 ( mergeMode === 'onSort' && ! ! sortExpr . find ( x => x . fieldName === x . fieldName ) ) )
9492 ) ;
0 commit comments