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/account_gallery/index.js
+++ b/app/javascript/flavours/glitch/features/account_gallery/index.js
@@ -89,6 +89,10 @@ export default class AccountGallery extends ImmutablePureComponent {
    this.handleScrollToBottom();
  }

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

@@ -110,7 +114,7 @@ export default class AccountGallery extends ImmutablePureComponent {
      <Column>
        <ColumnBackButton />

-        <ScrollContainer scrollKey='account_gallery'>
+        <ScrollContainer scrollKey='account_gallery' shouldUpdateScroll={this.shouldUpdateScroll}>
          <div className='scrollable' onScroll={this.handleScroll}>
            <HeaderContainer accountId={this.props.params.accountId} />