Skip to content

Commit ae4443b

Browse files
authored
Merge pull request #8705 from IgniteUI/ttonev/fix-8194-9.1.x
fix(grid): column unpining order #8194 9.1.x
2 parents 8c45370 + 006ba1c commit ae4443b

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5214,7 +5214,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
52145214
.filter((c) => c.pinned).sort((a, b) => this._pinnedColumns.indexOf(a) - this._pinnedColumns.indexOf(b));
52155215
this._unpinnedColumns = this.hasColumnGroups ? this.columnList.filter((c) => !c.pinned) :
52165216
this.columnList.filter((c) => !c.pinned)
5217-
.sort((a, b) => this._unpinnedColumns.indexOf(a) - this._unpinnedColumns.indexOf(b));
5217+
.sort((a, b) => a.index - b.index);
52185218
}
52195219

52205220
/**

projects/igniteui-angular/src/lib/grids/grid/column-pinning.spec.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,27 @@ describe('Column Pinning UI #grid', () => {
242242
toolbar = grid.toolbar.columnPinningUI;
243243
expect(toolbar.pinnableColumns.length).toBe(4);
244244
});
245+
246+
it('Checks order of columns after unpinning', () => {
247+
for (const column of grid.columns) {
248+
column.pin();
249+
}
250+
fix.detectChanges();
251+
grid.getColumnByName('ID').unpin();
252+
grid.getColumnByName('ReleaseDate').unpin();
253+
grid.getColumnByName('Downloads').unpin();
254+
grid.getColumnByName('ProductName').unpin();
255+
grid.getColumnByName('Released').unpin();
256+
fix.detectChanges();
257+
grid.unpinnedColumns.forEach((column, index) => {
258+
if (index === grid.unpinnedColumns.length - 1) {
259+
return;
260+
}
261+
expect(
262+
column.index < grid.unpinnedColumns[index + 1].index
263+
).toBe(true);
264+
});
265+
});
245266
});
246267

247268
describe('', () => {

0 commit comments

Comments
 (0)