Skip to content

Commit eb981ee

Browse files
committed
chore(*): Fix failing tests
1 parent 293eaf8 commit eb981ee

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4840,9 +4840,15 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
48404840
*/
48414841
protected getExtremumBasedColWidth(column: IgxColumnComponent): string {
48424842
let width = this._columnWidth;
4843-
if (column.minWidthPx > parseFloat(width)) {
4843+
const minWidth = this._columnWidth.indexOf('%') === -1 ? column.minWidthPx : column.minWidthPercent;
4844+
const maxWidth = this._columnWidth.indexOf('%') === -1 ? column.maxWidthPx : column.maxWidthPercent;
4845+
if (column.hidden) {
4846+
return width;
4847+
}
4848+
4849+
if (minWidth > parseFloat(width)) {
48444850
width = column.minWidth;
4845-
} else if (column.maxWidthPx < parseFloat(width)) {
4851+
} else if (maxWidth < parseFloat(width)) {
48464852
width = column.maxWidth;
48474853
}
48484854

0 commit comments

Comments
 (0)