From efcfe649caef1e6aede457addf8d6aab03125aa8 Mon Sep 17 00:00:00 2001
From: Phillip
Date: Thu, 12 Jan 2023 16:38:55 -0500
Subject: [PATCH] fix bugs
---
.../plugins/core/components/ChatPage.js | 18 ++++++++++++++++--
.../core/components/ChatScroller-css.js | 1 -
.../plugins/core/components/ChatScroller.js | 14 +++++++++++++-
.../plugins/core/components/ChatTextEditor.js | 11 ++++++++++-
4 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index ed19100a..b1b71914 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -162,6 +162,7 @@ class ChatPage extends LitElement {
align-items: center;
height: auto;
padding: 5px 5px 5px 7px;
+ overflow: hidden;
}
.chat-text-area .typing-area .emoji-button {
@@ -353,12 +354,20 @@ class ChatPage extends LitElement {
flex-direction: column;
gap: 5px;
width: 100%;
+ word-break: break-all;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ max-height: 60px;
}
.repliedTo-message p {
margin: 0px;
padding: 0px;
}
+ .repliedTo-message pre {
+ white-space: pre-wrap;
+ }
+
.repliedTo-message p mark {
background-color: #ffe066;
border-radius: 0.25em;
@@ -937,12 +946,17 @@ class ChatPage extends LitElement {
${this.repliedToMessageObj.senderName ? this.repliedToMessageObj.senderName : this.repliedToMessageObj.sender}
- ${unsafeHTML(generateHTML(this.repliedToMessageObj.message, [
+ ${this.repliedToMessageObj.toString() === '1' ? html`
+ ${this.repliedToMessageObj.message}
+ ` : ''}
+ ${this.repliedToMessageObj.toString() === '2' ? html`
+ ${unsafeHTML(generateHTML(this.repliedToMessageObj.message, [
StarterKit,
Underline,
Highlight
// other extensions …
- ]))}
+ ]))} ` : ''}
+
* + * {
- margin-top: 0.75em;
outline: none;
}
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index 2d46acb9..de34e742 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -576,12 +576,20 @@ class MessageTemplate extends LitElement {
${repliedToData.senderName ?? cropAddress(repliedToData.sender)}
+
+
+ ${version.toString() === '1' ? html`
+ ${repliedToData.decodedMessage.messageText}
+ ` : ''}
+ ${version.toString() === '2' ? html`
${unsafeHTML(generateHTML(repliedToData.decodedMessage.messageText, [
StarterKit,
Underline,
Highlight
// other extensions …
]))}
+ ` : ''}
+
@@ -617,8 +625,12 @@ class MessageTemplate extends LitElement {
id="messageContent"
class="message"
style=${(image && replacedMessage !== "") &&"margin-top: 15px;"}>
-
+ ${version.toString() === '2' ? html`
${unsafeHTML(messageVersion2)}
+ ` : ''}
+ ${version.toString() === '1' ? html`
+ ${unsafeHTML(this.emojiPicker.parse(replacedMessage))}
+ ` : ''}