diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 13:32:35 +0200 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2018-09-03 14:24:10 +0200 |
commit | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (patch) | |
tree | 82d6fc6bba891d4cf75c3f4e8ea75ca516ae3e15 /app/javascript/flavours/glitch/features/follow_requests/index.js | |
parent | 2b82829a5351855bbf8dccdb57c8f7dbd598b6bb (diff) |
Fixes columns scrolling to top when opening media modal
Fixes #700
Diffstat (limited to 'app/javascript/flavours/glitch/features/follow_requests/index.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/follow_requests/index.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/follow_requests/index.js b/app/javascript/flavours/glitch/features/follow_requests/index.js index 04ff3f111..1e4633984 100644 --- a/app/javascript/flavours/glitch/features/follow_requests/index.js +++ b/app/javascript/flavours/glitch/features/follow_requests/index.js @@ -42,6 +42,10 @@ export default class FollowRequests extends ImmutablePureComponent { } } + shouldUpdateScroll = (prevRouterProps, { location }) => { + return !(location.state && location.state.mastodonModalOpen); + } + render () { const { intl, accountIds } = this.props; @@ -57,7 +61,7 @@ export default class FollowRequests extends ImmutablePureComponent { <Column name='follow-requests' icon='users' heading={intl.formatMessage(messages.heading)}> <ColumnBackButtonSlim /> - <ScrollContainer scrollKey='follow_requests'> + <ScrollContainer scrollKey='follow_requests' shouldUpdateScroll={this.shouldUpdateScroll}> <div className='scrollable' onScroll={this.handleScroll}> {accountIds.map(id => <AccountAuthorizeContainer key={id} id={id} /> |