From cc8bd55e23bfcb51f9e43f893bb1bd3377840dba Mon Sep 17 00:00:00 2001
From: edde746 <86283021+edde746@users.noreply.github.com>
Date: Fri, 6 Feb 2026 21:41:42 +0100
Subject: [PATCH] fix: alpha jump bar focus

close #394
---
 .../libraries/tabs/library_browse_tab.dart    | 21 +++++++++++++++++--
 lib/widgets/alpha_jump_bar.dart               |  8 ++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/lib/screens/libraries/tabs/library_browse_tab.dart b/lib/screens/libraries/tabs/library_browse_tab.dart
index 9e58b207..18662e21 100644
--- a/lib/screens/libraries/tabs/library_browse_tab.dart
+++ b/lib/screens/libraries/tabs/library_browse_tab.dart
@@ -612,6 +612,23 @@ class _LibraryBrowseTabState extends BaseLibraryTabState<PlexMetadata, LibraryBr
     }
   }
 
+  /// Navigate from the alpha jump bar to the nearest visible grid item.
+  /// After a jump-scroll the previously focused item is off-screen (and its
+  /// FocusNode detached), so we target the last-column item in the first
+  /// visible row — the grid cell closest to the alpha bar.
+  void _navigateToGridNearScroll() {
+    if (items.isEmpty || _currentColumnCount < 1) return;
+
+    final row = _currentFirstVisibleIndex ~/ _currentColumnCount;
+    final targetIndex = ((row + 1) * _currentColumnCount - 1).clamp(0, items.length - 1);
+
+    if (targetIndex == 0) {
+      firstItemFocusNode.requestFocus();
+    } else {
+      getGridItemFocusNode(targetIndex, prefix: 'browse_grid_item').requestFocus();
+    }
+  }
+
   /// Navigate focus from grid up to the grouping chip
   void _navigateToChips() {
     _groupingChipFocusNode.requestFocus();
@@ -848,8 +865,8 @@ class _LibraryBrowseTabState extends BaseLibraryTabState<PlexMetadata, LibraryBr
                     onJump: _jumpToIndex,
                     currentFirstVisibleIndex: _currentFirstVisibleIndex,
                     focusNode: _alphaJumpBarFocusNode,
-                    onNavigateLeft: _navigateToGrid,
-                    onBack: widget.onBack,
+                    onNavigateLeft: _navigateToGridNearScroll,
+                    onBack: _navigateToGridNearScroll,
                   ),
           ),
       ],
diff --git a/lib/widgets/alpha_jump_bar.dart b/lib/widgets/alpha_jump_bar.dart
index bd353509..8096e8f5 100644
--- a/lib/widgets/alpha_jump_bar.dart
+++ b/lib/widgets/alpha_jump_bar.dart
@@ -75,21 +75,17 @@ class _AlphaJumpBarState extends State<AlphaJumpBar> {
     if (event.logicalKey == LogicalKeyboardKey.arrowUp) {
       if (_highlightedIndex > 0) {
         setState(() => _highlightedIndex--);
+        _jumpToLetter(AlphaJumpHelper.allLetters[_highlightedIndex]);
       }
       return KeyEventResult.handled;
     }
     if (event.logicalKey == LogicalKeyboardKey.arrowDown) {
       if (_highlightedIndex < AlphaJumpHelper.allLetters.length - 1) {
         setState(() => _highlightedIndex++);
+        _jumpToLetter(AlphaJumpHelper.allLetters[_highlightedIndex]);
       }
       return KeyEventResult.handled;
     }
-    if (event.logicalKey == LogicalKeyboardKey.select ||
-        event.logicalKey == LogicalKeyboardKey.enter ||
-        event.logicalKey == LogicalKeyboardKey.gameButtonA) {
-      _jumpToLetter(AlphaJumpHelper.allLetters[_highlightedIndex]);
-      return KeyEventResult.handled;
-    }
     if (event.logicalKey == LogicalKeyboardKey.arrowLeft) {
       widget.onNavigateLeft?.call();
       return KeyEventResult.handled;