diff options
author | ThibG <thib@sitedethib.com> | 2020-04-12 13:38:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-12 13:38:00 +0200 |
commit | ec31b1b75244c030bb4fb0ccabac7ff8b626db92 (patch) | |
tree | 767560676052450a94a9d3dcb3fbed778a6af6e8 /app/javascript/mastodon/features/blocks | |
parent | e51cbbbf5b49d6dc18e988a521ae6a13f731c29b (diff) |
Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445)
* Fix following, followers and follow requests pagination * Fix pagination of blocks and mutes
Diffstat (limited to 'app/javascript/mastodon/features/blocks')
-rw-r--r-- | app/javascript/mastodon/features/blocks/index.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js index 870c0de09..107deb841 100644 --- a/app/javascript/mastodon/features/blocks/index.js +++ b/app/javascript/mastodon/features/blocks/index.js @@ -19,6 +19,7 @@ const messages = defineMessages({ const mapStateToProps = state => ({ accountIds: state.getIn(['user_lists', 'blocks', 'items']), hasMore: !!state.getIn(['user_lists', 'blocks', 'next']), + isLoading: state.getIn(['user_lists', 'blocks', 'isLoading'], true), }); export default @connect(mapStateToProps) @@ -31,6 +32,7 @@ class Blocks extends ImmutablePureComponent { shouldUpdateScroll: PropTypes.func, accountIds: ImmutablePropTypes.list, hasMore: PropTypes.bool, + isLoading: PropTypes.bool, intl: PropTypes.object.isRequired, multiColumn: PropTypes.bool, }; @@ -44,7 +46,7 @@ class Blocks extends ImmutablePureComponent { }, 300, { leading: true }); render () { - const { intl, accountIds, shouldUpdateScroll, hasMore, multiColumn } = this.props; + const { intl, accountIds, shouldUpdateScroll, hasMore, multiColumn, isLoading } = this.props; if (!accountIds) { return ( @@ -63,6 +65,7 @@ class Blocks extends ImmutablePureComponent { scrollKey='blocks' onLoadMore={this.handleLoadMore} hasMore={hasMore} + isLoading={isLoading} shouldUpdateScroll={shouldUpdateScroll} emptyMessage={emptyMessage} bindToDocument={!multiColumn} |