Skip to content

Commit ff7237d

Browse files
committed
theme issue fixed
1 parent f02304d commit ff7237d

File tree

6 files changed

+24
-15
lines changed

6 files changed

+24
-15
lines changed

packages/messenger-demo/src/theme.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ export const themeColors = {
1010
activeContactBackgroundColor: 'dimgray',
1111
configurationBoxBackgroundColor: 'darkgrey',
1212
configurationBoxBorderColor: '#666876',
13-
chatBakgroundColor: '#5c5e54',
13+
chatBackgroundColor: '#5c5e54',
1414
disabledButtonTextColor: 'burlywood',
1515
errorTextColor: '#C30F1A',
1616
errorBackgroundColor: '#830B12',
1717
attachmentBackgroundColor: '#202129',
1818
selectedContactBorderColor: 'orange',
1919
profileConfigurationTextColor: 'pink',
2020
receivedMessageBackgroundColor: 'pink',
21-
receivedMessageTextColor: 'white',
21+
receivedMessageTextColor: 'orange',
2222
sentMessageBackgroundColor: 'blue',
23-
sentMessageTextColor: 'white',
23+
sentMessageTextColor: 'black',
2424
infoBoxBackgroundColor: 'green',
2525
infoBoxTextColor: 'yellow',
2626
buttonShadow: '#000000',

packages/messenger-widget/src/components/Contacts/Contacts.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.contacts-scroller {
2-
height: calc(100% - 65px) !important;
2+
height: calc(100% - 50px) !important;
33
padding-left: 1rem;
44
margin-top: 2px;
55
}

packages/messenger-widget/src/components/Message/Message.css

+6-6
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
background-color: var(--received-message-background-color);
5050
}
5151

52-
.msg:hover div .content-style + .msg-action-container {
52+
.msg:hover div .content-style+.msg-action-container {
5353
visibility: visible;
5454
}
5555

@@ -69,11 +69,11 @@
6969
flex-direction: column;
7070
}
7171

72-
.reply-preview-own{
72+
.reply-preview-own {
7373
background-color: var(--scrollbar-background-color);
7474
}
7575

76-
.reply-preview-contact{
76+
.reply-preview-contact {
7777
background-color: var(--scrollbar-background-color);
7878
}
7979

@@ -118,9 +118,9 @@
118118
}
119119

120120
.own-msg-text {
121-
background: var(--sent-message-text-color);
121+
color: var(--sent-message-text-color);
122122
}
123123

124124
.contact-msg-text {
125-
background: var(--received-message-text-color);
126-
}
125+
color: var(--received-message-text-color);
126+
}

packages/messenger-widget/src/components/Message/Message.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ export function Message(props: MessageProps) {
5757
state.uiView.selectedMessageView.messageData
5858
?.envelop.id === props.envelop.id
5959
? 'msg-editing-active'
60-
: 'ms-3 own-msg-background'
60+
: 'ms-3 own-msg-background own-msg-text'
6161
: !props.message &&
6262
props.envelop.message.metadata.type ===
6363
MessageActionType.DELETE &&
6464
(!props.envelop.message.attachments ||
6565
props.envelop.message.attachments.length < 1)
6666
? 'contact-deleted-msg'
67-
: 'contact-msg-background'
67+
: 'contact-msg-background contact-msg-text'
6868
).concat(
6969
' ',
7070
props.reactions.length > 0
@@ -210,8 +210,8 @@ export function Message(props: MessageProps) {
210210
className={'reacted d-flex'.concat(
211211
' ',
212212
props.ownMessage
213-
? 'background-config-box'
214-
: 'normal-btn-hover',
213+
? 'own-msg-background'
214+
: 'contact-msg-background',
215215
)}
216216
>
217217
{props.reactions.map((item, index) => {

packages/messenger-widget/src/components/Message/bl.ts

+9
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@ export const deleteEmoji = async (
5151
) => {
5252
const userDb = state.userDb;
5353

54+
/**
55+
* User can't remove reactions on his own messages.
56+
* As the other account can only react to my messages.
57+
* And only that other account can remove those reactions.
58+
**/
59+
if (props.ownMessage) {
60+
return;
61+
}
62+
5463
if (!userDb) {
5564
throw Error('userDB not found');
5665
}

packages/messenger-widget/src/utils/theme-utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const getCustomizedTheme = (themeCss: any) => {
7272
? `1px solid ${themeCss.configurationBoxBorderColor}`
7373
: defaultTheme.backgroundConfigBoxBorder,
7474
chatBackground:
75-
themeCss.chatBakgroundColor ?? defaultTheme.chatBackground,
75+
themeCss.chatBackgroundColor ?? defaultTheme.chatBackground,
7676
disabledBtnText:
7777
themeCss.disabledButtonTextColor ?? defaultTheme.disabledBtnText,
7878
textError: themeCss.errorTextColor ?? defaultTheme.textError,

0 commit comments

Comments
 (0)