Normalize input decoration theme #168981

bleroux · 2025-05-16T15:14:32Z

This PR is to make InputDecorationTheme conform to Flutter Material's conventions for component themes:

Added a InputDecorationThemeData class which defines overrides for the defaults for InputDecorator properties.
Added InputDecorationTheme constructor parameters: InputDecorationThemeData? data and Widget? child. This is now the preferred way to configure a InputDecorationTheme:

InputDecorationTheme(
	data: InputDecorationThemeData(
	    filled: true,
	    fillColor: Colors.amber,
	    ...
	  ),
  	child: const TextField()
)

These two properties are made nullable to not break existing apps which has customized ThemeData.inputDecorationTheme.

Update InputDecorationTheme to be an InheritedTheme subclass.
Changed the type of component theme defaults from InputDecorationTheme to InputDecorationThemeData.
Changed the InputDecorationTheme bottomAppBarTheme property to Object? bottomAppBarTheme in ThemeData and ThemeData.copyWith() (Object? is used for the moment to minimize Google tests failure. A follow-up PR will replace Object? with InputDecorationThemeData.
Addresses the "theme normalization" sub-project within ☂️ Material Theme System Updates #91772.

A migration guide will be created on website repo.

bleroux · 2025-05-16T15:17:51Z

@QuncCccccc This PR sets ThemeData.InputDecorationTheme type to Object? to simplify the migration.

Because, InputDecorationTheme is used by several widgets as a property, for instance DropdownMenu.inputDecorationTheme, let me know if Object? should also be use for these properties?

QuncCccccc · 2025-05-16T17:27:51Z

I think we can leave it for now until we decided to clean up the properties in InputDecorationTheme. The reason why we change the type of ThemeData.xxxTheme to Object? is we want merging this PR and the g3 fixing to be two independent steps. If we change the type to xxxThemeData directly, the PR will be blocked until we provide a g3fix and make them roll in together. So this middle step is just to provide a soft land for the whole process, so I think we don't need to change other usage of InputDecorationTheme because seems they won't cause the breakages:) Please let me know if anything don't make sense 😊!

QuncCccccc

Overall looks good to me! Thanks so much for working on this big theme! Just left some comments, please let me know if you have any thoughts on them:)

examples/api/lib/material/dropdown_menu/dropdown_menu.0.dart

QuncCccccc · 2025-05-20T23:24:39Z

packages/flutter/lib/src/material/date_picker_theme.dart

  /// Overrides the [InputDatePickerFormField]'s input decoration theme.
  /// If this is null, [ThemeData.inputDecorationTheme] is used instead.
-  final InputDecorationTheme? inputDecorationTheme;
+  final InputDecorationThemeData? inputDecorationTheme;


I'm actually not sure if we should change the parameter type here because it may introduce more breaking changes. Do you think if it would be better to change the type when we are really removing the properties in InputDecorationTheme?

Similar for other widgets, just feel these public apis may cause too many breaking changes.

Makes sense. I reverted this changes and just kept the ThemeData.inputDecorationTheme change.

I was adding g3fix for this PR and noticed for this property and DropdownMenu.inputDecorationTheme, several usages are: ThemeData.inputDecorationTheme.copyWith() so with the changes in PR, breaking changes happened. Do you think if we should change both type to Object so the commonly-used cases can be accepted? Also once the normalization is done, we actually should deprecate these properties because at that time, developers can wrap the widget with InputDecorationTheme.

I changed both types to Object? in the last commit, seems reasonable.
Let me know if it helps with g3 fix.

packages/flutter/lib/src/material/dropdown_menu.dart

packages/flutter/lib/src/material/input_decorator.dart

QuncCccccc

Overall looks great! Thank you!

packages/flutter/lib/src/material/input_decorator.dart

QuncCccccc · 2025-06-04T17:20:50Z

