Merge pull request #5674 from pangeachat/5662-show-direct-matches-first-in-vocab-search

chore: if vocab analyics search, sort to put matches that start with …

lib/pangea/analytics_details_popup/vocab_analytics_list_view.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+import 'package:collection/collection.dart';
 import 'package:diacritic/diacritic.dart';
 import 'package:go_router/go_router.dart';
 
@@ -29,7 +30,7 @@ class VocabAnalyticsListView extends StatelessWidget {
   const VocabAnalyticsListView({super.key, required this.controller});
 
   List<ConstructUses>? get _filteredVocab =>
-      controller.vocab?.where(_vocabFilter).toList();
+      controller.vocab?.where(_vocabFilter).sorted(_sortBySearch).toList();
 
   bool _vocabFilter(ConstructUses use) =>
       use.lemma.isNotEmpty && _levelFilter(use) && _searchFilter(use);
@@ -55,6 +56,43 @@ class VocabAnalyticsListView extends StatelessWidget {
     return normalizedLemma.contains(normalizedSearch);
   }
 
+  int _sortBySearch(ConstructUses a, ConstructUses b) {
+    if (!controller.isSearching ||
+        controller.searchController.text.trim().isEmpty) {
+      return 0; // No sorting if not searching
+    }
+
+    final normalizedSearch = removeDiacritics(
+      controller.searchController.text,
+    ).toLowerCase();
+
+    final normalizedLemmaA = removeDiacritics(a.lemma).toLowerCase();
+    final normalizedLemmaB = removeDiacritics(b.lemma).toLowerCase();
+
+    // Sort matches that start with the search term first, then by closest match
+    final startsWithA = normalizedLemmaA.startsWith(normalizedSearch);
+    final startsWithB = normalizedLemmaB.startsWith(normalizedSearch);
+
+    if (startsWithA && !startsWithB) {
+      return -1; // A comes first
+    } else if (!startsWithA && startsWithB) {
+      return 1; // B comes first
+    } else {
+      // If both start with the search term or neither does, sort by closest match
+      final indexA = normalizedLemmaA.indexOf(normalizedSearch);
+      final indexB = normalizedLemmaB.indexOf(normalizedSearch);
+      if (indexA == -1 && indexB == -1) {
+        return 0; // Neither contains the search term
+      } else if (indexA == -1) {
+        return 1; // B comes first
+      } else if (indexB == -1) {
+        return -1; // A comes first
+      } else {
+        return indexA.compareTo(indexB); // Closer match comes first
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final vocab = controller.vocab;