fix
This commit is contained in:
mattyatea
parent
6cc503dfc9
commit
781cd5dd6d
|
|
@ -6,14 +6,13 @@ 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] }}
|
||||
|
|
@ -21,8 +20,6 @@ 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 }}
|
||||
|
|
@ -32,16 +29,13 @@ 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="padding-left: 18px;"
|
||||
style="top:unset;padding-left: 18px;"
|
||||
class="_acrylic"
|
||||
@click="toggleShown(index)"
|
||||
>
|
||||
|
|
@ -51,8 +45,6 @@ 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}:`)"
|
||||
|
|
@ -68,7 +60,6 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
</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}:`)"
|
||||
|
|
@ -82,8 +73,6 @@ 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"
|
||||
|
|
@ -118,6 +107,7 @@ const emit = defineEmits<{
|
|||
|
||||
const toggleShown = (index) => {
|
||||
shown_fold.value[index] = !shown_fold.value[index];
|
||||
|
||||
};
|
||||
|
||||
const toggleShown_fol = () => {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
-->
|
||||
|
||||
<template>
|
||||
<div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer, asWindow }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
|
||||
<div class="omfetrab" :class="['s' + size, 'w' + width, 'h' + height, { asDrawer, asWindow }]" :style="{ maxHeight: maxHeight ? maxHeight + 'px' : undefined }">
|
||||
<input ref="searchEl" :value="q" class="search" data-prevent-emoji-insert :class="{ filled: q != null && q != '' }" :placeholder="i18n.ts.search" type="search" @input="input()" @paste.stop="paste" @keydown.stop.prevent.enter="onEnter">
|
||||
<!-- FirefoxのTabフォーカスが想定外の挙動となるためtabindex="-1"を追加 https://github.com/misskey-dev/misskey/issues/10744 -->
|
||||
<div ref="emojisEl" class="emojis" tabindex="-1">
|
||||
|
|
@ -72,15 +72,15 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
</div>
|
||||
<div v-once class="group">
|
||||
<header class="_acrylic">{{ i18n.ts.customEmojis }}</header>
|
||||
|
||||
<XSection
|
||||
v-for="category in groupedData"
|
||||
:key="`custom:${category}`"
|
||||
:initialShown="false"
|
||||
:emojis="computed(() => customEmojis.filter(emoji => !emoji.draft).filter(e => category === null ? (e.category === 'null' || !e.category) : e.category === category).filter(filterAvailable).map(e => `:${e.name}:`))"
|
||||
:emojis="computed(() => customEmojis.filter(filterAvailable))"
|
||||
:category="category"
|
||||
@chosen="chosen"
|
||||
>
|
||||
{{ category || i18n.ts.other }}
|
||||
</XSection>
|
||||
/>
|
||||
</div>
|
||||
<div v-once class="group">
|
||||
<header class="_acrylic">{{ i18n.ts.emoji }}</header>
|
||||
|
|
@ -100,7 +100,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
<button class="_button tab" :class="{ active: tab === 'unicode' }" @click="tab = 'unicode'"><i class="ti ti-leaf ti-fw"></i></button>
|
||||
<button class="_button tab" :class="{ active: tab === 'tags' }" @click="tab = 'tags'"><i class="ti ti-hash ti-fw"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
|
|
@ -153,35 +153,20 @@ const tab = ref<'index' | 'custom' | 'unicode' | 'tags'>('index');
|
|||
let split_categories = [];
|
||||
customEmojiCategories.value.forEach(e => {
|
||||
if (e !== null){
|
||||
split_categories.push(e.split('/',2))
|
||||
split_categories.push(e.split('/'))
|
||||
}
|
||||
});
|
||||
|
||||
const groupedData = {};
|
||||
split_categories.forEach((item) => {
|
||||
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;
|
||||
}
|
||||
}
|
||||
groupedData[item[0]] = [];
|
||||
groupedData[item[0]].push(item[0]);
|
||||
}else{
|
||||
groupedData[item[0]].push(item[1]);
|
||||
}
|
||||
});
|
||||
|
||||
// 結果を配列に変換
|
||||
for (const key in groupedData) {
|
||||
groupedData[key] = Object.keys(groupedData[key]);
|
||||
}
|
||||
|
||||
console.log(split_categories,groupedData)
|
||||
console.log(groupedData)
|
||||
|
||||
watch(q, () => {
|
||||
if (emojisEl.value) emojisEl.value.scrollTop = 0;
|
||||
|
|
@ -196,7 +181,7 @@ watch(q, () => {
|
|||
|
||||
const searchCustom = () => {
|
||||
const max = 100;
|
||||
const emojis = customEmojis.value.filter(emoji => !emoji.draft);
|
||||
const emojis = customEmojis.value;
|
||||
const matches = new Set<Misskey.entities.CustomEmoji>();
|
||||
|
||||
const exactMatch = emojis.find(emoji => emoji.name === newQ);
|
||||
|
|
@ -596,8 +581,8 @@ defineExpose({
|
|||
|
||||
> header {
|
||||
/*position: sticky;
|
||||
top: 0;
|
||||
left: 0;*/
|
||||
top: 0;
|
||||
left: 0;*/
|
||||
height: 32px;
|
||||
line-height: 32px;
|
||||
z-index: 2;
|
||||
|
|
|
|||
Loading…
Reference in New Issue