From 076ad5fe6d840d9046bdba14afe3af5395ca00b7 Mon Sep 17 00:00:00 2001
From: ta264 <ta264@users.noreply.github.com>
Date: Wed, 5 May 2021 21:30:44 +0100
Subject: [PATCH] Revert "Fixed scrolling via jump list on series index"

This reverts commit 5d316ad7dc62af8b6d49cfe192847a786cbb81ed.
---
 frontend/src/Components/Table/VirtualTable.js | 23 +++++++------
 .../Index/Overview/SeriesIndexOverview.js     |  1 -
 .../Index/Overview/SeriesIndexOverviews.js    | 34 ++++++++-----------
 .../Index/Posters/SeriesIndexPosters.js       | 29 ++++++++--------
 4 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/frontend/src/Components/Table/VirtualTable.js b/frontend/src/Components/Table/VirtualTable.js
index 310459866..b2d68a888 100644
--- a/frontend/src/Components/Table/VirtualTable.js
+++ b/frontend/src/Components/Table/VirtualTable.js
@@ -7,6 +7,8 @@ import { WindowScroller, Grid } from 'react-virtualized';
 import hasDifferentItemsOrOrder from 'Utilities/Object/hasDifferentItemsOrOrder';
 import styles from './VirtualTable.css';
 
