Skip to content

Commit c071635

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Adjust selection check for pinned row root.
1 parent 238390f commit c071635

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8141,8 +8141,6 @@ export abstract class IgxGridBaseDirective implements GridType,
81418141
}
81428142
}
81438143
this._mergedDataInView = data;
8144-
console.log(data);
8145-
//this._activeRowIndexes = null;
81468144
}
81478145
}
81488146
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,8 @@ export class IgxRowDirective implements DoCheck, AfterViewInit, OnDestroy {
626626
const mergeMeta = this.metaData?.cellMergeMeta;
627627
const rowCount = mergeMeta?.get(col.field)?.rowSpan;
628628
if (mergeMeta && rowCount > 1) {
629-
const indexInData = this.pinned && this.grid.isRowPinningToTop ? this.index - this.grid.pinnedRecordsCount : this.index;
629+
const isPinned = this.pinned && this.disabled;
630+
const indexInData = isPinned && this.grid.isRowPinningToTop ? this.index - this.grid.pinnedRecordsCount : this.index;
630631
const range = this.grid.verticalScrollContainer.igxForOf.slice(indexInData, indexInData + rowCount);
631632
const inRange = range.filter(x => this.selectionService.isRowSelected(this.grid.primaryKey ? (x.recordRef || x)[this.grid.primaryKey] : (x.recordRef || x))).length > 0;
632633
return inRange;

0 commit comments

Comments
 (0)