Skip to content

[stable29] fix(MessagesList): fix unread marker when it is attached to the last message in collapsed group #12592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 1 commit into from
Jun 27, 2024
Merged

[stable29] fix(MessagesList): fix unread marker when it is attached to the last message in collapsed group #12592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/components/MessagesList/MessagesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ export default {

// When the current message is not visible (reaction or expired)
// we use the next message from the list start the scroller-visibility check
if (!el) {
if (!el || el.offsetParent === null) {
const messageId = this.$store.getters.getFirstDisplayableMessageIdAfterReadMarker(this.token, this.conversation.lastReadMessage)
el = document.getElementById('message_' + messageId)
}
Expand Down Expand Up @@ -982,6 +982,18 @@ export default {
let el = document.getElementById('message_' + this.visualLastReadMessageId)
if (el) {
el = el.closest('.message')
if (el === null || el.offsetParent === null) {
// Exception: when the message remains not visible
// e.g: it is the last message in collapsed group
// unread marker is set to the combined system message.
// Look for the unread marker itself
el = document.querySelector('.new-message-marker')
if (el) {
el = el.closest('.message')
} else {
console.warn('Visual last read message element not found')
}
}
}

return el
Expand Down