Skip to content

Commit e7989d7

Browse files
authored
Merge pull request #5669 from IgniteUI/fix-#3918-8.1.x
fix(grid): set flex shrink to 0 for all display containers
2 parents af18f69 + c5de71b commit e7989d7

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

projects/igniteui-angular/src/lib/core/styles/components/_common/_igx-display-container.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
position: relative;
44
width: 100%;
55
overflow: hidden;
6+
flex-shrink: 0;
67
}
78

89
%display-container--inactive {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1342,10 +1342,13 @@ describe('IgxGrid Component Tests', () => {
13421342
fix.detectChanges();
13431343
await wait(16);
13441344
// check UI
1345+
const rowSelectorHeader = fix.nativeElement.querySelector('.igx-grid__thead').querySelector('.igx-grid__cbx-selection');
13451346
const header0 = fix.debugElement.queryAll(By.css('igx-grid-header-group'))[0];
13461347
const header1 = fix.debugElement.queryAll(By.css('igx-grid-header-group'))[1];
13471348
const header2 = fix.debugElement.queryAll(By.css('igx-grid-header-group'))[2];
1348-
expect(header0.nativeElement.offsetWidth).toEqual(Math.round(0.7 * grid.unpinnedWidth));
1349+
const expectedWidth = Math.round(0.7 * (grid.unpinnedWidth + rowSelectorHeader.offsetWidth));
1350+
expect(header0.nativeElement.offsetWidth).toBeGreaterThanOrEqual(expectedWidth - 1);
1351+
expect(header0.nativeElement.offsetWidth).toBeLessThanOrEqual(expectedWidth + 1);
13491352
expect(header1.nativeElement.offsetWidth).toEqual(136);
13501353
expect(header2.nativeElement.offsetWidth).toEqual(136);
13511354
expect(hScroll.nativeElement.hidden).toBe(false);

0 commit comments

Comments
 (0)