chore(*): Returns data flattener to sorting pipe

Author: 3phase

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

@@ -5956,7 +5956,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
 
                         while (searchIndex !== -1) {
                             this.lastSearchInfo.matchInfoCache.push({
-                                row: data,
+                                row: dataRowRec,
                                 column: c.field,
                                 index: occurenceIndex++,
                             });

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts

@@ -365,28 +365,6 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
         super.ngAfterContentInit();
     }
 
-    /**
-     * @hidden @internal
-     */
-    public setFilteredSortedData(data, pinned: boolean) {
-        super.setFilteredSortedData(data, pinned);
-        const flatFilteredSortedData = [];
-        this.flattenTreeGridRecords(this.filteredSortedData, flatFilteredSortedData);
-        this.filteredSortedData = flatFilteredSortedData;
-    }
-
-    /**
-     * @hidden @internal
-     */
-    private flattenTreeGridRecords(records: any[], flatData: any[]) {
-        if (records && records.length) {
-            for (const record of records) {
-                (this.isGhostRecord(record)) ? flatData.push(record.data.recordData) : flatData.push(record.data);
-                this.flattenTreeGridRecords(record.children, flatData);
-            }
-        }
-    }
-
     private loadChildrenOnRowExpansion(args: IRowToggleEventArgs) {
         if (this.loadChildrenOnDemand) {
             const parentID = args.rowID;

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

@@ -212,10 +212,22 @@ export class IgxTreeGridSortingPipe implements PipeTransform {
         } else {
             result = DataUtil.treeGridSort(hierarchicalData, expressions, sorting);
         }
-        grid.setFilteredSortedData(result, pinned);
+
+        const filteredSortedData = [];
+        this.flattenTreeGridRecords(result, filteredSortedData);
+        grid.setFilteredSortedData(filteredSortedData, pinned);
 
         return result;
     }
+
+    private flattenTreeGridRecords(records: ITreeGridRecord[], flatData: any[]) {
+        if (records && records.length) {
+            for (const record of records) {
+                this.gridAPI.grid.isGhostRecord(record) ? flatData.push(record.data.recordData) : flatData.push(record.data);
+                this.flattenTreeGridRecords(record.children, flatData);
+            }
+        }
+    }
 }
 
 /** @hidden */