Skip to content

Commit 0483273

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Remove sortExpr as pipe trigger, since no longer needed.
1 parent 1a4fbd9 commit 0483273

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
| gridRowPinning:id:true:pipeTrigger
6363
| gridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
6464
| gridSort:sortingExpressions:groupingExpressions:sortStrategy:id:pipeTrigger:true
65-
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:sortingExpressions:activeRowIndexes:true:pipeTrigger; as pinnedData) {
65+
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:activeRowIndexes:true:pipeTrigger; as pinnedData) {
6666
@if (pinnedData.length > 0) {
6767
<div #pinContainer
6868
[ngClass]="{
@@ -89,7 +89,7 @@
8989
| gridDetails:hasDetails:expansionStates:pipeTrigger
9090
| gridAddRow:false:pipeTrigger
9191
| gridRowPinning:id:false:pipeTrigger
92-
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:sortingExpressions:activeRowIndexes:false:pipeTrigger"
92+
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:activeRowIndexes:false: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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class IgxGridCellMergePipe implements PipeTransform {
8686

8787
constructor(@Inject(IGX_GRID_BASE) private grid: GridType) { }
8888

89-
public transform(collection: any, colsToMerge: ColumnType[], mergeMode: GridCellMergeMode, mergeStrategy: IGridMergeStrategy, sortExpr: ISortingExpression[], activeRowIndexes: number[], pinned: boolean, _pipeTrigger: number) {
89+
public transform(collection: any, colsToMerge: ColumnType[], mergeMode: GridCellMergeMode, mergeStrategy: IGridMergeStrategy, activeRowIndexes: number[], pinned: boolean, _pipeTrigger: number) {
9090
if (colsToMerge.length === 0) {
9191
return collection;
9292
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
| gridRowPinning:id:true:pipeTrigger
4646
| gridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
4747
| gridSort:sortingExpressions:[]:sortStrategy:id:pipeTrigger:true
48-
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:sortingExpressions:activeRowIndexes:true:pipeTrigger; as pinnedData
48+
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:activeRowIndexes:true:pipeTrigger; as pinnedData
4949
) {
5050
@if (pinnedData.length > 0) {
5151
<div #pinContainer class="igx-grid__tr--pinned"
@@ -70,7 +70,7 @@
7070
| gridHierarchical:expansionStates:id:primaryKey:childLayoutKeys:pipeTrigger
7171
| gridAddRow:false:pipeTrigger
7272
| gridRowPinning:id:false:pipeTrigger
73-
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:sortingExpressions:activeRowIndexes:false:pipeTrigger"
73+
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:activeRowIndexes:false:pipeTrigger"
7474
[igxForScrollOrientation]="'vertical'" [igxForScrollContainer]="verticalScroll"
7575
[igxForContainerSize]="calcHeight" [igxForItemSize]="renderedRowHeight" [igxForTrackBy]="trackChanges"
7676
#verticalScrollContainer (chunkPreload)="dataLoading($event)" (dataChanging)="dataRebinding($event)" (dataChanged)="dataRebound($event)">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
| gridRowPinning:id:true:pipeTrigger
4848
| treeGridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:pipeTrigger:filteringPipeTrigger:true
4949
| treeGridSorting:sortingExpressions:treeGroupArea?.expressions:sortStrategy:pipeTrigger:true
50-
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:sortingExpressions:activeRowIndexes:true:pipeTrigger; as pinnedData
50+
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:activeRowIndexes:true:pipeTrigger; as pinnedData
5151
) {
5252
@if (pinnedData.length > 0) {
5353
<div #pinContainer
@@ -76,7 +76,7 @@
7676
| treeGridSummary:hasSummarizedColumns:summaryCalculationMode:summaryPosition:showSummaryOnCollapse:pipeTrigger:summaryPipeTrigger
7777
| treeGridAddRow:false:pipeTrigger
7878
| gridRowPinning:id:false:pipeTrigger
79-
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:sortingExpressions:activeRowIndexes:false:pipeTrigger"
79+
| gridCellMerge:columnsToMerge:cellMergeMode:mergeStrategy:activeRowIndexes:false:pipeTrigger"
8080
let-rowIndex="index" [igxForScrollOrientation]="'vertical'" [igxForScrollContainer]='verticalScroll'
8181
[igxForContainerSize]='calcHeight' [igxForItemSize]="renderedRowHeight" #verticalScrollContainer
8282
(dataChanging)="dataRebinding($event)" (dataChanged)="dataRebound($event)">

src/app/grid-cellMerging/grid-cellMerging.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h4 class="sample-title">Grid with cell merge</h4>
4444
</igx-input-group>
4545
</div>
4646
<igx-grid [data]="data" width="800px" height="550px" [moving]="true" #grid1
47-
[cellMergeMode]="'always'" [rowSelection]="'single'">
47+
[cellMergeMode]="'onSort'" [rowSelection]="'single'">
4848
<igx-column field="OrderID" header="Order ID">
4949
<ng-template igxCell let-cell="cell" let-val>
5050
Value: {{val}},Index: {{cell.row.index}}

0 commit comments

Comments
 (0)