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

Commit 5a1b98d

Browse files
authored
Improve accessibility of the room summary card (#12586)
* Improve accessibility of the room summary card Signed-off-by: Michael Telatynski <[email protected]> * Update @vector-im/compound-web to 4.5.0 Signed-off-by: Michael Telatynski <[email protected]> * Update snapshots Signed-off-by: Michael Telatynski <[email protected]> * Fix bad merge Signed-off-by: Michael Telatynski <[email protected]> --------- Signed-off-by: Michael Telatynski <[email protected]>
1 parent 5212ae8 commit 5a1b98d

File tree

2 files changed

+842
-816
lines changed

2 files changed

+842
-816
lines changed

src/components/views/right_panel/RoomSummaryCard.tsx

+59-48
Original file line numberDiff line numberDiff line change
@@ -522,57 +522,68 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, permalinkCreator, onClose, on
522522

523523
<Separator />
524524

525-
<ToggleMenuItem
526-
Icon={FavouriteIcon}
527-
label={_t("room|context_menu|favourite")}
528-
checked={isFavorite}
529-
onChange={() => tagRoom(room, DefaultTagID.Favourite)}
530-
// XXX: https://github.com/element-hq/compound/issues/288
531-
onSelect={() => {}}
532-
/>
533-
<MenuItem
534-
Icon={UserAddIcon}
535-
label={_t("action|invite")}
536-
disabled={!canInviteToState}
537-
onSelect={() => inviteToRoom(room)}
538-
/>
539-
<MenuItem Icon={LinkIcon} label={_t("action|copy_link")} onSelect={onShareRoomClick} />
540-
<MenuItem Icon={SettingsIcon} label={_t("common|settings")} onSelect={onRoomSettingsClick} />
541-
542-
<Separator />
543-
<MenuItem
544-
// this icon matches the legacy implementation
545-
// and is a short term solution until legacy room header is removed
546-
Icon={UserProfileSolidIcon}
547-
label={_t("common|people")}
548-
onSelect={onRoomMembersClick}
549-
/>
550-
{!isVideoRoom && (
551-
<>
552-
<MenuItem Icon={FilesIcon} label={_t("right_panel|files_button")} onSelect={onRoomFilesClick} />
553-
<MenuItem
554-
Icon={PollsIcon}
555-
label={_t("right_panel|polls_button")}
556-
onSelect={onRoomPollHistoryClick}
557-
/>
558-
{pinningEnabled && (
525+
<div role="menubar" aria-orientation="vertical">
526+
<ToggleMenuItem
527+
Icon={FavouriteIcon}
528+
label={_t("room|context_menu|favourite")}
529+
checked={isFavorite}
530+
onChange={() => tagRoom(room, DefaultTagID.Favourite)}
531+
// XXX: https://github.com/element-hq/compound/issues/288
532+
onSelect={() => {}}
533+
/>
534+
<MenuItem
535+
Icon={UserAddIcon}
536+
label={_t("action|invite")}
537+
disabled={!canInviteToState}
538+
onSelect={() => inviteToRoom(room)}
539+
/>
540+
<MenuItem Icon={LinkIcon} label={_t("action|copy_link")} onSelect={onShareRoomClick} />
541+
<MenuItem Icon={SettingsIcon} label={_t("common|settings")} onSelect={onRoomSettingsClick} />
542+
543+
<Separator />
544+
<MenuItem
545+
// this icon matches the legacy implementation
546+
// and is a short term solution until legacy room header is removed
547+
Icon={UserProfileSolidIcon}
548+
label={_t("common|people")}
549+
onSelect={onRoomMembersClick}
550+
/>
551+
{!isVideoRoom && (
552+
<>
553+
<MenuItem Icon={FilesIcon} label={_t("right_panel|files_button")} onSelect={onRoomFilesClick} />
559554
<MenuItem
560-
Icon={PinIcon}
561-
label={_t("right_panel|pinned_messages_button")}
562-
onSelect={onRoomPinsClick}
563-
>
564-
<Text as="span" size="sm">
565-
{pinCount}
566-
</Text>
567-
</MenuItem>
568-
)}
569-
<MenuItem Icon={ExportArchiveIcon} label={_t("export_chat|title")} onSelect={onRoomExportClick} />
570-
</>
571-
)}
555+
Icon={PollsIcon}
556+
label={_t("right_panel|polls_button")}
557+
onSelect={onRoomPollHistoryClick}
558+
/>
559+
{pinningEnabled && (
560+
<MenuItem
561+
Icon={PinIcon}
562+
label={_t("right_panel|pinned_messages_button")}
563+
onSelect={onRoomPinsClick}
564+
>
565+
<Text as="span" size="sm">
566+
{pinCount}
567+
</Text>
568+
</MenuItem>
569+
)}
570+
<MenuItem
571+
Icon={ExportArchiveIcon}
572+
label={_t("export_chat|title")}
573+
onSelect={onRoomExportClick}
574+
/>
575+
</>
576+
)}
572577

573-
<Separator />
578+
<Separator />
574579

575-
<MenuItem Icon={LeaveIcon} kind="critical" label={_t("action|leave_room")} onSelect={onLeaveRoomClick} />
580+
<MenuItem
581+
Icon={LeaveIcon}
582+
kind="critical"
583+
label={_t("action|leave_room")}
584+
onSelect={onLeaveRoomClick}
585+
/>
586+
</div>
576587

577588
{SettingsStore.getValue(UIFeature.Widgets) &&
578589
!isVideoRoom &&

0 commit comments

Comments
 (0)