Skip to content

Commit 855fc90

Browse files
authored
Merge pull request #213 from Detaysoft/forwardedMsg
forwarded message
2 parents bcf5abd + 910e10e commit 855fc90

12 files changed

Lines changed: 46 additions & 10 deletions

File tree

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ import { MessageBox } from 'react-chat-elements'
146146
| onMessageFocused | none | function | makes focus value false after the message becomes focus |
147147
| reply | none | object | reply data |
148148
| retracted | none | boolean | message deleted or retracted |
149+
| forwardedMessageText | Forwarded | string | forwarded message text |
149150

150151
## Reply Message Component
151152

@@ -385,6 +386,7 @@ inputClear()
385386
| onMaxLengthExceed | none | function | called when max length exceed |
386387
| autofocus | false | bool | input autofocus |
387388
| value | none | string | input value |
389+
388390
## Button Component
389391

390392
```javascript

example/App.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ button {
4848

4949
.input-area {
5050
height: 50px;
51-
background: red;
5251
}
5352

5453
.on-drag-mlist {

example/components/ChatListExample.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ function Test(params: any) {
1616
'padding': '2px',
1717
'right': '-12px',
1818
'top': '-6px',
19-
'background': 'red',
2019
'color': 'white',
2120
'borderRadius': '100%',
2221
'width': '12px',

example/components/DropdownExample.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ function DropdownExample() {
2424
icon: {
2525
component: <FaSquare />,
2626
float: 'left',
27-
color: 'red',
2827
size: 22,
2928
},
3029
text: 'Menu Item',

example/components/MessageListExample.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ function MessageListExample() {
115115
downButton={true}
116116
downButtonBadge={10}
117117
sendMessagePreview={true}
118-
messageBoxStyles={{ backgroundColor: 'red' }}
119-
notchStyle={{ fill: 'red' }}
120118
/>
121119

122120
<div

example/utils/MessageTypes.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const photoMessage: MessageType = {
1818
text: loremIpsum({ count: 1, units: 'sentences' }),
1919
titleColor: getRandomColor(),
2020
status: 'waiting',
21-
statusTitle: token() >= 5 ? 'Desktop' : 'Mobile',
21+
statusTitle: token() >= 5 ? 'Desktop' : 'Mobile',
2222
data: {
2323
uri: `data:image/png;base64,${photo(150)}`,
2424
status: {
@@ -54,6 +54,7 @@ export const locationMessage: MessageType = {
5454
notch: true,
5555
copiableDate: true,
5656
retracted: false,
57+
forwardedMessageText: 'Forwarded',
5758
className: '',
5859
data: {
5960
latitude: '37.773972',
@@ -100,6 +101,7 @@ export const fileMessage: MessageType = {
100101
notch: true,
101102
copiableDate: true,
102103
retracted: false,
104+
forwardedMessageText: 'Forwarded',
103105
className: '',
104106
reply:
105107
token() >= 1
@@ -186,6 +188,7 @@ export const videoMessage: MessageType = {
186188
removeButton: true,
187189
controlsList: '',
188190
status: 'read',
191+
forwardedMessageText: 'Forwarded',
189192
statusTitle: token() >= 5 ? 'Desktop' : 'Mobile',
190193
data: {
191194
uri: `data:image/png;base64,${photo(150)}`,
@@ -271,6 +274,7 @@ export const meetingMessage: MessageType = {
271274
copiableDate: true,
272275
retracted: false,
273276
className: '',
277+
forwardedMessageText: 'Forwarded',
274278
reply:
275279
token() >= 1
276280
? {
@@ -392,6 +396,7 @@ export const textMessage: MessageType = {
392396
notch: true,
393397
copiableDate: true,
394398
retracted: false,
399+
forwardedMessageText: 'Forwarded',
395400
className: '',
396401
reply:
397402
token() >= 1

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-chat-elements",
3-
"version": "12.0.11",
3+
"version": "12.0.12",
44
"description": "Reactjs chat components",
55
"author": "Avare Kodcu <abdurrahmaneker58@gmail.com>",
66
"main": "dist/main.js",

src/ChatItem/ChatItem.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
justify-content: center;
130130
display: flex;
131131
border-radius: 100%;
132-
background: red;
133132
}
134133

135134
.rce-citem-body--bottom-status-icon {

src/MessageBox/MessageBox.css

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,3 +331,26 @@
331331
.rce-mbox-title > .rce-avatar-container {
332332
margin-right: 5px;
333333
}
334+
335+
.rce-mbox-forwardedMessage {
336+
position: relative;
337+
overflow: hidden;
338+
display: flex;
339+
margin-top: -1px;
340+
margin-bottom: 6px;
341+
margin-right: -6px;
342+
margin-left: -6px;
343+
border-radius: 5px;
344+
padding: 0 5px;
345+
padding-right: 0;
346+
transition: 200ms;
347+
user-select: none;
348+
}
349+
350+
.rce-mbox-forwarded-message {
351+
display: flex;
352+
align-items: center;
353+
padding: 1px;
354+
font-size: 13px;
355+
font-style: italic;
356+
}

src/MessageBox/MessageBox.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import Avatar from '../Avatar/Avatar'
1717
import { RiShareForwardFill } from 'react-icons/ri'
1818
import { IoIosDoneAll } from 'react-icons/io'
1919
import { MdAccessTime, MdCheck, MdMessage, MdDelete, MdBlock, MdDoneAll } from 'react-icons/md'
20+
import { TiArrowForward } from 'react-icons/ti'
2021

2122
import { format } from 'timeago.js'
2223

@@ -130,7 +131,18 @@ const MessageBox: React.FC<MessageBoxType> = ({ focus = false, notch = true, sty
130131
</div>
131132
)}
132133

133-
{props.reply && <ReplyMessage onClick={props.onReplyMessageClick} {...props.reply} />}
134+
{props.forwardedMessageText ? (
135+
<div className='rce-mbox-forwardedMessage'>
136+
<div className='rce-mbox-forwarded-message'>
137+
<TiArrowForward fontSize={18} />
138+
<i style={{ margin: '0 3px 1px 0' }}> {props.forwardedMessageText}</i>
139+
</div>
140+
</div>
141+
) : null}
142+
143+
{!props.forwardedMessageText && props.reply ? (
144+
<ReplyMessage onClick={props.onReplyMessageClick} {...props.reply} />
145+
) : null}
134146

135147
{props.type === 'text' && (
136148
<div

0 commit comments

Comments
 (0)