alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small scroll/history behavior fixup to take weird browser patterns into account

signup-info-prompt
Claire 2021-07-13 12:57:07 +02:00
parent 84fbe4d030
commit 19ea6618b1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/containers/scroll_container.js
View File

@ -4,7 +4,8 @@ import { ScrollContainer as OriginalScrollContainer } from 'react-router-scroll-
// new history state and remembering the scroll position when going back. // new history state and remembering the scroll position when going back.
// There are a few things we need to do differently, though. // There are a few things we need to do differently, though.
const defaultShouldUpdateScroll = (prevRouterProps, { location }) => { const defaultShouldUpdateScroll = (prevRouterProps, { location }) => {
return !(prevRouterProps?.location?.state?.mastodonModalKey || location.state?.mastodonModalKey); // If the change is caused by opening a modal, do not scroll to top
return !(location.state?.mastodonModalKey && location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey);
} }
export default export default