Skip to content

Feat(MessagesList): Soft update messages list AND add sticky date separator. #11592

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
DorraJaouad merged 6 commits into from
Feb 28, 2024
Merged

Feat(MessagesList): Soft update messages list AND add sticky date separator. #11592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b814cf2
Fix(MessagesList): Restructure list and fix soft update
DorraJaouad Feb 16, 2024
3195a2e
Fix(MessagesList): make the datetimestamp the id to each section
DorraJaouad Feb 19, 2024
4e5582b
Fix(Reactions): add safeguards for lists
DorraJaouad Feb 19, 2024
59407d3
Fix(MessagesList): skip soft update when needed and make editing a me…
DorraJaouad Feb 19, 2024
e520f18
feat(MessagesList): Make dateSep sticky
DorraJaouad Feb 27, 2024
8f599c2
fix: adjust spinner position
DorraJaouad Feb 28, 2024
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: 10 additions & 4 deletions src/components/MessagesList/MessagesGroup/Message/MessagePart/Reactions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<template>
<!-- reactions buttons and popover with details -->
<div class="reactions-wrapper">
<div v-if="reactionsCount && reactionsSorted" class="reactions-wrapper">
<NcPopover v-for="reaction in reactionsSorted"
:key="reaction"
:delay="200"
Expand Down Expand Up @@ -175,11 +175,14 @@ export default {
},

reactionsSorted() {
return this.detailedReactions
? Object.keys(this.detailedReactions)
if (this.detailedReactions) {
return Object.keys(this.detailedReactions)
.sort((a, b) => this.detailedReactions[b].length - this.detailedReactions[a].length)
: Object.keys(this.plainReactions)
} else if (this.plainReactions) {
return Object.keys(this.plainReactions)
.sort((a, b) => this.plainReactions[b] - this.plainReactions[a])
}
return undefined
},

/**
Expand Down Expand Up @@ -243,6 +246,9 @@ export default {
},

reactionsCount(reaction) {
if (!this.detailedReactions || !this.plainReactions) {
return undefined
}
return this.detailedReactions
? this.detailedReactions[reaction]?.length
: this.plainReactions[reaction]
Expand Down
4 changes: 2 additions & 2 deletions src/components/MessagesList/MessagesGroup/MessagesGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-->

<template>
<div class="wrapper">
<li class="wrapper">
<div class="messages__avatar">
<AvatarWrapper :id="actorId"
:name="actorDisplayName"
Expand All @@ -47,7 +47,7 @@
:actor-type="actorType"
:actor-id="actorId" />
</ul>
</div>
</li>
</template>

<script>
Expand Down
4 changes: 2 additions & 2 deletions src/components/MessagesList/MessagesGroup/MessagesSystemGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-->

<template>
<div class="wrapper wrapper--system">
<li class="wrapper wrapper--system">
<div v-for="messagesCollapsed in messagesGroupedBySystemMessage"
:key="messagesCollapsed.id"
class="messages-group__system">
Expand All @@ -45,7 +45,7 @@
:previous-message-id="getPrevMessageId(message)" />
</ul>
</div>
</div>
</li>
</template>

<script>
Expand Down
Loading