From 01ff597e65fed5e558bce334c62b26fffa72c834 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 3 Aug 2023 03:57:27 +0000
Subject: [PATCH] fix emoji picker

---
 .../src/components/MkEmojiPickerDialog.vue         | 14 +++++++++++---
 packages/frontend/src/components/MkPopupMenu.vue   |  2 +-
 packages/frontend/src/scripts/reaction-picker.ts   |  6 +++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue
index 855d82c064..e1128b2fdb 100644
--- a/packages/frontend/src/components/MkEmojiPickerDialog.vue
+++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue
@@ -12,10 +12,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 	:transparentBg="true"
 	:manualShowing="manualShowing"
 	:src="src"
-	@click="modal?.close()"
+	@click="click"
 	@opening="opening"
 	@close="emit('close')"
 	@closed="emit('closed')"
+	@hide="emit('hide')"
 >
 	<MkEmojiPicker
 		ref="picker"
@@ -36,7 +37,7 @@ import MkModal from '@/components/MkModal.vue';
 import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
 import { defaultStore } from '@/store';
 
-withDefaults(defineProps<{
+const props = withDefaults(defineProps<{
 	manualShowing?: boolean | null;
 	src?: HTMLElement;
 	showPinned?: boolean;
@@ -51,6 +52,8 @@ const emit = defineEmits<{
 	(ev: 'done', v: any): void;
 	(ev: 'close'): void;
 	(ev: 'closed'): void;
+	(ev: 'click'): void;
+	(ev: 'hide'): void;
 }>();
 
 const modal = shallowRef<InstanceType<typeof MkModal>>();
@@ -58,7 +61,7 @@ const picker = shallowRef<InstanceType<typeof MkEmojiPicker>>();
 
 function chosen(emoji: any) {
 	emit('done', emoji);
-	modal.value?.close();
+	if (props.manualShowing === null) modal.value?.close();
 }
 
 function opening() {
@@ -70,6 +73,11 @@ function opening() {
 		picker.value?.focus();
 	}, 10);
 }
+
+function click() {
+	emit('click');
+	if (props.manualShowing === null) modal.value?.close();
+}
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/MkPopupMenu.vue b/packages/frontend/src/components/MkPopupMenu.vue
index 85b3eb459c..452222d7ed 100644
--- a/packages/frontend/src/components/MkPopupMenu.vue
+++ b/packages/frontend/src/components/MkPopupMenu.vue
@@ -15,7 +15,7 @@ import MkModal from './MkModal.vue';
 import MkMenu from './MkMenu.vue';
 import { MenuItem } from '@/types/menu';
 
-const props = defineProps<{
+defineProps<{
 	items: MenuItem[];
 	align?: 'center' | string;
 	width?: number;
diff --git a/packages/frontend/src/scripts/reaction-picker.ts b/packages/frontend/src/scripts/reaction-picker.ts
index 919c566e3f..bd74271dcd 100644
--- a/packages/frontend/src/scripts/reaction-picker.ts
+++ b/packages/frontend/src/scripts/reaction-picker.ts
@@ -24,14 +24,18 @@ class ReactionPicker {
 		}, {
 			done: reaction => {
 				this.onChosen!(reaction);
+				this.manualShowing.value = false;
 			},
 			close: () => {
 				this.manualShowing.value = false;
 			},
-			closed: () => {
+			hide: () => {
 				this.src.value = null;
 				this.onClosed!();
 			},
+			click: () => {
+				this.manualShowing.value = false;
+			}
 		});
 	}