about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/public_timeline
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-27 17:59:52 +0200
committerThibG <thib@sitedethib.com>2018-07-30 14:32:02 +0200
commitb02bfe86ce26ef001420841673257c9c5326b45c (patch)
treea4a619af1539362da34737faffee00121a852573 /app/javascript/flavours/glitch/features/public_timeline
parent5d060cb6e4d34c81c9d4a18cbcc1d6b1a5989260 (diff)
Don't reset scroll position when opening a modal
Diffstat (limited to 'app/javascript/flavours/glitch/features/public_timeline')
-rw-r--r--app/javascript/flavours/glitch/features/public_timeline/index.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.js b/app/javascript/flavours/glitch/features/public_timeline/index.js
index a6c0b1688..3eb92cafa 100644
--- a/app/javascript/flavours/glitch/features/public_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/public_timeline/index.js
@@ -71,6 +71,10 @@ export default class PublicTimeline extends React.PureComponent {
     this.props.dispatch(expandPublicTimeline({ maxId }));
   }
 
+  shouldUpdateScroll = (prevRouterProps, { location }) => {
+    return !(location.state && location.state.mastodonModalOpen)
+  }
+
   render () {
     const { intl, columnId, hasUnread, multiColumn } = this.props;
     const pinned = !!columnId;
@@ -95,6 +99,7 @@ export default class PublicTimeline extends React.PureComponent {
           onLoadMore={this.handleLoadMore}
           trackScroll={!pinned}
           scrollKey={`public_timeline-${columnId}`}
+          shouldUpdateScroll={this.shouldUpdateScroll}
           emptyMessage={<FormattedMessage id='empty_column.public' defaultMessage='There is nothing here! Write something publicly, or manually follow users from other instances to fill it up' />}
         />
       </Column>