Don't reset scroll position when opening a modal

2018-07-27 17:59:52 +02:00
parent 5d060cb6e4
commit b02bfe86ce
15 changed files with 75 additions and 5 deletions
--- a/app/javascript/flavours/glitch/features/pinned_statuses/index.js
+++ b/app/javascript/flavours/glitch/features/pinned_statuses/index.js
@ -41,6 +41,10 @@ export default class PinnedStatuses extends ImmutablePureComponent {
    this.column = c;
  }

+  shouldUpdateScroll = (prevRouterProps, { location }) => {
+    return !(location.state && location.state.mastodonModalOpen)
+  }
+
  render () {
    const { intl, statusIds, hasMore } = this.props;

@ -50,6 +54,7 @@ export default class PinnedStatuses extends ImmutablePureComponent {
        <StatusList
          statusIds={statusIds}
          scrollKey='pinned_statuses'
+          shouldUpdateScroll={this.shouldUpdateScroll}
          hasMore={hasMore}
        />
      </Column>