Skip to content

Commit f961b80

Browse files
authored
using theme.semanticColors.errorBackground to style background of failed messages
1 parent ac56170 commit f961b80

3 files changed

Lines changed: 13 additions & 8 deletions

File tree

packages/react-components/src/components/MessageThread.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ const memoizeAllMessages = memoizeFnAll(
331331
) => JSX.Element,
332332
defaultChatMessageRenderer: (message: MessageProps) => JSX.Element,
333333
strings: MessageThreadStrings,
334+
errorBackground: string,
334335
_attached?: boolean | string,
335336
statusToRender?: MessageStatus,
336337
participantCount?: number,
@@ -353,7 +354,7 @@ const memoizeAllMessages = memoizeFnAll(
353354
case 'chat': {
354355
const myChatMessageStyle =
355356
styles?.myChatMessageContainer || message.status === 'failed'
356-
? FailedMyChatMessageContainer
357+
? FailedMyChatMessageContainer(errorBackground)
357358
: defaultMyChatMessageContainer;
358359
const chatMessageStyle = styles?.chatMessageContainer || defaultChatMessageContainer;
359360
messageProps.messageContainerStyle = message.mine ? myChatMessageStyle : chatMessageStyle;
@@ -1011,6 +1012,8 @@ export const MessageThread = (props: MessageThreadProps): JSX.Element => {
10111012
[]
10121013
);
10131014

1015+
const theme = useTheme();
1016+
10141017
const messagesToDisplay = useMemo(
10151018
() =>
10161019
memoizeAllMessages((memoizedMessageFn) => {
@@ -1055,6 +1058,7 @@ export const MessageThread = (props: MessageThreadProps): JSX.Element => {
10551058
defaultStatusRenderer,
10561059
defaultChatMessageRenderer,
10571060
strings,
1061+
theme.semanticColors.errorBackground,
10581062
// Temporary solution to make sure we re-render if attach attribute is changed.
10591063
// The proper fix should be in selector.
10601064
message.messageType === 'chat' ? message.attached : undefined,
@@ -1079,6 +1083,7 @@ export const MessageThread = (props: MessageThreadProps): JSX.Element => {
10791083
defaultStatusRenderer,
10801084
defaultChatMessageRenderer,
10811085
strings,
1086+
theme.semanticColors.errorBackground,
10821087
participantCount,
10831088
readCountForHoveredIndicator,
10841089
onRenderMessage,
@@ -1091,8 +1096,6 @@ export const MessageThread = (props: MessageThreadProps): JSX.Element => {
10911096
]
10921097
);
10931098

1094-
const theme = useTheme();
1095-
10961099
const chatBody = useMemo(() => {
10971100
return (
10981101
<LiveAnnouncer>

packages/react-components/src/components/styles/MessageThread.styles.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ export const defaultMyChatMessageContainer: ComponentSlotStyle = {
102102
/**
103103
* @private
104104
*/
105-
export const FailedMyChatMessageContainer: ComponentSlotStyle = {
105+
export const FailedMyChatMessageContainer = (backgroundColor: string): ComponentSlotStyle => ({
106106
...defaultChatItemMessageContainer,
107-
backgroundColor: 'rgba(168, 0, 0, 0.2)'
108-
};
107+
backgroundColor
108+
});
109109

110110
/**
111111
* @private

packages/react-components/src/theming/themes.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ export const lightTheme: PartialTheme & CallingTheme = {
5454
iconWhite: '#ffffff'
5555
},
5656
semanticColors: {
57-
errorText: '#a80000'
57+
errorText: '#a80000',
58+
errorBackground: 'rgba(168, 0, 0, 0.2)'
5859
}
5960
};
6061

@@ -95,6 +96,7 @@ export const darkTheme: PartialTheme & CallingTheme = {
9596
iconWhite: '#ffffff'
9697
},
9798
semanticColors: {
98-
errorText: '#f1707b'
99+
errorText: '#f1707b',
100+
errorBackground: 'rgba(168, 0, 0, 0.2)'
99101
}
100102
};

0 commit comments

Comments
 (0)