Merge branch 'master' into mkirova/fix-6731

Author: dkamburov

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

@@ -3606,8 +3606,14 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
 
         if (dropTarget.pinned && !column.pinned) {
             column.pin();
+            if (!this.isPinningToStart) {
+                if (pos === DropPosition.AfterDropTarget) {
+                    position = DropPosition.AfterDropTarget;
+                } else {
+                    position = DropPosition.None;
+                }
+            }
             this._reorderColumns(column, dropTarget, position, this._pinnedColumns);
-
         }
 
         if (!dropTarget.pinned && column.pinned) {

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

@@ -574,6 +574,28 @@ describe('IgxGrid - Column Pinning #grid', () => {
             expect(fistPinnedHeaders[1].context.column.field).toBe('CompanyName');
         });
 
+        it('should pin an unpinned column when drag/drop it among pinned columns.', (async() => {
+
+            const fix = TestBed.createComponent(GridRightPinningComponent);
+            fix.detectChanges();
+
+            const grid = fix.componentInstance.instance;
+            grid.pinning = { columns: ColumnPinningPosition.End };
+            fix.detectChanges();
+            await wait();
+            fix.detectChanges();
+
+            // move 'ID' column to the pinned area
+            grid.moveColumn(grid.getColumnByName('ID'), grid.getColumnByName('ContactName'));
+            fix.detectChanges();
+
+            // verify column is pinned at the correct place
+            expect(grid.pinnedColumns[0].field).toEqual('CompanyName');
+            expect(grid.pinnedColumns[1].field).toEqual('ID');
+            expect(grid.pinnedColumns[2].field).toEqual('ContactName');
+            expect(grid.getColumnByName('ID').pinned).toBeTruthy();
+        }));
+
         it('should correctly pin columns with their summaries to end.', async() => {
             const fix = TestBed.createComponent(GridRightPinningComponent);
             fix.detectChanges();