djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Fix scroll position resetting when opening media modals in web UI 

Port 50755a47b4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
This commit is contained in:
Eugen Rochko 2019-09-12 20:14:59 +02:00 committed by Thibaut Girka
parent e7fd43c27c
commit 0d42111671
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/containers/mastodon.js
View File

@ -49,6 +49,10 @@ export default class Mastodon extends React.PureComponent {
} }
} }
shouldUpdateScroll (_, { location }) {
return !(location.state && location.state.mastodonModalOpen);
}
render () { render () {
const { locale } = this.props; const { locale } = this.props;
@ -57,7 +61,7 @@ export default class Mastodon extends React.PureComponent {
<Provider store={store}> <Provider store={store}>
<ErrorBoundary> <ErrorBoundary>
<BrowserRouter basename='/web'> <BrowserRouter basename='/web'>
<ScrollContext> <ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}>
<Route path='/' component={UI} /> <Route path='/' component={UI} />
</ScrollContext> </ScrollContext>
</BrowserRouter> </BrowserRouter>