${formattedMessages.map((formattedMessage) => {
@@ -99,6 +98,7 @@ class ChatScroller extends LitElement {
?isFirstMessage=${indexMessage === 0}
?isSingleMessageInGroup=${formattedMessage.messages.length > 1}
?isLastMessageInGroup=${indexMessage === formattedMessage.messages.length - 1}
+ .setToggledMessage=${this.setToggledMessage}
>
`
)
@@ -109,6 +109,9 @@ class ChatScroller extends LitElement {
}
shouldUpdate(changedProperties) {
+ if(changedProperties.has('isLoadingMessages')){
+ return true
+ }
// Only update element if prop1 changed.
return changedProperties.has('messages');
}
@@ -120,7 +123,22 @@ class ChatScroller extends LitElement {
return true;
}
+ setToggledMessage(message){
+ toggledMessage = message
+ }
+
+
async firstUpdated() {
+ this.emojiPicker.on('emoji', selection => {
+
+ this.sendMessage({
+ type: 'reaction',
+ editedMessageObj: toggledMessage,
+ reaction: selection.emoji,
+
+
+ })
+ });
this.viewElement = this.shadowRoot.getElementById('viewElement');
this.upObserverElement = this.shadowRoot.getElementById('upObserver');
this.downObserverElement = this.shadowRoot.getElementById('downObserver');
@@ -137,6 +155,7 @@ class ChatScroller extends LitElement {
_upObserverhandler(entries) {
if (entries[0].isIntersecting) {
+ this.setIsLoadingMessages(true);
let _scrollElement = entries[0].target.nextElementSibling;
this._getOldMessage(_scrollElement);
}
@@ -198,6 +217,7 @@ class MessageTemplate extends LitElement {
isFirstMessage: { type: Boolean },
isSingleMessageInGroup: { type: Boolean },
isLastMessageInGroup: { type: Boolean },
+ setToggledMessage: {attribute: false}
}
}
@@ -237,7 +257,13 @@ class MessageTemplate extends LitElement {
}
showBlockIconFunc(bool) {
- this.shadowRoot.querySelector(".chat-hover").focus({ preventScroll: true })
+ const chatHover = this.shadowRoot.querySelector(".chat-hover")
+
+ if(chatHover){
+ chatHover.querySelector(".chat-hover").focus({ preventScroll: true })
+ }
+
+
if(bool) {
this.showBlockAddressIcon = true;
} else {
@@ -454,6 +480,8 @@ class MessageTemplate extends LitElement {
@blur=${() => this.showBlockIconFunc(false)}
.sendMessage=${this.sendMessage}
version=${version}
+ .emojiPicker=${this.emojiPicker}
+ .setToggledMessage=${this.setToggledMessage}
>
@@ -529,7 +557,8 @@ class ChatMenu extends LitElement {
myAddress: { type: Object },
emojiPicker: { attribute: false },
sendMessage: {attribute: false},
- version: {type: String}
+ version: {type: String},
+ setToggledMessage: {attribute: false}
}
}
@@ -559,26 +588,6 @@ class ChatMenu extends LitElement {
parentEpml.request('showSnackBar', `${errorMsg}`)
}
- firstUpdated () {
- this.emojiPicker = new EmojiPicker({
- style: "twemoji",
- twemojiBaseUrl: '/emoji/',
- showPreview: false,
- showVariants: false,
- showAnimation: false,
- position: 'top-start',
- boxShadow: 'rgba(4, 4, 5, 0.15) 0px 0px 0px 1px, rgba(0, 0, 0, 0.24) 0px 8px 16px 0px'
- });
-
- this.emojiPicker.on('emoji', selection => {
- this.sendMessage({
- type: 'reaction',
- editedMessageObj: this.originalMessage,
- reaction: selection.emoji,
- })
- });
- }
-
render() {
return html`
@@ -590,7 +599,13 @@ class ChatMenu extends LitElement {
this.versionErrorSnack()
return
}
- this.emojiPicker.togglePicker(e.target)
+ try {
+ this.setToggledMessage(this.originalMessage)
+ this.emojiPicker.togglePicker(e.target)
+ } catch (error) {
+ console.log({error})
+ }
+
}}
>
diff --git a/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js b/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
index 52f6007f..aa52602e 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
@@ -266,7 +266,6 @@ class ChatTextEditor extends LitElement {
}
async firstUpdated() {
- console.log(this.placeholder, "here500");
if (this.hasGlobalEvents) {
this.addGlobalEventListener();
}
@@ -387,7 +386,7 @@ class ChatTextEditor extends LitElement {
}
initChatEditor() {
- const ChatEditor = function (editorConfig) {
+ const ChatEditor = function (editorConfig) {
const ChatEditor = function () {
const editor = this;
editor.init();
diff --git a/qortal-ui-plugins/plugins/utils/replace-messages-edited.js b/qortal-ui-plugins/plugins/utils/replace-messages-edited.js
index 71579f80..6f727266 100644
--- a/qortal-ui-plugins/plugins/utils/replace-messages-edited.js
+++ b/qortal-ui-plugins/plugins/utils/replace-messages-edited.js
@@ -17,13 +17,9 @@ export const replaceMessagesEdited = async ({
url: `/chat/messages?chatreference=${msg.reference}&reverse=true${msgQuery}`,
})
- console.log({response})
-
if (response && Array.isArray(response) && response.length !== 0) {
let responseItem = { ...response[0] }
- console.log('right before')
const decodeResponseItem = decodeMessageFunc(responseItem, isReceipient, _publicKey)
- console.log({decodeResponseItem})
delete decodeResponseItem.timestamp
msgItem = {
...msg,
@@ -43,24 +39,20 @@ export const replaceMessagesEdited = async ({
try {
parsedMessageObj = JSON.parse(msg.decodedMessage)
} catch (error) {
- console.log('error', {parsedMessageObj})
+ console.log('error')
return msg
}
- console.log('noerror')
let msgItem = msg
try {
let msgQuery = `&involving=${msg.recipient}&involving=${msg.sender}`
if (!isReceipient) {
msgQuery = `&txGroupId=${msg.txGroupId}`
}
-
- console.log({parsedMessageObj})
if (parsedMessageObj.repliedTo) {
const response = await parentEpml.request("apiCall", {
type: "api",
url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
})
- console.log({response2: response})
if (
response &&
Array.isArray(response) &&