From 6de9a8ccbf688e61eb4e49f1ff8215d764856d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Thu, 28 Dec 2023 15:49:16 +0900
Subject: [PATCH] =?UTF-8?q?fix(EmojiPicker):=20=E6=8A=95=E7=A8=BF=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=A7=E7=B5=B5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E6=8A=BC=E3=81=99=E3=81=A8?=
 =?UTF-8?q?=E5=BE=93=E6=9D=A5=E9=80=9A=E3=82=8A=E7=B5=B5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=83=94=E3=83=83=E3=82=AB=E3=83=BC=E3=81=AE=E3=82=A6=E3=82=A3?=
 =?UTF-8?q?=E3=83=B3=E3=83=89=E3=82=A6=E3=81=8C=E9=96=8B=E3=81=8F=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20(MisskeyIO#296)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ お知らせの絵文字ボタンでも同じ挙動になるように
---
 .../frontend/src/components/MkEmojiPickerWindow.vue | 11 +++++++++--
 packages/frontend/src/components/MkPostForm.vue     | 13 ++++---------
 packages/frontend/src/os.ts                         |  2 ++
 packages/frontend/src/pages/admin/announcements.vue |  6 +++++-
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiPickerWindow.vue b/packages/frontend/src/components/MkEmojiPickerWindow.vue
index 1a2c55e785..e3a85d0927 100644
--- a/packages/frontend/src/components/MkEmojiPickerWindow.vue
+++ b/packages/frontend/src/components/MkEmojiPickerWindow.vue
@@ -13,18 +13,25 @@ SPDX-License-Identifier: AGPL-3.0-only
 	:front="true"
 	@closed="emit('closed')"
 >
-	<MkEmojiPicker :showPinned="showPinned" :asReactionPicker="asReactionPicker" asWindow :class="$style.picker" @chosen="chosen"/>
+	<MkEmojiPicker
+		:class="$style.picker"
+		:showPinned="showPinned"
+		:pinnedEmojis="pinnedEmojis"
+		:asReactionPicker="asReactionPicker"
+		asWindow
+		@chosen="chosen"
+	/>
 </MkWindow>
 </template>
 
 <script lang="ts" setup>
-import { } from 'vue';
 import MkWindow from '@/components/MkWindow.vue';
 import MkEmojiPicker from '@/components/MkEmojiPicker.vue';
 
 withDefaults(defineProps<{
 	src?: HTMLElement;
 	showPinned?: boolean;
+	pinnedEmojis?: string[],
 	asReactionPicker?: boolean;
 }>(), {
 	showPinned: true,
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 8d59e0f0d6..d06a3d898c 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -860,15 +860,10 @@ function insertMention() {
 async function insertEmoji(ev: MouseEvent) {
 	textAreaReadOnly.value = true;
 
-	emojiPicker.show(
-		ev.currentTarget ?? ev.target,
-		emoji => {
-			insertTextAtCursor(textareaEl.value, emoji);
-		},
-		() => {
-			textAreaReadOnly.value = false;
-			nextTick(() => focus());
-		},
+	os.openEmojiPicker(
+		(ev.currentTarget ?? ev.target) as HTMLElement,
+		{ asReactionPicker: false },
+		textareaEl.value
 	);
 }
 
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index d742a53e66..1e330a027a 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -12,6 +12,7 @@ import { EventEmitter } from 'eventemitter3';
 import insertTextAtCursor from 'insert-text-at-cursor';
 import * as Misskey from 'misskey-js';
 import { i18n } from '@/i18n.js';
+import { defaultStore } from '@/store.js';
 import MkPostFormDialog from '@/components/MkPostFormDialog.vue';
 import MkWaitingDialog from '@/components/MkWaitingDialog.vue';
 import MkPageWindow from '@/components/MkPageWindow.vue';
@@ -533,6 +534,7 @@ export async function openEmojiPicker(src?: HTMLElement, opts, initialTextarea:
 
 	openingEmojiPicker = await popup(MkEmojiPickerWindow, {
 		src,
+		pinnedEmojis: opts?.asReactionPicker ? defaultStore.reactiveState.reactions : defaultStore.reactiveState.pinnedEmojis,
 		...opts,
 	}, {
 		chosen: emoji => {
diff --git a/packages/frontend/src/pages/admin/announcements.vue b/packages/frontend/src/pages/admin/announcements.vue
index 89eeea9ff1..ba6a46f766 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -131,7 +131,11 @@ function editUser(announcement): void {
 }
 
 function insertEmoji(ev: MouseEvent): void {
-	os.openEmojiPicker((ev.currentTarget ?? ev.target) as HTMLElement, {}, announceTitleEl.value);
+	os.openEmojiPicker(
+		(ev.currentTarget ?? ev.target) as HTMLElement,
+		{ asReactionPicker: false },
+		announceTitleEl.value
+	);
 }
 
 function add() {