Merge branch 'master' into mkirova/row-pinning-state-persist

Author: ChronosSF

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

@@ -147,6 +147,7 @@ import { IgxColumnComponent } from './columns/column.component';
 import { IgxColumnGroupComponent } from './columns/column-group.component';
 import { IGridSortingStrategy } from '../data-operations/sorting-strategy';
 import { IgxRowDragGhostDirective, IgxDragIndicatorIconDirective } from './row-drag.directive';
+import { isNumber } from 'util';
 
 const MINIMUM_COLUMN_WIDTH = 136;
 const FILTER_ROW_HEIGHT = 50;
@@ -4124,7 +4125,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
 
         this.endEdit(true);
 
-        this._pinnedRecordIDs.splice(eventArgs.insertAtIndex || this._pinnedRecordIDs.length, 0, rowID);
+        const insertIndex = isNumber(eventArgs.insertAtIndex) ? eventArgs.insertAtIndex : this._pinnedRecordIDs.length;
+        this._pinnedRecordIDs.splice(insertIndex, 0, rowID);
         this._pipeTrigger++;
         if (this.gridAPI.grid) {
             this.notifyChanges(true);

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

@@ -120,6 +120,31 @@ describe('Row Pinning #grid', () => {
             expect(grid.calcHeight - expectedHeight).toBeLessThanOrEqual(1);
         });
 
+        it('should allow pinning row at specified index via API.', () => {
+            grid.pinRow(fix.componentInstance.data[1]);
+            fix.detectChanges();
+
+            expect(grid.pinnedRows.length).toBe(1);
+            expect(grid.pinnedRows[0].rowData).toBe(fix.componentInstance.data[1]);
+
+            // pin at index 0
+            grid.pinRow(fix.componentInstance.data[2], 0);
+            fix.detectChanges();
+
+            expect(grid.pinnedRows.length).toBe(2);
+            expect(grid.pinnedRows[0].rowData).toBe(fix.componentInstance.data[2]);
+            expect(grid.pinnedRows[1].rowData).toBe(fix.componentInstance.data[1]);
+
+            // pin at index 1
+            grid.pinRow(fix.componentInstance.data[3], 1);
+            fix.detectChanges();
+
+            expect(grid.pinnedRows.length).toBe(3);
+            expect(grid.pinnedRows[0].rowData).toBe(fix.componentInstance.data[2]);
+            expect(grid.pinnedRows[1].rowData).toBe(fix.componentInstance.data[3]);
+            expect(grid.pinnedRows[2].rowData).toBe(fix.componentInstance.data[1]);
+        });
+
         it('should emit onRowPinning on pin/unpin.', () => {
             spyOn(grid.onRowPinning, 'emit').and.callThrough();