From 1fee4c194673127bbd272c1f88be53c04843ed5c Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sat, 31 Dec 2022 04:02:47 -0800
Subject: [PATCH] Restore scroll on infinite lists

---
 .../features/artists/components/album-artist-list-content.tsx | 4 ++--
 .../features/playlists/components/playlist-list-content.tsx   | 3 ++-
 src/renderer/features/songs/components/song-list-content.tsx  | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/renderer/features/artists/components/album-artist-list-content.tsx b/src/renderer/features/artists/components/album-artist-list-content.tsx
index 5f6c2928..47e582ce 100644
--- a/src/renderer/features/artists/components/album-artist-list-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-content.tsx
@@ -121,9 +121,9 @@ export const AlbumArtistListContent = ({ gridRef, tableRef }: AlbumArtistListCon
         rowCount: undefined,
       };
       params.api.setDatasource(dataSource);
-      // params.api.ensureIndexVisible(page.table.scrollOffset || 0, 'top');
+      params.api.ensureIndexVisible(page.table.scrollOffset || 0, 'top');
     },
-    [page.filter, queryClient, server],
+    [page.filter, page.table.scrollOffset, queryClient, server],
   );
 
   const onTablePaginationChanged = useCallback(
diff --git a/src/renderer/features/playlists/components/playlist-list-content.tsx b/src/renderer/features/playlists/components/playlist-list-content.tsx
index 4cbad0ae..58c6f730 100644
--- a/src/renderer/features/playlists/components/playlist-list-content.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-content.tsx
@@ -102,8 +102,9 @@ export const PlaylistListContent = ({ tableRef }: PlaylistListContentProps) => {
         rowCount: undefined,
       };
       params.api.setDatasource(dataSource);
+      params.api.ensureIndexVisible(page.table.scrollOffset, 'top');
     },
-    [page.filter, queryClient, server],
+    [page.filter, page.table.scrollOffset, queryClient, server],
   );
 
   const onPaginationChanged = useCallback(
diff --git a/src/renderer/features/songs/components/song-list-content.tsx b/src/renderer/features/songs/components/song-list-content.tsx
index da973820..e85b4979 100644
--- a/src/renderer/features/songs/components/song-list-content.tsx
+++ b/src/renderer/features/songs/components/song-list-content.tsx
@@ -104,8 +104,9 @@ export const SongListContent = ({ tableRef }: SongListContentProps) => {
         rowCount: undefined,
       };
       params.api.setDatasource(dataSource);
+      params.api.ensureIndexVisible(page.table.scrollOffset, 'top');
     },
-    [page.filter, queryClient, server],
+    [page.filter, page.table.scrollOffset, queryClient, server],
   );
 
   const onPaginationChanged = useCallback(