diff options
| author | marco <marcoambrosini@pm.me> | 2022-03-21 16:01:20 +0300 |
|---|---|---|
| committer | marco <marcoambrosini@pm.me> | 2022-03-24 16:01:45 +0300 |
| commit | 090263a1051b505e6c5ba44dcc76cb73566d3530 (patch) | |
| tree | ce874e953985aced8b376db9bdf3de6454b98526 /src | |
| parent | 462d0653c96274c3e73dd5e986381e6ffb48a022 (diff) | |
Do not close messageButtonsBar if emojipicker is open
Signed-off-by: marco <marcoambrosini@pm.me>
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/Message.vue | 4 | ||||
| -rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue index ef93de7a0..ab3272a47 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -148,9 +148,10 @@ the main body of the message as well as a quote. <!-- Message actions --> <MessageButtonsBar v-if="hasMessageButtonsBar" - v-show="showMessageButtonsBar || isActionMenuOpen" + v-show="showMessageButtonsBar || isActionMenuOpen || isEmojiPickerOpen" ref="messageButtonsBar" :is-action-menu-open.sync="isActionMenuOpen" + :is-emoji-picker-open.sync="isEmojiPickerOpen" :message-api-data="messageApiData" :message-object="messageObject" v-bind="$props" @@ -358,6 +359,7 @@ export default { // whether the message was seen, only used if this was marked as last read message seen: false, isActionMenuOpen: false, + isEmojiPickerOpen: false, detailedReactionsRequested: false, } }, diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue index 3c59b42cc..952caf3d3 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue @@ -114,7 +114,9 @@ </template> </Button> <EmojiPicker :container="`#message_${id}`" - @select="handleReactionClick"> + @select="handleReactionClick" + @after-show="onEmojiPickerOpen" + @after-hide="onEmojiPickerClose"> <Button type="tertiary"> <template #icon> <Plus :size="20" /> @@ -432,6 +434,14 @@ export default { onMenuClose() { this.$emit('update:isActionMenuOpen', false) }, + + onEmojiPickerOpen() { + this.$emit('update:isEmojiPickerOpen', true) + }, + + onEmojiPickerClose() { + this.$emit('update:isEmojiPickerOpen', false) + }, }, } </script> |