From 84f254e92ebfc09d7cbe0896f8542e854443f915 Mon Sep 17 00:00:00 2001
From: Anthony Whitford <anthony@whitford.com>
Date: Tue, 1 Dec 2020 22:33:00 -0800
Subject: [PATCH] Added a null-safe spread operator for field.value to guard
 against a null value. Resolves #607.

---
 lib/src/fields/form_builder_image_picker.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/fields/form_builder_image_picker.dart b/lib/src/fields/form_builder_image_picker.dart
index fb007902e6..0c5cbddacc 100644
--- a/lib/src/fields/form_builder_image_picker.dart
+++ b/lib/src/fields/form_builder_image_picker.dart
@@ -125,7 +125,7 @@ class FormBuilderImagePicker extends FormBuilderField<List<dynamic>> {
                                 onTap: () {
                                   state.requestFocus();
                                   field.didChange(
-                                      <dynamic>[...field.value]..remove(item));
+                                      <dynamic>[...?field.value]..remove(item));
                                 },
                                 child: Container(
                                   margin: const EdgeInsets.all(3),
@@ -184,12 +184,12 @@ class FormBuilderImagePicker extends FormBuilderField<List<dynamic>> {
                                 onImageSelected: (image) {
                                   state.requestFocus();
                                   field.didChange(
-                                      <dynamic>[...field.value, image]);
+                                      <dynamic>[...?field.value, image]);
                                   Navigator.pop(state.context);
                                 },
                                 onImage: (image) {
                                   field.didChange(
-                                      <dynamic>[...field.value, image]);
+                                      <dynamic>[...?field.value, image]);
                                   onChanged?.call(field.value);
                                   Navigator.pop(state.context);
                                 },