Skip to content

Commit d530fa7

Browse files
committed
(fix) users tag in messages reply
1 parent 499635f commit d530fa7

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

src/ChatWindow/FormatMessage.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
:class="{
99
'vac-text-ellipsis': singleLine,
1010
'vac-text-bold': checkType(message, 'bold'),
11-
'vac-text-italic': checkType(message, 'italic') || deleted,
11+
'vac-text-italic': deleted || checkType(message, 'italic'),
1212
'vac-text-strike': checkType(message, 'strike'),
1313
'vac-text-underline': checkType(message, 'underline'),
1414
'vac-text-inline-code':
1515
!singleLine && checkType(message, 'inline-code'),
1616
'vac-text-multiline-code':
1717
!singleLine && checkType(message, 'multiline-code'),
18-
'vac-text-tag': checkType(message, 'tag')
18+
'vac-text-tag': !reply && checkType(message, 'tag')
1919
}"
2020
:href="message.href"
2121
:target="message.href ? '_blank' : null"
@@ -47,6 +47,7 @@ export default {
4747
users: { type: Array, default: () => [] },
4848
linkify: { type: Boolean, default: true },
4949
singleLine: { type: Boolean, default: false },
50+
reply: { type: Boolean, default: false },
5051
textFormatting: { type: Boolean, required: true }
5152
},
5253

src/ChatWindow/Message.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ export default {
634634
border-radius: 8px;
635635
font-size: 14px;
636636
padding: 6px 9px 3px;
637-
white-space: pre-wrap;
637+
white-space: pre-line;
638638
max-width: 100%;
639639
-webkit-transition-property: box-shadow, opacity;
640640
transition-property: box-shadow, opacity;

src/ChatWindow/Room.vue

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,14 @@
182182
/>
183183
<div class="vac-reply-info">
184184
<div class="vac-reply-username">{{ messageReply.username }}</div>
185-
<div class="vac-reply-content">{{ messageReply.content }}</div>
185+
<div class="vac-reply-content">
186+
<format-message
187+
:content="messageReply.content"
188+
:users="room.users"
189+
:text-formatting="true"
190+
:reply="true"
191+
></format-message>
192+
</div>
186193
</div>
187194
</div>
188195

@@ -370,6 +377,7 @@ import Loader from './Loader'
370377
import Message from './Message'
371378
import SvgIcon from './SvgIcon'
372379
import EmojiPicker from './EmojiPicker'
380+
import FormatMessage from './FormatMessage'
373381
374382
const { messagesValid } = require('../utils/roomValidation')
375383
const { detectMobile, iOSDevice } = require('../utils/mobileDetection')
@@ -383,7 +391,8 @@ export default {
383391
Loader,
384392
Message,
385393
SvgIcon,
386-
EmojiPicker
394+
EmojiPicker,
395+
FormatMessage
387396
},
388397
389398
directives: {
@@ -499,6 +508,9 @@ export default {
499508
this.message = this.roomMessage
500509
setTimeout(() => this.onChangeInput(), 0)
501510
}
511+
setTimeout(() => {
512+
this.roomFooterHeight = this.$refs['roomFooter'].clientHeight
513+
}, 0)
502514
}
503515
},
504516
roomMessage: {
@@ -896,7 +908,7 @@ export default {
896908
897909
setTimeout(() => {
898910
this.roomFooterHeight = this.$refs['roomFooter'].clientHeight
899-
}, 10)
911+
}, 20)
900912
},
901913
addEmoji(emoji) {
902914
this.message += emoji.icon
@@ -1173,6 +1185,7 @@ export default {
11731185
.vac-reply-content {
11741186
font-size: 12px;
11751187
color: var(--chat-message-color-reply-content);
1188+
white-space: pre-line;
11761189
}
11771190
11781191
.vac-icon-reply {

0 commit comments

Comments
 (0)