matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-12-05 15:22:09 +03:00
Code Activity

Improve thread partitioning for 2nd degree relations (#7748)

Browse Source
This commit is contained in:
Germain
2022-02-10 15:18:55 +00:00
committed by GitHub
parent 87ca70edb1
commit 15a9303d29
6 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/structures/TimelinePanel.tsx
View File

@@ -1285,11 +1285,30 @@ class TimelinePanel extends React.Component<IProps, IState> {
// should use this list, so that they don't advance into pending events.
const liveEvents = [...events];
const thread = events[0]?.getThread();
// if we're at the end of the live timeline, append the pending events
if (!this.timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
events.push(...this.props.timelineSet.getPendingEvents(thread));
const pendingEvents = this.props.timelineSet.getPendingEvents();
if (this.context.timelineRenderingType === TimelineRenderingType.Thread) {
events.push(...pendingEvents.filter(e => e.threadRootId === this.context.threadId));
} else {
events.push(...pendingEvents.filter(e => {
const hasNoRelation = !e.getRelation();
if (hasNoRelation) {
return true;
}
if (e.isThreadRelation) {
return false;
}
const parentEvent = this.props.timelineSet.findEventById(e.getAssociatedId());
if (!parentEvent) {
return false;
} else {
return !parentEvent.isThreadRelation;
}
}));
}
}
return {