Fix scroll handling with modals

2021-07-13 11:07:16 +02:00
parent 6e3d5cbca2
commit 99f28c17de
5 changed files with 5 additions and 8 deletions
--- a/app/javascript/flavours/glitch/components/scrollable_list.js
+++ b/app/javascript/flavours/glitch/components/scrollable_list.js
@@ -265,8 +265,7 @@ class ScrollableList extends PureComponent {
  }

  defaultShouldUpdateScroll = (prevRouterProps, { location }) => {
-    if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
-    return !(location.state && location.state.mastodonModalOpen);
+    return !(prevRouterProps?.location?.state?.mastodonModalKey || location.state?.mastodonModalKey);
  }

  handleLoadPending = e => {