feat: migrate to new form field widget

mdeandrea-mrmilu · mdeandrea-mrmilu · commit d6beb12a0f97 · 2023-05-11T15:42:13.000+02:00
diff --git a/lib/src/fields/form_builder_color_picker.dart b/lib/src/fields/form_builder_color_picker.dart
@@ -30,7 +30,7 @@ extension on Color {
 enum ColorPickerType { colorPicker, materialPicker, blockPicker }
 
 /// Creates a field for `Color` input selection
-class FormBuilderColorPickerField extends FormBuilderField<Color> {
+class FormBuilderColorPickerField extends FormBuilderFieldDecoration<Color> {
   //TODO: Add documentation
   final TextEditingController? controller;
   final ColorPickerType colorPickerType;
@@ -70,19 +70,18 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
   final Widget Function(Color?)? colorPreviewBuilder;
 
   FormBuilderColorPickerField({
-    Key? key,
-    //From Super
-    required String name,
-    FormFieldValidator<Color>? validator,
-    Color? initialValue,
-    InputDecoration decoration = const InputDecoration(),
-    ValueChanged<Color?>? onChanged,
-    ValueTransformer<Color?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<Color>? onSaved,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    VoidCallback? onReset,
-    FocusNode? focusNode,
+    super.key,
+    required super.name,
+    super.validator,
+    super.initialValue,
+    super.decoration,
+    super.onChanged,
+    super.valueTransformer,
+    super.enabled,
+    super.onSaved,
+    super.autovalidateMode,
+    super.onReset,
+    super.focusNode,
     bool readOnly = false,
     this.colorPickerType = ColorPickerType.colorPicker,
     this.textCapitalization = TextCapitalization.none,
@@ -115,18 +114,6 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
     this.colorPreviewBuilder,
     this.availableColors = const [],
   }) : super(
-          key: key,
-          initialValue: initialValue,
-          name: name,
-          validator: validator,
-          valueTransformer: valueTransformer,
-          onChanged: onChanged,
-          autovalidateMode: autovalidateMode,
-          onSaved: onSaved,
-          enabled: enabled,
-          onReset: onReset,
-          decoration: decoration,
-          focusNode: focusNode,
           builder: (FormFieldState<Color?> field) {
             final state = field as FormBuilderColorPickerFieldState;
             return TextField(
@@ -183,8 +170,8 @@ class FormBuilderColorPickerField extends FormBuilderField<Color> {
       FormBuilderColorPickerFieldState();
 }
 
-class FormBuilderColorPickerFieldState
-    extends FormBuilderFieldState<FormBuilderColorPickerField, Color> {
+class FormBuilderColorPickerFieldState extends FormBuilderFieldDecorationState<
+    FormBuilderColorPickerField, Color> {
   late TextEditingController _effectiveController;
 
   String? get valueString => value?.toHex();
diff --git a/lib/src/fields/form_builder_rating_bar.dart b/lib/src/fields/form_builder_rating_bar.dart
@@ -3,7 +3,7 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 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> {
+class FormBuilderRatingBar extends FormBuilderFieldDecoration<double> {
   /// Defines color for glow.
   ///
   /// Default is [ThemeData.colorScheme.secondary].
@@ -95,19 +95,18 @@ class FormBuilderRatingBar extends FormBuilderField<double> {
   final RatingWidget? ratingWidget;
 
   FormBuilderRatingBar({
-    Key? key,
-    //From Super
-    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,
-    VoidCallback? onReset,
+    super.key,
+    super.autovalidateMode,
+    super.enabled,
+    super.initialValue,
+    super.focusNode,
+    super.onSaved,
+    super.validator,
+    super.decoration,
+    required super.name,
+    super.onChanged,
+    super.valueTransformer,
+    super.onReset,
     this.allowHalfRating = false,
     this.direction = Axis.horizontal,
     this.glow = true,
@@ -126,18 +125,6 @@ class FormBuilderRatingBar extends FormBuilderField<double> {
     this.updateOnDrag = false,
     this.wrapAlignment = WrapAlignment.start,
   }) : super(
-          key: key,
-          initialValue: initialValue,
-          name: name,
-          validator: validator,
-          valueTransformer: valueTransformer,
-          onChanged: onChanged,
-          autovalidateMode: autovalidateMode,
-          onSaved: onSaved,
-          enabled: enabled,
-          onReset: onReset,
-          decoration: decoration,
-          focusNode: focusNode,
           builder: (FormFieldState<double?> field) {
             final state = field as FormBuilderRatingBarState;
             final widget = state.widget;
@@ -182,4 +169,4 @@ class FormBuilderRatingBar extends FormBuilderField<double> {
 }
 
 class FormBuilderRatingBarState
-    extends FormBuilderFieldState<FormBuilderRatingBar, double> {}
+    extends FormBuilderFieldDecorationState<FormBuilderRatingBar, double> {}
diff --git a/lib/src/fields/form_builder_searchable_dropdown.dart b/lib/src/fields/form_builder_searchable_dropdown.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// Field for selecting value(s) from a searchable list
-class FormBuilderSearchableDropdown<T> extends FormBuilderField<T> {
+class FormBuilderSearchableDropdown<T> extends FormBuilderFieldDecoration<T> {
   ///offline items list
   final List<T> items;
 
@@ -89,18 +89,18 @@ class FormBuilderSearchableDropdown<T> extends FormBuilderField<T> {
 
   /// Creates field for selecting value(s) from a searchable list
   FormBuilderSearchableDropdown({
-    Key? key,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    bool enabled = true,
-    FocusNode? focusNode,
-    FormFieldSetter<T>? onSaved,
-    FormFieldValidator<T>? validator,
-    InputDecoration decoration = const InputDecoration(),
-    required String name,
-    T? initialValue,
-    ValueChanged<T?>? onChanged,
-    ValueTransformer<T?>? valueTransformer,
-    VoidCallback? onReset,
+    super.key,
+    super.autovalidateMode,
+    super.enabled,
+    super.focusNode,
+    super.onSaved,
+    super.validator,
+    super.decoration,
+    required super.name,
+    super.initialValue,
+    super.onChanged,
+    super.valueTransformer,
+    super.onReset,
     this.asyncItems,
     this.autoValidateMode,
     this.compareFn,
@@ -134,18 +134,6 @@ class FormBuilderSearchableDropdown<T> extends FormBuilderField<T> {
         popupValidationMultiSelectionWidget = null,
         popupCustomMultiSelectionWidget = null,
         super(
-          key: key,
-          initialValue: initialValue,
-          name: name,
-          validator: validator,
-          valueTransformer: valueTransformer,
-          onChanged: onChanged,
-          autovalidateMode: autovalidateMode,
-          onSaved: onSaved,
-          enabled: enabled,
-          onReset: onReset,
-          decoration: decoration,
-          focusNode: focusNode,
           builder: (FormFieldState<T?> field) {
             final state = field as FormBuilderSearchableDropdownState<T>;
             return DropdownSearch<T>(
@@ -182,4 +170,5 @@ class FormBuilderSearchableDropdown<T> extends FormBuilderField<T> {
 }
 
 class FormBuilderSearchableDropdownState<T>
-    extends FormBuilderFieldState<FormBuilderSearchableDropdown<T>, T> {}
+    extends FormBuilderFieldDecorationState<FormBuilderSearchableDropdown<T>,
+        T> {}
diff --git a/lib/src/fields/form_builder_signature_pad.dart b/lib/src/fields/form_builder_signature_pad.dart
@@ -6,7 +6,7 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:signature/signature.dart';
 
 /// Field with drawing pad on which user can doodle
-class FormBuilderSignaturePad extends FormBuilderField<Uint8List> {
+class FormBuilderSignaturePad extends FormBuilderFieldDecoration<Uint8List> {
   /// Controls the value of the signature pad.
   ///
   /// If null, this widget will create its own [SignatureController].
@@ -37,38 +37,25 @@ class FormBuilderSignaturePad extends FormBuilderField<Uint8List> {
 
   /// Creates field with drawing pad on which user can doodle
   FormBuilderSignaturePad({
-    Key? key,
-    //From Super
-    required String name,
-    FormFieldValidator<Uint8List>? validator,
-    Uint8List? initialValue,
-    InputDecoration decoration = const InputDecoration(),
-    ValueChanged<Uint8List?>? onChanged,
-    ValueTransformer<Uint8List?>? valueTransformer,
-    bool enabled = true,
-    FormFieldSetter<Uint8List>? onSaved,
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    VoidCallback? onReset,
-    FocusNode? focusNode,
+    super.key,
+    required super.name,
+    super.validator,
+    super.initialValue,
+    super.decoration,
+    super.onChanged,
+    super.valueTransformer,
+    super.enabled,
+    super.onSaved,
+    super.autovalidateMode,
+    super.onReset,
+    super.focusNode,
     this.backgroundColor = Colors.transparent,
     this.clearButtonText,
     this.width,
     this.height = 200,
     this.controller,
     this.border,
   }) : super(
-          autovalidateMode: autovalidateMode,
-          decoration: decoration,
-          enabled: enabled,
-          focusNode: focusNode,
-          initialValue: initialValue,
-          key: key,
-          name: name,
-          onChanged: onChanged,
-          onReset: onReset,
-          onSaved: onSaved,
-          validator: validator,
-          valueTransformer: valueTransformer,
           builder: (FormFieldState<Uint8List?> field) {
             final state = field as FormBuilderSignaturePadState;
             final theme = Theme.of(state.context);
@@ -85,12 +72,9 @@ class FormBuilderSignaturePad extends FormBuilderField<Uint8List> {
                     width: width,
                     decoration: BoxDecoration(
                       border: border,
-                      image:
-                          (null != initialValue && initialValue == state.value)
-                              ? DecorationImage(
-                                  image: MemoryImage(state.value!),
-                                )
-                              : null,
+                      image: null != initialValue && initialValue == state.value
+                          ? DecorationImage(image: MemoryImage(state.value!))
+                          : null,
                     ),
                     child: state.enabled
                         ? GestureDetector(
@@ -133,8 +117,8 @@ class FormBuilderSignaturePad extends FormBuilderField<Uint8List> {
   FormBuilderSignaturePadState createState() => FormBuilderSignaturePadState();
 }
 
-class FormBuilderSignaturePadState
-    extends FormBuilderFieldState<FormBuilderSignaturePad, Uint8List> {
+class FormBuilderSignaturePadState extends FormBuilderFieldDecorationState<
+    FormBuilderSignaturePad, Uint8List> {
   late SignatureController _controller;
 
   SignatureController get effectiveController => _controller;
diff --git a/lib/src/fields/form_builder_touch_spin.dart b/lib/src/fields/form_builder_touch_spin.dart
@@ -5,7 +5,7 @@ import 'package:intl/intl.dart';
 import '../widgets/touch_spin/touch_spin.dart';
 
 /// Field for selection of a number by tapping on an add or subtract icon
-class FormBuilderTouchSpin extends FormBuilderField<num> {
+class FormBuilderTouchSpin extends FormBuilderFieldDecoration<num> {
   /// Value to increment or decrement by
   final num step;
 
@@ -45,19 +45,18 @@ class FormBuilderTouchSpin extends FormBuilderField<num> {
 
   /// Creates field for selection of a number by tapping on an add or subtract icon
   FormBuilderTouchSpin({
-    Key? key,
-    //From Super
-    AutovalidateMode autovalidateMode = AutovalidateMode.disabled,
-    bool enabled = true,
-    FocusNode? focusNode,
-    FormFieldSetter<num>? onSaved,
-    FormFieldValidator<num>? validator,
-    InputDecoration decoration = const InputDecoration(),
-    num? initialValue,
-    required String name,
-    ValueChanged<num?>? onChanged,
-    ValueTransformer<num?>? valueTransformer,
-    VoidCallback? onReset,
+    super.key,
+    super.autovalidateMode,
+    super.enabled,
+    super.focusNode,
+    super.onSaved,
+    super.validator,
+    super.decoration,
+    super.initialValue,
+    required super.name,
+    super.onChanged,
+    super.valueTransformer,
+    super.onReset,
     this.addIcon = const Icon(Icons.add),
     this.displayFormat,
     this.iconActiveColor,
@@ -70,18 +69,6 @@ class FormBuilderTouchSpin extends FormBuilderField<num> {
     this.subtractIcon = const Icon(Icons.remove),
     this.textStyle = const TextStyle(fontSize: 24),
   }) : super(
-          autovalidateMode: autovalidateMode,
-          decoration: decoration,
-          enabled: enabled,
-          focusNode: focusNode,
-          initialValue: initialValue,
-          key: key,
-          name: name,
-          onChanged: onChanged,
-          onReset: onReset,
-          onSaved: onSaved,
-          validator: validator,
-          valueTransformer: valueTransformer,
           builder: (FormFieldState<num?> field) {
             final state = field as FormBuilderTouchSpinState;
             final theme = Theme.of(state.context);
@@ -118,4 +105,4 @@ class FormBuilderTouchSpin extends FormBuilderField<num> {
 }
 
 class FormBuilderTouchSpinState
-    extends FormBuilderFieldState<FormBuilderTouchSpin, num> {}
+    extends FormBuilderFieldDecorationState<FormBuilderTouchSpin, num> {}
diff --git a/lib/src/fields/form_builder_typeahead.dart b/lib/src/fields/form_builder_typeahead.dart
