Skip to content

Commit f87749b

Browse files
angelorodemangelorodem
committed
refactor(form_fields): update form fields to use enabledOverride and visibility parameters
1 parent a3ee8fc commit f87749b

File tree

7 files changed

+159
-37
lines changed

7 files changed

+159
-37
lines changed

‎packages/authenticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_in_form_field.dart‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
2323
CognitoUserAttributeKey? customAttributeKey,
2424
bool? required,
2525
super.autofillHints,
26+
super.enabledOverride,
27+
super.visible,
2628
}) : _customAttributeKey = customAttributeKey,
2729
super._(requiredOverride: required);
2830

@@ -32,6 +34,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
3234
FormFieldValidator<String>? validator,
3335
Iterable<String>? autofillHints,
3436
AuthenticatorTextFieldController? authenticatorTextFieldController,
37+
AuthenticatorTextEnabledOverride? enabledOverride,
38+
bool visible = true,
3539
}) => _ConfirmSignInTextField(
3640
key: key ?? keyNewPasswordConfirmSignInFormField,
3741
titleKey: InputResolverKey.passwordTitle,
@@ -40,6 +44,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
4044
validator: validator,
4145
autofillHints: autofillHints,
4246
authenticatorTextFieldController: authenticatorTextFieldController,
47+
enabledOverride: enabledOverride,
48+
visible: visible,
4349
);
4450

4551
/// Creates a new password component.
@@ -48,6 +54,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
4854
FormFieldValidator<String>? validator,
4955
Iterable<String>? autofillHints,
5056
AuthenticatorTextFieldController? authenticatorTextFieldController,
57+
AuthenticatorTextEnabledOverride? enabledOverride,
58+
bool visible = true,
5159
}) => _ConfirmSignInTextField(
5260
key: key ?? keyConfirmNewPasswordConfirmSignInFormField,
5361
titleKey: InputResolverKey.passwordConfirmationTitle,
@@ -56,6 +64,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
5664
validator: validator,
5765
autofillHints: autofillHints,
5866
authenticatorTextFieldController: authenticatorTextFieldController,
67+
enabledOverride: enabledOverride,
68+
visible: visible,
5969
);
6070

6171
/// Creates an auth answer component.
@@ -66,6 +76,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
6676
FormFieldValidator<String>? validator,
6777
Iterable<String>? autofillHints,
6878
AuthenticatorTextFieldController? authenticatorTextFieldController,
79+
AuthenticatorTextEnabledOverride? enabledOverride,
80+
bool visible = true,
6981
}) => _ConfirmSignInTextField(
7082
key: key ?? keyCustomChallengeConfirmSignInFormField,
7183
title: title,
@@ -78,6 +90,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
7890
validator: validator,
7991
autofillHints: autofillHints,
8092
authenticatorTextFieldController: authenticatorTextFieldController,
93+
enabledOverride: enabledOverride,
94+
visible: visible,
8195
);
8296

8397
/// Creates an mfa preference selection component.
@@ -100,6 +114,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
100114
FormFieldValidator<String>? validator,
101115
Iterable<String>? autofillHints,
102116
AuthenticatorTextFieldController? authenticatorTextFieldController,
117+
AuthenticatorTextEnabledOverride? enabledOverride,
118+
bool visible = true,
103119
}) => _ConfirmSignInTextField(
104120
key: key ?? keyCodeConfirmSignInFormField,
105121
titleKey: InputResolverKey.verificationCodeTitle,
@@ -108,6 +124,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
108124
validator: validator,
109125
autofillHints: autofillHints,
110126
authenticatorTextFieldController: authenticatorTextFieldController,
127+
enabledOverride: enabledOverride,
128+
visible: visible,
111129
);
112130

113131
/// Creates an address component.
@@ -117,6 +135,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
117135
bool? required,
118136
Iterable<String>? autofillHints,
119137
AuthenticatorTextFieldController? authenticatorTextFieldController,
138+
AuthenticatorTextEnabledOverride? enabledOverride,
139+
bool visible = true,
120140
}) => _ConfirmSignInTextField(
121141
key: key ?? keyAddressConfirmSignInFormField,
122142
titleKey: InputResolverKey.addressTitle,
@@ -126,6 +146,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
126146
required: required,
127147
autofillHints: autofillHints,
128148
authenticatorTextFieldController: authenticatorTextFieldController,
149+
enabledOverride: enabledOverride,
150+
visible: visible,
129151
);
130152

