Skip to content

Commit 2ed8b08

Browse files
committed
chore(*): Some more cleanup regarding pivot horizontal layout.
1 parent 81141ba commit 2ed8b08

File tree

5 files changed

+15
-20
lines changed

5 files changed

+15
-20
lines changed

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,8 @@ import { IMultiRowLayoutNode } from '../public_api';
88
@Injectable()
99
export class IgxPivotGridNavigationService extends IgxGridNavigationService {
1010
public override grid: IgxPivotGridComponent;
11-
protected _isRowHeaderActive = false;
12-
protected _isRowDimensionHeaderActive = false;
13-
14-
public set isRowHeaderActive(value: boolean) {
15-
this._isRowHeaderActive = value;
16-
}
17-
public get isRowHeaderActive() {
18-
return this._isRowHeaderActive;
19-
}
20-
21-
public set isRowDimensionHeaderActive(value: boolean) {
22-
this._isRowDimensionHeaderActive = value;
23-
}
24-
public get isRowDimensionHeaderActive() {
25-
return this._isRowDimensionHeaderActive;
26-
}
11+
public isRowHeaderActive = false;
12+
public isRowDimensionHeaderActive = false;
2713

2814
public get lastRowDimensionsIndex() {
2915
return this.grid.visibleRowDimensions.length - 1;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ export interface IPivotDimensionStrategy {
4848
dimensions: IPivotDimension[],
4949
values: IPivotValue[],
5050
cloneStrategy: IDataCloneStrategy,
51-
pivotKeys?: IPivotKeys,
52-
horizontalRendering?: boolean): any[];
51+
pivotKeys?: IPivotKeys): any[];
5352
}
5453

5554
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<igx-pivot-row-dimension-header-group [ngClass]="rowDimensionColumn.headerGroupClasses"
55
[ngStyle]="rowDimensionColumn.headerGroupStyles | igxHeaderGroupStyle:rowDimensionColumn:grid.pipeTrigger" [column]="rowDimensionColumn"
66
[style.min-width]="getHeaderWidthFromDimension() | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"
7+
[style.width]="getHeaderWidthFromDimension() | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"
78
[style.flex-basis]="getHeaderWidthFromDimension() | igxHeaderGroupWidth:grid.defaultHeaderGroupMinWidth:hasMRL"
89
[rowIndex]="rowIndex"
910
[colIndex]="colIndex"

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,21 @@ export class IgxPivotRowDimensionMrlRowComponent extends IgxGridHeaderRowCompone
5555
return this.getRowMRLTemplate(false, this.rowGroup);
5656
}
5757

58+
/**
59+
* @hidden @internal
60+
*/
5861
@Input()
5962
public rowIndex: number;
6063

64+
/**
65+
* @hidden @internal
66+
*/
6167
@Input()
6268
public rowGroup: IPivotGridRecord[];
6369

70+
/**
71+
* @hidden @internal
72+
*/
6473
@Input()
6574
public groupedData: IPivotGridRecord[][];
6675

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,10 +378,10 @@ export class PivotUtil {
378378
return leafs;
379379
}
380380

381-
public static getRecordKey(rec: IPivotGridRecord, currentDim: IPivotDimension, horizontalRendering: boolean = false) {
381+
public static getRecordKey(rec: IPivotGridRecord, currentDim: IPivotDimension, horizontalLayout: boolean = false) {
382382
const parentFields = [];
383383

384-
if (!horizontalRendering) {
384+
if (!horizontalLayout) {
385385
const currentDimIndex = rec.dimensions.findIndex(x => x.memberName === currentDim.memberName) + 1;
386386
const prevDims = rec.dimensions.slice(0, currentDimIndex);
387387
for (const prev of prevDims) {

0 commit comments

Comments
 (0)