From 66d94cfc528054142ea4f236f88ab0e8792761a3 Mon Sep 17 00:00:00 2001 From: Phillip Lang Martinez Date: Wed, 30 Nov 2022 16:50:56 +0200 Subject: [PATCH] fix bounce issue --- .../plugins/core/components/ChatPage.js | 16 +++++++++++++--- .../plugins/utils/replace-messages-edited.js | 10 +--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js index c2d5690b..3e6ad48c 100644 --- a/qortal-ui-plugins/plugins/core/components/ChatPage.js +++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js @@ -886,6 +886,7 @@ class ChatPage extends LitElement { } async getOldMessage(scrollElement) { + if (this.isReceipient) { const getInitialMessages = await parentEpml.request('apiCall', { @@ -910,8 +911,12 @@ class ChatPage extends LitElement { - b.timestamp }) await this.getUpdateComplete(); + const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template')); - scrollElement.scrollIntoView({ behavior: 'auto', block: 'center' }); + const findElement = marginElements.find((item)=> item.messageObj.reference === scrollElement.messageObj.reference) + if(findElement){ + findElement.scrollIntoView({ behavior: 'auto', block: 'center' }); + } } else { const getInitialMessages = await parentEpml.request('apiCall', { @@ -937,8 +942,13 @@ class ChatPage extends LitElement { - b.timestamp }) await this.getUpdateComplete(); - - scrollElement.scrollIntoView({ behavior: 'auto', block: 'center' }); + const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template')); + const findElement = marginElements.find((item)=> item.messageObj.reference === scrollElement.messageObj.reference) + + if(findElement){ + findElement.scrollIntoView({ behavior: 'auto', block: 'center' }); + } + } 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) &&