feat: update FormBuilderRadioGroup with new RadioGroup widget

Author: deandreamatias

lib/src/fields/form_builder_radio_group.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
-
-import 'package:flutter_form_builder/flutter_form_builder.dart';
+import 'package:flutter_form_builder/src/form_builder_field.dart';
+import 'package:flutter_form_builder/src/form_builder_field_decoration.dart';
+import 'package:flutter_form_builder/src/form_builder_field_option.dart';
+import 'package:flutter_form_builder/src/widgets/grouped_radio.dart';
 
 /// Field to select one value from a list of Radio Widgets
 class FormBuilderRadioGroup<T> extends FormBuilderFieldDecoration<T> {

lib/src/widgets/grouped_radio.dart

@@ -217,36 +217,42 @@ class _GroupedRadioState<T> extends State<GroupedRadio<T?>> {
       widgetList.add(buildItem(i));
     }
 
-    return switch (widget.orientation) {
-      OptionsOrientation.auto => OverflowBar(
-        alignment: MainAxisAlignment.spaceEvenly,
-        children: widgetList,
-      ),
-      OptionsOrientation.vertical => SingleChildScrollView(
-        scrollDirection: Axis.vertical,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+    return RadioGroup<T?>(
+      onChanged: (value) {
+        widget.onChanged(value);
+      },
+      groupValue: widget.value,
+      child: switch (widget.orientation) {
+        OptionsOrientation.auto => OverflowBar(
+          alignment: MainAxisAlignment.spaceEvenly,
           children: widgetList,
         ),
-      ),
-      OptionsOrientation.horizontal => SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        child: Row(children: widgetList),
-      ),
-      OptionsOrientation.wrap => SingleChildScrollView(
-        child: Wrap(
-          spacing: widget.wrapSpacing,
-          runSpacing: widget.wrapRunSpacing,
-          textDirection: widget.wrapTextDirection,
-          crossAxisAlignment: widget.wrapCrossAxisAlignment,
-          verticalDirection: widget.wrapVerticalDirection,
-          alignment: widget.wrapAlignment,
-          direction: Axis.horizontal,
-          runAlignment: widget.wrapRunAlignment,
-          children: widgetList,
+        OptionsOrientation.vertical => SingleChildScrollView(
+          scrollDirection: Axis.vertical,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: widgetList,
+          ),
+        ),
+        OptionsOrientation.horizontal => SingleChildScrollView(
+          scrollDirection: Axis.horizontal,
+          child: Row(children: widgetList),
+        ),
+        OptionsOrientation.wrap => SingleChildScrollView(
+          child: Wrap(
+            spacing: widget.wrapSpacing,
+            runSpacing: widget.wrapRunSpacing,
+            textDirection: widget.wrapTextDirection,
+            crossAxisAlignment: widget.wrapCrossAxisAlignment,
+            verticalDirection: widget.wrapVerticalDirection,
+            alignment: widget.wrapAlignment,
+            direction: Axis.horizontal,
+            runAlignment: widget.wrapRunAlignment,
+            children: widgetList,
+          ),
         ),
-      ),
-    };
+      },
+    );
   }
 
   /// the composite of all the components for the option at index
@@ -255,17 +261,12 @@ class _GroupedRadioState<T> extends State<GroupedRadio<T?>> {
     final optionValue = option.value;
     final isOptionDisabled = true == widget.disabled?.contains(optionValue);
     final control = Radio<T?>(
-      groupValue: widget.value,
       activeColor: widget.activeColor,
       focusColor: widget.focusColor,
       hoverColor: widget.hoverColor,
       materialTapTargetSize: widget.materialTapTargetSize,
       value: optionValue,
-      onChanged: isOptionDisabled
-          ? null
-          : (T? selected) {
-              widget.onChanged(selected);
-            },
+      enabled: !isOptionDisabled,
     );
 
     final label = GestureDetector(

test/src/fields/form_builder_radio_group_test.dart

@@ -172,5 +172,51 @@ void main() {
       expect(Focus.of(tester.element(widgetFinder)).hasFocus, true);
       expect(focusNode?.hasFocus, true);
     });
+    testWidgets(
+      'when change value, onChange will be called with value changed',
+      (WidgetTester tester) async {
+        const widgetName = 'key';
+        int? changedValue;
+        final testWidget = FormBuilderRadioGroup<int>(
+          name: widgetName,
+          onChanged: (value) {
+            changedValue = value;
+          },
+          options: const [
+            FormBuilderFieldOption(key: ValueKey('1'), value: 1),
+            FormBuilderFieldOption(key: ValueKey('2'), value: 2),
+            FormBuilderFieldOption(key: ValueKey('3'), value: 3),
+          ],
+        );
+        await tester.pumpWidget(buildTestableFieldWidget(testWidget));
+
+        expect(formValue(widgetName), isNull);
+        await tester.tap(find.byKey(const ValueKey('2')));
+        await tester.pumpAndSettle();
+        expect(changedValue, equals(2));
+      },
+    );
+    testWidgets('when is disable then can not change value', (
+      WidgetTester tester,
+    ) async {
+      const widgetName = 'key';
+      int? changedValue;
+      final testWidget = FormBuilderRadioGroup<int>(
+        name: widgetName,
+        onChanged: (value) {
+          changedValue = value;
+        },
+        enabled: false,
+        options: const [
+          FormBuilderFieldOption(key: ValueKey('1'), value: 1),
+          FormBuilderFieldOption(key: ValueKey('2'), value: 2),
+          FormBuilderFieldOption(key: ValueKey('3'), value: 3),
+        ],
+      );
+      await tester.pumpWidget(buildTestableFieldWidget(testWidget));
+      await tester.tap(find.byKey(const ValueKey('2')));
+      await tester.pumpAndSettle();
+      expect(changedValue, equals(null));
+    });
   });
 }