Skip to content

fix: include final constrained year in CalendarYearPicker #10536

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

Open
ZedingZhang wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −5
Open

fix: include final constrained year in CalendarYearPicker #10536

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: 17 additions & 1 deletion packages/react-aria-components/test/Calendar.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ describe('Calendar', () => {
value={value}
onChange={e => onChange(e.target.value)}>
{items.map(item => (
<option key={item.id} value={item.id}>
<option key={item.id} value={item.id} data-date={item.date.toString()}>
{item.formatted}
</option>
))}
Expand Down Expand Up @@ -968,6 +968,22 @@ describe('Calendar', () => {
.map(o => o.textContent)
).toEqual(Array.from({length: 7}, (_, i) => String(i + 2020)));

tree.rerender(
<YearPickerExample
key="cross-year-range"
calendarProps={{
minValue: new CalendarDate(2024, 8, 3),
maxValue: new CalendarDate(2025, 2, 3),
focusedValue: new CalendarDate(2025, 2, 1)
}}
/>
);
let yearPicker = tree.getByLabelText('year');
let options = within(yearPicker).getAllByRole('option');
expect(options.map(o => o.textContent)).toEqual(['2024', '2025']);
expect(yearPicker).toHaveValue('1');
expect(options[1]).toHaveAttribute('data-date', '2025-02-03');

tree.rerender(
<YearPickerExample
calendarProps={{defaultFocusedValue: new CalendarDate(2026, 6, 30)}}
Expand Down
9 changes: 5 additions & 4 deletions packages/react-aria/src/calendar/useCalendarYearPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ export function useCalendarYearPicker(
let years: CalendarYearPickerItem[] = [];
let date = minDate;
let value = 0;
while (date.compare(maxDate) <= 0) {
if (isSameYear(date, state.focusedDate)) {
while (date.compare(maxDate) <= 0 || isSameYear(date, maxDate)) {
let itemDate = date.compare(maxDate) > 0 ? maxDate : date;
if (isSameYear(itemDate, state.focusedDate)) {
value = years.length;
}

Expand All @@ -96,8 +97,8 @@ export function useCalendarYearPicker(
// store the year number, because in some calendars, such
// as the Japanese, the era may also change.
id: years.length,
date,
formatted: formatter.format(date.toDate(state.timeZone))
date: itemDate,
formatted: formatter.format(itemDate.toDate(state.timeZone))
});

date = date.add({years: 1});
Expand Down