From d49bd20fa0b2833d757984e2ec1a5db110cc4af4 Mon Sep 17 00:00:00 2001
From: edde746 <86283021+edde746@users.noreply.github.com>
Date: Tue, 16 Jun 2026 14:42:22 +0200
Subject: [PATCH] fix(libraries): restore top-row focus escape

close #1354
---
 .../libraries/tabs/library_collections_tab.dart        | 10 +++++++++-
 lib/screens/libraries/tabs/library_playlists_tab.dart  | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/screens/libraries/tabs/library_collections_tab.dart b/lib/screens/libraries/tabs/library_collections_tab.dart
index 03eb7b1f..4e6789ec 100644
--- a/lib/screens/libraries/tabs/library_collections_tab.dart
+++ b/lib/screens/libraries/tabs/library_collections_tab.dart
@@ -140,7 +140,12 @@ class _LibraryCollectionsTabState extends BaseLibraryTabState<MediaItem, Library
       padding: _effectivePadding,
       sliver: SliverList.builder(
         itemCount: totalSize,
-        itemBuilder: (context, index) => _buildMediaCardItem(index, isFirstColumn: true, disableScale: true),
+        itemBuilder: (context, index) => _buildMediaCardItem(
+          index,
+          isFirstRow: index == 0,
+          isFirstColumn: true,
+          disableScale: true,
+        ),
       ),
     );
   }
@@ -161,6 +166,7 @@ class _LibraryCollectionsTabState extends BaseLibraryTabState<MediaItem, Library
             itemCount: totalSize,
             itemBuilder: (context, index) => _buildMediaCardItem(
               index,
+              isFirstRow: GridSizeCalculator.isFirstRow(index, geometry.columnCount),
               isFirstColumn: GridSizeCalculator.isFirstColumn(index, geometry.columnCount),
               fullBleedImage: fullCardLayout,
             ),
@@ -172,6 +178,7 @@ class _LibraryCollectionsTabState extends BaseLibraryTabState<MediaItem, Library
 
   Widget _buildMediaCardItem(
     int index, {
+    required bool isFirstRow,
     required bool isFirstColumn,
     bool disableScale = false,
     bool fullBleedImage = false,
@@ -189,6 +196,7 @@ class _LibraryCollectionsTabState extends BaseLibraryTabState<MediaItem, Library
       disableScale: disableScale,
       fullBleedImage: fullBleedImage,
       onListRefresh: loadItems,
+      onNavigateUp: isFirstRow ? widget.onBack : null,
       onBack: widget.onBack,
       onNavigateLeft: isFirstColumn ? _navigateToSidebar : null,
     );
diff --git a/lib/screens/libraries/tabs/library_playlists_tab.dart b/lib/screens/libraries/tabs/library_playlists_tab.dart
index c9bf4527..48f177d3 100644
--- a/lib/screens/libraries/tabs/library_playlists_tab.dart
+++ b/lib/screens/libraries/tabs/library_playlists_tab.dart
@@ -142,7 +142,12 @@ class _LibraryPlaylistsTabState extends BaseLibraryTabState<MediaPlaylist, Libra
       padding: _effectivePadding,
       sliver: SliverList.builder(
         itemCount: totalSize,
-        itemBuilder: (context, index) => _buildPlaylistCard(index, isFirstColumn: true, disableScale: true),
+        itemBuilder: (context, index) => _buildPlaylistCard(
+          index,
+          isFirstRow: index == 0,
+          isFirstColumn: true,
+          disableScale: true,
+        ),
       ),
     );
   }
@@ -163,6 +168,7 @@ class _LibraryPlaylistsTabState extends BaseLibraryTabState<MediaPlaylist, Libra
             itemCount: totalSize,
             itemBuilder: (context, index) => _buildPlaylistCard(
               index,
+              isFirstRow: GridSizeCalculator.isFirstRow(index, geometry.columnCount),
               isFirstColumn: GridSizeCalculator.isFirstColumn(index, geometry.columnCount),
               fullBleedImage: fullCardLayout,
             ),
@@ -174,6 +180,7 @@ class _LibraryPlaylistsTabState extends BaseLibraryTabState<MediaPlaylist, Libra
 
   Widget _buildPlaylistCard(
     int index, {
+    required bool isFirstRow,
     required bool isFirstColumn,
     bool disableScale = false,
     bool fullBleedImage = false,
@@ -191,6 +198,7 @@ class _LibraryPlaylistsTabState extends BaseLibraryTabState<MediaPlaylist, Libra
       disableScale: disableScale,
       fullBleedImage: fullBleedImage,
       onListRefresh: loadItems,
+      onNavigateUp: isFirstRow ? widget.onBack : null,
       onBack: widget.onBack,
       onNavigateLeft: isFirstColumn ? _navigateToSidebar : null,
     );