Skip to content
Closed
Changes from all commits
Commits
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
31 changes: 11 additions & 20 deletions lib/src/fields/form_builder_dropdown.dart
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ class FormBuilderDropdown<T> extends FormBuilderFieldDecoration<T> {
FormBuilderDropdown({
super.key,
required super.name,

super.validator,
super.initialValue,
super.decoration,
Expand All @@ -249,6 +250,7 @@ class FormBuilderDropdown<T> extends FormBuilderFieldDecoration<T> {
this.iconSize = 24.0,
this.style,
this.disabledHint,
this.hint,
this.icon,
this.iconDisabledColor,
this.iconEnabledColor,
Expand All @@ -275,19 +277,14 @@ class FormBuilderDropdown<T> extends FormBuilderFieldDecoration<T> {
value: hasValue ? field.value : null,
style: style,
isDense: isDense,
disabledHint: hasValue
? items
.firstWhere(
(dropDownItem) => dropDownItem.value == field.value)
.child
: disabledHint,
disabledHint: hasValue ? items.firstWhere((dropDownItem) => dropDownItem.value == field.value).child : disabledHint,
elevation: elevation,
iconSize: iconSize,
icon: icon,
hint: hint,
iconDisabledColor: iconDisabledColor,
iconEnabledColor: iconEnabledColor,
onChanged:
state.enabled ? (T? value) => state.didChange(value) : null,
onChanged: state.enabled ? (T? value) => state.didChange(value) : null,
onTap: onTap,
focusNode: state.effectiveFocusNode,
autofocus: autofocus,
Expand All @@ -305,24 +302,20 @@ class FormBuilderDropdown<T> extends FormBuilderFieldDecoration<T> {
);

@override
FormBuilderFieldDecorationState<FormBuilderDropdown<T>, T> createState() =>
_FormBuilderDropdownState<T>();
FormBuilderFieldDecorationState<FormBuilderDropdown<T>, T> createState() => _FormBuilderDropdownState<T>();
}

class _FormBuilderDropdownState<T>
extends FormBuilderFieldDecorationState<FormBuilderDropdown<T>, T> {
class _FormBuilderDropdownState<T> extends FormBuilderFieldDecorationState<FormBuilderDropdown<T>, T> {
@override
void didUpdateWidget(covariant FormBuilderDropdown<T> oldWidget) {
super.didUpdateWidget(oldWidget);

final oldValues = oldWidget.items.map((e) => e.value).toList();
final currentlyValues = widget.items.map((e) => e.value).toList();
final oldChilds = oldWidget.items.map((e) => e.child.toString()).toList();
final currentlyChilds =
widget.items.map((e) => e.child.toString()).toList();
final currentlyChilds = widget.items.map((e) => e.child.toString()).toList();

if (!currentlyValues.contains(initialValue) &&
!initialValue.emptyValidator()) {
if (!currentlyValues.contains(initialValue) && !initialValue.emptyValidator()) {
assert(
currentlyValues.contains(initialValue) && initialValue.emptyValidator(),
'The initialValue [$initialValue] is not in the list of items or is not null or empty. '
Expand All @@ -332,10 +325,8 @@ class _FormBuilderDropdownState<T>
setValue(null);
}

if ((!listEquals(oldChilds, currentlyChilds) ||
!listEquals(oldValues, currentlyValues)) &&
(currentlyValues.contains(initialValue) ||
initialValue.emptyValidator())) {
if ((!listEquals(oldChilds, currentlyChilds) || !listEquals(oldValues, currentlyValues)) &&
(currentlyValues.contains(initialValue) || initialValue.emptyValidator())) {
setValue(initialValue);
}
}
Expand Down
Loading