imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reset room event_id fragment when ThreadView unmounts (#8186)

Browse source
This commit is contained in:
Germain 2022-03-30 14:20:20 +01:00 • committed by GitHub
parent e721c6b0c2
commit 31cd7edd33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/components/structures/ThreadView.tsx
View file

@ -51,6 +51,7 @@ import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
import Measured from '../views/elements/Measured'; import Measured from '../views/elements/Measured';
import PosthogTrackers from "../../PosthogTrackers"; import PosthogTrackers from "../../PosthogTrackers";
import { ButtonEvent } from "../views/elements/AccessibleButton"; import { ButtonEvent } from "../views/elements/AccessibleButton";
import RoomViewStore from '../../stores/RoomViewStore';
interface IProps { interface IProps {
room: Room; room: Room;
@ -106,9 +107,19 @@ export default class ThreadView extends React.Component<IProps, IState> {
public componentWillUnmount(): void { public componentWillUnmount(): void {
this.teardownThread(); this.teardownThread();
if (this.dispatcherRef) dis.unregister(this.dispatcherRef); if (this.dispatcherRef) dis.unregister(this.dispatcherRef);
const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId()); const roomId = this.props.mxEvent.getRoomId();
const room = MatrixClientPeg.get().getRoom(roomId);
room.removeListener(ThreadEvent.New, this.onNewThread); room.removeListener(ThreadEvent.New, this.onNewThread);
SettingsStore.unwatchSetting(this.layoutWatcherRef); SettingsStore.unwatchSetting(this.layoutWatcherRef);
const hasRoomChanged = RoomViewStore.getRoomId() !== roomId;
if (this.props.isInitialEventHighlighted && !hasRoomChanged) {
dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
room_id: this.props.room.roomId,
metricsTrigger: undefined, // room doesn't change
});
}
} }
public componentDidUpdate(prevProps) { public componentDidUpdate(prevProps) {
@ -206,7 +217,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
} }
}; };
private onScroll = (): void => { private resetHighlightedEvent = (): void => {
if (this.props.initialEvent && this.props.isInitialEventHighlighted) { if (this.props.initialEvent && this.props.isInitialEventHighlighted) {
dis.dispatch<ViewRoomPayload>({ dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom, action: Action.ViewRoom,
@ -363,7 +374,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
editState={this.state.editState} editState={this.state.editState}
eventId={this.props.initialEvent?.getId()} eventId={this.props.initialEvent?.getId()}
highlightedEventId={highlightedEventId} highlightedEventId={highlightedEventId}
onUserScroll={this.onScroll} onUserScroll={this.resetHighlightedEvent}
onPaginationRequest={this.onPaginationRequest} onPaginationRequest={this.onPaginationRequest}
/> />
</div> } </div> }