From 02a746de027f059c27c1e95098cfdfb4f24fe871 Mon Sep 17 00:00:00 2001
From: Aaron Madlon-Kay <aaron@madlon-kay.com>
Date: Sun, 28 Jan 2024 23:47:34 +0900
Subject: [PATCH] Ensure keys are sorted

---
 lib/src/actions/search.dart | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/src/actions/search.dart b/lib/src/actions/search.dart
index a12eb570..3d7222e5 100644
--- a/lib/src/actions/search.dart
+++ b/lib/src/actions/search.dart
@@ -226,10 +226,12 @@ class _SearchResultsNavigationState extends State<SearchResultsNavigation> {
     if (!mounted) return;
     final keys = _controller.searchResultKeys.value;
     if (_count != keys.length) {
-      final i = keys.indexWhere((key) => key.currentState?.selected == true);
+      final sortedKeys = List.of(keys)..sort((a, b) => a.compareByTopBound(b));
+      final i =
+          sortedKeys.indexWhere((key) => key.currentState?.selected == true);
       setState(() {
         _i = i;
-        _count = keys.length;
+        _count = sortedKeys.length;
       });
     }
   }