Skip to content

Commit 2e08303

Browse files
authored
Merge pull request #10062 from IgniteUI/sstoychev/width-height-null-12.1
fix(grid): adding null as possible value for width and height #9980 - 12.1
2 parents 4396425 + 67f0261 commit 2e08303

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,11 +1597,11 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
15971597
@WatchChanges()
15981598
@HostBinding('style.height')
15991599
@Input()
1600-
public get height() {
1600+
public get height(): string | null {
16011601
return this._height;
16021602
}
16031603

1604-
public set height(value: string) {
1604+
public set height(value: string | null) {
16051605
if (this._height !== value) {
16061606
this._height = value;
16071607
this.nativeElement.style.height = value;
@@ -1627,11 +1627,11 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
16271627
*/
16281628
@WatchChanges()
16291629
@Input()
1630-
public get width() {
1630+
public get width(): string | null {
16311631
return this._width;
16321632
}
16331633

1634-
public set width(value) {
1634+
public set width(value: string | null) {
16351635
if (this._width !== value) {
16361636
this._width = value;
16371637
this.nativeElement.style.width = value;
@@ -2942,8 +2942,8 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
29422942
private rowListDiffer;
29432943
private _hiddenColumnsText = '';
29442944
private _pinnedColumnsText = '';
2945-
private _height = '100%';
2946-
private _width = '100%';
2945+
private _height: string | null = '100%';
2946+
private _width: string | null = '100%';
29472947
private _rowHeight;
29482948
private _horizontalForOfs: Array<IgxGridForOfDirective<any>> = [];
29492949
private _multiRowLayoutRowSize = 1;

0 commit comments

Comments
 (0)