Merge pull request #206 from muhammad-hassan-shakeel/master

Thank you for your contribution
maheshj01 · Jan 28, 2025 · e2a0554 · e2a0554
2 parents 31a74e4 + 89dd700
commit e2a0554
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 2 deletions.
diff --git a/lib/src/searchfield.dart b/lib/src/searchfield.dart
@@ -708,7 +708,7 @@ class _SearchFieldState<T> extends State<SearchField<T>> {
       // if a item was already selected
       if (highlightIndex >= 0) {
         highlightIndex = widget.suggestions.indexWhere(
-            (element) => element == oldWidget.suggestions[highlightIndex]);
+            (element) => element == oldWidget.suggestions[highlightIndex - 1]);
       }
     }
     if (oldWidget.scrollbarDecoration != widget.scrollbarDecoration) {
@@ -721,7 +721,6 @@ class _SearchFieldState<T> extends State<SearchField<T>> {
     if (oldWidget.selectedValue != widget.selectedValue) {
       // highlightIndex = widget.suggestions
       //     .indexWhere((element) => element == widget.selectedValue);
-
       searchController!.text = widget.selectedValue?.searchKey ?? '';
     }
     if (oldWidget.searchInputDecoration != widget.searchInputDecoration) {
@@ -752,6 +751,7 @@ class _SearchFieldState<T> extends State<SearchField<T>> {
       filteredResult.addAll(widget.suggestions);
       // hide the suggestions
       suggestionStream.sink.add(null);
+      searchController!.text = item.searchKey;
       if (widget.onSuggestionTap != null) {
         widget.onSuggestionTap!(item);
       }

diff --git a/test/searchfield_test.dart b/test/searchfield_test.dart
@@ -836,6 +836,51 @@ void main() {
   });
 
   group('Suggestions should respect suggestionDirection', () {
+    testWidgets(
+        'you should be able to select a suggestion with SuggestionDirection.up',
+        (WidgetTester tester) async {
+      SearchFieldListItem<String>? selectedValue = null;
+      final boilerPlate = _boilerplate(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            SearchField(
+              suggestionDirection: SuggestionDirection.up,
+              key: const Key('searchfield'),
+              suggestions: ['ABC', 'DEF', 'GHI', 'JKL']
+                  .map(SearchFieldListItem<String>.new)
+                  .toList(),
+              selectedValue: selectedValue,
+              onSuggestionTap: (SearchFieldListItem<String> x) {
+                selectedValue = x;
+              },
+            ),
+          ],
+        ),
+      );
+      await tester.pumpWidget(boilerPlate);
+      await tester.pumpAndSettle();
+      final listFinder = find.byType(ListView);
+      final textField = find.byType(TextFormField);
+      expect(textField, findsOneWidget);
+      expect(listFinder, findsNothing);
+      await tester.tap(textField);
+      await tester.enterText(textField, '');
+      await tester.pumpAndSettle();
+      expect(listFinder, findsOneWidget);
+      // tap 2nd item
+      await tester.ensureVisible(find.text('DEF'));
+      final secondItem = find.text('DEF').first;
+      expect(secondItem, findsOneWidget);
+      await tester.ensureVisible(find.text('DEF'));
+      await tester.tap(secondItem);
+      await tester.pumpAndSettle();
+      expect(selectedValue!.searchKey, equals('DEF'));
+      expect(
+          (textField.evaluate().first.widget as TextFormField).controller?.text,
+          'DEF');
+    });
+
     testWidgets(
         'suggestions should respect suggestionDirection: SuggestionDirection.up',
         (WidgetTester tester) async {