chore(*): Break merge sequence on row activation. Discard custom merge nav.

Author: MKirova

projects/igniteui-angular/src/lib/data-operations/data-util.ts

@@ -98,11 +98,11 @@ export class DataUtil {
         return grouping.groupBy(data, state, grid, groupsRecords, fullResult);
     }
 
-    public static merge<T>(data: T[], columns: ColumnType[], strategy: IGridMergeStrategy = new DefaultMergeStrategy(), grid: GridType = null,
+    public static merge<T>(data: T[], columns: ColumnType[], strategy: IGridMergeStrategy = new DefaultMergeStrategy(), activeRowIndex = -1, grid: GridType = null,
     ): any[] {
         let result = [];
         for (const col of columns) {
-            strategy.merge(data, col.field, col.mergingComparer, result, grid);
+            strategy.merge(data, col.field, col.mergingComparer, result, activeRowIndex, grid);
         }
         return result;
 }

projects/igniteui-angular/src/lib/data-operations/merge-strategy.ts

@@ -11,6 +11,7 @@ export interface IGridMergeStrategy {
         field: string,
         comparer: (prevRecord: any, currentRecord: any, field: string) => boolean,
         result: any[],
+        activeRowIndex? : number,
         grid?: GridType
     ) => any[];
 }
@@ -28,15 +29,16 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
         field: string,
         comparer: (prevRecord: any, record: any, field: string) => boolean = this.comparer,
         result: any[],
+        activeRowIndex?: number,
         grid?: GridType
     ) {
         let prev = null;
         let index = 0;
         for (const rec of data) {
 
             const recData = result[index];
-            // if this is some special record type - add and skip merging
-            if (grid && grid.isDetailRecord(rec) || grid.isGhostRecord(rec) || grid.isGroupByRecord(rec)) {
+            // if this is active row or some special record type - add and skip merging
+            if (activeRowIndex === index || (grid && grid.isDetailRecord(rec) || grid.isGhostRecord(rec) || grid.isGroupByRecord(rec))) {
                 if(!recData) {
                     result.push(rec);
                 }

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -186,7 +186,6 @@ import { getCurrentResourceStrings } from '../core/i18n/resources';
 import { isTree, recreateTree, recreateTreeFromFields } from '../data-operations/expressions-tree-util';
 import { getUUID } from './common/random';
 import { IGridMergeStrategy } from '../data-operations/merge-strategy';
-import { IgxGridMergeNavigationService } from './grid-merge-navigation.service';
 
 interface IMatchInfoCache {
     row: any;
@@ -3989,14 +3988,11 @@ export abstract class IgxGridBaseDirective implements GridType,
         if (this.actionStrip) {
             this.actionStrip.menuOverlaySettings.outlet = this.outlet;
         }
-        this._setupNavigationService();
     }
 
-    protected _setupNavigationService() {
-        if (this.hasCellsToMerge) {
-            this.navigation = new IgxGridMergeNavigationService(this.platform);
-            this.navigation.grid = this;
-        }
+
+    protected get activeRowIndex(){
+        return this.navigation.activeNode.row;
     }
 
     protected get hasCellsToMerge() {

projects/igniteui-angular/src/lib/grids/grid-merge-navigation.service.ts

@@ -89,7 +89,7 @@
         | gridDetails:hasDetails:expansionStates:pipeTrigger
         | gridAddRow:false:pipeTrigger
         | gridRowPinning:id:false:pipeTrigger
-        | gridCellMerge:visibleColumns:cellMergeMode:sortingExpressions:pipeTrigger"
+        | gridCellMerge:visibleColumns:cellMergeMode:sortingExpressions:activeRowIndex:pipeTrigger"
             let-rowIndex="index" [igxForScrollOrientation]="'vertical'" [igxForScrollContainer]="verticalScroll"
             [igxForContainerSize]="calcHeight"
             [igxForItemSize]="hasColumnLayouts ? rowHeight * multiRowLayoutRowSize + 1 : renderedRowHeight"

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

@@ -1357,12 +1357,11 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
         this._gridAPI.sort_groupBy_multiple(this._groupingExpressions);
     }
 
-    protected override _setupNavigationService() {
+    protected _setupNavigationService() {
         if (this.hasColumnLayouts) {
             this.navigation = new IgxGridMRLNavigationService(this.platform);
             this.navigation.grid = this;
         }
-        super._setupNavigationService();
     }
 
     private checkIfNoColumnField(expression: IGroupingExpression | Array<IGroupingExpression> | any): boolean {

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

@@ -85,15 +85,15 @@ export class IgxGridCellMergePipe implements PipeTransform {
 
     constructor(@Inject(IGX_GRID_BASE) private grid: GridType) { }
 
-    public transform(collection: any, visibleColumns: ColumnType[], mergeMode: GridCellMergeMode, sortExpr: ISortingExpression[], _pipeTrigger: number) {
+    public transform(collection: any, visibleColumns: ColumnType[], mergeMode: GridCellMergeMode, sortExpr: ISortingExpression[], activeRowIndex: number, _pipeTrigger: number) {
         const columnToMerge = visibleColumns.filter(
             x => x.merge && (mergeMode ==='always' ||
             (mergeMode === 'onSort' && !!sortExpr.find( x=> x.fieldName === x.fieldName)))
         );
         if (columnToMerge.length === 0) {
             return collection;
         }
-        const result = DataUtil.merge(cloneArray(collection), columnToMerge, this.grid.mergeStrategy, this.grid);
+        const result = DataUtil.merge(cloneArray(collection), columnToMerge, this.grid.mergeStrategy, activeRowIndex, this.grid);
         return result;
     }
 }