From 69606ce586415bbb97fc7ce168d70d03a25be8fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bot=20of=20Thomas=20G=C3=BCttler?=
 <guettlibot@noreply.codeberg.org>
Date: Sun, 7 Jun 2026 04:38:30 +0200
Subject: [PATCH] fix: prevent Enter key from re-running a settled search
 (#479)

---
 lib/ui/screens/email_list_screen.dart   |  9 +++-
 test/widget/email_list_screen_test.dart | 61 +++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/lib/ui/screens/email_list_screen.dart b/lib/ui/screens/email_list_screen.dart
index fa2fbfe..5e54a7e 100644
--- a/lib/ui/screens/email_list_screen.dart
+++ b/lib/ui/screens/email_list_screen.dart
@@ -278,7 +278,14 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                 ),
             ],
             onChanged: _onSearchChanged,
-            onSubmitted: _runSearch,
+            onSubmitted: (value) {
+              // Only run the search if results haven't settled yet via
+              // onChanged — prevents a second IMAP round-trip from reordering
+              // the already-visible results when the user presses Enter.
+              if (_searchResults == null && !_searchLoading) {
+                unawaited(_runSearch(value));
+              }
+            },
             textInputAction: TextInputAction.search,
           ),
         ),
diff --git a/test/widget/email_list_screen_test.dart b/test/widget/email_list_screen_test.dart
index 60b1823..67404fb 100644
--- a/test/widget/email_list_screen_test.dart
+++ b/test/widget/email_list_screen_test.dart
@@ -798,6 +798,67 @@ void main() {
       },
     );
 
+    testWidgets(
+      'pressing Enter after search settles does not reorder results',
+      (tester) async {
+        // Reproduces: user types a query → onChanged fires → results settle.
+        // Then user presses Enter → onSubmitted fires a second search → the
+        // second IMAP response may return results in a different order, so the
+        // tile the user is about to tap is no longer the email they expect.
+        final email1 = testEmail(id: 'acc-1:1', subject: 'Alpha Foo');
+        final email2 = testEmail(id: 'acc-1:2', subject: 'Beta Foo');
+        var callCount = 0;
+        await tester.pumpWidget(
+          buildApp(
+            initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
+            overrides: [
+              accountRepositoryProvider.overrideWithValue(
+                FakeAccountRepository([kTestAccount]),
+              ),
+              mailboxRepositoryProvider.overrideWithValue(
+                FakeMailboxRepository(),
+              ),
+              emailRepositoryProvider.overrideWithValue(
+                FakeEmailRepository(
+                  onSearch: (_) async {
+                    callCount++;
+                    // First call: [Alpha, Beta]. Second call: reversed.
+                    return callCount == 1 ? [email1, email2] : [email2, email1];
+                  },
+                  emailBody: const EmailBody(emailId: '', attachments: []),
+                ),
+              ),
+            ],
+          ),
+        );
+        await tester.pumpAndSettle();
+
+        // Typing triggers onChanged → first search → results settle.
+        await tester.enterText(find.byType(TextField), 'foo');
+        await tester.pumpAndSettle();
+
+        expect(find.text('Alpha Foo'), findsOneWidget);
+        expect(find.text('Beta Foo'), findsOneWidget);
+        // Alpha must appear above Beta (it is first in the list).
+        expect(
+          tester.getTopLeft(find.text('Alpha Foo')).dy,
+          lessThan(tester.getTopLeft(find.text('Beta Foo')).dy),
+        );
+
+        // Pressing Enter triggers onSubmitted — must NOT re-run the search.
+        await tester.testTextInput.receiveAction(TextInputAction.search);
+        await tester.pumpAndSettle();
+
+        // Order must be unchanged: pressing Enter must not reorder results.
+        expect(find.text('Alpha Foo'), findsOneWidget);
+        expect(find.text('Beta Foo'), findsOneWidget);
+        expect(
+          tester.getTopLeft(find.text('Alpha Foo')).dy,
+          lessThan(tester.getTopLeft(find.text('Beta Foo')).dy),
+        );
+      },
+    );
+
     testWidgets('shows preview snippet when email has preview', (tester) async {
       final email = Email(
         id: 'acc-1:99',