LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix: Render line-breaks properly in messages (#2699)

Browse Source
This commit is contained in:
Pranav Raj S
2021-08-02 08:24:08 +05:30
committed by GitHub
parent bfa00cc12d
commit 5b3339cd33
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/dashboard/components/widgets/conversation/Message.vue
View File

@@ -144,7 +144,6 @@ export default {
text_content: { full: fullTextContent, reply: replyTextContent } = {}, text_content: { full: fullTextContent, reply: replyTextContent } = {},
} = {}, } = {},
} = this.contentAttributes; } = this.contentAttributes;
let contentToBeParsed = let contentToBeParsed =
replyHTMLContent || replyHTMLContent ||
replyTextContent || replyTextContent ||
@@ -154,7 +153,7 @@ export default {
if (contentToBeParsed && this.isIncoming) { if (contentToBeParsed && this.isIncoming) {
const parsedContent = this.stripStyleCharacters(contentToBeParsed); const parsedContent = this.stripStyleCharacters(contentToBeParsed);
if (parsedContent) { if (parsedContent) {
return parsedContent; return parsedContent.replace(/\n/g, '<br />');
} }
} }
return ( return (

2
app/javascript/dashboard/components/widgets/conversation/bubble/MailHead.vue
View File

@@ -29,7 +29,7 @@
export default { export default {
props: { props: {
emailAttributes: { emailAttributes: {
type: Array, type: Object,
default: () => ({}), default: () => ({}),
}, },
isIncoming: { isIncoming: {

2
app/javascript/shared/helpers/MessageFormatter.js
View File

@@ -47,7 +47,7 @@ class MessageFormatter {
const markedDownOutput = marked(withHash); const markedDownOutput = marked(withHash);
return markedDownOutput; return markedDownOutput;
} }
return marked(this.message); return marked(this.message, { breaks: true, gfm: true });
} }
get formattedMessage() { get formattedMessage() {

4
app/javascript/widget/components/UserMessage.vue
View File

@@ -126,5 +126,9 @@ export default {
margin-top: $space-normal; margin-top: $space-normal;
} }
} }
p:not(:last-child) {
margin-bottom: $space-normal;
}
} }
</style> </style>