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

Prevent having duplicates in pending room state

pull/21833/head
Germain Souquet 2021-05-27 08:57:27 +01:00
parent 118556b542
commit be22a325f6
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/structures/UserMenu.tsx
View File

@ -69,7 +69,7 @@ interface IState {
contextMenuPosition: PartialDOMRect;
isDarkTheme: boolean;
selectedSpace?: Room;
pendingRoomJoin: string[]
pendingRoomJoin: Set<string>
}
@replaceableComponent("structures.UserMenu")
@ -86,7 +86,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
this.state = {
contextMenuPosition: null,
isDarkTheme: this.isUserOnDarkTheme(),
pendingRoomJoin: [],
pendingRoomJoin: new Set<string>(),
};
OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
@ -168,28 +168,24 @@ export default class UserMenu extends React.Component<IProps, IState> {
}
};
private addPendingJoinRoom(roomId) {
private addPendingJoinRoom(roomId: string): void {
this.setState({
pendingRoomJoin: [
...this.state.pendingRoomJoin,
roomId,
],
pendingRoomJoin: new Set<string>(this.state.pendingRoomJoin)
.add(roomId),
});
}
private removePendingJoinRoom(roomId) {
const newPendingRoomJoin = this.state.pendingRoomJoin.filter(pendingJoinRoomId => {
return pendingJoinRoomId !== roomId;
});
if (newPendingRoomJoin.length !== this.state.pendingRoomJoin.length) {
private removePendingJoinRoom(roomId: string): void {
if (this.state.pendingRoomJoin.has(roomId)) {
this.state.pendingRoomJoin.delete(roomId);
this.setState({
pendingRoomJoin: newPendingRoomJoin,
pendingRoomJoin: new Set<string>(this.state.pendingRoomJoin),
})
}
}
get hasPendingActions(): boolean {
return this.state.pendingRoomJoin.length > 0;
return Array.from(this.state.pendingRoomJoin).length > 0;
}
private onOpenMenuClick = (ev: React.MouseEvent) => {