Merge branch 'master' into mkirova/fix-6701-master

Author: ChronosSF

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

@@ -48,18 +48,26 @@ export class IgxExcelStyleColumnMovingComponent {
     public onMoveButtonClicked(moveDirection) {
         let targetColumn;
         if (this.column.pinned) {
-            if (this.column.isLastPinned && moveDirection === 1) {
+            if (this.column.isLastPinned && moveDirection === 1 && this.grid.isPinningToStart) {
                 targetColumn = this.grid.unpinnedColumns[0];
                 moveDirection = 0;
+            } else if (this.column.isFirstPinned && moveDirection === 0 && !this.grid.isPinningToStart) {
+                targetColumn = this.grid.unpinnedColumns[this.grid.unpinnedColumns.length - 1];
+                moveDirection = 1;
             } else {
                 targetColumn = this.findColumn(moveDirection, this.grid.pinnedColumns);
             }
-        } else if (this.grid.unpinnedColumns.indexOf(this.column) === 0 && moveDirection === 0) {
+        } else if (this.grid.unpinnedColumns.indexOf(this.column) === 0 && moveDirection === 0 &&
+                    this.grid.isPinningToStart) {
             targetColumn = this.grid.pinnedColumns[this.grid.pinnedColumns.length - 1];
             if (targetColumn.parent) {
                 targetColumn = targetColumn.topLevelParent;
             }
             moveDirection = 1;
+        } else if (this.grid.unpinnedColumns.indexOf(this.column) === this.grid.unpinnedColumns.length - 1 &&
+            moveDirection === 1 && !this.grid.isPinningToStart) {
+            targetColumn = this.grid.pinnedColumns[0];
+            moveDirection = 0;
         } else {
             targetColumn = this.findColumn(moveDirection, this.grid.unpinnedColumns);
         }

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts

@@ -2580,6 +2580,47 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             ControlsFunction.verifyButtonIsDisabled(moveLeft, false);
         }));
 
+        it('Should right pin and unpin column after moving it left/right when clicking buttons.', fakeAsync(() => {
+            grid.pinning.columns = 1;
+
+            const columnToPin = grid.columns[grid.columns.length - 2];
+            columnToPin.pinned = true;
+            fix.detectChanges();
+
+            expect(grid.pinnedColumns.length).toBe(1);
+
+            const columnToMove = grid.unpinnedColumns[grid.unpinnedColumns.length - 1];
+            columnToMove.movable = true;
+
+            GridFunctions.clickExcelFilterIconFromCode(fix, grid, columnToMove.field);
+
+            const moveLeft = GridFunctions.getExcelStyleFilteringMoveButtons(fix)[0];
+            const moveRight = GridFunctions.getExcelStyleFilteringMoveButtons(fix)[1];
+
+            moveRight.click();
+            fix.detectChanges();
+
+            expect(grid.pinnedColumns.length).toBe(2);
+
+            expect(grid.pinnedColumns[0].field).toBe(columnToMove.field);
+            expect(grid.pinnedColumns[1].field).toBe(columnToPin.field);
+
+            moveRight.click();
+            fix.detectChanges();
+
+            expect(grid.pinnedColumns[0].field).toBe(columnToPin.field);
+            expect(grid.pinnedColumns[1].field).toBe(columnToMove.field);
+
+            moveLeft.click();
+            fix.detectChanges();
+
+            moveLeft.click();
+            fix.detectChanges();
+
+            expect(grid.pinnedColumns.length).toBe(1);
+            expect(grid.pinnedColumns[0].field).toBe(columnToPin.field);
+        }));
+
         it('Should pin column when clicking buttons.', fakeAsync(() => {
             GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'Downloads');