Skip to content

Commit cce0115

Browse files
authored
Merge branch 'master' into bpenkov/igx-date-range
2 parents aba8b1f + 7d36311 commit cce0115

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6125,7 +6125,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
61256125
private configureRowEditingOverlay(rowID: any, useOuter = false) {
61266126
this.rowEditSettings.outlet = useOuter ? this.parentRowOutletDirective : this.rowOutletDirective;
61276127
this.rowEditPositioningStrategy.settings.container = this.tbody.nativeElement;
6128-
const targetRow = this.gridAPI.get_row_by_key(rowID);
6128+
const pinned = this._pinnedRecordIDs.indexOf(rowID) !== -1;
6129+
const targetRow = !pinned ? this.gridAPI.get_row_by_key(rowID) : this.pinnedRows.find(x => x.rowID === rowID);
61296130
if (!targetRow) {
61306131
return;
61316132
}

src/app/grid-row-pinning/grid-row-pinning.sample.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<igx-switch (change)='onRowChange()' style="padding-left: 10px"> Bottom Row Pinning toggle</igx-switch>
1919
<igx-switch (change)='onChange()' style="padding-left: 10px"> Right Column Pinning toggle</igx-switch>
2020
</div>
21-
<igx-grid [igxGridState]="options" [allowFiltering]='true' [primaryKey]='"ID"' [pinning]="pinningConfig" [paging]="true"
21+
<igx-grid [rowEditable]="true" [igxGridState]="options" [allowFiltering]='true' [primaryKey]='"ID"' [pinning]="pinningConfig" [paging]="true"
2222
[columnHiding]='true' [showToolbar]='true' [columnPinning]='true' #grid1 [data]="data" [width]="'800px'"
2323
[height]="'600px'" [rowSelection]="true">
2424

0 commit comments

Comments
 (0)