Skip to content

Take control over your live stream video by running it yourself. Streaming + chat out of the box.

Fixes for aria-live bugs (#3694)

mahmed2000b159c3513d7c
diff --git a/web/components/chat/ChatContainer/ChatContainer.tsx b/web/components/chat/ChatContainer/ChatContainer.tsx
index 06a1413b48..cd8fab348c 100644
--- a/web/components/chat/ChatContainer/ChatContainer.tsx
+++ b/web/components/chat/ChatContainer/ChatContainer.tsx
@@ -1,6 +1,7 @@
import { Virtuoso } from 'react-virtuoso';
import { useState, useMemo, useRef, CSSProperties, FC, useEffect } from 'react';
import { ErrorBoundary } from 'react-error-boundary';
+import { Interweave } from 'interweave';
import {
ConnectedClientInfoEvent,
FediverseEvent,
@@ -320,8 +321,15 @@ export const ChatContainer: FC<ChatContainerProps> = ({
// Retrieve, clean, and attach username to newest chat message to be read out by screenreader
function getLastMessage() {
if (messages.length > 0 && typeof messages[messages.length - 1].body !== 'undefined') {
- const message = messages[messages.length - 1].body.replace(/(<([^>]+)>)/gi, '');
- const stringToRead = `${usernameToHighlight} said ${message}`;
+ const lastMessage = messages[messages.length - 1];
+ const message = lastMessage.body.replace(/(<([^>]+)>)/gi, '');
+ let stringToRead = '';
+ if (typeof lastMessage.user !== 'undefined') {
+ const username = lastMessage.user.displayName;
+ stringToRead = `${username} said ${message}`;
+ } else {
+ stringToRead = `System message: ${message}`;
+ }
return stringToRead;
}
return '';
@@ -364,7 +372,7 @@ export const ChatContainer: FC<ChatContainerProps> = ({
)}
</div>
<span className={styles.chatAccessibilityHidden} aria-live="polite">
- {lastMessage}
+ <Interweave content={lastMessage} />
</span>
</ErrorBoundary>
);