OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Fix jumping to bottom without a highlighted event
pull/21833/head
Germain 2021-06-07 09:01:47 +01:00 committed by GitHub
parent abfe6d85a0 b06da16a85
commit 00dd6e878f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/structures/RoomView.tsx
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 // jump down to the bottom of this room, where new events are arriving
private jumpToLiveTimeline = () => { private jumpToLiveTimeline = () => {
dis.dispatch({ if (this.state.initialEventId && this.state.isInitialEventHighlighted) {
action: 'view_room', // If we were viewing a highlighted event, firing view_room without
room_id: this.state.room.roomId, // 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 // jump up to wherever our read marker is