Skip to content

fix: WCAG (4.1.2) aria-labelledby on sequential messages #36055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

fix: WCAG (4.1.2) aria-labelledby on sequential messages #36055

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55a3099
Fixed aria-labelledby on sequential messages
ergotse May 22, 2025
e7c7065
Changed to relative import
ergotse May 26, 2025
9d29bbf
Merge branch 'develop' into RoomMessage
gabriellsh May 27, 2025
6e70289
Merge branch 'develop' into RoomMessage
gabriellsh Jun 4, 2025
7c30966
Merge branch 'develop' into RoomMessage
kodiakhq[bot] Jun 4, 2025
54aa180
Merge branch 'develop' into RoomMessage
MartinSchoeler Jul 11, 2025
283e9bb
Merge branch 'develop' into RoomMessage
kodiakhq[bot] Jul 11, 2025
e96cd70
Merge branch 'develop' into RoomMessage
ggazzo Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions apps/meteor/client/components/message/variants/RoomMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type IMessage, isOTRAckMessage, isOTRMessage } from '@rocket.chat/core-typings';
import { Message, MessageLeftContainer, MessageContainer, CheckBox } from '@rocket.chat/fuselage';
import { CheckBox, Message, MessageContainer, MessageLeftContainer } from '@rocket.chat/fuselage';
import { useToggle } from '@rocket.chat/fuselage-hooks';
import { MessageAvatar } from '@rocket.chat/ui-avatar';
import { useTranslation, useUserId } from '@rocket.chat/ui-contexts';
Expand All @@ -9,10 +9,10 @@ import { memo } from 'react';
import type { MessageActionContext } from '../../../../app/ui-utils/client/lib/MessageAction';
import { useIsMessageHighlight } from '../../../views/room/MessageList/contexts/MessageHighlightContext';
import {
useCountSelected,
useIsSelectedMessage,
useIsSelecting,
useToggleSelect,
useIsSelectedMessage,
useCountSelected,
} from '../../../views/room/MessageList/contexts/SelectedMessagesContext';
import { useJumpToMessage } from '../../../views/room/MessageList/hooks/useJumpToMessage';
import { useUserCard } from '../../../views/room/contexts/UserCardContext';
Expand All @@ -22,6 +22,7 @@ import MessageHeader from '../MessageHeader';
import MessageToolbarHolder from '../MessageToolbarHolder';
import StatusIndicators from '../StatusIndicators';
import RoomMessageContent from './room/RoomMessageContent';
import { useMessageListReadReceipts } from '../list/MessageListContext';

type RoomMessageProps = {
message: IMessage & { ignored?: boolean };
Expand Down Expand Up @@ -60,6 +61,8 @@ const RoomMessage = ({
const toggleSelected = useToggleSelect(message._id);
const selected = useIsSelectedMessage(message._id, isOTRMsg);

const { enabled: readReceiptEnabled } = useMessageListReadReceipts();

useCountSelected();
const messageRef = useJumpToMessage(message._id);

Expand All @@ -70,7 +73,7 @@ const RoomMessage = ({
role='listitem'
aria-roledescription={isOTRMsg ? t('OTR_message') : t('message')}
tabIndex={0}
aria-labelledby={`${message._id}-displayName ${message._id}-time ${message._id}-content ${message._id}-read-status`}
aria-labelledby={`${!sequential ? `${message._id}-displayName ${message._id}-time ${message._id}-content ${readReceiptEnabled ? `${message._id}-read-status` : ''}` : ''}`}
onClick={selecting && !isOTRMsg ? toggleSelected : undefined}
isSelected={selected}
isEditing={editing}
Expand Down
Loading