mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
Fix false positive validation result on form submission with AutovalidateMode.onUnfocus (#159394)
Fixes #159378 Resolved an issue where focused TextFormField was bypassed during form validation when using AutovalidateMode.onUnfocus on mobile devices. Validation is now correctly triggered for all fields, including those that are focused. ## 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]. - [x] I listed at least one issue that this PR fixes in the description above. - [ ] 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]. - [ ] 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]. <!-- Links --> [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
This commit is contained in:
parent
7c3c60b598
commit
2f9e2d9bc9
@ -354,9 +354,11 @@ class FormState extends State<Form> {
|
||||
final bool validateOnFocusChange = widget.autovalidateMode == AutovalidateMode.onUnfocus;
|
||||
|
||||
for (final FormFieldState<dynamic> field in _fields) {
|
||||
if (!validateOnFocusChange || !field._focusNode.hasFocus) {
|
||||
final bool hasFocus = field._focusNode.hasFocus;
|
||||
|
||||
if (!validateOnFocusChange || !hasFocus || (validateOnFocusChange && hasFocus)) {
|
||||
final bool isFieldValid = field.validate();
|
||||
hasError = !isFieldValid || hasError;
|
||||
hasError |= !isFieldValid;
|
||||
// Ensure that only the first error message gets announced to the user.
|
||||
if (errorMessage.isEmpty) {
|
||||
errorMessage = field.errorText ?? '';
|
||||
|
@ -1505,4 +1505,53 @@ void main() {
|
||||
expect(find.text(errorText('foo')), findsOneWidget);
|
||||
expect(find.text(errorText('bar')), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('AutovalidateMode.onUnfocus should validate all fields manually with FormState', (WidgetTester tester) async {
|
||||
final GlobalKey<FormState> formKey = GlobalKey<FormState>();
|
||||
const Key fieldKey = Key('form field');
|
||||
String errorText(String? value) => '$value/error';
|
||||
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
home: Center(
|
||||
child: Form(
|
||||
key: formKey,
|
||||
autovalidateMode: AutovalidateMode.onUnfocus,
|
||||
child: Material(
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
TextFormField(
|
||||
key: fieldKey,
|
||||
initialValue: 'foo',
|
||||
validator: errorText,
|
||||
),
|
||||
TextFormField(
|
||||
initialValue: 'bar',
|
||||
validator: errorText,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
|
||||
// Focus on the first field.
|
||||
await tester.tap(find.byKey(fieldKey));
|
||||
await tester.pump();
|
||||
|
||||
// Check no error messages are displayed initially.
|
||||
expect(find.text('foo/error'), findsNothing);
|
||||
expect(find.text('bar/error'), findsNothing);
|
||||
|
||||
// Validate all fields manually using FormState.
|
||||
expect(formKey.currentState!.validate(), isFalse);
|
||||
await tester.pump();
|
||||
|
||||
// Check error messages are displayed.
|
||||
expect(find.text('foo/error'), findsOneWidget);
|
||||
expect(find.text('bar/error'), findsOneWidget);
|
||||
});
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user