chore(*): Fix mrl issue. Fix tree grid and hgrid cell heights.

Author: MKirova

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

@@ -61,7 +61,7 @@
             [formatter]="col.formatter"
             [row]="this"
             [active]="isCellActive(col.visibleIndex)"
-            [style.min-height.px]="grid.rowHeight || 32"
+            [style.min-height.px]="cellHeight"
             [rowData]="rowData"
             [style.min-width]="col.width"
             [style.max-width]="col.width"
@@ -109,7 +109,7 @@
             [active]="isCellActive(col.visibleIndex)"
             [firstPinned]="col.isFirstPinned"
             [lastPinned]="col.isLastPinned"
-            [style.min-height.px]="grid.rowHeight || 32"
+            [style.min-height.px]="cellHeight"
             [rowData]="rowData"
             [style.min-width]="col.width"
             [style.max-width]="col.width"

projects/igniteui-angular/src/lib/grids/row.directive.ts

@@ -104,7 +104,13 @@ export class IgxRowDirective<T extends IgxGridBaseDirective & GridType> implemen
 
     @HostBinding('style.min-height.px')
     get rowHeight() {
-        return this.addRow ?  this.grid.rowHeight || 32 : null;
+        let height = this.grid.rowHeight || 32;
+        if (this.grid.hasColumnLayouts) {
+            const rs = this.columns.map(x => x.gridRowSpan);
+            const maxRowSpan = Math.max(... rs);
+            height = height * maxRowSpan;
+        }
+        return this.addRow ?  height : null;
     }
 
     get cellHeight() {

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

@@ -36,7 +36,7 @@
             [column]="col"
             [formatter]="col.formatter"
             [row]="this"
-            [style.min-height.px]="grid.rowHeight || 32"
+            [style.min-height.px]="cellHeight"
             [rowData]="rowData"
             [style.min-width]="col.width"
             [style.max-width]="col.width"
@@ -68,7 +68,7 @@
             [column]="col"
             [formatter]="col.formatter"
             [row]="this"
-            [style.min-height.px]="grid.rowHeight || 32"
+            [style.min-height.px]="cellHeight"
             [rowData]="rowData"
             [style.min-width]="col.width"
             [style.max-width]="col.width"
@@ -121,7 +121,7 @@
                 [row]="this"
                 [firstPinned]="col.isFirstPinned"
                 [lastPinned]="col.isLastPinned"
-                [style.min-height.px]="grid.rowHeight || 32"
+                [style.min-height.px]="cellHeight"
                 [rowData]="rowData"
                 [style.min-width]="col.width"
                 [style.max-width]="col.width"
@@ -154,7 +154,7 @@
                 [formatter]="col.formatter"
                 [row]="this"
                 [lastPinned]="col.isLastPinned"
-                [style.min-height.px]="grid.rowHeight || 32"
+                [style.min-height.px]="cellHeight"
                 [rowData]="rowData"
                 [style.min-width]="col.width"
                 [style.max-width]="col.width"

src/app/grid-multi-row-layout/grid-mrl.sample.html

@@ -22,6 +22,10 @@
             <igx-column [rowStart]="1" [width]="'10%'" [resizable]='true' [colStart]="2" [movable]="false" sortable="true" field="Phone"></igx-column>
             <igx-column [rowStart]="2" [resizable]='true' [colStart]="1" [colEnd]="3" [rowEnd]="4" [movable]="false" sortable="true" field="Fax"></igx-column>
         </igx-column-layout>
+        <igx-action-strip #actionstrip>
+            <igx-grid-pinning-actions></igx-grid-pinning-actions>
+            <igx-grid-editing-actions [addRow]="true"></igx-grid-editing-actions>
+        </igx-action-strip>
     </igx-grid>
     <span igxButton (click)="hideGroup()">Hide/Show second group</span>
     <span igxButton (click)="pinGroup()">Pin/Unpin second group</span>