Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix jumping to read marker for events without tiles #4830

Closed
wants to merge 1 commit into from
Closed

Fix jumping to read marker for events without tiles #4830

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: 7 additions & 3 deletions src/components/structures/MessagePanel.js
View file
Open in desktop
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