diff options
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.js | 11 | ||||
| -rw-r--r-- | src/components/emoji_picker/emoji_picker.vue | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index ca2a3683..4a447905 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -192,13 +192,9 @@ const EmojiPicker = { setScroll(right + margin - headerCont.clientWidth) } }, - highlight (index) { + highlight (groupId) { this.setShowStickers(false) - const item = this.filteredEmojiGroups[index] - if (!item) { - return - } - const indexInList = this.emojiItems.findIndex(k => k.id === item.id) + const indexInList = this.emojiItems.findIndex(k => k.id === groupId) this.$refs['emoji-groups'].scrollToItem(indexInList) }, updateScrolledClass (target) { @@ -261,9 +257,6 @@ const EmojiPicker = { this.filteredEmojiGroups = this.getFilteredEmojiGroups() } }, - mounted () { - this.recalculateItemPerRow() - }, computed: { minItemSize () { return this.emojiHeight diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue index ae4683f5..453ecdfc 100644 --- a/src/components/emoji_picker/emoji_picker.vue +++ b/src/components/emoji_picker/emoji_picker.vue @@ -13,7 +13,7 @@ class="emoji-tabs" > <span - v-for="(group, index) in filteredEmojiGroups" + v-for="group in filteredEmojiGroups" :ref="setGroupRef('group-header-' + group.id)" :key="group.id" class="emoji-tabs-item" @@ -21,7 +21,7 @@ active: activeGroupView === group.id }" :title="group.text" - @click.prevent="highlight(index)" + @click.prevent="highlight(group.id)" > <span v-if="group.image" |