Skip to content

Commit e9c29e3

Browse files
authored
Merge branch 'master' into drop-down-border-radius
2 parents 174e24f + d04e75c commit e9c29e3

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4624,7 +4624,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
46244624
const columnsToSize = this.hasColumnLayouts ?
46254625
combinedBlocksSize - columnsWithSetWidths.length :
46264626
visibleChildColumns.length - columnsWithSetWidths.length;
4627-
46284627
const sumExistingWidths = columnsWithSetWidths
46294628
.reduce((prev, curr) => {
46304629
const colWidth = curr.width;
@@ -4635,12 +4634,17 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
46354634
return prev + currWidth;
46364635
}, 0);
46374636

4637+
// When all columns are hidden, return 0px width
4638+
if (!sumExistingWidths && !columnsToSize) {
4639+
return '0px';
4640+
}
4641+
46384642
const columnWidth = Math.floor(!Number.isFinite(sumExistingWidths) ?
46394643
Math.max(computedWidth / columnsToSize, MINIMUM_COLUMN_WIDTH) :
46404644
Math.max((computedWidth - sumExistingWidths) / columnsToSize, MINIMUM_COLUMN_WIDTH));
46414645

46424646
return columnWidth + 'px';
4643-
}
4647+
}
46444648

46454649
/**
46464650
* @hidden

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,9 @@ describe('Column Hiding UI #grid', () => {
620620
grid.columnList.forEach((col) => col.hidden = true);
621621
tick(30);
622622
fix.detectChanges();
623+
grid.columnList.forEach((col) => {
624+
expect(col.width).toBe('0px');
625+
});
623626
fixEl = fix.nativeElement, gridEl = grid.nativeElement;
624627

625628
tHeadItems = fixEl.querySelector('igx-grid-header-group');

0 commit comments

Comments
 (0)