Skip to content

Commit f0b5de3

Browse files
authored
Merge branch 'vnext' into update-samples-configs
2 parents 6ad579a + a475d3f commit f0b5de3

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

src/app/data-display/linear-progressbar/linear-dynamic-sample/linear-dynamic-sample.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class LinearDynamicSampleComponent implements OnInit{
1010
public currentValue: number;
1111

1212
public ngOnInit() {
13-
this.currentValue = 0;
13+
this.currentValue = 50;
1414
}
1515

1616
public incrementProgress() {

src/app/grid/grid-sorting-sample/grid-sorting-sample.component.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable @typescript-eslint/naming-convention */
2-
import { Component, OnInit, ViewChild } from '@angular/core';
2+
import { Component, OnInit, AfterViewInit, ViewChild } from '@angular/core';
33
import { DefaultSortingStrategy, IgxGridComponent, ISortingOptions, SortingDirection } from 'igniteui-angular';
44
import { DATA } from '../../data/localData';
55

@@ -9,7 +9,7 @@ import { DATA } from '../../data/localData';
99
templateUrl: 'grid-sorting-sample.component.html'
1010
})
1111

12-
export class SortingSampleComponent implements OnInit {
12+
export class SortingSampleComponent implements OnInit, AfterViewInit {
1313
@ViewChild('grid1', { read: IgxGridComponent, static: true })
1414
public grid1: IgxGridComponent;
1515
public data: any[];
@@ -26,6 +26,9 @@ export class SortingSampleComponent implements OnInit {
2626

2727
public ngOnInit(): void {
2828
this.data = DATA;
29+
}
30+
31+
public ngAfterViewInit(): void {
2932
this.grid1.sortingExpressions = [
3033
{
3134
dir: SortingDirection.Asc, fieldName: 'CategoryName',

src/app/tree-grid/tree-grid-sorting-sample/tree-grid-sorting-sample.component.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit, ViewChild } from '@angular/core';
1+
import { Component, OnInit, ViewChild, AfterViewInit } from '@angular/core';
22
import { DefaultSortingStrategy, IgxTreeGridComponent, ISortingOptions, SortingDirection } from 'igniteui-angular';
33
import { ORDERS_DATA } from '../data/orders';
44

@@ -8,7 +8,7 @@ import { ORDERS_DATA } from '../data/orders';
88
templateUrl: 'tree-grid-sorting-sample.component.html'
99
})
1010

11-
export class TreeGridSortingSampleComponent implements OnInit {
11+
export class TreeGridSortingSampleComponent implements OnInit, AfterViewInit {
1212
@ViewChild('treegrid1', { read: IgxTreeGridComponent, static: true })
1313
public treegrid1: IgxTreeGridComponent;
1414
public data: any[];
@@ -35,6 +35,9 @@ export class TreeGridSortingSampleComponent implements OnInit {
3535

3636
public ngOnInit(): void {
3737
this.data = ORDERS_DATA;
38+
}
39+
40+
public ngAfterViewInit(): void {
3841
this.treegrid1.sortingExpressions = [
3942
{ dir: SortingDirection.Asc, fieldName: 'UnitPrice',
4043
ignoreCase: true, strategy: DefaultSortingStrategy.instance() }

0 commit comments

Comments
 (0)