From c5fa09dd86252c54cb35d5075350816d95c0d6a2 Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Thu, 24 Apr 2025 14:56:45 +0300
Subject: [PATCH] Fixed: Restore scroll position for collections and discover
 on go back

---
 frontend/src/Collection/Collection.js       | 4 ++++
 frontend/src/DiscoverMovie/DiscoverMovie.js | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/frontend/src/Collection/Collection.js b/frontend/src/Collection/Collection.js
index 78ce430983..aed824c071 100644
--- a/frontend/src/Collection/Collection.js
+++ b/frontend/src/Collection/Collection.js
@@ -224,6 +224,7 @@ class Collection extends Component {
       view,
       onSortSelect,
       onFilterSelect,
+      initialScrollTop,
       onScroll,
       isRefreshingCollections,
       isSaving,
@@ -306,6 +307,7 @@ class Collection extends Component {
             ref={this.scrollerRef}
             className={styles.contentBody}
             innerClassName={styles[`${view}InnerContentBody`]}
+            onScroll={onScroll}
           >
             {
               isFetching && !isPopulated &&
@@ -334,6 +336,7 @@ class Collection extends Component {
                     onSelectedChange={this.onSelectedChange}
                     onSelectAllChange={this.onSelectAllChange}
                     selectedState={selectedState}
+                    scrollTop={initialScrollTop}
                     {...otherProps}
                   />
                 </div>
@@ -374,6 +377,7 @@ class Collection extends Component {
 }
 
 Collection.propTypes = {
+  initialScrollTop: PropTypes.number,
   isFetching: PropTypes.bool.isRequired,
   isPopulated: PropTypes.bool.isRequired,
   isSaving: PropTypes.bool.isRequired,
diff --git a/frontend/src/DiscoverMovie/DiscoverMovie.js b/frontend/src/DiscoverMovie/DiscoverMovie.js
index 19fafe9476..75a440d36f 100644
--- a/frontend/src/DiscoverMovie/DiscoverMovie.js
+++ b/frontend/src/DiscoverMovie/DiscoverMovie.js
@@ -259,6 +259,7 @@ class DiscoverMovie extends Component {
       onSortSelect,
       onFilterSelect,
       onViewSelect,
+      initialScrollTop,
       onScroll,
       onAddMoviesPress,
       isSyncingLists,
@@ -369,6 +370,7 @@ class DiscoverMovie extends Component {
             ref={this.scrollerRef}
             className={styles.contentBody}
             innerClassName={styles[`${view}InnerContentBody`]}
+            onScroll={onScroll}
           >
             {
               isFetching && !isPopulated &&
@@ -397,6 +399,7 @@ class DiscoverMovie extends Component {
                     onSelectedChange={this.onSelectedChange}
                     onSelectAllChange={this.onSelectAllChange}
                     selectedState={selectedState}
+                    scrollTop={initialScrollTop}
                     {...otherProps}
                   />
                 </div>
@@ -441,6 +444,7 @@ class DiscoverMovie extends Component {
 }
 
 DiscoverMovie.propTypes = {
+  initialScrollTop: PropTypes.number,
   isFetching: PropTypes.bool.isRequired,
   isPopulated: PropTypes.bool.isRequired,
   error: PropTypes.object,