bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '340-load-more-community-fix' into 'develop'

Browse source 
Pass last statusID into status list before filtering, fixes #340

Closes #340

See merge request soapbox-pub/soapbox-fe!188
This commit is contained in:
Alex Gleason 2020-08-26 19:43:32 +00:00
commit 96ccf02ab8
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/soapbox/components/status_list.js
View file

@ -18,6 +18,7 @@ export default class StatusList extends ImmutablePureComponent {
static propTypes = { static propTypes = {
scrollKey: PropTypes.string.isRequired, scrollKey: PropTypes.string.isRequired,
statusIds: ImmutablePropTypes.list.isRequired, statusIds: ImmutablePropTypes.list.isRequired,
lastStatusId: PropTypes.string,
featuredStatusIds: ImmutablePropTypes.list, featuredStatusIds: ImmutablePropTypes.list,
onLoadMore: PropTypes.func, onLoadMore: PropTypes.func,
isLoading: PropTypes.bool, isLoading: PropTypes.bool,
@ -62,7 +63,8 @@ export default class StatusList extends ImmutablePureComponent {
} }
handleLoadOlder = debounce(() => { handleLoadOlder = debounce(() => {
this.props.onLoadMore(this.props.statusIds.size > 0 ? this.props.statusIds.last() : undefined); const loadMoreID = this.props.lastStatusId ? this.props.lastStatusId : this.props.statusIds.last();
this.props.onLoadMore(loadMoreID);
}, 300, { leading: true }) }, 300, { leading: true })
_selectChild(index, align_top) { _selectChild(index, align_top) {

2
app/soapbox/features/ui/containers/status_list_container.js
View file

@ -22,10 +22,12 @@ const makeGetStatusIds = () => createSelector([
}); });
const mapStateToProps = (state, { timelineId }) => { const mapStateToProps = (state, { timelineId }) => {
const lastStatusId = state.getIn(['timelines', timelineId, 'items'], ImmutableList()).last();
const getStatusIds = makeGetStatusIds(); const getStatusIds = makeGetStatusIds();
return { return {
statusIds: getStatusIds(state, { type: timelineId }), statusIds: getStatusIds(state, { type: timelineId }),
lastStatusId: lastStatusId,
isLoading: state.getIn(['timelines', timelineId, 'isLoading'], true), isLoading: state.getIn(['timelines', timelineId, 'isLoading'], true),
isPartial: state.getIn(['timelines', timelineId, 'isPartial'], false), isPartial: state.getIn(['timelines', timelineId, 'isPartial'], false),
hasMore: state.getIn(['timelines', timelineId, 'hasMore']), hasMore: state.getIn(['timelines', timelineId, 'hasMore']),