Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions src/components/MessagesList/MessagesGroup/Message/Message.vue
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ the main body of the message as well as a quote.
<NcEmojiPicker v-if="canReact && showMessageButtonsBar"
:per-line="5"
:container="`#message_${id}`"
@select="handleReactionClick">
@select="handleReactionClick"
@after-show="onEmojiPickerOpen"
@after-hide="onEmojiPickerClose">
<NcButton class="reaction-button"
:aria-label="t('spreed', 'Add more reactions')">
<template #icon>
Expand Down Expand Up @@ -401,7 +403,10 @@ export default {
// whether the message was seen, only used if this was marked as last read message
seen: false,
isActionMenuOpen: false,
// Right side bottom bar
isEmojiPickerOpen: false,
// Left side follow-up reaction
isFollowUpEmojiPickerOpen: false,
isReactionsMenuOpen: false,
isForwarderOpen: false,
detailedReactionsLoading: false,
Expand Down Expand Up @@ -570,7 +575,7 @@ export default {
},

showMessageButtonsBar() {
return !this.isSystemMessage && !this.isTemporary && (this.isHovered || this.isActionMenuOpen || this.isEmojiPickerOpen || this.isReactionsMenuOpen || this.isForwarderOpen)
return !this.isSystemMessage && !this.isTemporary && (this.isHovered || this.isActionMenuOpen || this.isEmojiPickerOpen || this.isFollowUpEmojiPickerOpen || this.isReactionsMenuOpen || this.isForwarderOpen)
},

isTemporaryUpload() {
Expand Down Expand Up @@ -735,6 +740,14 @@ export default {
}
},

onEmojiPickerOpen() {
this.isFollowUpEmojiPickerOpen = true
},

onEmojiPickerClose() {
this.isFollowUpEmojiPickerOpen = false
},

async handleReactionClick(clickedEmoji) {
if (!this.canReact) {
showError(t('spreed', 'No permission to post reactions in this conversation'))
Expand Down