Skip to content

Commit f6f92c9

Browse files
authored
Merge pull request #9532 from IgniteUI/12.0.x
merge 12.0.x into master
2 parents 475986d + 955b442 commit f6f92c9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"web-animations-js": "^2.3.2"
8585
},
8686
"igxDevDependencies": {
87-
"@igniteui/angular-schematics": "~12.0.800-rc.0"
87+
"@igniteui/angular-schematics": "~12.0.800"
8888
},
8989
"ng-update": {
9090
"migrations": "./migrations/migration-collection.json"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,8 +661,8 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
661661
* @param index
662662
*/
663663
public getRowByKey(key: any): RowType {
664-
const rec = this.primaryKey ? this.filteredSortedData.find(r => r[this.primaryKey] === key) :
665-
this.filteredSortedData.find(r => r === key);
664+
const rec = this.filteredSortedData ? this.primaryKey ? this.filteredSortedData.find(r => r[this.primaryKey] === key) :
665+
this.filteredSortedData.find(r => r === key) : undefined;
666666
const index = this.dataView.findIndex(r => r.data && r.data === rec);
667667
if (index < 0 || index >= this.filteredSortedData.length) {
668668
return undefined;

0 commit comments

Comments
 (0)