Skip to content

Commit f32d3a8

Browse files
authored
Merge branch 'vnext' into mkirkova/fix-linear-progress-dynamic-3306
2 parents 8f1ca56 + cad68ba commit f32d3a8

4 files changed

Lines changed: 26 additions & 20 deletions

File tree

package-lock.json

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
"bootstrap": "^5.2.3",
6666
"file-saver": "^2.0.2",
6767
"hammerjs": "^2.0.8",
68-
"igniteui-angular": "^16.0.0-rc.0",
68+
"igniteui-angular": "^16.0.0",
6969
"igniteui-angular-charts": "^15.0.1",
7070
"igniteui-angular-core": "^15.0.1",
7171
"igniteui-angular-extras": "^16.0.2",
72-
"igniteui-angular-i18n": "^15.1.5",
72+
"igniteui-angular-i18n": "^16.0.0",
7373
"igniteui-dockmanager": "^1.12.4",
7474
"igniteui-live-editing": "^2.0.7",
7575
"igniteui-theming": "^1.2.0",

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)