131153
/// Creates a birthdate component.
@@ -134,6 +156,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
134156
FormFieldValidator<String>? validator,
135157
bool? required,
136158
Iterable<String>? autofillHints,
159+
AuthenticatorTextEnabledOverride? enabledOverride,
160+
bool visible = true,
137161
}) => _ConfirmSignInDateField(
138162
key: key ?? keyBirthdateConfirmSignInFormField,
139163
titleKey: InputResolverKey.birthdateTitle,
@@ -142,6 +166,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
142166
validator: validator,
143167
required: required,
144168
autofillHints: autofillHints,
169+
enabledOverride: enabledOverride,
170+
visible: visible,
145171
);
146172

147173
/// Creates an email component.
@@ -151,6 +177,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
151177
bool? required,
152178
Iterable<String>? autofillHints,
153179
AuthenticatorTextFieldController? authenticatorTextFieldController,
180+
AuthenticatorTextEnabledOverride? enabledOverride,
181+
bool visible = true,
154182
}) => _ConfirmSignInTextField(
155183
key: key ?? keyEmailConfirmSignInFormField,
156184
titleKey: InputResolverKey.emailTitle,
@@ -160,6 +188,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
160188
required: required,
161189
autofillHints: autofillHints,
162190
authenticatorTextFieldController: authenticatorTextFieldController,
191+
enabledOverride: enabledOverride,
192+
visible: visible,
163193
);
164194

165195
/// Creates a familyName component.
@@ -169,6 +199,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
169199
bool? required,
170200
Iterable<String>? autofillHints,
171201
AuthenticatorTextFieldController? authenticatorTextFieldController,
202+
AuthenticatorTextEnabledOverride? enabledOverride,
203+
bool visible = true,
172204
}) => _ConfirmSignInTextField(
173205
key: key ?? keyFamilyNameConfirmSignInFormField,
174206
titleKey: InputResolverKey.familyNameTitle,
@@ -178,6 +210,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
178210
required: required,
179211
autofillHints: autofillHints,
180212
authenticatorTextFieldController: authenticatorTextFieldController,
213+
enabledOverride: enabledOverride,
214+
visible: visible,
181215
);
182216

183217
/// Creates a gender component.
@@ -187,6 +221,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
187221
bool? required,
188222
Iterable<String>? autofillHints,
189223
AuthenticatorTextFieldController? authenticatorTextFieldController,
224+
AuthenticatorTextEnabledOverride? enabledOverride,
225+
bool visible = true,
190226
}) => _ConfirmSignInTextField(
191227
key: key ?? keyGenderConfirmSignInFormField,
192228
titleKey: InputResolverKey.genderTitle,
@@ -196,6 +232,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
196232
required: required,
197233
autofillHints: autofillHints,
198234
authenticatorTextFieldController: authenticatorTextFieldController,
235+
enabledOverride: enabledOverride,
236+
visible: visible,
199237
);
200238

201239
/// Creates a givenName component.
@@ -205,6 +243,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
205243
bool? required,
206244
Iterable<String>? autofillHints,
207245
AuthenticatorTextFieldController? authenticatorTextFieldController,
246+
AuthenticatorTextEnabledOverride? enabledOverride,
247+
bool visible = true,
208248
}) => _ConfirmSignInTextField(
209249
key: key ?? keyGivenNameConfirmSignInFormField,
210250
titleKey: InputResolverKey.givenNameTitle,
@@ -214,6 +254,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
214254
required: required,
215255
autofillHints: autofillHints,
216256
authenticatorTextFieldController: authenticatorTextFieldController,
257+
enabledOverride: enabledOverride,
258+
visible: visible,
217259
);
218260

