Update save behaviour

SimformSolutionsPvtLtd · Sep 13, 2022 · 1184f9b · 1184f9b
1 parent b1bbfef
commit 1184f9b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -147,7 +147,7 @@ class _MyHomePageState extends State<MyHomePage> {
                       buttonText: Text("Favorite Animals"),
                       title: Text("Animals"),
                       items: _items,
-                      onConfirm: (values) {
+                      onConfirm: (values, [search]) {
                         _selectedAnimals2 = values;
                       },
                       chipDisplay: MultiSelectChipDisplay(
@@ -192,7 +192,7 @@ class _MyHomePageState extends State<MyHomePage> {
                   }
                   return null;
                 },
-                onConfirm: (values) {
+                onConfirm: (values, [search]) {
                   setState(() {
                     _selectedAnimals3 = values;
                   });

diff --git a/lib/bottom_sheet/multi_select_bottom_sheet.dart b/lib/bottom_sheet/multi_select_bottom_sheet.dart
@@ -20,7 +20,7 @@ class MultiSelectBottomSheet<T> extends StatefulWidget
   final void Function(List<T>)? onSelectionChanged;
 
   /// Fires when confirm is tapped.
-  final void Function(List<T>)? onConfirm;
+  final void Function(List<T>, [String?])? onConfirm;
 
   /// Toggles search functionality.
   final bool searchable;

diff --git a/lib/bottom_sheet/multi_select_bottom_sheet_field.dart b/lib/bottom_sheet/multi_select_bottom_sheet_field.dart
@@ -31,7 +31,7 @@ class MultiSelectBottomSheetField<V> extends FormField<List<V>> {
   final void Function(List<V>)? onSelectionChanged;
 
   /// Fires when confirm is tapped.
-  final void Function(List<V>) onConfirm;
+  final void Function(List<V>, [String?]) onConfirm;
 
   /// Toggles search functionality.
   final bool searchable;
@@ -221,7 +221,7 @@ class _MultiSelectBottomSheetFieldView<V> extends StatefulWidget {
   final List<V>? initialValue;
   final Widget? title;
   final void Function(List<V>)? onSelectionChanged;
-  final void Function(List<V>)? onConfirm;
+  final void Function(List<V>, [String?])? onConfirm;
   final bool searchable;
   final Text? confirmText;
   final Text? cancelText;
@@ -350,13 +350,12 @@ class __MultiSelectBottomSheetFieldViewState<V>
     }
   }
 
-  void populateSelectedItems(){
-    if(widget.initialValue != null){
+  void populateSelectedItems() {
+    if (widget.initialValue != null) {
       _selectedItems = widget.initialValue!;
     }
   }
 
-
   Widget _buildInheritedChipDisplay() {
     List<MultiSelectItem<V>?> chipDisplayItems = [];
     chipDisplayItems = widget.checkCondition == null
@@ -446,12 +445,12 @@ class __MultiSelectBottomSheetFieldViewState<V>
             separateSelectedItems: widget.separateSelectedItems,
             initialValue: _selectedItems,
             emptyListPlaceHolder: widget.emptyListPlaceHolder,
-            onConfirm: (selected) {
+            onConfirm: (selected, [search]) {
               if (widget.state != null) {
                 widget.state!.didChange(selected);
               }
               _selectedItems = selected;
-              if (widget.onConfirm != null) widget.onConfirm!(selected);
+              if (widget.onConfirm != null) widget.onConfirm!(selected, search);
             },
             onSelectionChanged: widget.onSelectionChanged,
             searchable: widget.searchable,

diff --git a/lib/custom_bottom_sheet/custom_multi_select_bottom_sheet.dart b/lib/custom_bottom_sheet/custom_multi_select_bottom_sheet.dart
@@ -20,7 +20,7 @@ class CustomMultiSelectBottomSheet<T> extends StatefulWidget
   final void Function(List<T>)? onSelectionChanged;
 
   /// Fires when confirm is tapped.
-  final void Function(List<T>)? onConfirm;
+  final void Function(List<T>, [String?])? onConfirm;
 
   /// Toggles search functionality.
   final bool searchable;
@@ -437,7 +437,7 @@ class _CustomMultiSelectBottomSheetState<T>
                           child: ElevatedButton(
                             onPressed: () {
                               widget.onConfirmTap(
-                                  context, _selectedValues, widget.onConfirm);
+                                  context, _selectedValues, widget.onConfirm, searchController.text);
                             },
                             child: widget.confirmText ??
                                 Text(

diff --git a/lib/custom_bottom_sheet/custom_multi_select_bottom_sheet_field.dart b/lib/custom_bottom_sheet/custom_multi_select_bottom_sheet_field.dart
@@ -31,7 +31,7 @@ class CustomMultiSelectBottomSheetField<V> extends FormField<List<V>> {
   final void Function(List<V>)? onSelectionChanged;
 
   /// Fires when confirm is tapped.
-  final void Function(List<V>) onConfirm;
+  final void Function(List<V>, [String?]) onConfirm;
 
   /// Toggles search functionality.
   final bool searchable;
@@ -231,7 +231,7 @@ class _MultiSelectBottomSheetFieldView<V> extends StatefulWidget {
   final List<V>? initialValue;
   final Widget? title;
   final void Function(List<V>)? onSelectionChanged;
-  final void Function(List<V>)? onConfirm;
+  final void Function(List<V>, [String?])? onConfirm;
   final bool searchable;
   final Text? confirmText;
   final Text? cancelText;
@@ -471,12 +471,12 @@ class __MultiSelectBottomSheetFieldViewState<V>
             separateSelectedItems: widget.separateSelectedItems,
             initialValue: _selectedItems,
             emptyListPlaceHolder: widget.emptyListPlaceHolder,
-            onConfirm: (selected) {
+            onConfirm: (selected, [search]) {
               if (widget.state != null) {
                 widget.state!.didChange(selected);
               }
               _selectedItems = selected;
-              if (widget.onConfirm != null) widget.onConfirm!(selected);
+              if (widget.onConfirm != null) widget.onConfirm!(selected, search);
             },
             onSelectionChanged: widget.onSelectionChanged,
             searchable: widget.searchable,

diff --git a/lib/dialog/mult_select_dialog.dart b/lib/dialog/mult_select_dialog.dart
@@ -18,7 +18,7 @@ class MultiSelectDialog<T> extends StatefulWidget with MultiSelectActions<T> {
   final void Function(List<T>)? onSelectionChanged;
 
   /// Fires when confirm is tapped.
-  final void Function(List<T>)? onConfirm;
+  final void Function(List<T>, [String?])? onConfirm;
 
   /// Toggles search functionality. Default is false.
   final bool searchable;

diff --git a/lib/dialog/multi_select_dialog_field.dart b/lib/dialog/multi_select_dialog_field.dart
@@ -383,7 +383,7 @@ class __MultiSelectDialogFieldViewState<V>
           confirmText: widget.confirmText,
           cancelText: widget.cancelText,
           separateSelectedItems: widget.separateSelectedItems,
-          onConfirm: (selected) {
+          onConfirm: (selected, [search]) {
             if (widget.state != null) {
               widget.state!.didChange(selected);
             }

diff --git a/lib/util/multi_select_actions.dart b/lib/util/multi_select_actions.dart
@@ -32,10 +32,10 @@ class MultiSelectActions<T> {
   /// Pops the dialog from the navigation stack and returns the selected values.
   /// Calls the onConfirm function if one was provided.
   void onConfirmTap(
-      BuildContext ctx, List<T> selectedValues, Function(List<T>)? onConfirm) {
+      BuildContext ctx, List<T> selectedValues, Function(List<T>, [String?])? onConfirm, [String? searchText]) {
     Navigator.pop(ctx, selectedValues);
     if (onConfirm != null) {
-      onConfirm(selectedValues);
+      onConfirm(selectedValues, searchText);
     }
   }