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/followers/index.js | |
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/followers/index.js')
-rw-r--r-- | app/javascript/mastodon/features/followers/index.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js index f8723e055..302ccffdd 100644 --- a/app/javascript/mastodon/features/followers/index.js +++ b/app/javascript/mastodon/features/followers/index.js @@ -22,6 +22,7 @@ const mapStateToProps = (state, props) => ({ isAccount: !!state.getIn(['accounts', props.params.accountId]), accountIds: state.getIn(['user_lists', 'followers', props.params.accountId, 'items']), hasMore: !!state.getIn(['user_lists', 'followers', props.params.accountId, 'next']), + isLoading: state.getIn(['user_lists', 'followers', props.params.accountId, 'isLoading'], true), blockedBy: state.getIn(['relationships', props.params.accountId, 'blocked_by'], false), }); @@ -34,6 +35,7 @@ class Followers extends ImmutablePureComponent { shouldUpdateScroll: PropTypes.func, accountIds: ImmutablePropTypes.list, hasMore: PropTypes.bool, + isLoading: PropTypes.bool, blockedBy: PropTypes.bool, isAccount: PropTypes.bool, multiColumn: PropTypes.bool, @@ -58,7 +60,7 @@ class Followers extends ImmutablePureComponent { }, 300, { leading: true }); render () { - const { shouldUpdateScroll, accountIds, hasMore, blockedBy, isAccount, multiColumn } = this.props; + const { shouldUpdateScroll, accountIds, hasMore, blockedBy, isAccount, multiColumn, isLoading } = this.props; if (!isAccount) { return ( @@ -85,6 +87,7 @@ class Followers extends ImmutablePureComponent { <ScrollableList scrollKey='followers' hasMore={hasMore} + isLoading={isLoading} onLoadMore={this.handleLoadMore} shouldUpdateScroll={shouldUpdateScroll} prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />} |