diff options
Diffstat (limited to 'app/javascript/flavours/glitch/features/status/index.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/status/index.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/status/index.js b/app/javascript/flavours/glitch/features/status/index.js index 333a8b0d2..e1330b183 100644 --- a/app/javascript/flavours/glitch/features/status/index.js +++ b/app/javascript/flavours/glitch/features/status/index.js @@ -342,6 +342,10 @@ export default class Status extends ImmutablePureComponent { this.setState({ fullscreen: isFullscreen() }); } + shouldUpdateScroll = (prevRouterProps, { location }) => { + return !(location.state && location.state.mastodonModalOpen) + } + render () { let ancestors, descendants; const { setExpansion } = this; @@ -385,7 +389,7 @@ export default class Status extends ImmutablePureComponent { )} /> - <ScrollContainer scrollKey='thread'> + <ScrollContainer scrollKey='thread' shouldUpdateScroll={this.shouldUpdateScroll}> <div className={classNames('scrollable', 'detailed-status__wrapper', { fullscreen })} ref={this.setRef}> {ancestors} |