Skip to content

Commit ab29858

Browse files
authored
Merge branch '9.1.x' into ibarakov/fix-8372-9.1.x
2 parents 315a798 + b5c3821 commit ab29858

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
616616

617617
private generateUniqueValues(columnValues: any[]) {
618618
if (this.column.dataType === DataType.String && this.column.filteringIgnoreCase) {
619-
const filteredUniqueValues = columnValues.map(s => s?.toLowerCase())
619+
const filteredUniqueValues = columnValues.map(s => s?.toString().toLowerCase())
620620
.reduce((map, val, i) => map.get(val) ? map : map.set(val, columnValues[i]),
621621
new Map);
622622

projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ export class IgxGridNavigationService {
183183
}
184184

185185
focusFirstCell(header = true) {
186-
if (this.grid.dataView.length && this.activeNode &&
186+
if ((header || this.grid.dataView.length) && this.activeNode &&
187187
(this.activeNode.row === -1 || this.activeNode.row === this.grid.dataView.length)) { return; }
188188
this.activeNode = { row: header ? -1 : this.grid.dataView.length, column: 0,
189189
level: this.grid.hasColumnLayouts ? 1 : 0, mchCache: { level: 0, visibleIndex: 0} };

0 commit comments

Comments
 (0)