about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/blocks
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-27 17:59:52 +0200
committerThibG <thib@sitedethib.com>2018-07-30 14:32:02 +0200
commitb02bfe86ce26ef001420841673257c9c5326b45c (patch)
treea4a619af1539362da34737faffee00121a852573 /app/javascript/flavours/glitch/features/blocks
parent5d060cb6e4d34c81c9d4a18cbcc1d6b1a5989260 (diff)
Don't reset scroll position when opening a modal
Diffstat (limited to 'app/javascript/flavours/glitch/features/blocks')
-rw-r--r--app/javascript/flavours/glitch/features/blocks/index.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/blocks/index.js b/app/javascript/flavours/glitch/features/blocks/index.js
index edd448921..4c8b16504 100644
--- a/app/javascript/flavours/glitch/features/blocks/index.js
+++ b/app/javascript/flavours/glitch/features/blocks/index.js
@@ -42,6 +42,10 @@ export default class Blocks extends ImmutablePureComponent {
     }
   }
 
+  shouldUpdateScroll = (prevRouterProps, { location }) => {
+    return !(location.state && location.state.mastodonModalOpen)
+  }
+
   render () {
     const { intl, accountIds } = this.props;
 
@@ -56,7 +60,7 @@ export default class Blocks extends ImmutablePureComponent {
     return (
       <Column name='blocks' icon='ban' heading={intl.formatMessage(messages.heading)}>
         <ColumnBackButtonSlim />
-        <ScrollContainer scrollKey='blocks'>
+        <ScrollContainer scrollKey='blocks' shouldUpdateScroll={this.shouldUpdateScroll}>
           <div className='scrollable' onScroll={this.handleScroll}>
             {accountIds.map(id =>
               <AccountContainer key={id} id={id} />