diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-27 17:59:52 +0200 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2018-07-30 14:32:02 +0200 |
commit | b02bfe86ce26ef001420841673257c9c5326b45c (patch) | |
tree | a4a619af1539362da34737faffee00121a852573 /app/javascript/flavours/glitch/features/direct_timeline | |
parent | 5d060cb6e4d34c81c9d4a18cbcc1d6b1a5989260 (diff) |
Don't reset scroll position when opening a modal
Diffstat (limited to 'app/javascript/flavours/glitch/features/direct_timeline')
-rw-r--r-- | app/javascript/flavours/glitch/features/direct_timeline/index.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/index.js b/app/javascript/flavours/glitch/features/direct_timeline/index.js index 418db7c79..25af49342 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/index.js +++ b/app/javascript/flavours/glitch/features/direct_timeline/index.js @@ -71,6 +71,10 @@ export default class DirectTimeline extends React.PureComponent { this.props.dispatch(expandDirectTimeline({ maxId })); } + shouldUpdateScroll = (prevRouterProps, { location }) => { + return !(location.state && location.state.mastodonModalOpen) + } + render () { const { intl, hasUnread, columnId, multiColumn } = this.props; const pinned = !!columnId; @@ -93,6 +97,7 @@ export default class DirectTimeline extends React.PureComponent { <StatusListContainer trackScroll={!pinned} scrollKey={`direct_timeline-${columnId}`} + shouldUpdateScroll={this.shouldUpdateScroll} timelineId='direct' onLoadMore={this.handleLoadMore} emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any direct messages yet. When you send or receive one, it will show up here." />} |