KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Do not reset the scroll if there is no new message (#5108)

Browse source
This commit is contained in:
Pranav Raj S 2022-07-26 10:40:21 +05:30 • committed by GitHub
parent 885fcf667c
commit d57dc41cee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
View file

@ -87,7 +87,6 @@
:selected-tweet="selectedTweet" :selected-tweet="selectedTweet"
:popout-reply-box.sync="isPopoutReplyBox" :popout-reply-box.sync="isPopoutReplyBox"
@click="showPopoutReplyBox" @click="showPopoutReplyBox"
@scrollToMessage="scrollToBottom"
/> />
</div> </div>
</div> </div>

11
app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
View file

@ -117,11 +117,16 @@ export default {
}, },
setActiveChat() { setActiveChat() {
if (this.conversationId) { if (this.conversationId) {
const chat = this.findConversation(); const selectedConversation = this.findConversation();
if (!chat) { // If conversation doesn't exist or selected conversation is same as the active
// conversation, don't set active conversation.
if (
!selectedConversation ||
selectedConversation.id === this.currentChat.id
) {
return; return;
} }
this.$store.dispatch('setActiveChat', chat).then(() => { this.$store.dispatch('setActiveChat', selectedConversation).then(() => {
bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE); bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
}); });
} else { } else {