Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix being unable to load past a full page of filtered posts in Home timeline #24930

Merged
merged 1 commit into from May 16, 2023
Merged

Fix being unable to load past a full page of filtered posts in Home timeline #24930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/javascript/mastodon/components/status_list.jsx
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@ export default class StatusList extends ImmutablePureComponent {
alwaysPrepend: PropTypes.bool,
withCounters: PropTypes.bool,
timelineId: PropTypes.string,
lastId: PropTypes.string,
};

static defaultProps = {
Expand Down Expand Up @@ -55,7 +56,8 @@ export default class StatusList extends ImmutablePureComponent {
};

handleLoadOlder = debounce(() => {
this.props.onLoadMore(this.props.statusIds.size > 0 ? this.props.statusIds.last() : undefined);
const { statusIds, lastId, onLoadMore } = this.props;
onLoadMore(lastId || (statusIds.size > 0 ? statusIds.last() : undefined));
}, 300, { leading: true });

_selectChild (index, align_top) {
Expand Down
1 change: 1 addition & 0 deletions app/javascript/mastodon/features/ui/containers/status_list_container.js
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@ const makeMapStateToProps = () => {

const mapStateToProps = (state, { timelineId }) => ({
statusIds: getStatusIds(state, { type: timelineId }),
lastId: state.getIn(['timelines', timelineId, 'items'])?.last(),
isLoading: state.getIn(['timelines', timelineId, 'isLoading'], true),
isPartial: state.getIn(['timelines', timelineId, 'isPartial'], false),
hasMore: state.getIn(['timelines', timelineId, 'hasMore']),
Expand Down