Skip to content

Commit 6e76efa

Browse files
committed
Merge branch 'pivot-grid-master' of https://github.com/IgniteUI/igniteui-angular into dkamburov/pivot-keyboard-nav
2 parents 08197bc + a9229b8 commit 6e76efa

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
8989
* Emitted when the dimension collection is changed via the grid chip area.
9090
*
9191
* @remarks
92-
* Returns the new dimension collection and its type:
92+
* Returns the new dimension collection and its type:
9393
* @example
9494
* ```html
9595
* <igx-pivot-grid #grid [data]="localData" [height]="'305px'" [autoGenerate]="true"
@@ -316,7 +316,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
316316
public get defaultExpandState() {
317317
return this._defaultExpandState;
318318
}
319-
319+
320320
public set defaultExpandState(val: boolean) {
321321
this._defaultExpandState = val;
322322
}
@@ -1114,7 +1114,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
11141114
ref.instance.header = parent != null ? key.split(parent.header + '-')[1] : key;
11151115
ref.instance.field = key;
11161116
ref.instance.parent = parent;
1117-
ref.instance.width = value.dimension.width || MINIMUM_COLUMN_WIDTH + 'px';
1117+
ref.instance.width = value.dimension?.width || MINIMUM_COLUMN_WIDTH + 'px';
11181118
ref.instance.dataType = this.pivotConfiguration.values[0]?.dataType || this.resolveDataTypes(data[0][key]);
11191119
ref.instance.formatter = this.pivotConfiguration.values[0]?.formatter;
11201120
ref.instance.sortable = true;
@@ -1150,13 +1150,13 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
11501150
refSibling.instance.header = parent != null ? key.split(parent.header + '-')[1] : key;
11511151
refSibling.instance.field = key;
11521152
refSibling.instance.parent = parent;
1153-
ref.instance.width = value.dimension.width || MINIMUM_COLUMN_WIDTH + 'px';
1153+
ref.instance.width = value.dimension?.width || MINIMUM_COLUMN_WIDTH + 'px';
11541154
ref.instance.sortable = true;
11551155
refSibling.instance.dataType = this.pivotConfiguration.values[0]?.dataType || this.resolveDataTypes(data[0][key]);
11561156
refSibling.instance.formatter = this.pivotConfiguration.values[0]?.formatter;
11571157
columns.push(refSibling.instance);
11581158

1159-
measureChildren = this.getMeasureChildren(factoryColumn, data, refSibling.instance, false, value.dimension.width);
1159+
measureChildren = this.getMeasureChildren(factoryColumn, data, refSibling.instance, false, value.dimension?.width);
11601160
refSibling.instance.children.reset(measureChildren);
11611161
columns = columns.concat(measureChildren);
11621162
}
@@ -1169,7 +1169,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
11691169
refSibling.instance.header = parent != null ? key.split(parent.header + '-')[1] : key;
11701170
refSibling.instance.field = key;
11711171
refSibling.instance.parent = parent;
1172-
ref.instance.width = value.dimension.width || MINIMUM_COLUMN_WIDTH + 'px';
1172+
ref.instance.width = value.dimension?.width || MINIMUM_COLUMN_WIDTH + 'px';
11731173
ref.instance.sortable = true;
11741174
refSibling.instance.dataType = this.pivotConfiguration.values[0]?.dataType || this.resolveDataTypes(data[0][key]);
11751175
refSibling.instance.formatter = this.pivotConfiguration.values[0]?.formatter;

0 commit comments

Comments
 (0)