Skip to content

Commit 7f70490

Browse files
committed
fix(column): remove defaultMinWidth fallback
1 parent c24fd27 commit 7f70490

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -968,8 +968,9 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
968968
*/
969969
public get minWidthPx() {
970970
const gridAvailableSize = this.grid.calcWidth;
971-
const isPercentageWidth = this.minWidth && typeof this.minWidth === 'string' && this.minWidth.indexOf('%') !== -1;
972-
return isPercentageWidth ? parseFloat(this.minWidth) / 100 * gridAvailableSize : parseFloat(this.minWidth);
971+
const minWidth = this.minWidth || this.defaultMinWidth;
972+
const isPercentageWidth = minWidth && typeof minWidth === 'string' && minWidth.indexOf('%') !== -1;
973+
return isPercentageWidth ? parseFloat(minWidth) / 100 * gridAvailableSize : parseFloat(minWidth);
973974
}
974975

975976
/**
@@ -986,8 +987,9 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
986987
*/
987988
public get minWidthPercent() {
988989
const gridAvailableSize = this.grid.calcWidth;
989-
const isPercentageWidth = this.minWidth && typeof this.minWidth === 'string' && this.minWidth.indexOf('%') !== -1;
990-
return isPercentageWidth ? parseFloat(this.minWidth) : parseFloat(this.minWidth) / gridAvailableSize * 100;
990+
const minWidth = this.minWidth || this.defaultMinWidth;
991+
const isPercentageWidth = minWidth && typeof minWidth === 'string' && minWidth.indexOf('%') !== -1;
992+
return isPercentageWidth ? parseFloat(minWidth) : parseFloat(minWidth) / gridAvailableSize * 100;
991993
}
992994

993995

@@ -1012,11 +1014,10 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
10121014
return;
10131015
}
10141016
this._defaultMinWidth = value;
1015-
this.minWidthSetByUser = true;
10161017
this.grid.notifyChanges(true);
10171018
}
10181019
public get minWidth(): string {
1019-
return !this._defaultMinWidth ? this.defaultMinWidth : this._defaultMinWidth;
1020+
return this._defaultMinWidth;
10201021
}
10211022

10221023
/** @hidden @internal **/
@@ -1786,10 +1787,6 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
17861787
* @hidden
17871788
*/
17881789
public widthConstrained = false;
1789-
/**
1790-
* @hidden
1791-
*/
1792-
public minWidthSetByUser = false;
17931790

17941791
/**
17951792
* @hidden
@@ -2653,7 +2650,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
26532650
this._calcWidth = this.getConstrainedSizePx(currentCalcWidth);
26542651
} else {
26552652
let possibleColumnWidth = '';
2656-
if (!this.widthSetByUser && this.minWidthSetByUser && this.userSetMinWidthPx < this.grid.minColumnWidth) {
2653+
if (!this.widthSetByUser && this.userSetMinWidthPx && this.userSetMinWidthPx < this.grid.minColumnWidth) {
26572654
possibleColumnWidth = this.defaultWidth = this.grid.getPossibleColumnWidth(null, this.userSetMinWidthPx);
26582655
} else {
26592656
possibleColumnWidth = this.width;

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,7 @@ export abstract class IgxHierarchicalGridBaseDirective extends IgxGridBaseDirect
273273
mirror.inputs.forEach((input) => {
274274
const propName = input.propName;
275275
if (!(col[propName] instanceof IgxSummaryOperand)) {
276-
if (propName === 'minWidth') {
277-
const minWidthSetByUser = col.minWidthSetByUser;
278-
ref.instance[propName] = col[propName];
279-
ref.instance.minWidthSetByUser = minWidthSetByUser;
280-
} else {
281-
ref.instance[propName] = col[propName];
282-
}
276+
ref.instance[propName] = col[propName];
283277
} else {
284278
ref.instance[propName] = col[propName].constructor;
285279
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
531531
expect(pivotGrid.gridSize).toBe(Size.Small);
532532
const dimensionContents = fixture.debugElement.queryAll(By.css('.igx-grid__tbody-pivot-dimension'));
533533
let rowHeaders = dimensionContents[0].queryAll(By.directive(IgxPivotRowDimensionHeaderGroupComponent));
534-
expect(rowHeaders[0].componentInstance.column.minWidth).toBe(minWidthSupercompact);
534+
expect(rowHeaders[0].componentInstance.column.defaultMinWidth).toBe(minWidthSupercompact);
535535
expect(pivotGrid.rowList.first.cells.first.nativeElement.offsetHeight).toBe(cellHeightSuperCompact);
536536

537537
pivotGrid.superCompactMode = false;
@@ -543,7 +543,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
543543

544544
expect(pivotGrid.gridSize).toBe(Size.Large);
545545
rowHeaders = dimensionContents[0].queryAll(By.directive(IgxPivotRowDimensionHeaderGroupComponent));
546-
expect(rowHeaders[0].componentInstance.column.minWidth).toBe(minWidthComf);
546+
expect(rowHeaders[0].componentInstance.column.defaultMinWidth).toBe(minWidthComf);
547547
expect(pivotGrid.rowList.first.cells.first.nativeElement.offsetHeight).toBe(cellHeightComf);
548548
}));
549549

@@ -2411,7 +2411,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
24112411
fixture.detectChanges();
24122412

24132413
rowHeaders = dimensionContents[0].queryAll(By.directive(IgxPivotRowDimensionHeaderGroupComponent));
2414-
const minWdith = parseFloat(rowHeaders[0].componentInstance.column.minWidth);
2414+
const minWdith = parseFloat(rowHeaders[0].componentInstance.column.defaultMinWidth);
24152415
expect(parseFloat(rowHeaders[0].componentInstance.column.width)).toEqual(minWdith);
24162416
expect(parseFloat(rowHeaders[3].componentInstance.column.width)).toEqual(minWdith);
24172417

0 commit comments

Comments
 (0)