Merge branch 'master' into dkamburov/row-pin-hiding

Author: ChronosSF

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

@@ -2411,6 +2411,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
      */
     protected destroy$ = new Subject<any>();
 
+    protected _filteredSortedPinnedData;
+    protected _filteredSortedUnpinnedData;
     protected _filteredPinnedData;
     protected _filteredUnpinnedData;
 
@@ -2935,6 +2937,22 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
         this.setupColumns();
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    public setFilteredSortedData(data, pinned: boolean) {
+        if (this._pinnedRecordIDs.length > 0 && pinned) {
+            this._filteredSortedPinnedData = data;
+            this.filteredSortedData = this.isRowPinningToTop ? [... this._filteredSortedPinnedData, ... this._filteredSortedUnpinnedData] :
+            [... this._filteredSortedUnpinnedData, ... this._filteredSortedPinnedData];
+        } else if (this._pinnedRecordIDs.length > 0 && !pinned) {
+            this._filteredSortedUnpinnedData = data;
+        } else {
+            this.filteredSortedData = data;
+        }
+    }
+
     /**
      * @hidden @internal
      */

projects/igniteui-angular/src/lib/grids/grid/grid.component.html

@@ -116,7 +116,7 @@
         | visibleColumns:hasVisibleColumns
         | rowPinning:id:true:pipeTrigger
         | gridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
-        | gridSort:sortingExpressions:sortStrategy:id:pipeTrigger
+        | gridSort:sortingExpressions:sortStrategy:id:pipeTrigger:true
         | gridDetails:hasDetails:expansionStates:pipeTrigger as pinnedData'>
             <div #pinContainer *ngIf='pinnedData.length > 0' 
                 [ngClass]="{

projects/igniteui-angular/src/lib/grids/grid/grid.pipes.ts

@@ -29,7 +29,7 @@ export class IgxGridSortingPipe implements PipeTransform {
     }
 
     public transform(collection: any[], expressions: ISortingExpression[], sorting: IGridSortingStrategy,
-                     id: string, pipeTrigger: number): any[] {
+                     id: string, pipeTrigger: number, pinned?): any[] {
         const grid = this.gridAPI.grid;
         let result: any[];
 
@@ -38,7 +38,7 @@ export class IgxGridSortingPipe implements PipeTransform {
         } else {
             result = DataUtil.sort(cloneArray(collection), expressions, sorting);
         }
-        grid.filteredSortedData = result;
+        grid.setFilteredSortedData(result, pinned);
 
         return result;
     }

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

@@ -253,6 +253,42 @@ describe('Row Pinning #grid', () => {
             expect(grid.getRowByIndex(1).rowID).toBe(fix.componentInstance.data[1]);
         });
 
+        it('should search in both pinned and unpinned rows.', () => {
+            // pin 1st row
+            let row = grid.getRowByIndex(0);
+            row.pinned = true;
+            fix.detectChanges();
+            expect(grid.pinnedRows.length).toBe(1);
+
+            let finds = grid.findNext('mari');
+            fix.detectChanges();
+
+            const fixNativeElement = fix.debugElement.nativeElement;
+            let spans = fixNativeElement.querySelectorAll('.igx-highlight');
+            expect(spans.length).toBe(1);
+            expect(finds).toEqual(2);
+
+            finds = grid.findNext('antonio');
+            fix.detectChanges();
+
+            spans = fixNativeElement.querySelectorAll('.igx-highlight');
+            expect(spans.length).toBe(2);
+            expect(finds).toEqual(2);
+
+            // pin 3rd row
+            row = grid.getRowByIndex(2);
+            row.pinned = true;
+            fix.detectChanges();
+            expect(grid.pinnedRows.length).toBe(2);
+
+            finds = grid.findNext('antonio');
+            fix.detectChanges();
+
+            spans = fixNativeElement.querySelectorAll('.igx-highlight');
+            expect(spans.length).toBe(2);
+            expect(finds).toEqual(2);
+        });
+
         it('should allow pinning onInit', () => {
             expect(() => {
                 fix = TestBed.createComponent(GridRowPinningComponent);