Merge pull request #308 from lukaszdebowski/allow-for-null-suggestions

Allow suggestionsCallback to return null
AbdulRahmanAlHamali · May 7, 2021 · 5ddd68a · 5ddd68a
2 parents b1cdc6b + 48a876a
commit 5ddd68a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/cupertino_flutter_typeahead.dart b/lib/cupertino_flutter_typeahead.dart
@@ -887,7 +887,7 @@ class _SuggestionsListState<T> extends State<_SuggestionsList<T>>
         this._error = null;
       });
 
-      Iterable<T> suggestions = [];
+      Iterable<T>? suggestions;
       Object? error;
 
       try {
@@ -901,7 +901,8 @@ class _SuggestionsListState<T> extends State<_SuggestionsList<T>>
         // if it wasn't removed in the meantime
         setState(() {
           double? animationStart = widget.animationStart;
-          if (error != null || suggestions.isEmpty) {
+          // allow suggestionsCallback to return null and not throw error here
+          if (error != null || suggestions?.isEmpty == true) {
             animationStart = 1.0;
           }
           this._animationController!.forward(from: animationStart);

diff --git a/lib/flutter_typeahead.dart b/lib/flutter_typeahead.dart
@@ -1075,7 +1075,7 @@ class _SuggestionsListState<T> extends State<_SuggestionsList<T>>
         this._error = null;
       });
 
-      Iterable<T> suggestions = [];
+      Iterable<T>? suggestions;
       Object? error;
 
       try {
@@ -1089,7 +1089,8 @@ class _SuggestionsListState<T> extends State<_SuggestionsList<T>>
         // if it wasn't removed in the meantime
         setState(() {
           double? animationStart = widget.animationStart;
-          if (error != null || suggestions.isEmpty) {
+            // allow suggestionsCallback to return null and not throw error here
+          if (error != null || suggestions?.isEmpty == true) {
             animationStart = 1.0;
           }
           this._animationController!.forward(from: animationStart);