butter/keanu-weblite
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix room list selection problems

Browse source
This commit is contained in:
N-Pex 2023-03-14 12:59:09 +01:00
parent ab51e3dc95
commit 63fa6743fe
1 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/RoomList.vue
View file

@ -1,8 +1,8 @@
<template> <template>
<v-list dense class="room-list"> <v-list dense class="room-list">
<v-list-item-group v-model="currentRoomId" color="primary"> <v-list-item-group @change="roomChange" color="primary">
<v-list-item v-if="showCreate" @click.stop="$emit('newroom')" class="room-list-room"> <v-list-item v-if="showCreate" @click.stop="$emit('newroom')" class="room-list-room" :value="null">
<v-list-item-avatar class="round" size="42" color="#d9d9d9"> <v-list-item-avatar class="round" size="42" color="#d9d9d9">
<v-icon size="11">$vuetify.icons.ic_new_room</v-icon> <v-icon size="11">$vuetify.icons.ic_new_room</v-icon>
</v-list-item-avatar> </v-list-item-avatar>
@ -34,8 +34,7 @@
</v-list-item-action> </v-list-item-action>
</v-list-item> </v-list-item>
<v-list-item v-for="room in joinedRooms" :key="room.roomId" :value="room.roomId" class="room-list-room" <v-list-item v-for="room in joinedRooms" :key="room.roomId" :value="room.roomId" class="room-list-room">
#default="{ active }">
<v-list-item-avatar size="42" color="#d9d9d9"> <v-list-item-avatar size="42" color="#d9d9d9">
<v-img v-if="roomAvatar(room)" :src="roomAvatar(room)" /> <v-img v-if="roomAvatar(room)" :src="roomAvatar(room)" />
<span v-else class="white--text headline">{{ <span v-else class="white--text headline">{{
@ -51,7 +50,7 @@
</v-list-item-subtitle> </v-list-item-subtitle>
</v-list-item-content> </v-list-item-content>
<v-list-item-action> <v-list-item-action>
<v-icon size="16" v-if="active">$vuetify.icons.ic_circle_filled</v-icon> <v-icon size="16" v-if="room.roomId == $matrix.currentRoomId">$vuetify.icons.ic_circle_filled</v-icon>
<v-icon size="16" v-else>$vuetify.icons.ic_circle</v-icon> <v-icon size="16" v-else>$vuetify.icons.ic_circle</v-icon>
</v-list-item-action> </v-list-item-action>
</v-list-item> </v-list-item>
@ -82,7 +81,6 @@ export default {
}, },
data: () => ({ data: () => ({
currentRoomId: null,
/** A list of rooms currently processing some operation, like "join" or "reject" */ /** A list of rooms currently processing some operation, like "join" or "reject" */
roomsProcessing: {}, roomsProcessing: {},
}), }),
@ -95,7 +93,6 @@ export default {
return this.sortItemsOnName(this.$matrix.joinedRooms); return this.sortItemsOnName(this.$matrix.joinedRooms);
}, },
}, },
methods: { methods: {
roomAvatar(room) { roomAvatar(room) {
if (this.isDirect(room)) { if (this.isDirect(room)) {
@ -182,12 +179,10 @@ export default {
isDirect(room) { isDirect(room) {
return this.$matrix.isDirectRoom(room); return this.$matrix.isDirectRoom(room);
} },
},
watch: { roomChange(roomId) {
currentRoomId() { if (roomId == null || roomId == undefined || roomId == this.$matrix.currentRoomId) {
if (this.currentRoomId == null) {
// Ignore, this is caused by "new room" etc. // Ignore, this is caused by "new room" etc.
return; return;
} }
@ -195,11 +190,11 @@ export default {
this.$navigation.push( this.$navigation.push(
{ {
name: "Chat", name: "Chat",
params: { roomId: util.sanitizeRoomId(this.currentRoomId) }, params: { roomId: util.sanitizeRoomId(roomId) },
}, },
-1 -1
); );
}, }
}, },
}; };
</script> </script>