fix: item 0 steals focus after sidenav return

2026-03-04 18:39:49 +01:00
parent 5877673755
commit 7f2d548d32
1 changed files with 7 additions and 3 deletions
@@ -694,11 +694,15 @@ class _MainScreenState extends State<MainScreen> with RouteAware, WindowListener
        }
      });
    }
-    // When content regains focus while on Libraries, retry focusing the active tab
+    // When content regains focus while on Libraries, only focus the active tab
+    // if no child already has focus (avoids stale focus requests stealing focus
+    // from the current item when scrolling back to item 0)
    if (_currentIndex == 1 && !_isOffline) {
      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (_librariesKey.currentState case final FocusableTab focusable) {
-          focusable.focusActiveTabIfReady();
+        if (_contentFocusScope.focusedChild == null) {
+          if (_librariesKey.currentState case final FocusableTab focusable) {
+            focusable.focusActiveTabIfReady();
+          }
        }
      });
    }