Skip to content

feat: previewBuilder keep InputDecorator if showDecoration is true #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: previewBuilder keep InputDecorator if showDecoration is true #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 58 additions & 47 deletions lib/src/form_builder_image_picker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ class FormBuilderImagePicker extends FormBuilderFieldDecoration<List<dynamic>> {
final EdgeInsetsGeometry? previewMargin;

/// May be supplied for a fully custom display of the image preview
final Widget Function(BuildContext, List<Widget> children, Widget? addButton)?
final Widget Function(
BuildContext context,
List<Widget> children,
Widget? addButton,
)?
previewBuilder;

/// placeholder image displayed when picking a new image
Expand Down Expand Up @@ -313,54 +317,60 @@ class FormBuilderImagePicker extends FormBuilderFieldDecoration<List<dynamic>> {
);
}

if (previewBuilder != null) {
return Builder(
builder: (context) {
final widgets = value
.mapIndexed((i, v) => itemBuilder(context, v, i))
.toList();

return previewBuilder(
context,
widgets,
canUpload ? addButtonBuilder(context) : null,
);
},
);
}

final child = SizedBox(
height: previewHeight,
child: itemCount == 0
? null //empty list
: itemCount ==
1 //has a single item,
? canUpload
? addButtonBuilder(state.context) //upload button
: SizedBox(
width: previewAutoSizeWidth ? null : previewWidth,
child: itemBuilder(state.context, value.first, 0),
)
: ListView.builder(
itemExtent: previewAutoSizeWidth ? null : previewWidth,
scrollDirection: Axis.horizontal,
itemCount: itemCount,
itemBuilder: (context, index) {
return Container(
margin: previewMargin,
child: Builder(
builder: (context) {
if (index < value.length) {
final item = value[index];
return itemBuilder(context, item, index);
}
return addButtonBuilder(context);
final child = previewBuilder != null
? Builder(
builder: (context) {
final widgets = value
.mapIndexed((i, v) => itemBuilder(context, v, i))
.toList();

return previewBuilder(
context,
widgets,
canUpload ? addButtonBuilder(context) : null,
);
},
)
: SizedBox(
height: previewHeight,
child: itemCount == 0
? null //empty list
: itemCount ==
1 //has a single item,
? canUpload
? addButtonBuilder(state.context) //upload button
: SizedBox(
width: previewAutoSizeWidth
? null
: previewWidth,
child: itemBuilder(
state.context,
value.first,
0,
),
)
: ListView.builder(
itemExtent: previewAutoSizeWidth
? null
: previewWidth,
scrollDirection: Axis.horizontal,
itemCount: itemCount,
itemBuilder: (context, index) {
return Container(
margin: previewMargin,
child: Builder(
builder: (context) {
if (index < value.length) {
final item = value[index];
return itemBuilder(context, item, index);
}
return addButtonBuilder(context);
},
),
);
},
),
);
},
),
);
);
return showDecoration
? InputDecorator(decoration: state.decoration, child: child)
: child;
Expand Down Expand Up @@ -390,6 +400,7 @@ class XFileImage extends StatefulWidget {
this.fit,
this.loadingWidget,
});

final XFile file;
final BoxFit? fit;
final WidgetBuilder? loadingWidget;
Expand Down