From df26229e4d1ae6c495fad3f24e14740d7b728335 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sun, 8 Jan 2023 15:17:34 -0800
Subject: [PATCH] Fixed: Restoring scroll position when going back/forward to
 series list

(cherry picked from commit 5aad84dba453c42b4b5a9eac43deecf91a98f4f6)
---
 frontend/src/Movie/Index/MovieIndex.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Movie/Index/MovieIndex.tsx b/frontend/src/Movie/Index/MovieIndex.tsx
index dc8e5db31..45947cde8 100644
--- a/frontend/src/Movie/Index/MovieIndex.tsx
+++ b/frontend/src/Movie/Index/MovieIndex.tsx
@@ -10,6 +10,7 @@ import PageToolbarButton from 'Components/Page/Toolbar/PageToolbarButton';
 import PageToolbarSection from 'Components/Page/Toolbar/PageToolbarSection';
 import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator';
 import TableOptionsModalWrapper from 'Components/Table/TableOptions/TableOptionsModalWrapper';
+import withScrollPosition from 'Components/withScrollPosition';
 import { align, icons } from 'Helpers/Props';
 import SortDirection from 'Helpers/Props/SortDirection';
 import NoMovie from 'Movie/NoMovie';
@@ -48,7 +49,11 @@ function getViewComponent(view: string) {
   return MovieIndexTable;
 }
 
-function MovieIndex() {
+interface MovieIndexProps {
+  initialScrollTop?: number;
+}
+
+const MovieIndex = withScrollPosition((props) => {
   const {
     isFetching,
     isPopulated,
@@ -257,6 +262,7 @@ function MovieIndex() {
           ref={scrollerRef}
           className={styles.contentBody}
           innerClassName={styles[`${view}InnerContentBody`]}
+          initialScrollTop={props.initialScrollTop}
           onScroll={onScroll}
         >
           {isFetching && !isPopulated ? <LoadingIndicator /> : null}
@@ -301,6 +307,6 @@ function MovieIndex() {
       ) : null}
     </PageContent>
   );
-}
+}, 'movieIndex');
 
 export default MovieIndex;