Merge branch 'next-paginated-context' into 'next'
Next: Support paginated context API See merge request soapbox-pub/soapbox-fe!1253
This commit is contained in:
commit
3b55a5a9c7
4 changed files with 33 additions and 5 deletions
Binary file not shown.
|
@ -24,6 +24,10 @@ export const getLinks = (response: AxiosResponse): LinkHeader => {
|
|||
return new LinkHeader(response.headers?.link);
|
||||
};
|
||||
|
||||
export const getNextLink = (response: AxiosResponse): string | undefined => {
|
||||
return getLinks(response).refs.find(link => link.rel === 'next')?.uri;
|
||||
};
|
||||
|
||||
const getToken = (state: RootState, authType: string) => {
|
||||
return authType === 'app' ? getAppToken(state) : getAccessToken(state);
|
||||
};
|
||||
|
|
|
@ -51,7 +51,7 @@ import {
|
|||
hideStatus,
|
||||
revealStatus,
|
||||
} from '../../actions/statuses';
|
||||
import { fetchStatusWithContext } from '../../actions/statuses';
|
||||
import { fetchStatusWithContext, fetchNext } from '../../actions/statuses';
|
||||
import MissingIndicator from '../../components/missing_indicator';
|
||||
import { textForScreenReader, defaultMediaVisibility } from '../../components/status';
|
||||
import { makeGetStatus } from '../../selectors';
|
||||
|
@ -189,6 +189,7 @@ interface IStatusState {
|
|||
emojiSelectorFocused: boolean,
|
||||
isLoaded: boolean,
|
||||
error?: AxiosError,
|
||||
next?: string,
|
||||
}
|
||||
|
||||
class Status extends ImmutablePureComponent<IStatus, IStatusState> {
|
||||
|
@ -200,17 +201,18 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
|
|||
emojiSelectorFocused: false,
|
||||
isLoaded: Boolean(this.props.status),
|
||||
error: undefined,
|
||||
next: undefined,
|
||||
};
|
||||
|
||||
node: HTMLDivElement | null = null;
|
||||
status: HTMLDivElement | null = null;
|
||||
_scrolledIntoView: boolean = false;
|
||||
|
||||
fetchData = () => {
|
||||
fetchData = async() => {
|
||||
const { dispatch, params } = this.props;
|
||||
const { statusId } = params;
|
||||
|
||||
return dispatch(fetchStatusWithContext(statusId));
|
||||
const { next } = await dispatch(fetchStatusWithContext(statusId));
|
||||
this.setState({ next });
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
|
@ -641,6 +643,16 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
|
|||
return this.fetchData();
|
||||
}
|
||||
|
||||
handleLoadMore = () => {
|
||||
const { next } = this.state;
|
||||
|
||||
if (next) {
|
||||
this.props.dispatch(fetchNext(next)).then(({ next }) => {
|
||||
this.setState({ next });
|
||||
}).catch(() => {});
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
const { status, ancestorsIds, descendantsIds, intl } = this.props;
|
||||
|
||||
|
@ -754,7 +766,12 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
|
|||
</div>
|
||||
|
||||
<div ref={this.setRef} className='thread'>
|
||||
<ScrollableList onRefresh={this.handleRefresh}>
|
||||
<ScrollableList
|
||||
onRefresh={this.handleRefresh}
|
||||
hasMore={!!this.state.next}
|
||||
onLoadMore={this.handleLoadMore}
|
||||
placeholderComponent={() => <PlaceholderStatus thread />}
|
||||
>
|
||||
{children}
|
||||
</ScrollableList>
|
||||
</div>
|
||||
|
|
|
@ -286,6 +286,13 @@ const getInstanceFeatures = (instance: Instance) => {
|
|||
v.software === PLEROMA && gte(v.version, '2.4.50'),
|
||||
]),
|
||||
|
||||
/**
|
||||
* Supports pagination in threads.
|
||||
* @see GET /api/v1/statuses/:id/context/ancestors
|
||||
* @see GET /api/v1/statuses/:id/context/descendants
|
||||
*/
|
||||
paginatedContext: v.software === TRUTHSOCIAL,
|
||||
|
||||
/** Truth Social account registration API. */
|
||||
pepe: v.software === TRUTHSOCIAL,
|
||||
|
||||
|
|
Loading…
Reference in a new issue