Skip to content

Commit 27b3727

Browse files
committed
reactive_dropdown_search 6.0.0-pre3
1 parent 0dc1eb1 commit 27b3727

File tree

4 files changed

+29
-15
lines changed

4 files changed

+29
-15
lines changed

packages/reactive_dropdown_search/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [6.0.0-pre3]
2+
3+
* Split value item and value accessors
4+
15
## [6.0.0-pre2]
26

37
* Support `reactive_forms: 18.x`

packages/reactive_dropdown_search/lib/src/reactive_dropdown_search.dart

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ class ReactiveDropdownSearch<T, V> extends ReactiveFormField<T, V> {
124124
super.formControlName,
125125
super.formControl,
126126
super.validationMessages,
127-
DropDownSearchValueAccessor<T, V>? valueAccessor,
127+
ControlValueAccessor<T, V>? valueAccessor,
128+
DropDownSearchValueAccessor<T, V>? valueItemAccessor,
128129
super.showErrors,
129130

130131
////////////////////////////////////////////////////////////////////////////
@@ -144,12 +145,16 @@ class ReactiveDropdownSearch<T, V> extends ReactiveFormField<T, V> {
144145
BeforePopupOpening<V>? onBeforePopupOpening,
145146
Widget Function(BuildContext context, String error)? errorBuilder,
146147
}) : super(
147-
valueAccessor: valueAccessor != null
148-
? _DropDownSearchValueAccessor(
149-
items: items,
150-
dropDownValueAccessor: valueAccessor,
151-
)
152-
: null,
148+
valueAccessor: switch(valueAccessor) {
149+
ControlValueAccessor<T, V>() => valueAccessor,
150+
null => switch(valueItemAccessor) {
151+
DropDownSearchValueAccessor<T, V>() => _DropDownSearchValueAccessor(
152+
items: items,
153+
dropDownValueAccessor: valueItemAccessor,
154+
),
155+
null => null,
156+
},
157+
},
153158
builder: (field) {
154159
final effectiveDecoration = dropdownDecoratorProps.decoration
155160
?.applyDefaults(Theme.of(field.context).inputDecorationTheme);

packages/reactive_dropdown_search/lib/src/reactive_dropdown_search_multiselection.dart

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ class ReactiveDropdownSearchMultiSelection<T, V>
126126
super.formControlName,
127127
super.formControl,
128128
super.validationMessages,
129-
DropDownSearchMultiSelectionValueAccessor<T, V>? valueAccessor,
129+
ControlValueAccessor<List<T>, List<V>>? valueAccessor,
130+
DropDownSearchMultiSelectionValueAccessor<T, V>? valueItemAccessor,
130131
super.showErrors,
131132

132133
////////////////////////////////////////////////////////////////////////////
@@ -147,12 +148,16 @@ class ReactiveDropdownSearchMultiSelection<T, V>
147148
BeforePopupOpeningMultiSelection<V>? onBeforePopupOpening,
148149
Widget Function(BuildContext context, String error)? errorBuilder,
149150
}) : super(
150-
valueAccessor: valueAccessor != null
151-
? _DropDownSearchMultiSelectionValueAccessor(
152-
items: items,
153-
dropDownValueAccessor: valueAccessor,
154-
)
155-
: null,
151+
valueAccessor: switch(valueAccessor) {
152+
ControlValueAccessor<List<T>, List<V>>() => valueAccessor,
153+
null => switch(valueItemAccessor) {
154+
DropDownSearchMultiSelectionValueAccessor<T, V>() => _DropDownSearchMultiSelectionValueAccessor(
155+
items: items,
156+
dropDownValueAccessor: valueItemAccessor,
157+
),
158+
null => null,
159+
},
160+
},
156161
builder: (field) {
157162
final effectiveDecoration = dropdownDecoratorProps.decoration
158163
?.applyDefaults(Theme.of(field.context).inputDecorationTheme);

packages/reactive_dropdown_search/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: reactive_dropdown_search
22
description: Wrapper around searchable_dropdown to use with reactive_forms
3-
version: 6.0.0-pre2
3+
version: 6.0.0-pre3
44
repository: https://github.com/artflutter/reactive_forms_widgets/tree/master/packages/reactive_dropdown_search
55
issue_tracker: https://github.com/artflutter/reactive_forms_widgets/issues
66

0 commit comments

Comments
 (0)