Skip to content

fix(merging): add additional handling for grid size change with merge on #16199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkamburov merged 2 commits into from
Sep 9, 2025
Merged

fix(merging): add additional handling for grid size change with merge on #16199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
375db85
fix(merging): add additional handling for grid size change with merge on
mddragnev Sep 4, 2025
c19cd22
test(*): Add a test
mddragnev Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,8 +902,18 @@
map.get($grid-cell-padding-inline, 'cosy'),
map.get($grid-cell-padding-inline, 'comfortable')
);
min-height: sizable(
rem(32px),
rem(40px),
rem(50px)
);
} @else {
padding-inline: pad-inline(rem(8px), rem(12px), rem(16px));
min-height: sizable(
rem(32px),
rem(40px),
rem(48px)
);

igx-icon {
opacity: if($theme-variant == 'light', .75, .85);
Expand Down Expand Up @@ -2736,6 +2746,19 @@
%igx-grid__tr-action {
&:last-of-type {
border-inline-end: var-get($theme, 'header-border-width') var-get($theme, 'header-border-style') var-get($theme, 'header-border-color');
@if $variant != 'indigo' {
min-height: sizable(
rem(32px),
rem(40px),
rem(50px)
);
} @else {
min-height: sizable(
rem(32px),
rem(40px),
rem(48px)
);
}
}
}

Expand Down
37 changes: 20 additions & 17 deletions projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2517,7 +2517,7 @@ export abstract class IgxGridBaseDirective implements GridType,
public get mergeStrategy() {
return this._mergeStrategy;
}
public set mergeStrategy(value) {
public set mergeStrategy(value) {
this._mergeStrategy = value;
}

Expand Down Expand Up @@ -3119,7 +3119,7 @@ export abstract class IgxGridBaseDirective implements GridType,
/**
* @hidden @internal
*/
public hoverIndex: number;
public hoverIndex: number;

/**
* @hidden @internal
Expand Down Expand Up @@ -4001,22 +4001,22 @@ export abstract class IgxGridBaseDirective implements GridType,
* @hidden
* @internal
*/
public get columnsToMerge() : ColumnType[] {
public get columnsToMerge(): ColumnType[] {
if (this._columnsToMerge.length) {
return this._columnsToMerge;
}
const cols = this.visibleColumns.filter(
x => x.merge && (this.cellMergeMode ==='always' ||
(this.cellMergeMode === 'onSort' && !!this.sortingExpressions.find( y => y.fieldName === x.field)))
x => x.merge && (this.cellMergeMode === 'always' ||
(this.cellMergeMode === 'onSort' && !!this.sortingExpressions.find(y => y.fieldName === x.field)))
);
this._columnsToMerge = cols;
return this._columnsToMerge;
}

protected allowResetOfColumnsToMerge() {
const cols = this.visibleColumns.filter(
x => x.merge && (this.cellMergeMode ==='always' ||
(this.cellMergeMode === 'onSort' && !!this.sortingExpressions.find( y => y.fieldName === x.field)))
x => x.merge && (this.cellMergeMode === 'always' ||
(this.cellMergeMode === 'onSort' && !!this.sortingExpressions.find(y => y.fieldName === x.field)))
);
if (areEqualArrays(cols, this._columnsToMerge)) {
return false;
Expand Down Expand Up @@ -5650,6 +5650,9 @@ export abstract class IgxGridBaseDirective implements GridType,
* The rowHeight input is bound to min-height css prop of rows that adds a 1px border in all cases
*/
public get renderedRowHeight(): number {
if (this.hasCellsToMerge) {
return this.rowHeight;
}
return this.rowHeight + 1;
}

Expand Down Expand Up @@ -7740,9 +7743,9 @@ export abstract class IgxGridBaseDirective implements GridType,
const virtRec = this.verticalScrollContainer.igxForOf[targetRowIndex];
const col = typeof (column) === 'number' ? this.visibleColumns[column] : column;
const rowSpan = this.isRecordMerged(virtRec) ? virtRec?.cellMergeMeta.get(col)?.rowSpan : 1;
if (rowSpan > 1) {
targetRowIndex += Math.floor(rowSpan/2);
}
if (rowSpan > 1) {
targetRowIndex += Math.floor(rowSpan / 2);
}
if (delayScrolling) {
this.verticalScrollContainer.dataChanged.pipe(first(), takeUntil(this.destroy$)).subscribe(() => {
this.scrollDirective(this.verticalScrollContainer,
Expand Down Expand Up @@ -8096,10 +8099,10 @@ export abstract class IgxGridBaseDirective implements GridType,
if (this.hasCellsToMerge) {
let indexes = this.activeRowIndexes;
if (this.page > 0) {
indexes = indexes.map(x => this.perPage * this.page + x );
indexes = indexes.map(x => this.perPage * this.page + x);
}

data = DataUtil.merge(cloneArray(this.filteredSortedData), this.columnsToMerge, this.mergeStrategy, indexes, this);
data = DataUtil.merge(cloneArray(this.filteredSortedData), this.columnsToMerge, this.mergeStrategy, indexes, this);
}
const columnItems = this.visibleColumns.filter((c) => !c.columnGroup).sort((c1, c2) => c1.visibleIndex - c2.visibleIndex);
const columnsPathParts = columnItems.map(col => columnFieldPath(col.field));
Expand All @@ -8115,7 +8118,7 @@ export abstract class IgxGridBaseDirective implements GridType,
: resolveNestedPath(currentRowData, columnsPathParts[cid]);
if (value !== undefined && value !== null && c.searchable) {
let searchValue = caseSensitive ? String(value) : String(value).toLowerCase();
const isMergePlaceHolder = this.isRecordMerged(dataRow) ? !!dataRow?.cellMergeMeta.get(c.field)?.root : false;
const isMergePlaceHolder = this.isRecordMerged(dataRow) ? !!dataRow?.cellMergeMeta.get(c.field)?.root : false;
if (exactMatch) {
if (searchValue === searchText && !isMergePlaceHolder) {
const mic: IMatchInfoCache = {
Expand Down Expand Up @@ -8256,7 +8259,7 @@ export abstract class IgxGridBaseDirective implements GridType,
this._rowCount += 1; // include header row
}

private updateMergedData(){
private updateMergedData() {
// recalc merged data
if (this.columnsToMerge.length > 0) {
const startIndex = this.verticalScrollContainer.state.startIndex;
Expand All @@ -8267,9 +8270,9 @@ export abstract class IgxGridBaseDirective implements GridType,
if (rec.cellMergeMeta &&
// index + maxRowSpan is within view
startIndex < (index + Math.max(...rec.cellMergeMeta.values().toArray().map(x => x.rowSpan)))) {
const visibleIndex = this.isRowPinningToTop ? index + this.pinnedRecordsCount : index;
data.push({record: rec, index: visibleIndex, dataIndex: index });
}
const visibleIndex = this.isRowPinningToTop ? index + this.pinnedRecordsCount : index;
data.push({ record: rec, index: visibleIndex, dataIndex: index });
}
}
this._mergedDataInView = data;
this.notifyChanges();
Expand Down
Loading
Loading