reactive_dropdown_search 6.0.0-pre4

Author: vasilich6107

packages/reactive_dropdown_search/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [6.0.0-pre4]
+
+* add reference to original valueAccessor for items accessor
+
 ## [6.0.0-pre3]
 
 * Split value item and value accessors

packages/reactive_dropdown_search/lib/src/reactive_dropdown_search.dart

@@ -10,9 +10,17 @@ import 'package:reactive_forms/reactive_forms.dart';
 abstract class DropDownSearchValueAccessor<T, V> {
   DropDownSearchValueAccessor();
 
-  V? modelToViewValue(List<V> items, T? modelValue);
-
-  T? viewToModelValue(List<V> items, V? modelValue);
+  V? modelToViewValue(
+    List<V> items,
+    T? modelValue,
+    ControlValueAccessor<T, V> accessor,
+  );
+
+  T? viewToModelValue(
+    List<V> items,
+    V? modelValue,
+    ControlValueAccessor<T, V> accessor,
+  );
 }
 
 class _DropDownSearchValueAccessor<T, V> extends ControlValueAccessor<T, V> {
@@ -29,7 +37,11 @@ class _DropDownSearchValueAccessor<T, V> extends ControlValueAccessor<T, V> {
   V? modelToViewValue(T? modelValue) {
     final result = items?.call('', null) ?? [];
     if (result is List<V>) {
-      return dropDownValueAccessor.modelToViewValue(result, modelValue);
+      return dropDownValueAccessor.modelToViewValue(
+        result,
+        modelValue,
+        this,
+      );
     }
 
     throw UnsupportedError('Asynchronously fetched values are not supported');
@@ -40,7 +52,11 @@ class _DropDownSearchValueAccessor<T, V> extends ControlValueAccessor<T, V> {
     final result = items?.call('', null) ?? [];
 
     if (result is List<V>) {
-      return dropDownValueAccessor.viewToModelValue(result, viewValue);
+      return dropDownValueAccessor.viewToModelValue(
+        result,
+        viewValue,
+        this,
+      );
     }
 
     throw UnsupportedError('Asynchronously fetched values are not supported');
@@ -145,15 +161,16 @@ class ReactiveDropdownSearch<T, V> extends ReactiveFormField<T, V> {
     BeforePopupOpening<V>? onBeforePopupOpening,
     Widget Function(BuildContext context, String error)? errorBuilder,
   }) : super(
-          valueAccessor: switch(valueAccessor) {
+          valueAccessor: switch (valueAccessor) {
             ControlValueAccessor<T, V>() => valueAccessor,
-            null => switch(valueItemAccessor) {
-              DropDownSearchValueAccessor<T, V>() => _DropDownSearchValueAccessor(
-                items: items,
-                dropDownValueAccessor: valueItemAccessor,
-              ),
-              null => null,
-            },
+            null => switch (valueItemAccessor) {
+                DropDownSearchValueAccessor<T, V>() =>
+                  _DropDownSearchValueAccessor(
+                    items: items,
+                    dropDownValueAccessor: valueItemAccessor,
+                  ),
+                null => null,
+              },
           },
           builder: (field) {
             final effectiveDecoration = dropdownDecoratorProps.decoration

packages/reactive_dropdown_search/lib/src/reactive_dropdown_search_multiselection.dart

@@ -10,9 +10,17 @@ import 'package:reactive_forms/reactive_forms.dart';
 abstract class DropDownSearchMultiSelectionValueAccessor<T, V> {
   DropDownSearchMultiSelectionValueAccessor();
 
-  List<V>? modelToViewValue(List<V> items, List<T>? modelValue);
-
-  List<T>? viewToModelValue(List<V> items, List<V>? modelValue);
+  List<V>? modelToViewValue(
+    List<V> items,
+    List<T>? modelValue,
+    ControlValueAccessor<List<T>, List<V>> accessor,
+  );
+
+  List<T>? viewToModelValue(
+    List<V> items,
+    List<V>? modelValue,
+    ControlValueAccessor<List<T>, List<V>> accessor,
+  );
 }
 
 class _DropDownSearchMultiSelectionValueAccessor<T, V>
@@ -30,7 +38,11 @@ class _DropDownSearchMultiSelectionValueAccessor<T, V>
   List<V>? modelToViewValue(List<T>? modelValue) {
     final result = items?.call('', null) ?? [];
     if (result is List<V>) {
-      return dropDownValueAccessor.modelToViewValue(result, modelValue);
+      return dropDownValueAccessor.modelToViewValue(
+        result,
+        modelValue,
+        this,
+      );
     }
 
     throw UnsupportedError('Asynchronously fetched values are not supported');
@@ -41,7 +53,11 @@ class _DropDownSearchMultiSelectionValueAccessor<T, V>
     final result = items?.call('', null) ?? [];
 
     if (result is List<V>) {
-      return dropDownValueAccessor.viewToModelValue(result, viewValue);
+      return dropDownValueAccessor.viewToModelValue(
+        result,
+        viewValue,
+        this,
+      );
     }
 
     throw UnsupportedError('Asynchronously fetched values are not supported');
@@ -148,16 +164,17 @@ class ReactiveDropdownSearchMultiSelection<T, V>
     BeforePopupOpeningMultiSelection<V>? onBeforePopupOpening,
     Widget Function(BuildContext context, String error)? errorBuilder,
   }) : super(
-    valueAccessor: switch(valueAccessor) {
-      ControlValueAccessor<List<T>, List<V>>() => valueAccessor,
-      null => switch(valueItemAccessor) {
-        DropDownSearchMultiSelectionValueAccessor<T, V>() => _DropDownSearchMultiSelectionValueAccessor(
-          items: items,
-          dropDownValueAccessor: valueItemAccessor,
-        ),
-        null => null,
-      },
-    },
+          valueAccessor: switch (valueAccessor) {
+            ControlValueAccessor<List<T>, List<V>>() => valueAccessor,
+            null => switch (valueItemAccessor) {
+                DropDownSearchMultiSelectionValueAccessor<T, V>() =>
+                  _DropDownSearchMultiSelectionValueAccessor(
+                    items: items,
+                    dropDownValueAccessor: valueItemAccessor,
+                  ),
+                null => null,
+              },
+          },
           builder: (field) {
             final effectiveDecoration = dropdownDecoratorProps.decoration
                 ?.applyDefaults(Theme.of(field.context).inputDecorationTheme);

packages/reactive_dropdown_search/pubspec.yaml

@@ -1,6 +1,6 @@
 name: reactive_dropdown_search
 description: Wrapper around searchable_dropdown to use with reactive_forms
-version: 6.0.0-pre3
+version: 6.0.0-pre4
 repository: https://github.com/artflutter/reactive_forms_widgets/tree/master/packages/reactive_dropdown_search
 issue_tracker: https://github.com/artflutter/reactive_forms_widgets/issues