Skip to content

Commit 1361952

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Adjust pipe triggers.
1 parent a42b192 commit 1361952

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

projects/igniteui-angular/src/lib/grids/grid/grid.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
| gridDetails:hasDetails:expansionStates:pipeTrigger
9090
| gridAddRow:false:pipeTrigger
9191
| gridRowPinning:id:false:pipeTrigger
92-
| gridCellMerge:pipeTrigger"
92+
| gridCellMerge:visibleColumns:cellMergeMode:sortingExpressions:pipeTrigger"
9393
let-rowIndex="index" [igxForScrollOrientation]="'vertical'" [igxForScrollContainer]="verticalScroll"
9494
[igxForContainerSize]="calcHeight"
9595
[igxForItemSize]="hasColumnLayouts ? rowHeight * multiRowLayoutRowSize + 1 : renderedRowHeight"

projects/igniteui-angular/src/lib/grids/grid/grid.pipes.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { IGroupByExpandState } from '../../data-operations/groupby-expand-state.
55
import { IGroupByResult } from '../../data-operations/grouping-result.interface';
66
import { IFilteringExpressionsTree, FilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
77
import { 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';
99
import { FilterUtil, IFilteringStrategy } from '../../data-operations/filtering-strategy';
1010
import { ISortingExpression } from '../../data-operations/sorting-strategy';
1111
import { 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

Comments
 (0)