Merge pull request #1069 from danvick/765

Added shape property to FormBuilderChoiceChip

Author: deandreamatias

packages/flutter_form_builder/lib/src/fields/form_builder_choice_chips.dart

@@ -53,9 +53,21 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
   /// The default is [Colors.black].
   final Color? shadowColor;
 
-  /// The [ShapeBorder] to draw around the chip.
+  /// The [OutlinedBorder] to draw around the chip.
   ///
-  /// Defaults to the shape in the ambient [ChipThemeData].
+  /// Defaults to the shape in the ambient [ChipThemeData]. If the theme
+  /// shape resolves to null, the default is [StadiumBorder].
+  ///
+  /// This shape is combined with [side] to create a shape decorated with an
+  /// outline. If it is a [MaterialStateOutlinedBorder],
+  /// [MaterialStateProperty.resolve] is used for the following
+  /// [MaterialState]s:
+  ///
+  ///  * [MaterialState.disabled].
+  ///  * [MaterialState.selected].
+  ///  * [MaterialState.hovered].
+  ///  * [MaterialState.focused].
+  ///  * [MaterialState.pressed].
   final OutlinedBorder? shape;
 
   /// Configures the minimum size of the tap target.
@@ -311,6 +323,7 @@ class FormBuilderChoiceChip<T> extends FormBuilderField<T> {
                     for (FormBuilderChipOption<T> option in options)
                       ChoiceChip(
                         label: option,
+                        shape: shape,
                         selected: field.value == option.value,
                         onSelected: state.enabled
                             ? (selected) {

packages/flutter_form_builder/test/form_builder_choice_chips_test.dart

@@ -6,28 +6,84 @@ import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'form_builder_tester.dart';
 
 void main() {
-  testWidgets('FormBuilderChoiceChip -- 1,3', (WidgetTester tester) async {
-    const widgetName = 'cc1';
-    final testWidget = FormBuilderChoiceChip<int>(
-      shouldRequestFocus: false,
-      name: widgetName,
-      options: const [
-        FormBuilderChipOption(key: ValueKey('1'), value: 1),
-        FormBuilderChipOption(key: ValueKey('2'), value: 2),
-        FormBuilderChipOption(key: ValueKey('3'), value: 3),
-      ],
-    );
-    await tester.pumpWidget(buildTestableFieldWidget(testWidget));
-
-    expect(formSave(), isTrue);
-    expect(formValue(widgetName), isNull);
-    await tester.tap(find.byKey(const ValueKey('1')));
-    await tester.pumpAndSettle();
-    expect(formSave(), isTrue);
-    expect(formValue(widgetName), equals(1));
-    await tester.tap(find.byKey(const ValueKey('3')));
-    await tester.pumpAndSettle();
-    expect(formSave(), isTrue);
-    expect(formValue(widgetName), equals(3));
+  group('FormBuilderChoiceChip --', () {
+    testWidgets('basic', (WidgetTester tester) async {
+      const widgetName = 'cc1';
+
+      final testWidget = FormBuilderChoiceChip<int>(
+        shouldRequestFocus: false,
+        name: widgetName,
+        options: const [
+          FormBuilderChipOption(key: ValueKey('1'), value: 1),
+          FormBuilderChipOption(key: ValueKey('2'), value: 2),
+          FormBuilderChipOption(key: ValueKey('3'), value: 3),
+        ],
+      );
+      await tester.pumpWidget(buildTestableFieldWidget(testWidget));
+
+      expect(formSave(), isTrue);
+      expect(formValue<int?>(widgetName), isNull);
+      await tester.tap(find.byKey(const ValueKey('1')));
+      await tester.pumpAndSettle();
+      expect(formSave(), isTrue);
+      expect(formValue<int?>(widgetName), equals(1));
+      await tester.tap(find.byKey(const ValueKey('3')));
+      await tester.pumpAndSettle();
+      expect(formSave(), isTrue);
+      expect(formValue<int?>(widgetName), equals(3));
+    });
+  });
+  group('initial value -', () {
+    testWidgets('to FormBuilder', (WidgetTester tester) async {
+      const widgetName = 'cc2';
+
+      final testWidget = FormBuilderChoiceChip<int>(
+        shouldRequestFocus: false,
+        name: widgetName,
+        options: const [
+          FormBuilderChipOption(key: ValueKey('1'), value: 1),
+          FormBuilderChipOption(key: ValueKey('2'), value: 2),
+          FormBuilderChipOption(key: ValueKey('3'), value: 3),
+        ],
+      );
+      await tester.pumpWidget(buildTestableFieldWidget(
+        testWidget,
+        initialValue: {widgetName: 1},
+      ));
+
+      await tester.ensureVisible(find.byKey(const ValueKey('1')));
+      expect(formInstantValue(widgetName), equals(1));
+      expect(formSave(), isTrue);
+      expect(formValue<int?>(widgetName), equals(1));
+      await tester.tap(find.byKey(const ValueKey('3')));
+      await tester.pumpAndSettle();
+      expect(formSave(), isTrue);
+      expect(formValue<int?>(widgetName), equals(3));
+    });
+    testWidgets('to Widget', (WidgetTester tester) async {
+      const widgetName = 'cc3';
+
+      final testWidget = FormBuilderChoiceChip<int>(
+        shouldRequestFocus: false,
+        name: widgetName,
+        initialValue: 1,
+        options: const [
+          FormBuilderChipOption(key: ValueKey('1'), value: 1),
+          FormBuilderChipOption(key: ValueKey('2'), value: 2),
+          FormBuilderChipOption(key: ValueKey('3'), value: 3),
+        ],
+      );
+      await tester.pumpWidget(buildTestableFieldWidget(testWidget));
+      await tester.pumpAndSettle();
+
+      await tester.ensureVisible(find.byKey(const ValueKey('1')));
+      expect(formInstantValue(widgetName), equals(1));
+      expect(formSave(), isTrue);
+      expect(formValue<int?>(widgetName), equals(1));
+      await tester.tap(find.byKey(const ValueKey('3')));
+      await tester.pumpAndSettle();
+      expect(formSave(), isTrue);
+      expect(formValue<int?>(widgetName), equals(3));
+    });
   });
 }