me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Port ad91a0578b 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 8193445a3d
commit 96469fb187
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>