Fix `todayBorder` color being overridden by `todayForegroundColor` in `YearPicker` by Massinissa-Mouhoub · Pull Request #189345 · flutter/flutter

Massinissa-Mouhoub · 2026-07-12T15:22:10Z

The current-year item in YearPicker always overrode the color of DatePickerThemeData.todayBorder with the resolved foreground color, so a custom border color set in the theme was ignored. This was already fixed forthe day grid in #177911, but the year selector still had the old behavior.

This PR applies the same color resolution to the year picker as the day picker: the border's own color is used when it is non-transparent, otherwise it falls back to todayForegroundColor.

Before / after with:

DatePickerThemeData(
    todayBorder: BorderSide(color: Colors.red, width: 4),
    todayForegroundColor: WidgetStateProperty.all(Colors.blue),
    todayBackgroundColor: WidgetStateProperty.all(Colors.white),
),

Before	After

Added regression tests covering:

a custom todayBorder color is respected over the foreground color,
the custom border color is kept even when the current year is disabled,
a transparent todayBorder color falls back to todayForegroundColor.

Fixes #189298

Please @dkwingsmt review this since it's the same fix as #178792.

Pre-launch Checklist

gemini-code-assist

Code Review

This pull request updates the _YearPickerState to respect a custom, non-transparent todayBorder color over the foreground color, falling back to the foreground color if the border is transparent. It also adds corresponding regression tests. Feedback on the tests identifies an issue where the currentDate (2016) is set before the firstDate (2018) in a test case, which prevents the year 2016 from being rendered in the YearPicker grid and will cause the test to fail.

QuncCccccc

The code change looks good! Thanks a lot for your contribution.

Could you also update the PR description so it can be a bit more accurate. For example, in the sample code, the custom border color seems should be red to match the "After" screenshot. Also "since it's the same fix as #163909." seems the link should be #178792

QuncCccccc · 2026-07-22T20:39:27Z

