imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't form continuations on either side of a thread root (#8408)

Browse source
This commit is contained in:
Michael Telatynski 2022-04-26 09:30:36 +01:00 • committed by GitHub
parent f85e178fc1
commit a70f11704f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/structures/MessagePanel.tsx
View file

@ -92,9 +92,13 @@ export function shouldFormContinuation(
mxEvent.sender.name !== prevEvent.sender.name ||
mxEvent.sender.getMxcAvatarUrl() !== prevEvent.sender.getMxcAvatarUrl()) return false;
// Thread summaries in the main timeline should break up a continuation
if (threadsEnabled && prevEvent.isThreadRoot &&
timelineRenderingType !== TimelineRenderingType.Thread) return false;
// Thread summaries in the main timeline should break up a continuation on both sides
if (threadsEnabled &&
(mxEvent.isThreadRoot || prevEvent.isThreadRoot) &&
timelineRenderingType !== TimelineRenderingType.Thread
) {
return false;
}
// if we don't have tile for previous event then it was shown by showHiddenEvents and has no SenderProfile
if (!haveRendererForEvent(prevEvent, showHiddenEvents)) return false;