+const ROW_HEIGHT = 38;
+
 function overscanIndicesGetter(options) {
   const {
     cellCount,
@@ -45,7 +47,8 @@ class VirtualTable extends Component {
 
   componentDidUpdate(prevProps, prevState) {
     const {
-      items
+      items,
+      scrollIndex
     } = this.props;
 
     const {
@@ -56,6 +59,13 @@ class VirtualTable extends Component {
       // recomputeGridSize also forces Grid to discard its cache of rendered cells
       this._grid.recomputeGridSize();
     }
+
+    if (scrollIndex != null && scrollIndex !== prevProps.scrollIndex) {
+      this._grid.scrollToCell({
+        rowIndex: scrollIndex,
+        columnIndex: 0
+      });
+    }
   }
 
   //
@@ -86,8 +96,6 @@ class VirtualTable extends Component {
       header,
       headerHeight,
       rowRenderer,
-      rowHeight,
-      scrollIndex,
       ...otherProps
     } = this.props;
 
@@ -117,11 +125,6 @@ class VirtualTable extends Component {
           if (!height) {
             return null;
           }
-
-          const finalScrollTop = scrollIndex == null ?
-            scrollTop :
-            scrollIndex * rowHeight;
-
           return (
             <Measure
               whitelist={['width']}
@@ -141,11 +144,11 @@ class VirtualTable extends Component {
                     width={width}
                     height={height}
                     headerHeight={height - headerHeight}
-                    rowHeight={rowHeight}
+                    rowHeight={ROW_HEIGHT}
                     rowCount={items.length}
                     columnCount={1}
                     columnWidth={width}
-                    scrollTop={finalScrollTop}
+                    scrollTop={scrollTop}
                     onScroll={onChildScroll}
                     overscanRowCount={2}
                     cellRenderer={rowRenderer}
diff --git a/frontend/src/Series/Index/Overview/SeriesIndexOverview.js b/frontend/src/Series/Index/Overview/SeriesIndexOverview.js
index e279e507e..0e7af9d90 100644
--- a/frontend/src/Series/Index/Overview/SeriesIndexOverview.js
+++ b/frontend/src/Series/Index/Overview/SeriesIndexOverview.js
@@ -270,7 +270,6 @@ SeriesIndexOverview.propTypes = {
 };
 
 SeriesIndexOverview.defaultProps = {
-  overview: '',
   statistics: {
     seasonCount: 0,
     episodeCount: 0,
diff --git a/frontend/src/Series/Index/Overview/SeriesIndexOverviews.js b/frontend/src/Series/Index/Overview/SeriesIndexOverviews.js
index 24ec769c8..eab7fc7fd 100644
--- a/frontend/src/Series/Index/Overview/SeriesIndexOverviews.js
+++ b/frontend/src/Series/Index/Overview/SeriesIndexOverviews.js
@@ -71,6 +71,7 @@ class SeriesIndexOverviews extends Component {
       items,
       sortKey,
       overviewOptions,
+      jumpToCharacter,
       isSmallScreen
     } = this.props;
 
@@ -95,6 +96,18 @@ class SeriesIndexOverviews extends Component {
       // recomputeGridSize also forces Grid to discard its cache of rendered cells
       this._grid.recomputeGridSize();
     }
+
+    if (jumpToCharacter != null && jumpToCharacter !== prevProps.jumpToCharacter) {
+      const index = getIndexOfFirstCharacter(items, jumpToCharacter);
+
+      if (this._grid && index != null) {
+
+        this._grid.scrollToCell({
+          rowIndex: index,
+          columnIndex: 0
+        });
+      }
+    }
   }
 
   //
@@ -188,7 +201,6 @@ class SeriesIndexOverviews extends Component {
     const {
       scroller,
       items,
-      jumpToCharacter,
       isSmallScreen
     } = this.props;
 
@@ -210,24 +222,6 @@ class SeriesIndexOverviews extends Component {
               return <div />;
             }
 
-            let finalScrollTop = scrollTop;
-
-            if (jumpToCharacter != null) {
-              const index = getIndexOfFirstCharacter(items, jumpToCharacter);
-
-              if (index != null) {
-                if (index > 0) {
-                  // Adjust 5px upwards so there is a gap between the bottom
-                  // of the toolbar and top of the poster.
-
-                  finalScrollTop = rowHeight * index - 5;
-                } else {
-                  finalScrollTop = 0;
-                }
-
-              }
-            }
-
             return (
               <div ref={registerChild}>
                 <Grid
@@ -241,7 +235,7 @@ class SeriesIndexOverviews extends Component {
                   rowHeight={rowHeight}
                   width={width}
                   onScroll={onChildScroll}
-                  scrollTop={finalScrollTop}
+                  scrollTop={scrollTop}
                   overscanRowCount={2}
                   cellRenderer={this.cellRenderer}
                   scrollToAlignment={'start'}
diff --git a/frontend/src/Series/Index/Posters/SeriesIndexPosters.js b/frontend/src/Series/Index/Posters/SeriesIndexPosters.js
index d452f3fbd..44201f56c 100644
--- a/frontend/src/Series/Index/Posters/SeriesIndexPosters.js
+++ b/frontend/src/Series/Index/Posters/SeriesIndexPosters.js
@@ -114,6 +114,7 @@ class SeriesIndexPosters extends Component {
       items,
       sortKey,
       posterOptions,
+      jumpToCharacter,
       isSmallScreen
     } = this.props;
 
@@ -138,6 +139,19 @@ class SeriesIndexPosters extends Component {
       // recomputeGridSize also forces Grid to discard its cache of rendered cells
       this._grid.recomputeGridSize();
     }
+
+    if (jumpToCharacter != null && jumpToCharacter !== prevProps.jumpToCharacter) {
+      const index = getIndexOfFirstCharacter(items, jumpToCharacter);
+
+      if (this._grid && index != null) {
+        const row = Math.floor(index / columnCount);
+
+        this._grid.scrollToCell({
+          rowIndex: row,
+          columnIndex: 0
+        });
+      }
+    }
   }
 
   //
@@ -242,7 +256,6 @@ class SeriesIndexPosters extends Component {
     const {
       scroller,
       items,
-      jumpToCharacter,
       isSmallScreen
     } = this.props;
 
@@ -268,18 +281,6 @@ class SeriesIndexPosters extends Component {
               return <div />;
             }
 
-            let finalScrollTop = scrollTop;
-
-            if (jumpToCharacter != null) {
-              const index = getIndexOfFirstCharacter(items, jumpToCharacter);
-
-              if (index != null) {
-                const row = Math.floor(index / columnCount);
-
-                finalScrollTop = rowHeight * row;
-              }
-            }
-
             return (
               <div ref={registerChild}>
                 <Grid
@@ -293,7 +294,7 @@ class SeriesIndexPosters extends Component {
                   rowHeight={rowHeight}
                   width={width}
                   onScroll={onChildScroll}
-                  scrollTop={finalScrollTop}
+                  scrollTop={scrollTop}
                   overscanRowCount={2}
                   cellRenderer={this.cellRenderer}
                   scrollToAlignment={'start'}