From e88c0ed26a2338f6d5a1ea6f08beea21a4dbdded Mon Sep 17 00:00:00 2001
From: meronmks <meronmks.8914@gmail.com>
Date: Sun, 22 Oct 2023 15:52:18 +0900
Subject: [PATCH] Fix: lint error 2

---
 .../frontend/src/components/MkEmojiPicker.section.vue  |  4 ++--
 packages/frontend/src/components/MkEmojiPicker.vue     | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiPicker.section.vue b/packages/frontend/src/components/MkEmojiPicker.section.vue
index 4fe6700d98..5da151829d 100644
--- a/packages/frontend/src/components/MkEmojiPicker.section.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.section.vue
@@ -42,7 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only
       <MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
     </button>
   </div>
-  <div v-if="shown" v-for="child in customEmojiTree" style="padding-left: 18px;">
+  <div v-for="child in customEmojiTree" v-if="shown" style="padding-left: 18px;">
     <!-- TODO: 再帰へのイベントの渡し方が微妙なのか反応はするがエフェクトが出ない -->
     <MkEmojiPickerSection
         :key="`custom:${child.value}`"
@@ -50,7 +50,7 @@ SPDX-License-Identifier: AGPL-3.0-only
         :emojis="computed(() => customEmojis.filter(e => e.category === child.category).map(e => `:${e.name}:`))"
         :isChildrenExits="child.children.length!==0"
         :customEmojiTree="child.children"
-        @chosen="emit('chosen', $event)"
+				@chosen="emit('chosen', $event, $event)"
     >
       {{ child.value }}
     </MkEmojiPickerSection>
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index b80d45c826..2551026d26 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -157,7 +157,7 @@ const customEmojiFolderRoot: CustomEmojiFolderTree = { value: "", category: "",
 
 function parseAndMergeCategories(input: string, root: CustomEmojiFolderTree): CustomEmojiFolderTree {
   const parts = input.split('/');
-  let category = ""
+  let category = "";
   let currentNode: CustomEmojiFolderTree = root;
 
   for (const part of parts) {
@@ -179,16 +179,14 @@ function parseAndMergeCategories(input: string, root: CustomEmojiFolderTree): Cu
   return currentNode;
 }
 
-customEmojiCategories.value.forEach(e => {
-  if (e !== null){
-    parseAndMergeCategories(e, customEmojiFolderRoot);
+customEmojiCategories.value.forEach(ec => {
+  if (ec !== null) {
+    parseAndMergeCategories(ec, customEmojiFolderRoot);
   }
 });
 
 parseAndMergeCategories(i18n.ts.other, customEmojiFolderRoot);
 
-console.log(customEmojiFolderRoot)
-
 watch(q, () => {
 	if (emojisEl.value) emojisEl.value.scrollTop = 0;