@@ -12,8 +12,8 @@ import classNames from "classnames";
12
12
import { useRoomListItemViewModel } from "../../../viewmodels/roomlist/RoomListItemViewModel" ;
13
13
import DecoratedRoomAvatar from "../../avatars/DecoratedRoomAvatar" ;
14
14
import { Flex } from "../../../utils/Flex" ;
15
- import { _t } from "../../../../languageHandler" ;
16
15
import { RoomListItemMenuView } from "./RoomListItemMenuView" ;
16
+ import { NotificationDecoration } from "../NotificationDecoration" ;
17
17
18
18
interface RoomListItemViewPropsProps extends React . HTMLAttributes < HTMLButtonElement > {
19
19
/**
@@ -37,6 +37,7 @@ export function RoomListItemView({ room, isSelected, ...props }: RoomListItemVie
37
37
// The compound menu in RoomListItemMenuView needs to be rendered when the hover menu is shown
38
38
// Using display: none; and then display:flex when hovered in CSS causes the menu to be misaligned
39
39
const showHoverDecoration = ( isMenuOpen || isHover ) && vm . showHoverMenu ;
40
+ // const hasNotification = vm.notificationState.isUnread;
40
41
41
42
return (
42
43
< button
@@ -46,7 +47,7 @@ export function RoomListItemView({ room, isSelected, ...props }: RoomListItemVie
46
47
} ) }
47
48
type = "button"
48
49
aria-selected = { isSelected }
49
- aria-label = { _t ( "room_list|room|open_room" , { roomName : room . name } ) }
50
+ aria-label = { vm . a11yLabel }
50
51
onClick = { ( ) => vm . openRoom ( ) }
51
52
onMouseOver = { ( ) => setIsHover ( true ) }
52
53
onMouseOut = { ( ) => setIsHover ( false ) }
@@ -65,7 +66,7 @@ export function RoomListItemView({ room, isSelected, ...props }: RoomListItemVie
65
66
>
66
67
{ /* We truncate the room name when too long. Title here is to show the full name on hover */ }
67
68
< span title = { room . name } > { room . name } </ span >
68
- { showHoverDecoration && (
69
+ { showHoverDecoration ? (
69
70
< RoomListItemMenuView
70
71
room = { room }
71
72
setMenuOpen = { ( isOpen ) => {
@@ -74,6 +75,8 @@ export function RoomListItemView({ room, isSelected, ...props }: RoomListItemVie
74
75
else setTimeout ( ( ) => setIsMenuOpen ( isOpen ) , 0 ) ;
75
76
} }
76
77
/>
78
+ ) : (
79
+ < NotificationDecoration vm = { vm . notificationDecorationViewState } />
77
80
) }
78
81
</ Flex >
79
82
</ Flex >
0 commit comments