219261
/// Creates a middleName component.
@@ -223,6 +265,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
223265
bool? required,
224266
Iterable<String>? autofillHints,
225267
AuthenticatorTextFieldController? authenticatorTextFieldController,
268+
AuthenticatorTextEnabledOverride? enabledOverride,
269+
bool visible = true,
226270
}) => _ConfirmSignInTextField(
227271
key: key ?? keyMiddleNameConfirmSignInFormField,
228272
titleKey: InputResolverKey.middleNameTitle,
@@ -232,6 +276,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
232276
required: required,
233277
autofillHints: autofillHints,
234278
authenticatorTextFieldController: authenticatorTextFieldController,
279+
enabledOverride: enabledOverride,
280+
visible: visible,
235281
);
236282

237283
/// Creates a name component.
@@ -241,6 +287,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
241287
bool? required,
242288
Iterable<String>? autofillHints,
243289
AuthenticatorTextFieldController? authenticatorTextFieldController,
290+
AuthenticatorTextEnabledOverride? enabledOverride,
291+
bool visible = true,
244292
}) => _ConfirmSignInTextField(
245293
key: key ?? keyNameConfirmSignInFormField,
246294
titleKey: InputResolverKey.nameTitle,
@@ -250,6 +298,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
250298
required: required,
251299
autofillHints: autofillHints,
252300
authenticatorTextFieldController: authenticatorTextFieldController,
301+
enabledOverride: enabledOverride,
302+
visible: visible,
253303
);
254304

255305
/// Creates a nickname component.
@@ -259,6 +309,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
259309
bool? required,
260310
Iterable<String>? autofillHints,
261311
AuthenticatorTextFieldController? authenticatorTextFieldController,
312+
AuthenticatorTextEnabledOverride? enabledOverride,
313+
bool visible = true,
262314
}) => _ConfirmSignInTextField(
263315
key: key ?? keyNicknameConfirmSignInFormField,
264316
titleKey: InputResolverKey.nicknameTitle,
@@ -268,6 +320,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
268320
required: required,
269321
autofillHints: autofillHints,
270322
authenticatorTextFieldController: authenticatorTextFieldController,
323+
enabledOverride: enabledOverride,
324+
visible: visible,
271325
);
272326

273327
/// Creates a phoneNumber component.
@@ -277,6 +331,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
277331
bool? required,
278332
Iterable<String>? autofillHints,
279333
AuthenticatorTextFieldController? authenticatorTextFieldController,
334+
AuthenticatorTextEnabledOverride? enabledOverride,
335+
bool visible = true,
280336
}) => _ConfirmSignInPhoneField(
281337
key: key ?? keyPhoneNumberConfirmSignInFormField,
282338
titleKey: InputResolverKey.phoneNumberTitle,
@@ -286,6 +342,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
286342
required: required,
287343
autofillHints: autofillHints,
288344
authenticatorTextFieldController: authenticatorTextFieldController,
345+
enabledOverride: enabledOverride,
346+
visible: visible,
289347
);
290348

291349
/// Creates a preferredUsername component.
@@ -295,6 +353,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
295353
bool? required,
296354
Iterable<String>? autofillHints,
297355
AuthenticatorTextFieldController? authenticatorTextFieldController,
356+
AuthenticatorTextEnabledOverride? enabledOverride,
357+
bool visible = true,
298358
}) => _ConfirmSignInTextField(
299359
key: key ?? keyPreferredUsernameConfirmSignInFormField,
300360
titleKey: InputResolverKey.preferredUsernameTitle,
@@ -304,6 +364,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
304364
required: required,
305365
autofillHints: autofillHints,
306366
authenticatorTextFieldController: authenticatorTextFieldController,
367+
enabledOverride: enabledOverride,
368+
visible: visible,
307369
);
308370

309371
/// Creates a custom attribute component.
@@ -316,6 +378,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
316378
bool? required,
317379
Iterable<String>? autofillHints,
318380
AuthenticatorTextFieldController? authenticatorTextFieldController,
381+
AuthenticatorTextEnabledOverride? enabledOverride,
382+
bool visible = true,
319383
}) => _ConfirmSignInTextField(
320384
key: key,
321385
title: title,
@@ -326,6 +390,8 @@ abstract class ConfirmSignInFormField<FieldValue extends Object>
326390
required: required,
327391
autofillHints: autofillHints,
328392
authenticatorTextFieldController: authenticatorTextFieldController,
393+
enabledOverride: enabledOverride,
394+
visible: visible,
329395
);
330396

