Skip to content

Commit 03f2cae

Browse files
authored
Merge pull request #3257 from IgniteUI/EWhite/3250-grid-samples-height
fix(grid height): add height to grid and light-dark mode
2 parents 1a5b800 + 30faf20 commit 03f2cae

7 files changed

Lines changed: 43 additions & 11 deletions

File tree

src/app/grid/grid-sample-pinning/grid-toolbar-pinning.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="grid__wrapper" style='width: 100%;'>
1+
<div [ngClass]="{'grid__wrapper': true, 'dark-theme': dark === true }" style='width: 100%;'>
22
<igx-grid [igxPreventDocumentScroll]="true" #grid1 [data]="data" [width]="'100%'" [height]="'480px'">
33
<igx-grid-toolbar>
44
<igx-grid-toolbar-actions>

src/app/grid/grid-sample-pinning/grid-toolbar-pinning.component.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Component, ViewChild, ViewEncapsulation, OnInit } from '@angular/core';
22
import { IgxColumnComponent, IgxGridComponent } from 'igniteui-angular';
33
import { DATA } from '../../data/customers';
4+
import { ActivatedRoute } from '@angular/router';
45

56
@Component({
67
encapsulation: ViewEncapsulation.None,
@@ -14,8 +15,12 @@ import { DATA } from '../../data/customers';
1415
export class PinningToolbarSampleComponent implements OnInit{
1516
@ViewChild('grid1', { static: true }) public grid1: IgxGridComponent;
1617

18+
public dark = false;
1719
public data: any[];
1820
public columns: any[];
21+
22+
constructor(private activatedRoute: ActivatedRoute) {}
23+
1924
public ngOnInit(): void {
2025
this.columns = [
2126
{ field: 'CompanyName', header: 'Company Name', width: 300 },
@@ -29,6 +34,10 @@ export class PinningToolbarSampleComponent implements OnInit{
2934
{ field: 'Fax', header: 'Fax', width: 150 }
3035
];
3136
this.data = DATA;
37+
38+
this.activatedRoute.queryParams.subscribe(params => {
39+
this.dark = !!params.dark;
40+
});
3241
}
3342

3443
public toggleColumn(col: IgxColumnComponent) {

src/app/hierarchical-grid/hierarchical-grid-column-pinning/hierarchical-grid-toolbar-pinning.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="grid__wrapper">
1+
<div [ngClass]="{'grid__wrapper': true, 'dark-theme': dark === true }">
22
<igx-hierarchical-grid [igxPreventDocumentScroll]="true" class="hierarchicalGrid" [data]="localdata" [autoGenerate]="false"
33
[height]="'100%'" [width]="'100%'" #hierarchicalGrid>
44
<igx-grid-toolbar>

src/app/hierarchical-grid/hierarchical-grid-column-pinning/hierarchical-grid-toolbar-pinning.component.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
width: 100%;
33
}
44

5+
:host {
6+
height: 110vh;
7+
}
8+
59
.grid__wrapper {
6-
margin: 0 auto;
7-
padding: 16px;
10+
margin: 0 auto 4rem;
11+
padding: 1rem;
12+
height: 100%;
813
}
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
1-
import { Component } from '@angular/core';
1+
import { Component, OnInit } from '@angular/core';
22
import { CUSTOMERS } from '../../data/hierarchical-data';
3+
import { ActivatedRoute } from '@angular/router';
34

45
@Component({
56
selector: 'app-hierarchical-grid-toolbar-pinning',
67
styleUrls: ['./hierarchical-grid-toolbar-pinning.component.scss'],
78
templateUrl: 'hierarchical-grid-toolbar-pinning.component.html'
89
})
9-
export class HGridToolbarPinningComponent {
10+
export class HGridToolbarPinningComponent implements OnInit {
1011
public localdata;
12+
public dark = false;
1113

12-
constructor() {
14+
constructor(private activatedRoute: ActivatedRoute) {
1315
this.localdata = CUSTOMERS;
1416
}
17+
18+
public ngOnInit(): void {
19+
this.activatedRoute.queryParams.subscribe(params => {
20+
this.dark = !!params.dark;
21+
});
22+
}
23+
1524
}
25+

src/app/tree-grid/tree-grid-column-pinning-sample/tree-grid-toolbar-pinning.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="grid__wrapper">
1+
<div [ngClass]="{'grid__wrapper': true, 'dark-theme': dark === true }">
22
<igx-tree-grid [igxPreventDocumentScroll]="true" #treeGrid [data]="data" primaryKey="ID" foreignKey="ParentID" [autoGenerate]="false" height="600px"
33
width="100%">
44
<igx-grid-toolbar>
Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { Component, ViewChild } from '@angular/core';
1+
import { Component, ViewChild, OnInit } from '@angular/core';
22
import { IgxTreeGridComponent } from 'igniteui-angular';
33
import { generateEmployeeDetailedFlatData } from '../data/employees-flat-detailed';
4+
import { ActivatedRoute } from '@angular/router';
45

56
@Component({
67
providers: [],
@@ -10,11 +11,18 @@ import { generateEmployeeDetailedFlatData } from '../data/employees-flat-detaile
1011

1112
})
1213

13-
export class TreeGridPinningToolbarSampleComponent {
14+
export class TreeGridPinningToolbarSampleComponent implements OnInit {
1415
@ViewChild('treeGrid', { static: true }) public treeGrid: IgxTreeGridComponent;
1516
public data: any[];
17+
public dark = false;
1618

17-
constructor() {
19+
constructor(private activatedRoute: ActivatedRoute) {
1820
this.data = generateEmployeeDetailedFlatData();
1921
}
22+
23+
public ngOnInit(): void {
24+
this.activatedRoute.queryParams.subscribe(params => {
25+
this.dark = !!params.dark;
26+
});
27+
}
2028
}

0 commit comments

Comments
 (0)