Skip to content

fix(datepicker): correct month navigation and focus updates within date bounds #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrasincze merged 1 commit into from
Oct 19, 2026
Merged

fix(datepicker): correct month navigation and focus updates within date bounds #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions projects/widgets/datepicker/calendar/calendar.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { IdsDatepickerView, IdsDatepickerViewType } from '../tokens/datepicker-v
import { IdsYearSelectorComponent } from '../year-selector/year-selector.component';

import { CdkTrapFocus } from '@angular/cdk/a11y';
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, computed, inject, input, linkedSignal, OnInit, output, viewChild, ViewEncapsulation } from '@angular/core';
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, computed, inject, input, linkedSignal, OnInit, output, untracked, viewChild, ViewEncapsulation } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { IdsButtonComponent } from '@i-cell/ids-angular/button';
import { clampDate, ComponentBaseWithDefaults, IdsSize, IdsSizeType, isValidDate, startOfMonth, startOfYear } from '@i-cell/ids-angular/core';
Expand Down Expand Up @@ -91,11 +91,21 @@ export class IdsCalendarComponent extends ComponentBaseWithDefaults<object> impl
this._view() === IdsDatepickerView.DAY ? this._intl.switchToYearSelectorLabel : this._intl.switchToDaySelectorLabel
));

protected _focusedDate: Date = new Date();
protected _focusedDate = linkedSignal<{ min: Date | null; max: Date | null }, Date>({
source: () => ({
min: this.min(),
max: this.max(),
}),
computation: ({ min, max }, previous): Date => {
const date = previous ? previous.value : untracked(() => this.value());
const safeValue = isValidDate(date) ? date : new Date();
return clampDate(safeValue, min, max);
},
equal: (previous, current) => previous.getTime() === current.getTime(),
});

public ngOnInit(): void {
this._intl.changes.pipe(takeUntilDestroyed(this._destroyRef)).subscribe(() => this._cdRef.markForCheck());
this._setFocusedDate(this.value());
}

protected _selectYear(selectedYear: Date): void {
Expand Down Expand Up @@ -144,7 +154,7 @@ export class IdsCalendarComponent extends ComponentBaseWithDefaults<object> impl

private _setFocusedDate(date: Date | null): void {
const safeValue = isValidDate(date) ? date : new Date();
this._focusedDate = clampDate(safeValue, this.min(), this.max());
this._focusedDate.set(clampDate(safeValue, this.min(), this.max()));
this._cdRef.markForCheck();
}
}
4 changes: 2 additions & 2 deletions projects/widgets/datepicker/datepicker.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ export class IdsDatepickerDirective extends DirectiveBaseWithDefaults<IdsDatepic
return;
}

if (!equalDates(min, calendar.min())) {
if (min?.getTime() !== calendar.min()?.getTime()) {
this._componentRef?.setInput('min', min);
}
if (!equalDates(max, calendar.max())) {
if (max?.getTime() !== calendar.max()?.getTime()) {
this._componentRef?.setInput('max', max);
}
if (view !== calendar.view()) {
Expand Down
16 changes: 10 additions & 6 deletions projects/widgets/datepicker/day-selector/day-selector.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ export class IdsDaySelectorComponent extends IdsCalendarPage {
protected _weekdayLabels = computed<string[]>(() =>
this._days().slice(0, daysPerWeek).map((date: Date) => this._intl.getWeekdayHeaderLabel(date) ?? ''));

private _isRangeEmpty = computed(() => {
const min = this.min();
const max = this.max();
return isValidDate(min) && isValidDate(max) && compareDates(min, max) > 0;
});

public override hasPreviousPage(): boolean {
const dayOnPrevPage = addDays(this._gridStartDate(), -1);
const min = this.min() ?? dayOnPrevPage;
const min = this.min();

return compareDates(dayOnPrevPage, min) > -1;
return !this._isRangeEmpty() && (!isValidDate(min) || compareDates(startOfMonth(min), this._currentMonth()) < 0);
}

public override gotoPreviousPage(): void {
Expand All @@ -50,10 +55,9 @@ export class IdsDaySelectorComponent extends IdsCalendarPage {
}

public override hasNextPage(): boolean {
const dayOnNextPage = addDays(this._gridEndDate(), 1);
const max = this.max() ?? dayOnNextPage;
const max = this.max();

return compareDates(dayOnNextPage, max) < 1;
return !this._isRangeEmpty() && (!isValidDate(max) || compareDates(startOfMonth(max), this._currentMonth()) > 0);
}

public override gotoNextPage(): void {
Expand Down
Loading