331397
/// Custom Cognito attribute key.
@@ -521,6 +587,8 @@ class _ConfirmSignInPhoneField extends ConfirmSignInFormField<String> {
521587
super.validator,
522588
super.required,
523589
super.autofillHints,
590+
super.enabledOverride,
591+
super.visible,
524592
this.authenticatorTextFieldController,
525593
}) : super._(customAttributeKey: attributeKey);
526594

@@ -591,6 +659,8 @@ class _ConfirmSignInTextField extends ConfirmSignInFormField<String> {
591659
super.validator,
592660
super.required,
593661
super.autofillHints,
662+
super.enabledOverride,
663+
super.visible,
594664
this.authenticatorTextFieldController,
595665
}) : super._(customAttributeKey: attributeKey);
596666

@@ -785,6 +855,8 @@ class _ConfirmSignInDateField extends ConfirmSignInFormField<String> {
785855
super.validator,
786856
super.required,
787857
super.autofillHints,
858+
super.enabledOverride,
859+
super.visible,
788860
}) : super._(customAttributeKey: attributeKey);
789861

790862
@override

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ abstract class ConfirmSignUpFormField<FieldValue extends Object>
2121
super.hintText,
2222
super.validator,
2323
super.autofillHints,
24+
super.enabledOverride,
25+
super.visible,
2426
}) : super._();
2527

2628
/// {@macro amplify_authenticator.username_form_field}
@@ -29,6 +31,8 @@ abstract class ConfirmSignUpFormField<FieldValue extends Object>
2931
FormFieldValidator<UsernameInput>? validator,
3032
Iterable<String>? autofillHints,
3133
AuthenticatorTextFieldController? authenticatorTextFieldController,
34+
AuthenticatorTextEnabledOverride? enabledOverride,
35+
bool visible = true,
3236
}) => _ConfirmSignUpUsernameField(
3337
key: key ?? keyUsernameConfirmSignUpFormField,
3438
titleKey: InputResolverKey.usernameTitle,
@@ -37,6 +41,8 @@ abstract class ConfirmSignUpFormField<FieldValue extends Object>
3741
validator: validator,
3842
autofillHints: autofillHints,
3943
authenticatorTextFieldController: authenticatorTextFieldController,
44+
enabledOverride: enabledOverride,
45+
visible: visible,
4046
);
4147

4248
/// Creates a verificationCode component.
@@ -45,6 +51,8 @@ abstract class ConfirmSignUpFormField<FieldValue extends Object>
4551
FormFieldValidator<String>? validator,
4652
Iterable<String>? autofillHints,
4753
AuthenticatorTextFieldController? authenticatorTextFieldController,
54+
AuthenticatorTextEnabledOverride? enabledOverride,
55+
bool visible = true,
4856
}) => _ConfirmSignUpTextField(
4957
key: key ?? keyCodeConfirmSignUpFormField,
5058
titleKey: InputResolverKey.verificationCodeTitle,
@@ -53,6 +61,8 @@ abstract class ConfirmSignUpFormField<FieldValue extends Object>
5361
validator: validator,
5462
autofillHints: autofillHints,
5563
authenticatorTextFieldController: authenticatorTextFieldController,
64+
enabledOverride: enabledOverride,
65+
visible: visible,
5666
);
5767

5868
@override
@@ -135,6 +145,8 @@ class _ConfirmSignUpTextField extends ConfirmSignUpFormField<String> {
135145
super.hintTextKey,
136146
super.validator,
137147
super.autofillHints,
148+
super.enabledOverride,
149+
super.visible,
138150
this.authenticatorTextFieldController,
139151
}) : super._();
140152

@@ -218,6 +230,8 @@ class _ConfirmSignUpUsernameField
218230
super.hintTextKey,
219231
super.validator,
220232
super.autofillHints,
233+
super.enabledOverride,
234+
super.visible,
221235
this.authenticatorTextFieldController,
222236
}) : super._();
223237

0 commit comments

Comments
 (0)