diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-13 12:57:07 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-13 13:21:00 +0200 |
| commit | 19ea6618b18ac5c11d4b0ac4eb8acb2276db6a89 (patch) | |
| tree | 4419aad8cc403edd32123ecc8c43f79b73780d9b | |
| parent | 84fbe4d030e3176fffaf49ac8eec0c0602b1ba87 (diff) | |
Small scroll/history behavior fixup to take weird browser patterns into account
| -rw-r--r-- | app/javascript/flavours/glitch/containers/scroll_container.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/containers/scroll_container.js b/app/javascript/flavours/glitch/containers/scroll_container.js index 595f3155f..740e266cb 100644 --- a/app/javascript/flavours/glitch/containers/scroll_container.js +++ b/app/javascript/flavours/glitch/containers/scroll_container.js @@ -4,7 +4,8 @@ import { ScrollContainer as OriginalScrollContainer } from 'react-router-scroll- // new history state and remembering the scroll position when going back. // There are a few things we need to do differently, though. 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 |