Skip to content

fix(ui5-calendar): show correct year range when secondaryCalendarType… - #14191

Merged
didip1000 merged 3 commits into
mainfrom
calendar-high
Oct 23, 2026
Merged

didip1000 merged 3 commits into
mainfrom
calendar-high

Conversation

@didip1000

Copy link
Copy Markdown
Contributor

When the secondary calendar type was set globally (rather than through the secondaryCalendarType property), the Year Picker displayed an incorrect range of years.

This happened because hasSecondaryCalendarType only looked at the secondaryCalendarType property and ignored the globally configured value. As a result, the Calendar laid out a 20-year range while the Year Picker rendered an 8-year grid, so the two no longer matched.

The fix makes hasSecondaryCalendarType read the resolved calendar type (property or global configuration), so the Calendar and Year Picker stay in sync in both cases.

Fixes: #14185

@didip1000
didip1000 requested a review from GDamyanov October 21, 2026 11:49
@didip1000 didip1000 self-assigned this Oct 21, 2026
@didip1000
didip1000 deployed to netlify-preview October 21, 2026 11:49 — with GitHub Actions Active
@sap-ui5-webcomponents-release

Copy link
Copy Markdown

@didip1000
didip1000 deployed to netlify-preview October 23, 2026 11:06 — with GitHub Actions Active
Comment thread packages/main/cypress/specs/CalendarConfig.cy.tsx
@didip1000
didip1000 deployed to netlify-preview October 23, 2026 13:11 — with GitHub Actions Active
@didip1000
didip1000 requested a review from GDamyanov October 23, 2026 13:14
@didip1000
didip1000 marked this pull request as ready for review October 23, 2026 14:09
@didip1000
didip1000 merged commit 692a645 into main Oct 23, 2026
14 checks passed
@didip1000
didip1000 deleted the calendar-high branch October 23, 2026 14:10
@didip1000
didip1000 deployed to netlify-preview October 23, 2026 14:10 — with GitHub Actions Active
@sap-ui5-webcomponents-release

Copy link
Copy Markdown

🧹 Preview deployment cleaned up: https://pr-14191--ui5-webcomponents.netlify.app

This branch was successfully deployed

1 active deployment
netlify-preview — 4a64cdfc Deployed Oct 23, 2026 by didip1000 via cleanup-preview #723
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[SFSF] [Calendar]: Secondary calendar type is not set for the WC calendar

2 participants