From 1a81bda3db066301b3fada3b3db0e1db5f0b2e9e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 4 Apr 2019 17:08:59 +0300
Subject: isCode format fix

---
 vnext/src/components/Message.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'vnext/src')

diff --git a/vnext/src/components/Message.js b/vnext/src/components/Message.js
index 1d9afe9a..6b0854a4 100644
--- a/vnext/src/components/Message.js
+++ b/vnext/src/components/Message.js
@@ -12,6 +12,7 @@ import { format } from '../utils/embed';
 import './Message.css';
 
 function Message({ data, visitor, children, ...rest }) {
+    const isCode = (data.tags || []).indexOf('code') >= 0;
     return (
         <div className="msg-cont">
             <header className="h">
@@ -28,7 +29,7 @@ function Message({ data, visitor, children, ...rest }) {
                 <TagsList user={data.user} data={data.tags || []} />
             </header>
             <div className="msg-txt">
-                <p dangerouslySetInnerHTML={{ __html: format(data.body, data.mid, (data.tags || []).indexOf('code') >= 0) }}></p>
+                <MessageContainer isCode={isCode} data={{ __html: format(data.body, data.mid, isCode) }} />
             </div>
             {data.photo &&
                 <p className="ir"><a href={`//i.juick.com/p/${data.mid}.${data.attach}`} data-fname={`${data.mid}.${data.attach}`}>
@@ -86,6 +87,10 @@ function Message({ data, visitor, children, ...rest }) {
 
 export default React.memo(Message);
 
+function MessageContainer({isCode, data}) {
+    return isCode ? (<pre dangerouslySetInnerHTML={data} />) : (<p dangerouslySetInnerHTML={data} />);
+}
+
 function Tags({ data, user, ...rest }) {
     return data.length > 0 && (
         <div className="msg-tags">
-- 
cgit v1.2.3