From 3dbd33d3aa3fdfd7700685b7a59b9505fa139859 Mon Sep 17 00:00:00 2001 From: Valentin Vignal <32538273+ValentinVignal@users.noreply.github.com> Date: Wed, 8 Oct 2025 04:13:57 +0800 Subject: [PATCH] Migrate to `WidgetStateInputBorder` (#176386) Follow up https://github.com/flutter/flutter/pull/176330 Migrate the remaining files from `MaterialStateOutlineInputBorder` and `MaterialStateUnderlineInputBorder ` to `WidgetStateInputBorder `. This PR only focus on `WidgetStateInputBorder`. - This minimizes conflicts and reduces the size of the PR for easier reviews and follow up - I'll work on the other elements of `packages/flutter/lib/src/material/material_state.dart` into other PRs ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --- packages/flutter/lib/src/material/input_decorator.dart | 6 +++--- packages/flutter/test/material/input_decorator_test.dart | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/flutter/lib/src/material/input_decorator.dart b/packages/flutter/lib/src/material/input_decorator.dart index 1e984d4c1b3..283ee859764 100644 --- a/packages/flutter/lib/src/material/input_decorator.dart +++ b/packages/flutter/lib/src/material/input_decorator.dart @@ -5261,9 +5261,9 @@ class InputDecorationThemeData with Diagnosticable { /// The shape of the border to draw around the decoration's container. /// - /// If [border] is a [MaterialStateUnderlineInputBorder] - /// or [MaterialStateOutlineInputBorder], then the effective border can depend on - /// the [WidgetState.focused] state, i.e. if the [TextField] is focused or not. + /// If [border] is a [WidgetStateInputBorder], then the effective border can + /// depend on the [WidgetState.focused] state, i.e. if the [TextField] is + /// focused or not. /// /// The decoration's container is the area which is filled if [filled] is /// true and bordered per the [border]. It's the area adjacent to diff --git a/packages/flutter/test/material/input_decorator_test.dart b/packages/flutter/test/material/input_decorator_test.dart index 8ed040a5358..a7900f0ea3f 100644 --- a/packages/flutter/test/material/input_decorator_test.dart +++ b/packages/flutter/test/material/input_decorator_test.dart @@ -8456,7 +8456,7 @@ void main() { ); // InputDecoration (baseDecoration) defines InputDecoration properties - final MaterialStateOutlineInputBorder border = MaterialStateOutlineInputBorder.resolveWith(( + final WidgetStateInputBorder border = WidgetStateInputBorder.resolveWith(( Set states, ) { return const OutlineInputBorder(); @@ -8522,7 +8522,7 @@ void main() { expect(decoration.counterStyle, decorationStyle); expect(decoration.filled, false); expect(decoration.fillColor, Colors.blue); - expect(decoration.border, isA()); + expect(decoration.border, isA()); expect(decoration.alignLabelWithHint, false); expect( decoration.constraints,