Skip to content

Commit dfe9e0c

Browse files
committed
chore(*): Allows row expansion & changes default pinned row expansion behavior
1 parent f35bc03 commit dfe9e0c

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

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,7 +79,7 @@
7979
<ng-container *ngFor="let rowData of data
8080
| visibleColumns:hasVisibleColumns
8181
| treeGridRowPinning:id:pipeTrigger
82-
| treeGridHierarchizing:primaryKey:foreignKey:childDataKey:id:pipeTrigger
82+
| treeGridHierarchizing:primaryKey:foreignKey:childDataKey:id:true:pipeTrigger
8383
| treeGridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger
8484
| treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger; let rowIndex = index">
8585
<ng-container *ngTemplateOutlet="record_template; context: getContext(rowData, rowIndex, true)">
@@ -93,7 +93,7 @@
9393
<ng-template igxGridFor let-rowData [igxGridForOf]="data
9494
| treeGridTransaction:id:pipeTrigger
9595
| visibleColumns:hasVisibleColumns
96-
| treeGridHierarchizing:primaryKey:foreignKey:childDataKey:id:pipeTrigger
96+
| treeGridHierarchizing:primaryKey:foreignKey:childDataKey:id:false:pipeTrigger
9797
| treeGridShadowRows:id:pipeTrigger
9898
| treeGridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger
9999
| treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class IgxTreeGridHierarchizingPipe implements PipeTransform {
2525
}
2626

2727
public transform(collection: any[], primaryKey: string, foreignKey: string, childDataKey: string,
28-
id: string, pipeTrigger: number): ITreeGridRecord[] {
28+
id: string, pinned: boolean = false, pipeTrigger: number): ITreeGridRecord[] {
2929
const grid = this.gridAPI.grid;
3030
let hierarchicalRecords: ITreeGridRecord[] = [];
3131
const treeGridRecordsMap = new Map<any, ITreeGridRecord>();
@@ -39,7 +39,7 @@ export class IgxTreeGridHierarchizingPipe implements PipeTransform {
3939
}
4040

4141
grid.flatData = flatData;
42-
grid.records = treeGridRecordsMap;
42+
grid.records = (pinned) ? grid.records : treeGridRecordsMap;
4343
grid.rootRecords = hierarchicalRecords;
4444
return hierarchicalRecords;
4545
}
@@ -168,11 +168,7 @@ export class IgxTreeGridFlatteningPipe implements PipeTransform {
168168
data.push(hierarchicalRecord);
169169
}
170170

171-
const pinnedRow = this.gridAPI.get_row_by_key(hierarchicalRecord.rowID) !== undefined ?
172-
this.gridAPI.get_row_by_key(hierarchicalRecord.rowID).pinned :
173-
false;
174-
175-
hierarchicalRecord.expanded = this.gridAPI.get_row_expansion_state(hierarchicalRecord) || pinnedRow;
171+
hierarchicalRecord.expanded = this.gridAPI.get_row_expansion_state(hierarchicalRecord);
176172

177173
this.updateNonProcessedRecordExpansion(grid, hierarchicalRecord);
178174

0 commit comments

Comments
 (0)