Skip to content

Commit a93fc98

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Fix moving pinned cols via exc.style moving.
1 parent cf316eb commit a93fc98

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-moving.component.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,17 @@ export class IgxExcelStyleMovingComponent {
5959
} else {
6060
targetColumn = this.findColumn(moveDirection, this.esf.grid.pinnedColumns);
6161
}
62-
} else if (this.esf.grid.unpinnedColumns.indexOf(this.esf.column) === 0 && moveDirection === 0 &&
63-
this.esf.column.pinningPosition === ColumnPinningPosition.Start) {
64-
targetColumn = this.esf.grid.pinnedColumns[this.esf.grid.pinnedColumns.length - 1];
62+
} else if (this.esf.grid.unpinnedColumns.indexOf(this.esf.column) === 0 && moveDirection === 0) {
63+
// moving first unpinned, left (into pin start area)
64+
targetColumn = this.esf.grid.pinnedStartColumns[this.esf.grid.pinnedStartColumns.length - 1];
6565
if (targetColumn.parent) {
6666
targetColumn = targetColumn.topLevelParent;
6767
}
6868
moveDirection = 1;
6969
} else if (this.esf.grid.unpinnedColumns.indexOf(this.esf.column) === this.esf.grid.unpinnedColumns.length - 1 &&
70-
moveDirection === 1 && this.esf.column.pinningPosition === ColumnPinningPosition.End) {
71-
targetColumn = this.esf.grid.pinnedColumns[0];
70+
moveDirection === 1) {
71+
// moving last unpinned, right (into pin end area)
72+
targetColumn = this.esf.grid.pinnedEndColumns[0];
7273
moveDirection = 0;
7374
} else {
7475
targetColumn = this.findColumn(moveDirection, this.esf.grid.unpinnedColumns);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4760,9 +4760,9 @@ export abstract class IgxGridBaseDirective implements GridType,
47604760
// pinning and unpinning will work correctly even without passing index
47614761
// but is easier to calclulate the index here, and later use it in the pinning event args
47624762
if (target.pinned && !column.pinned) {
4763-
const pinnedIndex = target.pinningPosition === ColumnPinningPosition.Start ? this._pinnedStartColumns.indexOf(target) : this._pinnedEndColumns.indexOf(target);
4763+
const pinnedIndex = target.pinningPosition === ColumnPinningPosition.Start ? this.pinnedStartColumns.indexOf(target) : this.pinnedEndColumns.indexOf(target);
47644764
const index = pos === DropPosition.AfterDropTarget ? pinnedIndex + 1 : pinnedIndex;
4765-
column.pin(index);
4765+
column.pin(index, target.pinningPosition);
47664766
}
47674767

47684768
if (!target.pinned && column.pinned) {

0 commit comments

Comments
 (0)