igniteui-webcomponents-grids 6.1.0-rc.0 → 6.1.0-rc.1

package/grids/combined.js

@@ -24462,6 +24462,7 @@ var vn = (() => {
       this.triggerAddAnimationClass = false, this.addAnimationEnd.emit(this);
     }
     getMergeCellSpan(e) {
+      if (this.grid.shouldResize) return null;
       let t = this.metaData.cellMergeMeta.get(e.field).rowSpan, o = "", s = this.pinned && !this.disabled, a = this.grid.isRowPinningToTop && !s ? this.index - this.grid.pinnedRecordsCount : this.index;
       for (let l = a; l < a + t; l++) {
         let c = this.grid.verticalScrollContainer.getSizeAt(l);
@@ -24490,8 +24491,9 @@ var vn = (() => {
       return this.grid.isRecordMerged(t) && (t = e.recordRef), this.grid.isTreeRow && this.grid.isTreeRow(t) && (t = t.data), this.grid.primaryKey ? t[this.grid.primaryKey] : t;
     }
     getRowHeight() {
+      if (this.grid.shouldResize) return null;
       let e = this.pinned && !this.disabled, t = this.grid.isRowPinningToTop && !e ? this.index - this.grid.pinnedRecordsCount : this.index;
-      return this.grid._cdrRequests && this.grid.verticalScrollContainer.recalcUpdateSizes(), this.grid.verticalScrollContainer.getSizeAt(t) - 1 || this.grid.rowHeight;
+      return this.grid._cdrRequests && this.grid.verticalScrollContainer.recalcUpdateSizes(), this.grid.verticalScrollContainer.getSizeAt(t) || this.grid.rowHeight;
     }
     get resolveDragIndicatorClasses() {
       let e = "igx-grid__drag-indicator", t = this.grid.rowDragging && !this.dragging ? "igx-grid__drag-indicator--off" : "";
@@ -41745,7 +41747,7 @@ var Gc = (() => {
       return this.renderedActualRowHeight * Math.min(this._defaultTargetRecordNumber, this.paginator ? Math.min(e, this.paginator.perPage) : e);
     }
     get renderedRowHeight() {
-      return this.rowHeight + 1;
+      return this.hasCellsToMerge ? this.rowHeight : this.rowHeight + 1;
     }
     get outerWidth() {
       return this.hasVerticalScroll() ? this.calcWidth + this.scrollSize : this.calcWidth;