Skip to content

Commit

Permalink
Merge pull request #11637 from nextcloud/fix/11602/show-color-picker-…
Browse files Browse the repository at this point in the history
…popover

fix(ConversationAvatarEditor): show color picker popover
  • Loading branch information
DorraJaouad authored Feb 28, 2024
2 parents 109e7a8 + 0acc522 commit 925f878
Showing 1 changed file with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,15 @@
<div class="avatar__buttons">
<!-- Set emoji as avatar -->
<template v-if="!showCropper">
<NcEmojiPicker :per-line="5"
@select="setEmoji">
<NcEmojiPicker :per-line="5" :container="container" @select="setEmoji">
<NcButton :title="t('spreed', 'Set emoji as conversation picture')"
:aria-label="t('spreed', 'Set emoji as conversation picture')">
<template #icon>
<EmoticonOutline :size="20" />
</template>
</NcButton>
</NcEmojiPicker>
<NcColorPicker v-if="emojiAvatar" v-model="backgroundColor">
<NcColorPicker v-if="emojiAvatar" v-model="backgroundColor" :container="container">
<NcButton :title="t('spreed', 'Set background color for conversation picture')"
:aria-label="t('spreed', 'Set background color for conversation picture')">
<template #icon>
Expand Down Expand Up @@ -212,6 +211,10 @@ export default {
},

computed: {
container() {
return this.$store.getters.getMainContainerSelector()
},

inputId() {
return `account-property-${this.conversation.displayName}`
},
Expand Down

0 comments on commit 925f878

Please sign in to comment.