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

Fix jumping to read marker for events without tiles #4830

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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: 7 additions & 3 deletions src/components/structures/MessagePanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -517,10 +517,14 @@ export default class MessagePanel extends React.Component {
// replacing all of the DOM elements every time we paginate.
ret.push(...this._getTilesForEvent(prevEvent, mxEv, last));
prevEvent = mxEv;
}

const readMarker = this._readMarkerForEvent(eventId, i >= lastShownNonLocalEchoIndex);
if (readMarker) ret.push(readMarker);
// Only consider drawing the read marker for events that also have a
// tile. When scrolling to the read marker, we assume that if the read
// marker node is present, then there is also an event tile with a
// matching scroll token as well.
const readMarker = this._readMarkerForEvent(eventId, i >= lastShownNonLocalEchoIndex);
if (readMarker) ret.push(readMarker);
}
}
}

Expand Down