From 9c9cd168ee0c8a9d2528ef2eda6f7de0b8d8da41 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Nov 2020 11:47:30 +0900 Subject: Improve emoji picker --- src/client/components/note.vue | 44 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 30 deletions(-) (limited to 'src/client/components/note.vue') diff --git a/src/client/components/note.vue b/src/client/components/note.vue index 53972d9f6f..bf89cbf568 100644 --- a/src/client/components/note.vue +++ b/src/client/components/note.vue @@ -498,36 +498,20 @@ export default defineComponent({ react(viaKeyboard = false) { pleaseLogin(); this.blur(); - if (this.$store.state.device.useFullReactionPicker) { - os.popup(import('@/components/emoji-picker.vue'), { - src: this.$refs.reactButton, - }, { - done: reaction => { - if (reaction) { - os.api('notes/reactions/create', { - noteId: this.appearNote.id, - reaction: reaction - }); - } - this.focus(); - }, - }, 'closed'); - } else { - os.popup(import('@/components/reaction-picker.vue'), { - showFocus: viaKeyboard, - src: this.$refs.reactButton, - }, { - done: reaction => { - if (reaction) { - os.api('notes/reactions/create', { - noteId: this.appearNote.id, - reaction: reaction - }); - } - this.focus(); - }, - }, 'closed'); - } + os.popup(import('@/components/emoji-picker.vue'), { + src: this.$refs.reactButton, + compact: !this.$store.state.device.useFullReactionPicker + }, { + done: reaction => { + if (reaction) { + os.api('notes/reactions/create', { + noteId: this.appearNote.id, + reaction: reaction + }); + } + this.focus(); + }, + }, 'closed'); }, reactDirectly(reaction) { -- cgit v1.2.3-freya