Skip to content

Commit 2f2f55c

Browse files
MKirovaMKirova
authored andcommitted
Change default expand state on init.
1 parent 6aadc50 commit 2f2f55c

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
8282

8383
public columnGroupStates = new Map<IgxColumnGroupComponent, boolean>();
8484
public isPivot = true;
85+
protected _defaultExpandState = true;
8586
private _data;
8687
private _filteredData;
8788
private p_id = `igx-pivot-grid-${NEXT_ID++}`;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class IgxPivotRowPipe implements PipeTransform {
2929
// apply aggregations based on the created groups
3030
// PivotUtil.applyAggregations(hierarchies, values, pivotKeys);
3131
// generate flat data from the hierarchies
32-
const data = PivotUtil.flattenHierarchy(hierarchies, collection[0] ?? [], rows, pivotKeys, 0, expansionStates);
32+
const data = PivotUtil.flattenHierarchy(hierarchies, collection[0] ?? [], rows, pivotKeys, 0, expansionStates, true);
3333
return data;
3434
}
3535
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<igx-icon *ngIf="hasChild" [attr.draggable]="false"
103103
(click)="grid.toggleRow(rowDimensionKey)"
104104
style='cursor: pointer;'>
105-
{{grid.expansionStates.get(rowDimensionKey) ? 'expand_more' : 'expand_less'}}</igx-icon>
105+
{{ expandState ? 'expand_more' : 'expand_less'}}</igx-icon>
106106
{{column.header}}
107107
</div>
108108
</ng-template>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ export class IgxPivotRowComponent extends IgxRowDirective<IgxPivotGridComponent>
6262
return this.rowDimension.map(x => x.header).join('_');
6363
}
6464

65+
public get expandState() {
66+
return this.grid.gridAPI.get_row_expansion_state(this.rowDimensionKey);
67+
}
68+
6569
public ngOnInit() {
6670
// generate rowDimension
6771
const rowDimConfig = this.grid.pivotConfiguration.rows;

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-util.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ export class PivotUtil {
6161
return result;
6262
}
6363

64-
public static flattenHierarchy(hierarchies, rec, dims, pivotKeys, level = 0, expansionStates: Map<any, boolean>) {
64+
public static flattenHierarchy(hierarchies, rec, dims, pivotKeys, level = 0,
65+
expansionStates: Map<any, boolean>, defaultExpandState: boolean) {
6566
const flatData = [];
6667
for (const dim of dims) {
6768
hierarchies.forEach((h, key) => {
@@ -72,10 +73,11 @@ export class PivotUtil {
7273
obj = { ...obj, ...h[pivotKeys.aggregations] };
7374
obj[pivotKeys.level] = level;
7475
flatData.push(obj);
75-
const isExpanded = expansionStates.get(key);
76+
const isExpanded = expansionStates.get(key) === undefined ? defaultExpandState : expansionStates.get(key);
77+
7678
if (h[pivotKeys.children] && h[pivotKeys.children].size > 0) {
7779
obj[pivotKeys.records] = this.flattenHierarchy(h[pivotKeys.children], rec,
78-
dim.childLevels, pivotKeys, level + 1, expansionStates);
80+
dim.childLevels, pivotKeys, level + 1, expansionStates, defaultExpandState);
7981
if (isExpanded) {
8082
for (const record of obj[pivotKeys.records]) {
8183
flatData.push(record);

0 commit comments

Comments
 (0)