From 972baa881b08c6286609beedbb724eb1e2db0e51 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 19 Apr 2020 19:14:08 -0600
Subject: [PATCH] Revert "Fix Filepanel scroll position state lost when room is
 changed"

---
 src/components/structures/FilePanel.js | 44 +-------------------------
 src/components/structures/RoomView.js  |  4 +--
 src/stores/RoomScrollStateStore.js     | 19 +++--------
 3 files changed, 8 insertions(+), 59 deletions(-)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index f073785df3..f8c03be864 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -25,8 +25,6 @@ import {MatrixClientPeg} from '../../MatrixClientPeg';
 import EventIndexPeg from "../../indexing/EventIndexPeg";
 import { _t } from '../../languageHandler';
 
-import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
-
 /*
  * Component which shows the filtered file using a TimelinePanel
  */
@@ -43,8 +41,6 @@ const FilePanel = createReactClass({
     getInitialState: function() {
         return {
             timelineSet: null,
-            initialEventId: null,
-            initialEventPixelOffset: null,
         };
     },
 
@@ -88,16 +84,6 @@ const FilePanel = createReactClass({
 
         await this.updateTimelineSet(this.props.roomId);
 
-        if (this.props.roomId) {
-            const filePanelScrollState = RoomScrollStateStore.getFilePanelScrollState(this.props.roomId);
-            if (filePanelScrollState) {
-                this.setState({
-                    initialEventId: filePanelScrollState.focussedEvent,
-                    initialEventPixelOffset: filePanelScrollState.pixelOffset,
-                });
-            }
-        }
-
         if (!MatrixClientPeg.get().isRoomEncrypted(this.props.roomId)) return;
 
         // The timelineSets filter makes sure that encrypted events that contain
@@ -115,10 +101,6 @@ const FilePanel = createReactClass({
     },
 
     componentWillUnmount() {
-        if (this.props.roomId) {
-            RoomScrollStateStore.setFilePanelScrollState(this.props.roomId, this._getScrollState());
-        }
-
         const client = MatrixClientPeg.get();
         if (client === null) return;
 
@@ -208,26 +190,6 @@ const FilePanel = createReactClass({
         }
     },
 
-    _getScrollState: function() {
-        const timelinePanel = this._timelinePanel;
-        const scrollState = timelinePanel.getScrollState();
-
-        if (!timelinePanel) return null;
-
-        if (!scrollState || scrollState.stuckAtBottom) {
-            return null;
-        }
-
-        return {
-            focussedEvent: scrollState.trackedScrollToken,
-            pixelOffset: scrollState.pixelOffset,
-        };
-    },
-
-    _getTimelinePanelRef: function(ref) {
-        this._timelinePanel = ref;
-    },
-
     render: function() {
         if (MatrixClientPeg.get().isGuest()) {
             return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
@@ -253,15 +215,11 @@ const FilePanel = createReactClass({
             //             "(" + this.state.timelineSet._timelines.join(", ") + ")" + " with key " + this.props.roomId);
             return (
                 <div className="mx_FilePanel" role="tabpanel">
-                    <TimelinePanel
-                        ref={this._getTimelinePanelRef}
-                        key={"filepanel_" + this.props.roomId}
+                    <TimelinePanel key={"filepanel_" + this.props.roomId}
                         manageReadReceipts={false}
                         manageReadMarkers={false}
                         timelineSet={this.state.timelineSet}
                         showUrlPreview = {false}
-                        eventId={this.state.initialEventId}
-                        eventPixelOffset={this.state.initialEventPixelOffset}
                         onPaginationRequest={this.onPaginationRequest}
                         tileShape="file_grid"
                         resizeNotifier={this.props.resizeNotifier}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e68d4b96dd..179e0aa2e9 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -269,7 +269,7 @@ export default createReactClass({
             // If an event ID wasn't specified, default to the one saved for this room
             // in the scroll state store. Assume initialEventPixelOffset should be set.
             if (!newState.initialEventId) {
-                const roomScrollState = RoomScrollStateStore.getRoomViewScrollState(newState.roomId);
+                const roomScrollState = RoomScrollStateStore.getScrollState(newState.roomId);
                 if (roomScrollState) {
                     newState.initialEventId = roomScrollState.focussedEvent;
                     newState.initialEventPixelOffset = roomScrollState.pixelOffset;
@@ -466,7 +466,7 @@ export default createReactClass({
 
         // update the scroll map before we get unmounted
         if (this.state.roomId) {
-            RoomScrollStateStore.setRoomViewScrollState(this.state.roomId, this._getScrollState());
+            RoomScrollStateStore.setScrollState(this.state.roomId, this._getScrollState());
         }
 
         if (this.state.shouldPeek) {
diff --git a/src/stores/RoomScrollStateStore.js b/src/stores/RoomScrollStateStore.js
index 9d48a7cc85..07848283d1 100644
--- a/src/stores/RoomScrollStateStore.js
+++ b/src/stores/RoomScrollStateStore.js
@@ -32,24 +32,15 @@ class RoomScrollStateStore {
         //
         //    pixelOffset: the number of pixels the window is scrolled down
         //        from the focussedEvent.
-        this._RoomViewScrollStateMap = {};
-        this._FilePanelScrollStateMap = {};
+        this._scrollStateMap = {};
     }
 
-    getRoomViewScrollState(roomId) {
-        return this._RoomViewScrollStateMap[roomId];
+    getScrollState(roomId) {
+        return this._scrollStateMap[roomId];
     }
 
-    setRoomViewScrollState(roomId, scrollState) {
-        this._RoomViewScrollStateMap[roomId] = scrollState;
-    }
-
-    getFilePanelScrollState(roomId, scrollState) {
-        return this._FilePanelScrollStateMap[roomId];
-    }
-
-    setFilePanelScrollState(roomId, scrollState) {
-        this._FilePanelScrollStateMap[roomId] = scrollState;
+    setScrollState(roomId, scrollState) {
+        this._scrollStateMap[roomId] = scrollState;
     }
 }