Refactor E2eMessageSharedIcon to MVVM (#33544)

* Refactor E2eMessageSharedIcon to MVVM

* FIx Prettier and i18n

* Fix prettier

* Remove legacy E2eMessageSharedIcon component

* Cover E2eMessageSharedIcon MVVM updates

* Fix prettier

* Update apps/web/src/components/views/rooms/EventTile.tsx

Co-authored-by: Florian Duros <florian.duros@ormaz.fr>

* Skip unknown E2E shared icon visual

* Track E2E shared icon listener disposal

* Remove E2E shared icon room state guard

* Remove E2E shared icon client resync

* Use built-in disposables for shared icon VM

* Update shared icon VM without React key

---------

Co-authored-by: Florian Duros <florian.duros@ormaz.fr>
This commit is contained in:
Zack
2026-05-28 08:01:39 +00:00
committed by GitHub
co-authored by Florian Duros
parent 013413c27a
commit 34c388f760
14 changed files with 516 additions and 121 deletions
@@ -0,0 +1,92 @@
/*
Copyright 2026 Element Creations Ltd.
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
Please see LICENSE files in the repository root for full details.
*/
import { EventTimeline, RoomStateEvent, type MatrixClient, type RoomState } from "matrix-js-sdk/src/matrix";
import {
BaseViewModel,
type E2eMessageSharedIconViewModel as E2eMessageSharedIconViewModelInterface,
type E2eMessageSharedIconViewSnapshot,
} from "@element-hq/web-shared-components";
export interface E2eMessageSharedIconViewModelProps {
/** Matrix client used to look up room membership state. */
client: MatrixClient;
/** The ID of the room containing the event whose keys were shared. */
roomId: string;
/** The ID of the user who shared the keys. */
keyForwardingUserId: string;
}
export class E2eMessageSharedIconViewModel
extends BaseViewModel<E2eMessageSharedIconViewSnapshot, E2eMessageSharedIconViewModelProps>
implements E2eMessageSharedIconViewModelInterface
{
private roomStateListenerCleanup?: () => void;
public constructor(props: E2eMessageSharedIconViewModelProps) {
super(props, E2eMessageSharedIconViewModel.computeSnapshot(props));
this.setupRoomStateListener();
this.disposables.track(() => this.teardownRoomStateListener());
}
public setRoomId(roomId: string): void {
if (this.props.roomId === roomId) return;
this.props = { ...this.props, roomId };
this.setupRoomStateListener();
this.updateSnapshotFromProps();
}
public setKeyForwardingUserId(keyForwardingUserId: string): void {
if (this.props.keyForwardingUserId === keyForwardingUserId) return;
this.props = { ...this.props, keyForwardingUserId };
this.updateSnapshotFromProps();
}
private updateSnapshotFromProps = (): void => {
this.snapshot.merge(E2eMessageSharedIconViewModel.computeSnapshot(this.props));
};
private setupRoomStateListener(): void {
this.teardownRoomStateListener();
const roomState = this.getForwardRoomState();
if (!roomState) return;
// The room can change while the VM lives, so this listener needs per-room cleanup before final VM disposal.
roomState.on(RoomStateEvent.Events, this.updateSnapshotFromProps);
this.roomStateListenerCleanup = (): void => {
roomState.off(RoomStateEvent.Events, this.updateSnapshotFromProps);
};
}
private teardownRoomStateListener(): void {
this.roomStateListenerCleanup?.();
this.roomStateListenerCleanup = undefined;
}
private getForwardRoomState(): RoomState | undefined {
return this.props.client.getRoom(this.props.roomId)?.getLiveTimeline()?.getState(EventTimeline.FORWARDS);
}
private static computeSnapshot(props: E2eMessageSharedIconViewModelProps): E2eMessageSharedIconViewSnapshot {
const displayName = E2eMessageSharedIconViewModel.getDisplayName(props);
return {
displayName,
userId: props.keyForwardingUserId,
};
}
private static getDisplayName(props: E2eMessageSharedIconViewModelProps): string {
const roomState = props.client.getRoom(props.roomId)?.getLiveTimeline()?.getState(EventTimeline.FORWARDS);
const forwardingMember = roomState?.getMember(props.keyForwardingUserId);
return forwardingMember?.rawDisplayName ?? props.keyForwardingUserId;
}
}