+  }
+
+  // Regression test for https://github.com/flutter/flutter/issues/189298
+  testWidgets('Non-null todayBorder color should be respected over foreground color', (


Suggested change

testWidgets('Non-null todayBorder color should be respected over foreground color', (

testWidgets('Non-null todayBorder color should be respected over todayBackgroundColor', (

QuncCccccc · 2026-07-22T20:50:13Z

-        borderSide = borderSide.copyWith(color: textColor);
-      }
+      final bool hasCustomBorderColor =
+          datePickerTheme.todayBorder != null && datePickerTheme.todayBorder!.color.opacity != 0.0;


Maybe consider to update the doc for datePickerTheme.todayBorder to mention yearpicker as well.

QuncCccccc · 2026-07-22T20:50:51Z

-          const localizations = DefaultMaterialLocalizations();
-          final initialDate = DateTime(2016, DateTime.january, 15);
-          DateTime? selectedDate;
+      testWidgets('Selected date Semantics announcement on onDateChanged', (


Seems there are a bunch of reformatting changes. Can we try to rebase master and see if the formatting issues can be fixed?

- Revert unrelated dart format churn in the Semantics announcement tests so the diff only contains the year picker changes. - Rename the year picker regression test to reflect the todayBackgroundColor case. - Document that DatePickerThemeData.todayBorder also applies to the year selector, not just the day grid.

Massinissa-Mouhoub · 2026-07-23T21:18:09Z

@QuncCccccc I applied your comments please check. I still notice formatting issues, but I don't know if I should keep it like this or revert tbh.

QuncCccccc · 2026-07-23T22:15:08Z

I still notice formatting issues, but I don't know if I should keep it like this or revert tbh.

I think it would be better if we can revert these unrelated changes. Do you need any help? I can push a commit to revert them if that helps.

Massinissa-Mouhoub · 2026-07-23T22:56:18Z

I think it would be better if we can revert these unrelated changes. Do you need any help? I can push a commit to revert them if that helps.

I think I fixed those formatting issues 🤞🤞, @QuncCccccc please check.

QuncCccccc · 2026-07-23T23:05:47Z

Hmm seems I can still see them.

Massinissa-Mouhoub · 2026-07-23T23:14:08Z

@QuncCccccc what about now ?

QuncCccccc

LGTM! Thanks a lot!

Massinissa-Mouhoub · 2026-07-27T14:22:30Z

@QuncCccccc, could you please add autosubmit to this PR since it's been approved?

dkwingsmt

LGTM. Thank you!

Massinissa-Mouhoub · 2026-08-07T13:46:03Z

@dkwingsmt @QuncCccccc I believe this PR needs waiting for code freeze also since it's been approved ?

dkwingsmt · 2026-08-07T19:32:05Z

Yes it is! I was waiting for a final round of CI check. Here you go.

Thanks for your contribution! This PR has reached completion, however we're not able to merge this PR for the moment due to the Material/Cupertino code freeze (#184093). As soon as the decoupling is complete, we will post a way to port this PR to the new packages to land. In the meantime, I'll convert this PR to a draft and apply a label so that we can quickly find it when the freeze is lifted.

Massinissa-Mouhoub · 2026-08-26T18:28:45Z

Since decoupling has finished (congratulations 🎉) I was wondering what is the next step for this PR and this PR.
@dkwingsmt @QuncCccccc

QuncCccccc · 2026-08-26T18:52:10Z

Hi @Massinissa-Mouhoub! Yes! Material_ui and Cupertino_ui start to accept contributions. Guidance and instructions for easily porting over can be found in #188444.

When the port PR is ready, feel free to close this PR:) Thank you!

Massinissa-Mouhoub · 2026-08-30T22:37:34Z

@QuncCccccc @dkwingsmt This PR has been ported: flutter/packages#12697, please check it.

…roundColor` in `YearPicker` (#12697) This PR ports flutter/flutter#189345 from flutter/flutter to flutter/packages, as part of flutter/flutter#188444. Fixes flutter/flutter#189298 ## Pre-Review Checklist

github-actions Bot added framework flutter/packages/flutter repository. See also f: labels. p: material_ui material_ui package in flutter/packages labels Jul 12, 2026

gemini-code-assist Bot reviewed Jul 12, 2026

View reviewed changes

Comment thread packages/flutter/test/material/calendar_date_picker_test.dart

Massinissa-Mouhoub force-pushed the issue_189298 branch from e24c1c8 to 9d7208c Compare July 12, 2026 15:52

Piinks requested a review from QuncCccccc July 15, 2026 21:24

dkwingsmt self-requested a review July 22, 2026 18:14

QuncCccccc added the CICD Run CI/CD label Jul 22, 2026

QuncCccccc reviewed Jul 22, 2026

View reviewed changes

Massinissa-Mouhoub added 2 commits July 23, 2026 11:07

chore: format calendar_date_picker_test.dart with pinned dart format

4386581

fix: respect todayBorder color in YearPicker

778bed0

QuncCccccc force-pushed the issue_189298 branch from 9d7208c to 778bed0 Compare July 23, 2026 18:07

flutter-dashboard Bot removed the CICD Run CI/CD label Jul 23, 2026

QuncCccccc added the CICD Run CI/CD label Jul 23, 2026

flutter-dashboard Bot removed the CICD Run CI/CD label Jul 23, 2026

QuncCccccc added the CICD Run CI/CD label Jul 23, 2026

Reformat calendar_date_picker_test.dart file to mimick master branch

a6e6540

flutter-dashboard Bot removed the CICD Run CI/CD label Jul 23, 2026

fix: reformat calendar_date_picker_test.dart to mimic master branch

e11bd4d

QuncCccccc approved these changes Jul 24, 2026

View reviewed changes

dkwingsmt approved these changes Jul 27, 2026

View reviewed changes

Merge branch 'master' into issue_189298

878e522

dkwingsmt added the CICD Run CI/CD label Jul 27, 2026

flutter-dashboard Bot removed the CICD Run CI/CD label Jul 27, 2026

dkwingsmt added the CICD Run CI/CD label Aug 5, 2026

dkwingsmt marked this pull request as draft August 7, 2026 19:32

dkwingsmt added the waiting for code freeze This PR is waiting for a code freeze to resolve. label Aug 7, 2026

Massinissa-Mouhoub mentioned this pull request Aug 30, 2026

[material_ui] Fix todayBorder color being overridden by todayForegroundColor in YearPicker flutter/packages#12697

Merged

11 tasks done

Massinissa-Mouhoub closed this Sep 4, 2026

	testWidgets('Non-null todayBorder color should be respected over foreground color', (
	testWidgets('Non-null todayBorder color should be respected over todayBackgroundColor', (

Conversation

Massinissa-Mouhoub commented Jul 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

QuncCccccc left a comment

Choose a reason for hiding this comment

Uh oh!

QuncCccccc Jul 22, 2026

Choose a reason for hiding this comment

Uh oh!

QuncCccccc Jul 22, 2026

Choose a reason for hiding this comment

Uh oh!

QuncCccccc Jul 22, 2026

Choose a reason for hiding this comment

Uh oh!

Massinissa-Mouhoub commented Jul 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

QuncCccccc commented Jul 23, 2026

Uh oh!

Massinissa-Mouhoub commented Jul 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

QuncCccccc commented Jul 23, 2026

Uh oh!

Massinissa-Mouhoub commented Jul 23, 2026

Uh oh!

QuncCccccc left a comment

Choose a reason for hiding this comment

Uh oh!

Massinissa-Mouhoub commented Jul 27, 2026

Uh oh!

dkwingsmt left a comment

Choose a reason for hiding this comment

Uh oh!

Massinissa-Mouhoub commented Aug 7, 2026

Uh oh!

dkwingsmt commented Aug 7, 2026

Uh oh!

Massinissa-Mouhoub commented Aug 26, 2026

Uh oh!

QuncCccccc commented Aug 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Massinissa-Mouhoub commented Aug 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Massinissa-Mouhoub commented Jul 12, 2026 •

edited

Loading

Massinissa-Mouhoub commented Jul 23, 2026 •

edited

Loading

Massinissa-Mouhoub commented Jul 23, 2026 •

edited

Loading

QuncCccccc commented Aug 26, 2026 •

edited

Loading