fix(react): WeeklyDayPicker shows correct week number in collapsed view - #36725
Open
Sanjay Santhanam (Sanjays2402) wants to merge 1 commit into
Open
Sanjay Santhanam (Sanjays2402) wants to merge 1 commit into
Sanjay Santhanam (Sanjays2402) wants to merge 1 commit into
Conversation
In collapsed single-week views (weeksToShow=1, e.g. WeeklyDayPicker), CalendarGridRow rendered weekNumbers[weekIndex] from getWeekNumbersInMonth, which is anchored on the 1st of the navigated month. With only one visible row, weekIndex is always 0, so the row showed the first week-of-month number instead of the visible week's number (e.g. navigated to Fri Sep 11 2026 it showed 35 while the visible week is 36). Derive the week number from the row's own days (getWeekNumber of the week's last day) instead. This is identical to the previous values in full-month view (verified: 561 rows across 12 months x 3 firstDayOfWeek x 3 firstWeekOfYear settings, zero differences) and correct in collapsed views (verified for every day of 2026).
Sanjay Santhanam (Sanjays2402)
requested a review
from a team
as a code owner
September 11, 2026 10:45
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The test omits a required prop, and transition week headers expose hidden content to assistive technology.
Get a fresh assessment by requesting another Copilot review.
Pull request overview
Fixes v8 collapsed calendar views by calculating week numbers from each rendered row.
Changes:
- Derives week numbers from row dates.
- Adds a collapsed-view regression test.
- Adds a patch change file.
- Merge confidence: 55/100 due to unresolved build, test, and accessibility issues.
File summaries
| File | Description |
|---|---|
CalendarGridRow.tsx |
Calculates each row’s week number directly. |
CalendarDayGrid.test.tsx |
Adds regression coverage for issue #36721. |
| Change file | Records the v8 patch fix. |
Review details
- Files reviewed: 3/3 changed files
- Comments generated: 3
- Review effort level: Balanced
💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| weeksToShow={1} | ||
| showWeekNumbers={true} | ||
| firstDayOfWeek={DayOfWeek.Sunday} | ||
| firstWeekOfYear={FirstWeekOfYear.FirstFullWeek} |
Comment on lines
+38
to
+42
| const displayedWeekNumbers = Array.from(container.querySelectorAll('th[scope="row"] span')).map( | ||
| cell => cell.textContent, | ||
| ); | ||
| // The visible row must show 36 (its own week), not 35 (the first week-of-month number). | ||
| expect(displayedWeekNumbers).toContain('36'); |
Comment on lines
+57
to
58
| {showWeekNumbers && weekNumber !== null && ( | ||
| <th |
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #36721.
What was wrong
CalendarGridRowrendered the week number asweekNumbers[weekIndex], whereweekNumberscomes fromgetWeekNumbersInMonth(...)anchored on the 1st of the navigated month. In collapsed single-week views (weeksToShow=1, e.g.WeeklyDayPicker) only one row is visible, soweekIndexis always0and the row always showed the first week-of-month number instead of the visible week's number.How I reproduced it
Built a day grid for
navigatedDate = Fri Sep 11 2026withdateRangeType=Week, weeksToShow=1, firstDayOfWeek=Sunday, firstWeekOfYear=FirstFullWeekand ran the row's logic against it: the visible row (Sep 6 - Sep 12) rendered35while the actual week number is36.The fix
CalendarGridRownow derives the week number from the row's own days —getWeekNumberof the last day of the week — instead of indexing into the month-anchored array. This is a 3-line change in the component plus a regression test.Tests
firstDayOfWeekvalues x 3firstWeekOfYearvalues, zero differences.dateMathweek-number assertions (getWeekNumbersInMonth/getWeekNumber, all four option groups fromdateMath.test.ts): 4/4 pass.CalendarDayGrid.test.tsxthat renders a collapsed single-week grid withshowWeekNumbersand asserts the visible row shows36for Sep 11 2026 (it shows35without the fix).Note: the repo's jest setup needs a full
yarn install, which isn't available in this environment, so the component test above was validated through the same logic against the repo's real date-time sources rather than a jest run.