igniteui-angular 20.1.0-rc.0 → 20.1.0-rc.1

package/fesm2022/igniteui-angular.mjs

@@ -29009,6 +29009,9 @@ class IgxRowDirective {
         this.addAnimationEnd.emit(this);
     }
     getMergeCellSpan(col) {
+        if (this.grid.shouldResize) {
+            return null;
+        }
         const rowCount = this.metaData.cellMergeMeta.get(col.field).rowSpan;
         let sizeSpans = "";
         const isPinned = this.pinned && !this.disabled;
@@ -29052,13 +29055,16 @@ class IgxRowDirective {
         return this.grid.primaryKey ? recData[this.grid.primaryKey] : recData;
     }
     getRowHeight() {
+        if (this.grid.shouldResize) {
+            return null;
+        }
         const isPinned = this.pinned && !this.disabled;
         const indexInData = this.grid.isRowPinningToTop && !isPinned ? this.index - this.grid.pinnedRecordsCount : this.index;
         if (this.grid._cdrRequests) {
             // recalc size if repaint is requested.
             this.grid.verticalScrollContainer.recalcUpdateSizes();
         }
-        const size = this.grid.verticalScrollContainer.getSizeAt(indexInData) - 1;
+        const size = this.grid.verticalScrollContainer.getSizeAt(indexInData);
         return size || this.grid.rowHeight;
     }
     /**
@@ -69894,6 +69900,9 @@ class IgxGridBaseDirective {
      * The rowHeight input is bound to min-height css prop of rows that adds a 1px border in all cases
      */
     get renderedRowHeight() {
+        if (this.hasCellsToMerge) {
+            return this.rowHeight;
+        }
         return this.rowHeight + 1;
     }
     /**