From 23137dfd4beba7d2e1318f3829bddc8440eae82d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 8 Nov 2019 21:44:36 +0200
Subject: [PATCH] reset position when reopening emoji picker

---
 src/components/emoji_picker/emoji_picker.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index d46dbaa5..432816be 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -109,6 +109,9 @@ const EmojiPicker = {
       this.customEmojiBufferSlice += LOAD_EMOJI_BY
     },
     startEmojiLoad (forceUpdate = false) {
+      this.$nextTick(() => {
+        this.$refs['emoji-groups'].scrollTop = 0
+      })
       const bufferSize = this.customEmojiBuffer.length
       const bufferPrefilledAll = bufferSize === this.filteredEmoji.length
       if (bufferPrefilledAll && !forceUpdate) {
@@ -126,7 +129,6 @@ const EmojiPicker = {
   watch: {
     keyword () {
       this.customEmojiLoadAllConfirmed = false
-      this.$refs['emoji-groups'].scrollTop = 0
       this.onScroll()
       this.startEmojiLoad(true)
     }