Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Consider continuations when resolving whether a tile is last in section #7461

Merged
merged 1 commit into from
Jan 10, 2022
Merged

Consider continuations when resolving whether a tile is last in section #7461

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/components/structures/MessagePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,12 +727,14 @@ export default class MessagePanel extends React.Component<IProps, IState> {
ret.push(dateSeparator);
}

let willWantDateSeparator = false;
let lastInSection = true;
if (nextEventWithTile) {
willWantDateSeparator = this.wantsDateSeparator(mxEv, nextEventWithTile.getDate() || new Date());
lastInSection = willWantDateSeparator || mxEv.getSender() !== nextEventWithTile.getSender() ||
getEventDisplayInfo(nextEventWithTile).isInfoMessage;
const nextEv = nextEventWithTile;
const willWantDateSeparator = this.wantsDateSeparator(mxEv, nextEv.getDate() || new Date());
lastInSection = willWantDateSeparator ||
mxEv.getSender() !== nextEv.getSender() ||
getEventDisplayInfo(nextEv).isInfoMessage ||
!shouldFormContinuation(mxEv, nextEv, this.showHiddenEvents, this.context.timelineRenderingType);
}

// is this a continuation of the previous message?
Expand Down