Skip to content

Commit 0aa410b

Browse files
authored
Merge branch '9.0.x' into dmdimitrov/issue7480-9.0.x
2 parents eed025d + 68728a5 commit 0aa410b

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

projects/igniteui-angular/src/lib/calendar/calendar-base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ export class IgxCalendarBaseDirective implements ControlValueAccessor {
379379
const result = [];
380380
start = this.getDateOnly(start);
381381
end = this.getDateOnly(end);
382-
while (start.getTime() !== end.getTime()) {
382+
while (start.getTime() < end.getTime()) {
383383
start = this.calendarModel.timedelta(start, 'day', 1);
384384
result.push(start);
385385
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2495,11 +2495,10 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
24952495
this.zone.run(() => {
24962496
this.zone.onStable.pipe(first()).subscribe(() => {
24972497
this.verticalScrollContainer.onChunkLoad.emit(this.verticalScrollContainer.state);
2498+
if (this.rowEditable) {
2499+
this.changeRowEditingOverlayStateOnScroll(this.rowInEditMode);
2500+
}
24982501
});
2499-
2500-
if (this.rowEditable) {
2501-
this.changeRowEditingOverlayStateOnScroll(this.rowInEditMode);
2502-
}
25032502
});
25042503
this.disableTransitions = false;
25052504

0 commit comments

Comments
 (0)