Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 792251c

Browse files
committed
Give each room directory entry the listitem role to correspond with the containing list.
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
1 parent 5c66bd6 commit 792251c

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

src/components/structures/RoomDirectory.tsx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -589,9 +589,11 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
589589
if (room.avatar_url) avatarUrl = mediaFromMxc(room.avatar_url).getSquareThumbnailHttp(32);
590590

591591
// We use onMouseDown instead of onClick, so that we can avoid text getting selected
592-
return [
592+
return <div
593+
key={room.room_id}
594+
role="listitem"
595+
>
593596
<div
594-
key={`${room.room_id}_avatar`}
595597
onMouseDown={(ev) => this.onRoomClicked(room, ev)}
596598
className="mx_RoomDirectory_roomAvatar"
597599
>
@@ -603,9 +605,8 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
603605
idName={name}
604606
url={avatarUrl}
605607
/>
606-
</div>,
608+
</div>
607609
<div
608-
key={`${room.room_id}_description`}
609610
onMouseDown={(ev) => this.onRoomClicked(room, ev)}
610611
className="mx_RoomDirectory_roomDescription"
611612
>
@@ -626,30 +627,27 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
626627
>
627628
{ getDisplayAliasForRoom(room) }
628629
</div>
629-
</div>,
630+
</div>
630631
<div
631-
key={`${room.room_id}_memberCount`}
632632
onMouseDown={(ev) => this.onRoomClicked(room, ev)}
633633
className="mx_RoomDirectory_roomMemberCount"
634634
>
635635
{ room.num_joined_members }
636-
</div>,
636+
</div>
637637
<div
638-
key={`${room.room_id}_preview`}
639638
onMouseDown={(ev) => this.onRoomClicked(room, ev)}
640639
// cancel onMouseDown otherwise shift-clicking highlights text
641640
className="mx_RoomDirectory_preview"
642641
>
643642
{ previewButton }
644-
</div>,
643+
</div>
645644
<div
646-
key={`${room.room_id}_join`}
647645
onMouseDown={(ev) => this.onRoomClicked(room, ev)}
648646
className="mx_RoomDirectory_join"
649647
>
650648
{ joinOrViewButton }
651-
</div>,
652-
];
649+
</div>
650+
</div>;
653651
}
654652

655653
private stringLooksLikeId(s: string, fieldType: IFieldType) {

0 commit comments

Comments
 (0)