diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2021-02-28 10:03:52 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2021-02-28 10:03:52 +0900 |
| commit | cbcbd6f0a910ee286b0eee491588d278190f341f (patch) | |
| tree | f0613da4b8e0eb157fc8d221a2f43f7c77c83514 /src/client | |
| parent | chore: improve reaction picker behaviour (diff) | |
| download | sharkey-cbcbd6f0a910ee286b0eee491588d278190f341f.tar.gz sharkey-cbcbd6f0a910ee286b0eee491588d278190f341f.tar.bz2 sharkey-cbcbd6f0a910ee286b0eee491588d278190f341f.zip | |
chore: improve reaction picker behaviour
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/components/emoji-picker-dialog.vue | 7 | ||||
| -rw-r--r-- | src/client/components/emoji-picker.vue | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/client/components/emoji-picker-dialog.vue b/src/client/components/emoji-picker-dialog.vue index 3450d219c3..4b165d9f91 100644 --- a/src/client/components/emoji-picker-dialog.vue +++ b/src/client/components/emoji-picker-dialog.vue @@ -1,5 +1,5 @@ <template> -<MkModal ref="modal" :manual-showing="manualShowing" :src="src" @click="$refs.modal.close()" @opening="$refs.picker.focus()" @close="$emit('close')" @closed="$emit('closed')"> +<MkModal ref="modal" :manual-showing="manualShowing" :src="src" @click="$refs.modal.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')"> <MkEmojiPicker :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" @chosen="chosen" ref="picker"/> </MkModal> </template> @@ -46,6 +46,11 @@ export default defineComponent({ this.$emit('done', emoji); this.$refs.modal.close(); }, + + opening() { + this.$refs.picker.reset(); + this.$refs.picker.focus(); + } } }); </script> diff --git a/src/client/components/emoji-picker.vue b/src/client/components/emoji-picker.vue index 41e667dd98..7c82211993 100644 --- a/src/client/components/emoji-picker.vue +++ b/src/client/components/emoji-picker.vue @@ -282,6 +282,10 @@ export default defineComponent({ } }, + reset() { + this.$refs.emojis.scrollTop = 0; + }, + getKey(emoji: any) { return typeof emoji === 'string' ? emoji : (emoji.char || `:${emoji.name}:`); }, |