packages/flutter/test/material/input_decorator_test.dart

 const String twoLines = 'line1\nline2';
 const String threeLines = 'line1\nline2\nline3';

 Widget buildInputDecorator({


Can we add a test to check if a local InputDecorationTheme can override the themedata.inputDecortationTheme?

Oh, I missed that. It will required several changes as the current implementation as many references to Theme.of(context).inputDecorationTheme.
For the test, I will create a group because there are many properties and combinations to test.

I added a group to test that most of the properties can be overridden with a local theme.
Some properties are missing because there are no M3 tests for them. To make it easier to track this work, I will filed other PRs to add the missing M3 tests and, when needed, fix the implementation if it does not use the local theme properly.

Thank you!

Some properties are missing because there are no M3 tests for them. To make it easier to track this work, I will filed other PRs to add the missing M3 tests

We don't need to add the M3 tests if M3 didn't specify the property in defaults. It would be fine as long as we can make sure the properties works when we use them in a local InputDecorationThemeData.

when needed, fix the implementation if it does not use the local theme properly.

Does this mean that some properties don't work in a InputDecorationThemeData? If so, maybe we should not add them in InputDecorationThemeData.

Migrating InputDecoration tests to M3 is still a work in a progress. This is why some properties are missing existing M3 tests.
To correctly check that the local theme properly work for those properties I would first have to add tests that check if the general theme is working for those properties (hopefully most of them are probably ok, otherwise we would have get some reports).
My problem is that I prefer to do that in separate PRs as it becomes difficult to track changes in this PR, and It would be more revert proof.

Ah I see. Yeah, separating PRs makes sense to me!

…ter#171584) ## Description This PR is similar to what was done for `DatePickerThemeData` in flutter#168981. It changes `TimePickerThemeData.inputDecorationTheme` type to `InputDecorationThemeData` (instead of `InputDecorationTheme`) and uses Object? for the corresponding constructor parameter. ## Tests Adds 1 test

…175838) ## Description This PR adds tests for `InputDecorationThemeData` border related properties. It also adds some missing M3 tests for those same properties. ## Related Issue Related to #168981 ## Tests Adds 10 tests.

## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `TextFormField` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to #168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [TextFormField does not inherit local InputDecorationTheme](#176391) ## Tests - Adds 1 test

…r#176397) ## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `TextFormField` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to flutter#168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [TextFormField does not inherit local InputDecorationTheme](flutter#176391) ## Tests - Adds 1 test

…me (#176564) ## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `DropdownButtonFormField` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to #168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [DropdownButtonFormField does not inherit local InputDecorationTheme](#176561) ## Tests - Adds 1 test

## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `TextField` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to #168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [[SearchBar] Inconsistent inheritance of InputDecorationTheme](#176198) ## Tests - Adds 1 test - Updates 1 test

…#177086) ## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `DateRangePickerDialog` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to #168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [DateRangePickerDialog does not inherit local InputDecorationTheme](#177083) ## Tests - Adds 1 test

…eme (#177090) ## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `InputDatePickerFormField` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to #168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [InputDatePickerFormField does not inherit local InputDecorationTheme](#177088) ## Tests - Adds 1 test

…ter#170903) ## Description This PR adds missing M3 tests for InputDecoration.floatingLabelAlignment. ## Related Issue Will help to complete flutter#168981 ## Tests Adds 8 tests (based on existing M2 tests).

) ## Description This PR adds tests for `InputDecorationThemeData.floatingLabelBehavior`, `InputDecorationThemeData.floatingLabelAlignment`, and `InputDecorationThemeData.contentPadding`. ## Related Issue Related to flutter#168981 ## Tests Adds 3 tests, moves one.

…ter#171584) ## Description This PR is similar to what was done for `DatePickerThemeData` in flutter#168981. It changes `TimePickerThemeData.inputDecorationTheme` type to `InputDecorationThemeData` (instead of `InputDecorationTheme`) and uses Object? for the corresponding constructor parameter. ## Tests Adds 1 test

…lutter#175838) ## Description This PR adds tests for `InputDecorationThemeData` border related properties. It also adds some missing M3 tests for those same properties. ## Related Issue Related to flutter#168981 ## Tests Adds 10 tests.

…r#176397) ## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `TextFormField` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to flutter#168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [TextFormField does not inherit local InputDecorationTheme](flutter#176391) ## Tests - Adds 1 test

…me (flutter#176564) ## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `DropdownButtonFormField` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to flutter#168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [DropdownButtonFormField does not inherit local InputDecorationTheme](flutter#176561) ## Tests - Adds 1 test

…6300) ## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `TextField` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to flutter#168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [[SearchBar] Inconsistent inheritance of InputDecorationTheme](flutter#176198) ## Tests - Adds 1 test - Updates 1 test

…flutter#177086) ## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `DateRangePickerDialog` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to flutter#168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [DateRangePickerDialog does not inherit local InputDecorationTheme](flutter#177083) ## Tests - Adds 1 test

…eme (flutter#177090) ## Description This PR replaces global `ThemeData.inputDecorationTheme` usage in `InputDatePickerFormField` with `InputDecorationTheme.of ` which returns the ambient `InputDecorationTheme`. It is a follow up to flutter#168981 which introduces `InputDecorationTheme.of `. ## Related Issue Fixes [InputDatePickerFormField does not inherit local InputDecorationTheme](flutter#177088) ## Tests - Adds 1 test

guidezpl mentioned this pull request May 16, 2025

☂️ Material Theme System Updates #91772

Open

43 tasks

bleroux force-pushed the input_decoration_theme_normalization branch from 7e4398b to 520a3d9 Compare May 16, 2025 16:51

bleroux force-pushed the input_decoration_theme_normalization branch 2 times, most recently from e87d275 to 02b9d21 Compare May 16, 2025 20:55

bleroux requested a review from QuncCccccc May 20, 2025 15:24

QuncCccccc reviewed May 21, 2025

View reviewed changes

bleroux force-pushed the input_decoration_theme_normalization branch 7 times, most recently from 673b58e to 06d1336 Compare May 23, 2025 15:13

huycozy mentioned this pull request May 26, 2025

Normalize BottomAppBarTheme #168586

Merged

9 tasks

bleroux force-pushed the input_decoration_theme_normalization branch 4 times, most recently from a08dca9 to 6d5b2f4 Compare May 27, 2025 07:28

bleroux requested a review from QuncCccccc May 27, 2025 08:30

bleroux force-pushed the input_decoration_theme_normalization branch 2 times, most recently from 80609ec to 32f1bd0 Compare June 3, 2025 08:40

QuncCccccc reviewed Jun 4, 2025

View reviewed changes

bleroux force-pushed the input_decoration_theme_normalization branch from 32f1bd0 to 4e17bec Compare June 11, 2025 08:56

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025

de3f80459 Normalize input decoration theme (flutter/flutter#168981)

330204f

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025

de3f80459 Normalize input decoration theme (flutter/flutter#168981)

13d9ee6

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025

de3f80459 Normalize input decoration theme (flutter/flutter#168981)

d3d124b

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025

de3f80459 Normalize input decoration theme (flutter/flutter#168981)

8c1e0cf

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2025

de3f80459 Normalize input decoration theme (flutter/flutter#168981)

c507419

bleroux mentioned this pull request Sep 23, 2025

Add tests for InputDecoration borders (M3 and theme normalization) #175838

Merged

This was referenced Sep 30, 2025

Fix TextField does not inherit local InputDecorationTheme #176300

Merged

Fix TextFormField does not inherit local InputDecorationTheme #176397

Merged

TextFormField does not inherit local InputDecorationTheme #176391

Closed

bleroux mentioned this pull request Oct 6, 2025

Fix DropdownButtonFormField does not inherit local InputDecorationTheme #176564

Merged

This was referenced Oct 16, 2025

Fix DateRangePickerDialog does not inherit local InputDecorationTheme #177086

Merged

Fix InputDatePickerFormField does not inherit local InputDecorationTheme #177090

Merged

Normalize input decoration theme #168981

Normalize input decoration theme #168981

Uh oh!

Conversation

bleroux commented May 16, 2025

Uh oh!

bleroux commented May 16, 2025

Uh oh!

QuncCccccc commented May 16, 2025

Uh oh!

QuncCccccc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

QuncCccccc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants