Skip to content

Keep reactions menu open #7066

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
nickvergessen merged 2 commits into from
Mar 30, 2022
Merged

Keep reactions menu open #7066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ae1c99
Keep reactions menu open
marcoambrosini Mar 25, 2022
2ecbd5a
Close reactions menu after reacting
marcoambrosini Mar 29, 2022
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
4 changes: 3 additions & 1 deletion src/components/MessagesList/MessagesGroup/Message/Message.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ the main body of the message as well as a quote.
ref="messageButtonsBar"
:is-action-menu-open.sync="isActionMenuOpen"
:is-emoji-picker-open.sync="isEmojiPickerOpen"
:is-reactions-menu-open.sync="isReactionsMenuOpen"
:message-api-data="messageApiData"
:message-object="messageObject"
v-bind="$props"
Expand Down Expand Up @@ -357,6 +358,7 @@ export default {
seen: false,
isActionMenuOpen: false,
isEmojiPickerOpen: false,
isReactionsMenuOpen: false,
detailedReactionsRequested: false,
}
},
Expand Down Expand Up @@ -507,7 +509,7 @@ export default {
},

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

isTemporaryUpload() {
Expand Down
37 changes: 28 additions & 9 deletions src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@

<template>
<!-- Message Actions -->
<div class="message-buttons-bar">
<template v-if="page === 0">
<div v-click-outside="handleClickOutside"
class="message-buttons-bar">
<template v-if="!isReactionsMenuOpen">
<Button v-if="acceptsReactions"
type="tertiary"
@click="page = 1">
@click="openReactionsMenu">
<template #icon>
<EmoticonOutline :size="20" />
</template>
Expand Down Expand Up @@ -95,9 +96,9 @@
</Actions>
</template>

<template v-if="page === 1">
<template v-if="isReactionsMenuOpen">
<Button type="tertiary"
@click="page = 0">
@click="closeReactionsMenu">
<template #icon>
<ArrowLeft :size="20" />
</template>
Expand Down Expand Up @@ -278,15 +279,17 @@ export default {
type: Object,
required: true,
},

isReactionsMenuOpen: {
type: Boolean,
required: true,
},
},

data() {
return {
// Shows/hides the message forwarder component
showForwarder: false,

// The pagination of the buttons menu
page: 0,
}
},

Expand Down Expand Up @@ -420,7 +423,7 @@ export default {
actorId: this.actorId,
})
}

this.closeReactionsMenu()
},

handleDelete() {
Expand All @@ -442,6 +445,22 @@ export default {
onEmojiPickerClose() {
this.$emit('update:isEmojiPickerOpen', false)
},

openReactionsMenu() {
this.$emit('update:isReactionsMenuOpen', true)
},

handleClickOutside(event) {
// Making sure that the click is outside the MessageButtonsBar
if (event.path.indexOf(this.$el) !== -1) {
return
}
this.closeReactionsMenu()
},

closeReactionsMenu() {
this.$emit('update:isReactionsMenuOpen', false)
},
},
}
</script>
Expand Down