Merge branch 'master' into SKrastev/row-pinning-nav

Author: ChronosSF

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

@@ -2947,7 +2947,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
         if (this.hasPinnedRecords && pinned) {
             this._filteredPinnedData = data || [];
             const filteredUnpinned =  this._filteredUnpinnedData || [];
-            this.filteredData = [... this._filteredPinnedData, ... filteredUnpinned];
+            const filteredData =  [... this._filteredPinnedData, ... filteredUnpinned];
+            this.filteredData =  filteredData.length > 0 ? filteredData : this._filteredUnpinnedData;
         } else if (this.hasPinnedRecords && !pinned) {
             this._filteredUnpinnedData = data;
         } else {

src/app/grid-row-pinning/grid-row-pinning.sample.html

@@ -81,7 +81,7 @@
 
         <div class="sample-column">
             <div>igxTreeGrid</div>
-            <igx-tree-grid [pinning]="pinningConfig" #treegrid [allowFiltering]='true' [data]="treeData" primaryKey="employeeID" foreignKey="PID" [rowSelectable]="true"
+            <igx-tree-grid [paging]='true' [pinning]="pinningConfig" #treegrid [allowFiltering]='true' [data]="treeData" primaryKey="employeeID" foreignKey="PID" [rowSelectable]="true"
             [width]="'900px'" [height]="'800px'" [showToolbar]="true"
             [columnHiding]="true" [columnPinning]="true" [exportExcel]="true" [exportCsv]="true" exportText="Export"
            >
@@ -94,7 +94,7 @@
             </igx-column>
             <igx-column *ngFor="let c of treeColumns" [field]="c.field" [dataType]="c.dataType" [header]="c.label"
                 [pinned]="c.pinned" [movable]="c.movable" [groupable]="false" [resizable]="c.resizable" [width]="c.width"
-                [sortable]="true" [filterable]="true" [editable]="true" [hidden]="c.hidden" [hasSummary]="c.hasSummary"
+                [sortable]="true" [filterable]="true" [editable]="true" [hidden]="c.hidden"
                 [minWidth]="c.minWidth" [maxWidth]="c.maxWidth">
             </igx-column>