Merge pull request #6146 from robintown/fix-jump-to-bottom

Fix jumping to bottom without a highlighted event
This commit is contained in:
Germain 2021-06-07 09:01:47 +01:00 committed by GitHub
commit 00dd6e878f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1526,10 +1526,19 @@ export default class RoomView extends React.Component<IProps, IState> {
// jump down to the bottom of this room, where new events are arriving
private jumpToLiveTimeline = () => {
if (this.state.initialEventId && this.state.isInitialEventHighlighted) {
// If we were viewing a highlighted event, firing view_room without
// an event will take care of both clearing the URL fragment and
// jumping to the bottom
dis.dispatch({
action: 'view_room',
room_id: this.state.room.roomId,
});
} else {
// Otherwise we have to jump manually
this.messagePanel.jumpToLiveTimeline();
dis.fire(Action.FocusComposer);
}
};
// jump up to wherever our read marker is