fix(grid): Exclude border from rowHeight calc.

Author: MayaKirova

angular.json

@@ -28,7 +28,12 @@
             "assets": [
               "src/favicon.ico",
               "src/assets",
-              "src/web.config"
+              "src/web.config",
+              {
+                "glob": "theme.css",
+                "input": "src/app/grid-cellMerging",
+                "output": "assets/grid-cellMerging"
+              }
             ],
             "styles": [
               "src/styles/styles.scss"

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

@@ -696,12 +696,8 @@ export class IgxRowDirective implements DoCheck, AfterViewInit, OnDestroy {
         }
         const isPinned = this.pinned && !this.disabled;
         const indexInData = this.grid.isRowPinningToTop && !isPinned ? this.index - this.grid.pinnedRecordsCount : this.index;
-        if ((this.grid as any)._cdrRequests) {
-            // recalc size if repaint is requested.
-            this.grid.verticalScrollContainer.recalcUpdateSizes();
-        }
         const size = this.grid.verticalScrollContainer.getSizeAt(indexInData);
-        return size || this.grid.rowHeight;
+        return (size - this.grid._borderSize) || this.grid.rowHeight;
     }
 
     /**

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

@@ -1,5 +1,7 @@
 <h4 class="sample-title">Grid with cell merge</h4>
 
+<button (click)="toggleTheme()">{{ themeLoaded() ? 'Unload Theme CSS' : 'Load Theme CSS' }}</button>
+
 <div class="grid__wrapper">
   <igx-input-group type="search" class="searchInput">
     <igx-prefix>

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

@@ -1,4 +1,5 @@
-import { Component, ViewChild } from '@angular/core';
+import { Component, ViewChild, inject, signal } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import {
     DefaultTreeGridMergeStrategy,
@@ -54,6 +55,8 @@ import { INVOICE_DATA } from '../shared/invoiceData';
     ]
 })
 export class GridCellMergingComponent {
+    private readonly document = inject(DOCUMENT);
+    public themeLoaded = signal(false);
     public hierarchicalData = HIERARCHICAL_DATA.concat(HIERARCHICAL_DATA).concat(HIERARCHICAL_DATA);
     public treeData = HIERARCHICAL_SAMPLE_DATA;
     public treeGridMergeStrategy =  new ByLevelTreeGridMergeStrategy();
@@ -74,6 +77,22 @@ export class GridCellMergingComponent {
         this.data = allData;
     }
 
+    public toggleTheme(): void {
+        const id = 'grid-cell-merging-theme';
+        const existing = this.document.getElementById(id);
+        if (existing) {
+            existing.remove();
+            this.themeLoaded.set(false);
+        } else {
+            const link = this.document.createElement('link');
+            link.rel = 'stylesheet';
+            link.href = 'assets/grid-cellMerging/theme.css';
+            link.id = id;
+            this.document.head.appendChild(link);
+            this.themeLoaded.set(true);
+        }
+    }
+
     public toggleStrategy() {
         if (this.treeGridMergeStrategy instanceof ByLevelTreeGridMergeStrategy) {
             this.treeGridMergeStrategy = new DefaultTreeGridMergeStrategy();