Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Accessibility",
"comment": "Add a Narrator announcement when a message is deleted",
"packageName": "@azure/communication-react",
"email": "98852890+vhuseinova-msft@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "patch",
"area": "fix",
"workstream": "Accessibility",
"comment": "Add a Narrator announcement when a message is deleted",
"packageName": "@azure/communication-react",
"email": "98852890+vhuseinova-msft@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -3188,6 +3188,7 @@ export interface MessageThreadStrings {
liveAuthorIntro: string;
messageContentAriaText: string;
messageContentMineAriaText: string;
messageDeletedAnnouncementAriaLabel: string;
messageReadCount?: string;
monday: string;
newMessagesIndicator: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2461,6 +2461,7 @@ export interface MessageThreadStrings {
liveAuthorIntro: string;
messageContentAriaText: string;
messageContentMineAriaText: string;
messageDeletedAnnouncementAriaLabel: string;
messageReadCount?: string;
monday: string;
newMessagesIndicator: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1534,6 +1534,7 @@ export interface MessageThreadStrings {
liveAuthorIntro: string;
messageContentAriaText: string;
messageContentMineAriaText: string;
messageDeletedAnnouncementAriaLabel: string;
messageReadCount?: string;
monday: string;
newMessagesIndicator: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1224,6 +1224,7 @@ export interface MessageThreadStrings {
liveAuthorIntro: string;
messageContentAriaText: string;
messageContentMineAriaText: string;
messageDeletedAnnouncementAriaLabel: string;
messageReadCount?: string;
monday: string;
newMessagesIndicator: string;
Expand Down
52 changes: 47 additions & 5 deletions packages/react-components/src/components/MessageThread.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import {
ChatMessageComponentWrapper,
ChatMessageComponentWrapperProps
} from './ChatMessage/ChatMessageComponentWrapper';
import { Announcer } from './Announcer';

const isMessageSame = (first: ChatMessage, second: ChatMessage): boolean => {
return (
Expand Down Expand Up @@ -211,6 +212,8 @@ export interface MessageThreadStrings {
editBoxSubmitButton: string;
/** String for action menu indicating there are more options */
actionMenuMoreOptions?: string;
/** Aria label to announce when a message is deleted */
messageDeletedAnnouncementAriaLabel: string;
/* @conditional-compile-remove(file-sharing) */
/** String for download file button in file card */
downloadFile: string;
Expand Down Expand Up @@ -715,6 +718,47 @@ export const MessageThreadWrapper = (props: MessageThreadProps): JSX.Element =>
[onFetchAttachments]
);

const localeStrings = useLocale().strings.messageThread;
const strings = useMemo(() => ({ ...localeStrings, ...props.strings }), [localeStrings, props.strings]);

const latestDeletedMessageIdRef = useRef<string | undefined>(undefined);
Comment thread
emlynmac marked this conversation as resolved.
Outdated
const deletedMessageAriaLabel = useMemo(() => {
// as MessageThread doesn't know when a message is deleted,
// we need to keep track of the latest deleted message id and check if it still exists in `newMessages`
if (
!latestDeletedMessageIdRef.current ||
newMessages.find((message) => message.messageId === latestDeletedMessageIdRef.current)
) {
return undefined;
}

return strings.messageDeletedAnnouncementAriaLabel;
}, [newMessages, strings.messageDeletedAnnouncementAriaLabel]);

useEffect(() => {
if (deletedMessageAriaLabel !== undefined) {
// reset value to avoid the announcement repetition during re-renders
// it should be done in useEffect hook as if it's done in `deletedMessageAriaLabel` then
// `deletedMessageAriaLabel` is considered impure
latestDeletedMessageIdRef.current = undefined;
}
}, [deletedMessageAriaLabel]);

const onDeleteMessageCallback = useCallback(
async (messageId: string): Promise<void> => {
if (!onDeleteMessage) {
return;
}
try {
await onDeleteMessage(messageId);
latestDeletedMessageIdRef.current = messageId;
} catch (e) {
console.log('onDeleteMessage failed: messageId', messageId, 'error', e);
}
},
[onDeleteMessage]
);

const isAllChatMessagesLoadedRef = useRef(false);
// isAllChatMessagesLoadedRef needs to be updated every time when a new adapter is set in order to display correct data
// onLoadPreviousChatMessages is updated when a new adapter is set
Expand Down Expand Up @@ -961,9 +1005,6 @@ export const MessageThreadWrapper = (props: MessageThreadProps): JSX.Element =>
[]
);

const localeStrings = useLocale().strings.messageThread;
const strings = useMemo(() => ({ ...localeStrings, ...props.strings }), [localeStrings, props.strings]);

const defaultStatusRenderer = useCallback(
(
message: ChatMessage | /* @conditional-compile-remove(data-loss-prevention) */ BlockedMessage,
Expand Down Expand Up @@ -1006,7 +1047,7 @@ export const MessageThreadWrapper = (props: MessageThreadProps): JSX.Element =>
index,
onUpdateMessage,
onCancelEditMessage,
onDeleteMessage,
onDeleteMessageCallback,
onSendMessage,
props.disableEditing,
lastDeliveredChatMessage,
Expand All @@ -1021,7 +1062,7 @@ export const MessageThreadWrapper = (props: MessageThreadProps): JSX.Element =>
lastSendingChatMessage,
messages,
onCancelEditMessage,
onDeleteMessage,
onDeleteMessageCallback,
onSendMessage,
onUpdateMessage,
props.disableEditing,
Expand All @@ -1048,6 +1089,7 @@ export const MessageThreadWrapper = (props: MessageThreadProps): JSX.Element =>
)}
<LiveAnnouncer>
<FluentV9ThemeProvider v8Theme={theme}>
<Announcer announcementString={deletedMessageAriaLabel} ariaLive={'polite'} />
<Chat
// styles?.chatContainer used in className and style prop as style prop can't handle CSS selectors
className={mergeClasses(classes.root, mergeStyles(styles?.chatContainer))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@
"downloadFile": "Download file",
"blockedWarningText": "This message was deleted due to organizational policy.",
"blockedWarningLinkText": "Details",
"fileCardGroupMessage": "The message has {fileCount} attachment"
"fileCardGroupMessage": "The message has {fileCount} attachment",
"messageDeletedAnnouncementAriaLabel": "The message is deleted"
},
"errorBar": {
"unableToReachChatService": "You are offline",
Expand Down