Skip to content

Commit 760d59c

Browse files
committed
chore(*): Merge upstream master
2 parents f061ffd + 92cb1e7 commit 760d59c

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

-1
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@
424424
grid-row: 2;
425425
border-bottom: 1px dotted igx-color($palette, 'grays', 400);
426426
z-index: 2;
427-
display: table;
428427

429428
%grid__group-indentation {
430429
&::after {

projects/igniteui-angular/src/lib/grid/grid.pinning.spec.ts

+15-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ describe('IgxGrid - Column Pinning ', () => {
220220
const currentColumn = 'ProductName';
221221
const releasedColumn = 'Released';
222222

223-
grid.sort({fieldName: currentColumn, dir: SortingDirection.Asc});
223+
grid.sort({ fieldName: currentColumn, dir: SortingDirection.Asc });
224224

225225
fix.detectChanges();
226226

@@ -518,6 +518,7 @@ describe('IgxGrid - Column Pinning ', () => {
518518
expect(grid.pinnedColumns.length).toEqual(1);
519519
expect(grid.unpinnedColumns.length).toEqual(9);
520520
});
521+
521522
it('should allow hiding columns in the unpinned area.', () => {
522523

523524
const fix = TestBed.createComponent(GridPinningComponent);
@@ -601,6 +602,19 @@ describe('IgxGrid - Column Pinning ', () => {
601602
expect(grid.columns[6].pinned).toBe(true);
602603
expect(grid.unpinnedWidth).toBeGreaterThanOrEqual(grid.unpinnedAreaMinWidth);
603604
});
605+
606+
it('should not have grid layout row with width that extends pass the container\'s one', () => {
607+
const fix = TestBed.createComponent(GridPinningComponent);
608+
fix.detectChanges();
609+
const grid = fix.componentInstance.instance;
610+
611+
grid.getColumnByName('Phone').pinned = true;
612+
fix.detectChanges();
613+
614+
const gridChildren = Array.prototype.slice.call(grid.nativeElement.children);
615+
const gridWidth = grid.nativeElement.getBoundingClientRect().width;
616+
gridChildren.forEach(elem => expect(elem.getBoundingClientRect().width).toEqual(gridWidth));
617+
});
604618
});
605619
@Component({
606620
template: `

0 commit comments

Comments
 (0)