Fix buttons of widget in a room (#12288)
* Revert 3acd648
- Fix timeline position when moving to a room and coming back
* Fix initialEventId
This commit is contained in:
parent
28f7aac9a5
commit
494d9de6f0
5 changed files with 35 additions and 14 deletions
|
@ -687,7 +687,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
|
|||
newState.showRightPanel = false;
|
||||
}
|
||||
|
||||
const initialEventId = this.context.roomViewStore.getInitialEventId();
|
||||
const initialEventId = this.context.roomViewStore.getInitialEventId() ?? this.state.initialEventId;
|
||||
if (initialEventId) {
|
||||
let initialEvent = room?.findEventById(initialEventId);
|
||||
// The event does not exist in the current sync data
|
||||
|
@ -1430,6 +1430,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
|
|||
tombstone: this.getRoomTombstone(room),
|
||||
liveTimeline: room.getLiveTimeline(),
|
||||
});
|
||||
|
||||
dis.dispatch<ActionPayload>({ action: Action.RoomLoaded });
|
||||
};
|
||||
|
||||
private onRoomTimelineReset = (room?: Room): void => {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue