Merge branch 'master' into ibarakov/fix-12787

Author: kdinev

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.spec.ts

@@ -195,6 +195,44 @@ describe('igxGridEditingActions #grid ', () => {
             expect(pinningIcons.length).toBe(1);
             expect(pinningIcons[0].nativeElement.className.indexOf('igx-button--disabled') === -1).toBeTruthy();
         });
+
+        it('should emit correct rowPinning arguments with pinning actions', () => {
+            spyOn(grid.rowPinning, 'emit').and.callThrough();
+            const row = grid.getRowByIndex(1);
+
+            actionStrip.show(grid.rowList.toArray()[1]);
+            fixture.detectChanges();
+            let pinningIcon = fixture.debugElement.queryAll(By.css(`igx-grid-pinning-actions igx-icon`))[0];
+
+            pinningIcon.parent.triggerEventHandler('click', new Event('click'));
+            fixture.detectChanges();
+
+            expect(grid.rowPinning.emit).toHaveBeenCalledTimes(1);
+            expect(grid.rowPinning.emit).toHaveBeenCalledWith({
+                rowID : row.key,
+                insertAtIndex: 0,
+                isPinned: true,
+                row,
+                cancel: false
+            });
+
+            const row5 = grid.getRowByIndex(4);
+            actionStrip.show(grid.rowList.toArray()[4]);
+            fixture.detectChanges();
+            pinningIcon = fixture.debugElement.queryAll(By.css(`igx-grid-pinning-actions igx-icon`))[0];
+
+            pinningIcon.parent.triggerEventHandler('click', new Event('click'));
+            fixture.detectChanges();
+
+            expect(grid.rowPinning.emit).toHaveBeenCalledTimes(2);
+            expect(grid.rowPinning.emit).toHaveBeenCalledWith({
+                rowID : row5.key,
+                insertAtIndex: 1,
+                isPinned: true,
+                row: row5,
+                cancel: false
+            });
+        });
     });
 
     describe('auto show/hide', () => {

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-pinning-actions.component.ts

@@ -81,7 +81,7 @@ export class IgxGridPinningActionsComponent extends IgxGridActionsBaseDirective
         }
         const row = this.strip.context;
         const grid = row.grid;
-        grid.pinRow(row.key);
+        grid.pinRow(row.key, grid.pinnedRecords.length);
         this.strip.hide();
     }
 

projects/igniteui-angular/src/lib/grids/api.service.ts

@@ -152,11 +152,12 @@ export class GridBaseAPIService<T extends GridType> implements GridServiceType {
         }
         if (this.grid.primaryKey === cell.column.field) {
             if (this.grid.pinnedRecords.length > 0) {
-                if (this.grid.pinnedRecords.find(r => r == cell.rowData)) {
-                    const pinnedRowIndex = this.grid.pinnedRecords.indexOf(cell.rowData);
+                const rowIndex = this.grid.pinnedRecords.indexOf(cell.rowData);
+                if (rowIndex !== -1) {
                     const previousRowId = cell.value;
-                    this.unpin_row(previousRowId);
-                    this.pin_row(args.newValue, pinnedRowIndex);
+                    const rowType = this.grid.getRowByIndex(cell.rowIndex);
+                    this.unpin_row(previousRowId, rowType);
+                    this.pin_row(args.newValue, rowIndex, rowType);
                 }
             }
             if (this.grid.selectionService.isRowSelected(cell.id.rowID)) {
@@ -566,13 +567,13 @@ export class GridBaseAPIService<T extends GridType> implements GridServiceType {
         grid._pinnedRecordIDs.splice(insertIndex, 0, rowID);
     }
 
-    public unpin_row(rowID: any): void {
+    public unpin_row(rowID: any, row: RowType): void {
         const grid = (this.grid as any);
         const index = grid._pinnedRecordIDs.indexOf(rowID);
         if (index === -1) {
             return;
         }
-        const eventArgs = this.get_pin_row_event_args(rowID, null , null, false);
+        const eventArgs = this.get_pin_row_event_args(rowID, null , row, false);
         grid.rowPinning.emit(eventArgs);
 
         if (eventArgs.cancel) {
@@ -589,7 +590,7 @@ export class GridBaseAPIService<T extends GridType> implements GridServiceType {
             cancel: false
         }
         if (typeof index === 'number') {
-            eventArgs.insertAtIndex = index;
+            eventArgs.insertAtIndex = index <= this.grid.pinnedRecords.length ? index : this.grid.pinnedRecords.length;
         }
         return eventArgs;
     }

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

@@ -176,6 +176,60 @@ describe('Row Pinning #grid', () => {
             expect(grid.rowPinning.emit).toHaveBeenCalledTimes(2);
         });
 
+        it('should emit correct rowPinning arguments on pin/unpin.', () => {
+            spyOn(grid.rowPinning, 'emit').and.callThrough();
+
+            const row = grid.getRowByIndex(5);
+            const rowID = row.key;
+            row.pin();
+
+            expect(grid.rowPinning.emit).toHaveBeenCalledTimes(1);
+            expect(grid.rowPinning.emit).toHaveBeenCalledWith({
+                rowID,
+                insertAtIndex: 0,
+                isPinned: true,
+                row,
+                cancel: false
+            });
+
+            const row2 = grid.getRowByIndex(3);
+            const rowID2 = row2.key;
+            row2.pin();
+
+            expect(grid.rowPinning.emit).toHaveBeenCalledTimes(2);
+            expect(grid.rowPinning.emit).toHaveBeenCalledWith({
+                rowID: rowID2,
+                insertAtIndex: 1,
+                isPinned: true,
+                row: row2,
+                cancel: false
+            });
+        });
+
+        it('should be able to set pin possition of row on pin/unpin events.', () => {
+            const row1 = grid.getRowByIndex(0);
+            row1.pin();
+            expect(row1.pinned).toBe(true);
+            expect(grid.pinnedRecords.length).toBe(1);
+            expect(grid.pinnedRecords[0]).toEqual(row1.data);
+
+            const row2 = grid.getRowByIndex(2);
+            row2.pin();
+            grid.pinRow(row2.key);
+            expect(row2.pinned).toBe(true);
+            expect(grid.pinnedRecords.length).toBe(2);
+            expect(grid.pinnedRecords[1]).toEqual(row2.data);
+
+            grid.rowPinning.subscribe((e: IPinRowEventArgs) => {
+                e.insertAtIndex = 0;
+            });
+            const row5 = grid.getRowByIndex(5);
+            row5.pin();
+            expect(row2.pinned).toBe(true);
+            expect(grid.pinnedRecords.length).toBe(3);
+            expect(grid.pinnedRecords[0]).toEqual(row5.data);
+        });
+
         it('should emit rowPinned on pin/unpin.', () => {
             spyOn(grid.rowPinned, 'emit').and.callThrough();