Merge branch 'mkirova/cell-merge-split-merge-pipes' of https://github.com/IgniteUI/igniteui-angular into mkirova/cell-merge-split-merge-pipes

Author: MKirova

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

@@ -76,7 +76,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
                 continue;
             }
             const recToUpdateData = recData ?? { recordRef: grid.isGhostRecord(rec) ? rec.recordRef : rec, cellMergeMeta: new Map<string, IMergeByResult>(), ghostRecord: rec.ghostRecord };
-            recToUpdateData.cellMergeMeta.set(field, { rowSpan: 1 });
+            recToUpdateData.cellMergeMeta.set(field, { rowSpan: 1, childRecords: [] });
             if (prev && comparer.call(this, prev.recordRef, recToUpdateData.recordRef, field, isDate, isTime) && prev.ghostRecord === recToUpdateData.ghostRecord) {
                 const root = prev.cellMergeMeta.get(field)?.root ?? prev;
                 root.cellMergeMeta.get(field).rowSpan += 1;

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

@@ -154,8 +154,8 @@ export interface IGroupingDoneEventArgs extends IBaseEventArgs {
         IgxGridDetailsPipe,
         IgxStringReplacePipe,
         IgxGridCellMergePipe,
-        IgxGridUnmergeActivePipe,
-        IgxScrollInertiaDirective
+        IgxScrollInertiaDirective,
+        IgxGridUnmergeActivePipe
     ],
     schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })

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

@@ -9,7 +9,7 @@ import { ColumnType, GridType, IGX_GRID_BASE } from '../common/grid.interface';
 import { FilterUtil, IFilteringStrategy } from '../../data-operations/filtering-strategy';
 import { ISortingExpression } from '../../data-operations/sorting-strategy';
 import { IGridSortingStrategy, IGridGroupingStrategy } from '../common/strategy';
-import { GridCellMergeMode, RowPinningPosition } from '../common/enums';
+import { GridCellMergeMode } from '../common/enums';
 import { IGridMergeStrategy } from '../../data-operations/merge-strategy';
 
 /**
@@ -107,7 +107,7 @@ export class IgxGridUnmergeActivePipe implements PipeTransform {
         if (colsToMerge.length === 0) {
             return collection;
         }
-        if (this.grid.hasPinnedRecords && !pinned && this.grid.pinning.rows !== RowPinningPosition.Bottom) {
+        if (!pinned && this.grid.isPinningToStart) {
             activeRowIndexes = activeRowIndexes.map(x => x - this.grid.pinnedRecordsCount);
         }
         activeRowIndexes = activeRowIndexes.filter((val, idx, arr) => arr.indexOf(val) === idx).filter(x => !isNaN(x));

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

@@ -43,6 +43,18 @@
                 }
         </div>
         }
+        @if (mergedDataInView && mergedDataInView.length > 0) {
+            <div igxScrollInertia
+            [IgxScrollInertiaScrollContainer]="this.verticalScrollContainer.dc.instance.scrollContainer"
+            [IgxScrollInertiaDirection]="this.verticalScrollContainer.dc.instance.scrollDirection">
+                @for (rowData of mergedDataInView; track rowData.record;) {
+                    <igx-hierarchical-grid-row class="igx-grid__tr--merged-top" [gridID]="id" [index]="rowData.index" [data]="rowData.record.recordRef" [metaData]="rowData.record" [style.top.px]="getMergeCellOffset(rowData)"
+                    [ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowData.index:hasColumnLayouts:isRecordMerged(rowData.record):false:rowData.record:pipeTrigger"
+                    [ngStyle]="rowStyles | igxGridRowStyles:rowData.record:rowData.index:pipeTrigger" #row>
+                    </igx-hierarchical-grid-row>
+                }
+        </div>
+        }
         <ng-template #pinnedRecordsTemplate>
             @if (data
                 | gridTransaction:id:pipeTrigger

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

@@ -57,8 +57,8 @@
     </div>
 </ng-template>
 
-<ng-template #pinnedCellsTemplate let-col let-columns="columns">
-    @for (col of columns | igxNotGrouped; track trackPinnedColumn(col)) {
+<ng-template #pinnedCellsTemplate let-col>
+    @for (col of pinnedColumns | igxNotGrouped; track trackPinnedColumn(col)) {
         @if (this.hasMergedCells) {
             <div [style.height.px]=" this.metaData?.cellMergeMeta.get(col.field)?.rowSpan > 1 ? getRowHeight() : null"
                  class="igx-grid__mrl-block"
@@ -98,6 +98,7 @@
         [style.min-width]="col.resolvedWidth"
         [style.max-width]="col.resolvedWidth"
         [style.flex-basis]="col.resolvedWidth"
+        [style.left]="col.rightPinnedOffset"
         [width]="col.getCellWidth()"
         [visibleColumnIndex]="col.visibleIndex"
         [value]="data | dataMapper:col.field:grid.pipeTrigger:data[col.field]:col.hasNestedPath"
@@ -135,6 +136,7 @@
         [style.min-width]="col.resolvedWidth"
         [style.max-width]="col.resolvedWidth"
         [style.flex-basis]="col.resolvedWidth"
+        [style.left]="col.rightPinnedOffset"
         [width]="col.getCellWidth()"
         [visibleColumnIndex]="col.visibleIndex"
         [value]="data | dataMapper:col.field:grid.pipeTrigger:data[col.field]:col.hasNestedPath"