From 81182b86120487e1ef2637f8139d4d2b504c0d3f Mon Sep 17 00:00:00 2001
From: mattyatea <mattyacocacora0@gmail.com>
Date: Wed, 18 Oct 2023 20:51:43 +0900
Subject: [PATCH] Feat:emoji folder

---
 .../src/components/MkEmojiPicker.section.vue  | 46 +++++++++++--------
 .../frontend/src/components/MkEmojiPicker.vue | 29 +++++++++---
 2 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/packages/frontend/src/components/MkEmojiPicker.section.vue b/packages/frontend/src/components/MkEmojiPicker.section.vue
index 0582cf8b74..3be1b2bf37 100644
--- a/packages/frontend/src/components/MkEmojiPicker.section.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.section.vue
@@ -6,13 +6,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
     <!-- このコンポーネントの要素のclassは親から利用されるのでむやみに弄らないこと -->
     <section>
-
-
+        <!-- categoryが定義されてない(Unicodeの絵文字とか) -->
         <header v-if="!category" class="_acrylic" @click="shown = !shown">
             <i class="toggle ti-fw" :class="shown ? 'ti ti-chevron-down' : 'ti ti-chevron-up'"></i>
             <slot></slot>
             ({{ emojis.length }})
         </header>
+
+        <!-- categoryが定義されてるけど中身が1つしかない -->
         <header v-else-if="category.length === 1" class="_acrylic" @click="shown = !shown">
             <i class="toggle ti-fw" :class="shown ? 'ti ti-chevron-down' : 'ti ti-chevron-up'"></i>
             {{ category[0] }}
@@ -20,6 +21,8 @@ SPDX-License-Identifier: AGPL-3.0-only
                 emojis.filter(e => category === null ? (e.category === 'null' || !e.category) : e.category === category[0]).length
             }})
         </header>
+
+        <!-- categoryに1つ以上要素がある(フォルダが有る) -->
         <header v-else class="_acrylic" style="top:unset;" @click="toggleShown_fol">
             <i class="toggle ti-fw" :class="shown_fol? 'ti ti-chevron-down' : 'ti ti-chevron-up'"></i>
             {{ category[0] || i18n.ts.other }}
@@ -29,13 +32,16 @@ SPDX-License-Identifier: AGPL-3.0-only
             <template v-else>
                 ({{
                     emojis.filter(e => category === null ? (e.category === 'null' || !e.category) : e.category === category[0]).length
-                }}) 2
+                }})
             </template>
         </header>
+        <!-- フォルダが有るときのフォルダと絵文字表示する部分 -->
         <template v-for="(n, index) in category" v-if="shown_fol">
+
+            <!-- フォルダの部分 -->
             <header
                     v-if="emojis.filter(e => category === null ? (e.category === 'null' || !e.category) : e.category === category[0]).length !== 0 || index!==0"
-                    style="top:unset;padding-left: 18px;"
+                    style="padding-left: 18px;"
                     class="_acrylic"
                     @click="toggleShown(index)"
             >
@@ -45,21 +51,24 @@ SPDX-License-Identifier: AGPL-3.0-only
                     emojis.filter(e => category === null ? (e.category === 'null' || !e.category) : e.category === (index === 0 && category !== undefined ? category[0] : `${category[0]}/${n}`)).length
                 }})
             </header>
-                <div v-if="shown_fold[index]" class="body">
-                    <button
-                            v-for="emoji in emojis.filter(e => category === null ? (e.category === 'null' || !e.category) : e.category ===( index === 0 && category !== undefined ? category[0] : `${category[0]}/${n}`)).map(e => `:${e.name}:`)"
-                            :key="emoji"
-                            :data-emoji="emoji"
-                            class="_button item"
-                            @pointerenter="computeButtonTitle"
-                            @click="emit('chosen', emoji, $event)"
-                    >
-                        <MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
-                        <MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
-                    </button>
-                </div>
+
+            <!-- 絵文字の部分 -->
+            <div v-if="shown_fold[index]" class="body">
+                <button
+                        v-for="emoji in emojis.filter(e => category === null ? (e.category === 'null' || !e.category) : e.category ===( index === 0 && category !== undefined ? category[0] : `${category[0]}/${n}`)).map(e => `:${e.name}:`)"
+                        :key="emoji"
+                        :data-emoji="emoji"
+                        class="_button item"
+                        @pointerenter="computeButtonTitle"
+                        @click="emit('chosen', emoji, $event)"
+                >
+                    <MkCustomEmoji v-if="emoji[0] === ':'" class="emoji" :name="emoji" :normal="true"/>
+                    <MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
+                </button>
+            </div>
         </template>
 
+        <!-- categoryが1つしかないときのフォルダと絵文字表示する部分 -->
         <div v-if="shown && category" class="body">
             <button
                     v-for="emoji in emojis.filter(e => e.category === category[0]).map(e => `:${e.name}:`)"
@@ -73,6 +82,8 @@ SPDX-License-Identifier: AGPL-3.0-only
                 <MkEmoji v-else class="emoji" :emoji="emoji" :normal="true"/>
             </button>
         </div>
+
+        <!-- Unicodeのやつ -->
         <div v-else-if="shown && !category" class="body">
             <button
                     v-for="emoji in emojis"
@@ -107,7 +118,6 @@ const emit = defineEmits<{
 
 const toggleShown = (index) => {
     shown_fold.value[index] = !shown_fold.value[index];
-
 };
 
 const toggleShown_fol = () => {
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 33a7d003a6..4f035777f3 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -153,20 +153,35 @@ const tab = ref<'index' | 'custom' | 'unicode' | 'tags'>('index');
 let split_categories = [];
 customEmojiCategories.value.forEach(e => {
     if (e !== null){
-        split_categories.push(e.split('/'))
+        split_categories.push(e.split('/',2))
     }
 });
 
 const groupedData = {};
 split_categories.forEach((item) => {
-        if (!groupedData[item[0]]) {
-            groupedData[item[0]] = [];
-            groupedData[item[0]].push(item[0]);
-        }else{
-            groupedData[item[0]].push(item[1]);
+    if (!groupedData[item[0]]) {
+        groupedData[item[0]] = {};
+        groupedData[item[0]][item[0]] = true;
+        if (item.length > 1) {
+            for (let i = 1; i < item.length; i++) {
+                groupedData[item[0]][item[i]] = true;
+            }
         }
+    } else {
+        if (item.length > 1) {
+            for (let i = 1; i < item.length; i++) {
+                groupedData[item[0]][item[i]] = true;
+            }
+        }
+    }
 });
-console.log(groupedData)
+
+// 結果を配列に変換
+for (const key in groupedData) {
+    groupedData[key] = Object.keys(groupedData[key]);
+}
+
+console.log(split_categories,groupedData)
 
 watch(q, () => {
 	if (emojisEl.value) emojisEl.value.scrollTop = 0;