Skip to content

Commit 46fcd55

Browse files
committed
fix(igxTreeGrid): Additional fixes for tree grid row pining and update test.
1 parent d688472 commit 46fcd55

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5194,7 +5194,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
51945194
}
51955195

51965196
/**
5197-
* Returns the currently transformed paged/filtered/sorted/grouped row data, displayed in the grid.
5197+
* Returns the currently transformed paged/filtered/sorted/grouped/pinned/unpinned row data, displayed in the grid.
51985198
* @example
51995199
* ```typescript
52005200
* const dataView = this.grid.dataView;
@@ -5446,7 +5446,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
54465446
* If `headers` is enabled, it will use the column header (if any) instead of the column field.
54475447
*/
54485448
public getSelectedData(formatters = false, headers = false) {
5449-
const source = this.dataView;
5449+
const source = this.filteredSortedData;
54505450
return this.extractDataFromSelection(source, formatters, headers);
54515451
}
54525452

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,12 +1565,12 @@ describe('IgxTreeGrid - Integration #tGrid', () => {
15651565
treeGrid.perPage = 5;
15661566
fix.detectChanges();
15671567

1568-
expect(treeGrid.dataView.length).toBe(5);
1568+
expect(treeGrid.dataView.length).toBe(6);
15691569

15701570
treeGrid.perPage = 10;
15711571
fix.detectChanges();
15721572

1573-
expect(treeGrid.dataView.length).toBe(10);
1573+
expect(treeGrid.dataView.length).toBe(11);
15741574
});
15751575

15761576
it('should correctly apply paging state for grid and paginator when there are pinned rows.', fakeAsync(() => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
| treeGridTransaction:id:pipeTrigger
8080
| visibleColumns:hasVisibleColumns
8181
| treeGridNormalizeRecord:pipeTrigger
82+
| gridRowPinning:id:true:pipeTrigger
8283
| treeGridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
83-
| treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger:true
84-
| gridRowPinning:id:true:pipeTrigger as pinnedData'>
84+
| treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger:true as pinnedData'>
8585
<div #pinContainer *ngIf='pinnedData.length > 0'
8686
[ngClass]="{
8787
'igx-grid__tr--pinned-bottom': !isRowPinningToTop,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
640640
source.push(record.data);
641641
};
642642

643-
this.dataView.forEach(process);
643+
this.unpinnedDataView.forEach(process);
644644
source = this.isRowPinningToTop ? [...this.pinnedDataView, ...source] : [...source, ...this.pinnedDataView];
645645
return this.extractDataFromSelection(source, formatters, headers);
646646
}

0 commit comments

Comments
 (0)