refactor(authenticator): remove enabled override from form field enums and streamline effective enabled logic

Author: angelorodem

packages/authenticator/amplify_authenticator/lib/src/enums/authenticator_text_enabled_override.dart

@@ -6,9 +6,6 @@ enum AuthenticatorTextEnabledOverride {
   /// Use the default enabled state.
   defaultSetting,
 
-  /// Force the field to be enabled.
-  enabled,
-
   /// Force the field to be disabled.
   disabled,
 }

packages/authenticator/amplify_authenticator/lib/src/mixins/authenticator_text_field.dart

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import 'package:amplify_authenticator/src/controllers/authenticator_text_field_controller.dart';
 import 'package:amplify_authenticator/src/widgets/form.dart';
 import 'package:amplify_authenticator/src/widgets/form_field.dart';
 import 'package:flutter/material.dart';
@@ -19,7 +20,7 @@ mixin AuthenticatorTextField<
   bool _controllerUpdateScheduled = false;
 
   @protected
-  TextEditingController? get textController =>
+  AuthenticatorTextFieldController? get textController =>
       widget.authenticatorTextFieldController;
 
   void _maybeUpdateEffectiveController() {
@@ -184,12 +185,12 @@ mixin AuthenticatorTextField<
         // Don't sync during build
         final shouldHandleChangeImmediately = _effectiveController == null;
         return TextFormField(
-          style: enabled
+          style: effectiveEnabled
               ? null
               : TextStyle(color: Theme.of(context).disabledColor),
           controller: _effectiveController,
           initialValue: _effectiveController == null ? initialValue : null,
-          enabled: enabled,
+          enabled: effectiveEnabled,
           validator: widget.validatorOverride ?? validator,
           onChanged: shouldHandleChangeImmediately ? onChanged : null,
           autocorrect: false,

packages/authenticator/amplify_authenticator/lib/src/mixins/authenticator_username_field.dart

@@ -24,7 +24,7 @@ mixin AuthenticatorUsernameField<
   bool _controllerUpdateScheduled = false;
 
   @protected
-  TextEditingController? get textController =>
+  AuthenticatorTextFieldController? get textController =>
       widget.authenticatorTextFieldController;
 
   void _updateController() {
@@ -398,27 +398,25 @@ mixin AuthenticatorUsernameField<
         requiredOverride: true,
         onChanged: handleChanged,
         validator: validator,
-        enabled: enabled
-            ? AuthenticatorTextEnabledOverride.enabled
-            : AuthenticatorTextEnabledOverride.disabled,
+        enabled: widget.enabledOverride,
         errorMaxLines: errorMaxLines,
         initialValue: state.username,
         autofillHints: autofillHints,
-        authenticatorTextFieldController:
-            textController as AuthenticatorTextFieldController?,
+        authenticatorTextFieldController: textController,
       );
     }
 
     _updateController();
-    // Don't sync during build
 
     final controllerInUse = _controller != null;
 
     return TextFormField(
-      style: enabled ? null : TextStyle(color: Theme.of(context).disabledColor),
+      style: effectiveEnabled
+          ? null
+          : TextStyle(color: Theme.of(context).disabledColor),
       controller: _controller,
       initialValue: _controller == null ? initialValue?.username : null,
-      enabled: enabled,
+      enabled: effectiveEnabled,
       validator: validator,
       onChanged: (username) {
         if (!controllerInUse) {

packages/authenticator/amplify_authenticator/lib/src/widgets/form_field.dart

@@ -196,15 +196,20 @@ abstract class AuthenticatorFormFieldState<
   FieldValue? get initialValue => null;
 
   /// Whether the form field accepts input.
-  bool get enabled {
+  bool get enabled => true;
+
+  /// Effective enabled state that combines [enabled] with [widget.enabledOverride].
+  ///
+  /// Subclasses can override [enabled] to provide custom logic for determining
+  /// the default enabled state. This property ensures the override is respected.
+  @nonVirtual
+  bool get effectiveEnabled {
     switch (widget.enabledOverride) {
-      case AuthenticatorTextEnabledOverride.enabled:
-        return true;
       case AuthenticatorTextEnabledOverride.disabled:
         return false;
       case AuthenticatorTextEnabledOverride.defaultSetting:
       case null:
-        return true;
+        return enabled;
     }
   }
 
@@ -367,5 +372,8 @@ abstract class AuthenticatorFormFieldState<
       ..add(DiagnosticsProperty<double?>('marginBottom', marginBottom))
       ..add(DoubleProperty('labelGap', labelGap))
       ..add(IterableProperty<String>('autofillHints', autofillHints));
+    properties.add(
+      DiagnosticsProperty<bool>('effectiveEnabled', effectiveEnabled),
+    );
   }
 }

packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_up_form_field.dart

@@ -94,15 +94,6 @@ abstract class _ConfirmSignUpFormFieldState<FieldValue extends Object>
 
   @override
   bool get enabled {
-    switch (widget.enabledOverride) {
-      case AuthenticatorTextEnabledOverride.enabled:
-        return true;
-      case AuthenticatorTextEnabledOverride.disabled:
-        return false;
-      case AuthenticatorTextEnabledOverride.defaultSetting:
-      case null:
-        break;
-    }
     switch (widget.field) {
       case ConfirmSignUpField.code:
         return true;

packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/phone_number_field.dart

@@ -11,17 +11,17 @@ class AuthenticatorPhoneField<FieldType extends Enum>
     super.requiredOverride,
     this.onChanged,
     this.validator,
-    this.enabled,
+    AuthenticatorTextEnabledOverride? enabled,
     this.initialValue,
     this.errorMaxLines,
     super.autofillHints,
     this.authenticatorTextFieldController,
   }) : super._(
          titleKey: InputResolverKey.phoneNumberTitle,
          hintTextKey: InputResolverKey.phoneNumberHint,
+         enabledOverride: enabled,
        );
 
-  final AuthenticatorTextEnabledOverride? enabled;
   final String? initialValue;
   final ValueChanged<String>? onChanged;
   final FormFieldValidator<String?>? validator;
@@ -41,7 +41,6 @@ class AuthenticatorPhoneField<FieldType extends Enum>
       ..add(
         ObjectFlagProperty<ValueChanged<String>>.has('onChanged', onChanged),
       )
-      ..add(EnumProperty<AuthenticatorTextEnabledOverride?>('enabled', enabled))
       ..add(StringProperty('initialValue', initialValue))
       ..add(IntProperty('errorMaxLines', errorMaxLines))
       ..add(
@@ -81,19 +80,6 @@ class _AuthenticatorPhoneFieldState<FieldType extends Enum>
     return initialValue;
   }
 
-  @override
-  bool get enabled {
-    switch (widget.enabled) {
-      case AuthenticatorTextEnabledOverride.enabled:
-        return true;
-      case AuthenticatorTextEnabledOverride.disabled:
-        return false;
-      case AuthenticatorTextEnabledOverride.defaultSetting:
-      case null:
-        return super.enabled;
-    }
-  }
-
   @override
   int get errorMaxLines => widget.errorMaxLines ?? super.errorMaxLines;
 

packages/authenticator/amplify_authenticator/test/form_field_controller_test.dart

@@ -7,7 +7,6 @@ import 'package:amplify_authenticator/src/keys.dart';
 import 'package:amplify_authenticator/src/state/inherited_authenticator_state.dart';
 import 'package:amplify_authenticator_test/amplify_authenticator_test.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
@@ -197,19 +196,17 @@ void main() {
       final fieldFinder = find.byKey(keyUsernameSignInFormField);
       await tester.tap(fieldFinder);
       await tester.pump();
-      await tester.showKeyboard(fieldFinder);
 
       expect(tester.takeException(), isNull);
 
-      await tester.sendKeyEvent(LogicalKeyboardKey.keyA);
+      // Use enterText to simulate typing - sendKeyEvent doesn't update
+      // TextEditingController in widget tests
+      await tester.enterText(fieldFinder, 'a ');
       await tester.pump();
       expect(tester.takeException(), isNull);
 
-      await tester.sendKeyEvent(LogicalKeyboardKey.space);
-      await tester.pump();
-      expect(tester.takeException(), isNull);
-
-      await tester.sendKeyEvent(LogicalKeyboardKey.backspace);
+      // Simulate backspace by entering text without the trailing space
+      await tester.enterText(fieldFinder, 'a');
       await tester.pump();
       expect(tester.takeException(), isNull);