tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't reset scroll position when opening a modal

Browse Source
This commit is contained in:
Thibaut Girka
2018-07-27 17:59:52 +02:00
committed by ThibG
parent 5d060cb6e4
commit b02bfe86ce
15 changed files with 75 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/status/index.js
View File

@ -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}