Merge branch 'master' of https://github.com/danvick/form_builder_file_picker

# Conflicts:
#	example/pubspec.lock
#	pubspec.lock

Author: danvick

example/lib/generated_plugin_registrant.dart

@@ -4,6 +4,7 @@
 
 // ignore_for_file: directives_ordering
 // ignore_for_file: lines_longer_than_80_chars
+// ignore_for_file: depend_on_referenced_packages
 
 import 'package:file_picker/_internal/file_picker_web.dart';
 

lib/src/form_builder_file_picker.dart

@@ -78,7 +78,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
     VoidCallback? onReset,
     FocusNode? focusNode,
     this.maxFiles,
-    this.withData = false,
+    this.withData = kIsWeb,
     this.withReadStream = false,
     this.allowMultiple = false,
     this.previewImages = true,
@@ -105,18 +105,15 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
             final state = field as _FormBuilderFilePickerState;
 
             return InputDecorator(
-              decoration: decoration,
+              decoration: state.decoration,
               child: Column(
                 children: <Widget>[
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: <Widget>[
-                      if (maxFiles != null)
-                        Text('${state._files.length} / $maxFiles'),
+                      if (maxFiles != null) Text('${state._files.length} / $maxFiles'),
                       InkWell(
-                        onTap: state.enabled &&
-                                (null == state._remainingItemCount ||
-                                    state._remainingItemCount! > 0)
+                        onTap: state.enabled && (null == state._remainingItemCount || state._remainingItemCount! > 0)
                             ? () => state.pickFiles(field)
                             : null,
                         child: selector,
@@ -125,10 +122,8 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
                   ),
                   const SizedBox(height: 3),
                   customFileViewerBuilder != null
-                      ? customFileViewerBuilder.call(state._files,
-                          (files) => state._setFiles(files ?? [], field))
-                      : state.defaultFileViewer(state._files,
-                          (files) => state._setFiles(files ?? [], field)),
+                      ? customFileViewerBuilder.call(state._files, (files) => state._setFiles(files ?? [], field))
+                      : state.defaultFileViewer(state._files, (files) => state._setFiles(files ?? [], field)),
                 ],
               ),
             );
@@ -140,8 +135,7 @@ class FormBuilderFilePicker extends FormBuilderField<List<PlatformFile>> {
       createState() => _FormBuilderFilePickerState();
 }
 
-class _FormBuilderFilePickerState
-    extends FormBuilderFieldState<FormBuilderFilePicker, List<PlatformFile>> {
+class _FormBuilderFilePickerState extends FormBuilderFieldState<FormBuilderFilePicker, List<PlatformFile>> {
   /// Image File Extensions.
   ///
   /// Note that images may be previewed.
@@ -163,8 +157,7 @@ class _FormBuilderFilePickerState
 
   List<PlatformFile> _files = [];
 
-  int? get _remainingItemCount =>
-      widget.maxFiles == null ? null : widget.maxFiles! - _files.length;
+  int? get _remainingItemCount => widget.maxFiles == null ? null : widget.maxFiles! - _files.length;
 
   @override
   void initState() {
@@ -204,8 +197,7 @@ class _FormBuilderFilePickerState
     }
   }
 
-  void _setFiles(
-      List<PlatformFile> files, FormFieldState<List<PlatformFile>?> field) {
+  void _setFiles(List<PlatformFile> files, FormFieldState<List<PlatformFile>?> field) {
     setState(() => _files = files);
     field.didChange(_files);
   }
@@ -215,16 +207,14 @@ class _FormBuilderFilePickerState
     field.didChange(_files);
   }
 
-  Widget defaultFileViewer(
-      List<PlatformFile> files, FormFieldSetter<List<PlatformFile>> setter) {
+  Widget defaultFileViewer(List<PlatformFile> files, FormFieldSetter<List<PlatformFile>> setter) {
     final theme = Theme.of(context);
 
     return LayoutBuilder(
       builder: (context, constraints) {
         const count = 3;
         const spacing = 10;
-        final itemSize =
-            (constraints.biggest.width - (count * spacing)) / count;
+        final itemSize = (constraints.biggest.width - (count * spacing)) / count;
         return Wrap(
           // scrollDirection: Axis.horizontal,
           alignment: WrapAlignment.start,
@@ -243,11 +233,10 @@ class _FormBuilderFilePickerState
                   children: <Widget>[
                     Container(
                       alignment: Alignment.center,
-                      child: (imageFileExts.contains(
-                                  files[index].extension!.toLowerCase()) &&
-                              widget.previewImages)
-                          ? Image.file(File(files[index].path!),
-                              fit: BoxFit.cover)
+                      child: (imageFileExts.contains(files[index].extension!.toLowerCase()) && widget.previewImages)
+                          ? kIsWeb
+                              ? Image.memory(files[index].bytes!, fit: BoxFit.cover)
+                              : Image.file(File(files[index].path!), fit: BoxFit.cover)
                           : Container(
                               alignment: Alignment.center,
                               color: theme.primaryColor,