Skip to content
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

Jump to bottom

fix(chat): expand system messages group if visual unread marker is set on it #11063

Merged
merged 1 commit into from
Dec 1, 2023
+18 −8
Merged

fix(chat): expand system messages group if visual unread marker is set on it #11063

Show file tree
Hide file tree
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
9 changes: 4 additions & 5 deletions src/components/MessagesList/MessagesGroup/Message/Message.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,9 @@ the main body of the message as well as a quote.
@close="isTranslateDialogOpen = false" />

<div v-if="isLastReadMessage"
v-observe-visibility="lastReadMessageVisibilityChanged">
<div class="new-message-marker">
<span>{{ t('spreed', 'Unread messages') }}</span>
</div>
v-observe-visibility="lastReadMessageVisibilityChanged"
class="new-message-marker">
<span>{{ t('spreed', 'Unread messages') }}</span>
</div>
</li>
</template>
Expand Down Expand Up @@ -1077,7 +1076,7 @@ export default {

.new-message-marker {
position: relative;
margin: 20px 15px 20px -45px;
margin: 20px 15px;
border-top: 1px solid var(--color-border);

span {
Expand Down
16 changes: 13 additions & 3 deletions src/components/MessagesList/MessagesGroup/MessagesSystemGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ export default {
}
},

computed: {
lastReadMessageId() {
return this.$store.getters.conversation(this.token)?.lastReadMessage
}
},

watch: {
messages: {
deep: true,
Expand Down Expand Up @@ -186,24 +192,28 @@ export default {
let lastMessage = null
let forceNextGroup = false
for (const message of messages) {
const isLastRead = message.id === this.lastReadMessageId
const groupingType = this.messagesShouldBeGrouped(message, lastMessage)
if (!groupingType || forceNextGroup) {
groups.push({ id: message.id, messages: [message], type: '', collapsed: this.groupIsCollapsed[message.id] ?? true })
groups.push({ id: message.id, messages: [message], type: '', collapsed: this.groupIsCollapsed[message.id] ?? !isLastRead })
forceNextGroup = false
} else {
if (groupingType === 'call_reconnected') {
groups.push({ id: message.id, messages: [groups.at(-1).messages.pop()], type: '', collapsed: this.groupIsCollapsed[message.id] ?? true })
groups.push({ id: message.id, messages: [groups.at(-1).messages.pop()], type: '', collapsed: this.groupIsCollapsed[message.id] ?? !isLastRead })
forceNextGroup = true
}
groups.at(-1).messages.push(message)
groups.at(-1).type = groupingType
if (isLastRead) {
groups.at(-1).collapsed = false
}
}
lastMessage = message
}

groups.forEach(group => {
if (this.groupIsCollapsed[group.id] === undefined) {
this.groupIsCollapsed[group.id] = true
this.groupIsCollapsed[group.id] = group.collapsed
}
})
return groups
Expand Down
1 change: 1 addition & 0 deletions src/composables/useCombinedSystemMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export function useCombinedSystemMessage() {
*/
function createCombinedSystemMessage({ id, messages, type, collapsed }) {
const combinedMessage = cloneDeep(messages[0])
combinedMessage.id = messages[0].id + '_combined'

// Handle cases when users reconnected to the call
if (type === 'call_reconnected') {
Expand Down
Loading