Skip to content

Commit fdf6c70

Browse files
authored
Merge branch '16.1.x' into rivanova/fix-13691-16.1.x
2 parents 0e9d584 + 9f0b6d7 commit fdf6c70

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -653,11 +653,13 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit, OnDestroy {
653653

654654
protected onFocus() {
655655
const firstIndexInView = this.virtDir.state.startIndex;
656-
this.focusedItem = {
657-
id: this.getItemId(firstIndexInView),
658-
index: firstIndexInView,
659-
checked: this.virtDir.igxForOf[firstIndexInView].isSelected
660-
};
656+
if (this.virtDir.igxForOf.length > 0) {
657+
this.focusedItem = {
658+
id: this.getItemId(firstIndexInView),
659+
index: firstIndexInView,
660+
checked: this.virtDir.igxForOf[firstIndexInView].isSelected
661+
};
662+
}
661663
this.setActiveDescendant();
662664
}
663665

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3698,6 +3698,7 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
36983698
public resetCaches(recalcFeatureWidth = true) {
36993699
if (recalcFeatureWidth) {
37003700
this._headerFeaturesWidth = NaN;
3701+
this.summaryService.summaryHeight = 0;
37013702
}
37023703
this.resetForOfCache();
37033704
this.resetColumnsCaches();

0 commit comments

Comments
 (0)