Implement shouldRequestFocus | Update test file (#958)

* chore: update test logic

* feat: impl shouldRequestFocus on some components

* fix: analyze

Co-authored-by: Danvick Miller <[email protected]>

Author: WilliamCunhaCardoso

melos.yaml

@@ -11,6 +11,11 @@ environment:
 
 scripts:
   analyze: melos exec -- pub global run tuneup check
+
   format: melos exec -- flutter format .
-  test: melos exec -- flutter test
+
+  test: >
+    melos exec -c 1 --fail-fast --dir-exists=test --ignore="*example*" -- \
+      flutter test test
+
   translate: melos exec --depends-on="intl_utils" -- flutter pub run intl_utils:generate

packages/form_builder_extra_fields/lib/src/fields/form_builder_chips_input.dart

@@ -8,68 +8,67 @@ class FormBuilderChipsInput<T> extends FormBuilderField<List<T>> {
   //TODO: Add documentation
   final ChipsInputSuggestions<T> findSuggestions;
 
-  // final ValueChanged<List<T>> onChanged;
+  final bool allowChipEditing;
+  final bool autocorrect;
+  final bool autofocus;
+  final bool obscureText;
+  final Brightness keyboardAppearance;
   final ChipsBuilder<T> chipBuilder;
   final ChipsBuilder<T> suggestionBuilder;
+  final double? suggestionsBoxMaxHeight;
   final int? maxChips;
-  final TextStyle? textStyle;
   final String? actionLabel;
-  final bool autocorrect;
+  final TextCapitalization textCapitalization;
   final TextInputAction inputAction;
   final TextInputType inputType;
-  final Brightness keyboardAppearance;
-  final bool obscureText;
-  final double? suggestionsBoxMaxHeight;
-  final TextCapitalization textCapitalization;
-  final bool allowChipEditing;
-  final bool autofocus;
   final TextOverflow textOverflow;
+  final TextStyle? textStyle;
 
   /// Creates a field that takes a list of `Chip`s as input and suggests more options
   /// while typing
   FormBuilderChipsInput({
     Key? key,
     //From Super
-    required String name,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
+    bool enabled = true,
+    FocusNode? focusNode,
+    FormFieldSetter<List<T>>? onSaved,
     FormFieldValidator<List<T>>? validator,
-    List<T> initialValue = const [],
     InputDecoration decoration = const InputDecoration(),
+    List<T> initialValue = const [],
+    required String name,
+    required this.chipBuilder,
+    required this.findSuggestions,
+    required this.suggestionBuilder,
     ValueChanged<List<T>?>? onChanged,
     ValueTransformer<List<T>?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<List<T>>? onSaved,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback? onReset,
-    FocusNode? focusNode,
-    required this.chipBuilder,
-    required this.suggestionBuilder,
-    required this.findSuggestions,
-    this.maxChips,
-    this.textStyle,
     this.actionLabel,
-    this.suggestionsBoxMaxHeight,
+    this.allowChipEditing = false,
     this.autocorrect = false,
+    this.autofocus = false,
     this.inputAction = TextInputAction.done,
     this.inputType = TextInputType.text,
     this.keyboardAppearance = Brightness.light,
+    this.maxChips,
     this.obscureText = false,
+    this.suggestionsBoxMaxHeight,
     this.textCapitalization = TextCapitalization.none,
-    this.allowChipEditing = false,
-    this.autofocus = false,
     this.textOverflow = TextOverflow.clip,
+    this.textStyle,
   }) : super(
-          key: key,
+          autovalidateMode: autovalidateMode,
+          decoration: decoration,
+          enabled: enabled,
+          focusNode: focusNode,
           initialValue: initialValue,
+          key: key,
           name: name,
-          validator: validator,
-          valueTransformer: valueTransformer,
           onChanged: onChanged,
-          autovalidateMode: autovalidateMode,
-          onSaved: onSaved,
-          enabled: enabled,
           onReset: onReset,
-          decoration: decoration,
-          focusNode: focusNode,
+          onSaved: onSaved,
+          validator: validator,
+          valueTransformer: valueTransformer,
           builder: (FormFieldState<List<T>?> field) {
             final state = field as _FormBuilderChipsInputState<T>;
 

packages/form_builder_extra_fields/lib/src/fields/form_builder_color_picker.dart

@@ -169,7 +169,6 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
               maxLines: maxLines,
               minLines: minLines,
               onEditingComplete: onEditingComplete,
-              // onFieldSubmitted: onFieldSubmitted,
               showCursor: showCursor,
               strutStyle: strutStyle,
               textDirection: textDirection,
@@ -247,7 +246,6 @@ class _FormBuilderColorPickerFieldState
         return ColorPicker(
           pickerColor: value ?? Colors.transparent,
           onColorChanged: _colorChanged,
-          // enableLabel: true,
           colorPickerWidth: 300,
           displayThumbColor: true,
           enableAlpha: true,
@@ -264,9 +262,6 @@ class _FormBuilderColorPickerFieldState
         return BlockPicker(
           pickerColor: value ?? Colors.transparent,
           onColorChanged: _colorChanged,
-          /*availableColors: [],
-          itemBuilder: ,
-          layoutBuilder: ,*/
         );
       default:
         throw 'Unknown ColorPickerType';

packages/form_builder_extra_fields/lib/src/fields/form_builder_cupertino_date_time_picker.dart

@@ -56,117 +56,117 @@ class FormBuilderCupertinoDateTimePicker extends FormBuilderField<DateTime> {
   final StrutStyle strutStyle;
 
   //
-  final Locale? locale;
-  final DateFormat? format;
+  final bool alwaysUse24HourFormat;
   final CupertinoDateTimePickerInputType inputType;
+  final DateCancelledCallback? onCancel;
+  final DateChangedCallback? onConfirm;
+  final DateFormat? format;
+  final DatePickerTheme? theme;
   final DateTime? firstDate;
   final DateTime? lastDate;
-  final bool alwaysUse24HourFormat;
-  final DatePickerTheme? theme;
-  final DateChangedCallback? onConfirm;
-  final DateCancelledCallback? onCancel;
+  final Locale? locale;
 
   FormBuilderCupertinoDateTimePicker({
     Key? key,
     //From Super
-    required String name,
-    FormFieldValidator<DateTime>? validator,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
+    bool enabled = true,
     DateTime? initialValue,
+    FocusNode? focusNode,
+    FormFieldSetter<DateTime>? onSaved,
+    FormFieldValidator<DateTime>? validator,
     InputDecoration decoration = const InputDecoration(),
+    required String name,
     ValueChanged<DateTime?>? onChanged,
     ValueTransformer<DateTime?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<DateTime>? onSaved,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback? onReset,
-    FocusNode? focusNode,
     //
-    this.locale,
+    this.alwaysUse24HourFormat = false,
+    this.firstDate,
     this.format,
     this.inputType = CupertinoDateTimePickerInputType.both,
-    this.firstDate,
     this.lastDate,
-    this.alwaysUse24HourFormat = false,
-    this.theme,
-    this.onConfirm,
+    this.locale,
     this.onCancel,
+    this.onConfirm,
+    this.theme,
 
     //TextField options
-    this.onFieldSubmitted,
+    this.autocorrect = false,
+    this.autofocus = false,
+    this.buildCounter,
     this.controller,
+    this.cursorColor,
+    this.cursorRadius,
+    this.cursorWidth = 2.0,
+    this.enableInteractiveSelection = false,
+    this.expands = false,
+    this.inputFormatters,
+    this.keyboardAppearance,
     this.keyboardType = TextInputType.datetime,
-    this.style,
-    this.textAlign = TextAlign.start,
-    this.autofocus = false,
-    this.obscureText = false,
-    this.autocorrect = false,
+    this.maxLength,
     this.maxLengthEnforcement = MaxLengthEnforcement.none,
-    this.textDirection,
     this.maxLines,
-    this.maxLength,
-    this.inputFormatters,
-    this.strutStyle = StrutStyle.disabled,
-    this.transitionBuilder,
-    this.showCursor = false,
     this.minLines,
-    this.expands = false,
-    this.textInputAction,
+    this.obscureText = false,
     this.onEditingComplete,
-    this.buildCounter,
-    this.cursorRadius,
-    this.cursorColor,
-    this.keyboardAppearance,
+    this.onFieldSubmitted,
     this.scrollPadding = const EdgeInsets.all(20.0),
-    this.enableInteractiveSelection = false,
-    this.cursorWidth = 2.0,
+    this.showCursor = false,
+    this.strutStyle = StrutStyle.disabled,
+    this.style,
+    this.textAlign = TextAlign.start,
     this.textCapitalization = TextCapitalization.none,
+    this.textDirection,
+    this.textInputAction,
+    this.transitionBuilder,
   }) : super(
-          key: key,
+          autovalidateMode: autovalidateMode,
+          decoration: decoration,
+          enabled: enabled,
+          focusNode: focusNode,
           initialValue: initialValue,
+          key: key,
           name: name,
-          validator: validator,
-          valueTransformer: valueTransformer,
           onChanged: onChanged,
-          autovalidateMode: autovalidateMode,
-          onSaved: onSaved,
-          enabled: enabled,
           onReset: onReset,
-          decoration: decoration,
-          focusNode: focusNode,
+          onSaved: onSaved,
+          validator: validator,
+          valueTransformer: valueTransformer,
           builder: (FormFieldState<DateTime?> field) {
             final state = field as _FormBuilderCupertinoDateTimePickerState;
 
             return TextField(
-              textDirection: textDirection,
-              textAlign: textAlign,
-              maxLength: maxLength,
+              autocorrect: autocorrect,
               autofocus: autofocus,
+              buildCounter: buildCounter,
+              controller: state._textFieldController,
+              cursorColor: cursorColor,
+              cursorRadius: cursorRadius,
+              cursorWidth: cursorWidth,
               decoration: state.decoration,
-              readOnly: true,
               enabled: state.enabled,
-              autocorrect: autocorrect,
-              controller: state._textFieldController,
+              enableInteractiveSelection: enableInteractiveSelection,
+              expands: expands,
               focusNode: state.effectiveFocusNode,
               inputFormatters: inputFormatters,
+              keyboardAppearance: keyboardAppearance,
               keyboardType: keyboardType,
+              maxLength: maxLength,
+              maxLengthEnforcement: maxLengthEnforcement,
               maxLines: maxLines,
-              obscureText: obscureText,
-              showCursor: showCursor,
               minLines: minLines,
-              expands: expands,
-              style: style,
+              obscureText: obscureText,
               onEditingComplete: onEditingComplete,
-              buildCounter: buildCounter,
-              cursorColor: cursorColor,
-              cursorRadius: cursorRadius,
-              cursorWidth: cursorWidth,
-              enableInteractiveSelection: enableInteractiveSelection,
-              keyboardAppearance: keyboardAppearance,
+              readOnly: true,
               scrollPadding: scrollPadding,
+              showCursor: showCursor,
               strutStyle: strutStyle,
+              style: style,
+              textAlign: textAlign,
               textCapitalization: textCapitalization,
+              textDirection: textDirection,
               textInputAction: textInputAction,
-              maxLengthEnforcement: maxLengthEnforcement,
             );
           },
         );
@@ -187,9 +187,9 @@ class _FormBuilderCupertinoDateTimePickerState extends FormBuilderFieldState<
     super.initState();
     _textFieldController = widget.controller ?? TextEditingController();
     _dateFormat = widget.format ?? _getDefaultDateTimeFormat();
-    final initVal = initialValue;
+    final _initialValue = initialValue;
     _textFieldController.text =
-        initVal == null ? '' : _dateFormat.format(initVal);
+        _initialValue == null ? '' : _dateFormat.format(_initialValue);
     effectiveFocusNode.addListener(_handleFocus);
   }
 

packages/form_builder_extra_fields/lib/src/fields/form_builder_rating_bar.dart

@@ -4,6 +4,8 @@ import 'package:flutter_rating_bar/flutter_rating_bar.dart';
 
 /// Field for selection of a numerical value using a star* rating widget
 class FormBuilderRatingBar extends FormBuilderField<double> {
+  final bool shouldRequestFocus;
+
   /// Defines color for glow.
   ///
   /// Default is [ThemeData.colorScheme.secondary].
@@ -97,34 +99,35 @@ class FormBuilderRatingBar extends FormBuilderField<double> {
   FormBuilderRatingBar({
     Key? key,
     //From Super
-    required String name,
-    FormFieldValidator<double>? validator,
+    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
+    bool enabled = true,
     double? initialValue,
+    FocusNode? focusNode,
+    FormFieldSetter<double>? onSaved,
+    FormFieldValidator<double>? validator,
     InputDecoration decoration = const InputDecoration(),
+    required String name,
     ValueChanged<double?>? onChanged,
     ValueTransformer<double?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<double>? onSaved,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
     VoidCallback? onReset,
-    FocusNode? focusNode,
-    this.glowColor,
-    this.maxRating,
-    this.textDirection,
-    this.unratedColor,
     this.allowHalfRating = false,
     this.direction = Axis.horizontal,
     this.glow = true,
+    this.glowColor,
     this.glowRadius = 2,
     this.initialRating = 0.0,
     this.itemCount = 5,
     this.itemPadding = EdgeInsets.zero,
     this.itemSize = 40.0,
+    this.maxRating,
     this.minRating = 0,
+    this.ratingWidget,
+    this.shouldRequestFocus = false,
     this.tapOnlyMode = false,
+    this.textDirection,
+    this.unratedColor,
     this.updateOnDrag = false,
     this.wrapAlignment = WrapAlignment.start,
-    this.ratingWidget,
   }) : super(
           key: key,
           initialValue: initialValue,
@@ -153,7 +156,10 @@ class FormBuilderRatingBar extends FormBuilderField<double> {
                 itemPadding: widget.itemPadding,
                 // itemBuilder: widget.itemBuilder
                 onRatingUpdate: (rating) {
-                  state.requestFocus();
+                  if (shouldRequestFocus) {
+                    state.requestFocus();
+                  }
+
                   field.didChange(rating);
                 },
                 ratingWidget: widget.ratingWidget ??