usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

カテゴリ末尾が / の場合ピッカーから消失するので「その他」と扱い対応

This commit is contained in:
meronmks 2023-10-28 18:00:28 +09:00
parent 0ae2d136e5
commit 2e05560358
No known key found for this signature in database
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/frontend/src/components/MkEmojiPicker.vue
View File

@ -160,21 +160,25 @@ function parseAndMergeCategories(input: string, root: CustomEmojiFolderTree): Cu
let category = "";
let currentNode: CustomEmojiFolderTree = root;
for (const part of parts) {
if (part) {
category += `/${part}`;
category = category.replace(/^\//, '');
let existingNode = currentNode.children.find((node) => node.value === part);
for (let part of parts) {
if (part) {
category += `/${part}`;
} else {
part = i18n.ts.other
category += `/`;
}
if (!existingNode) {
const newNode: CustomEmojiFolderTree = { value: part, category, children: [] };
currentNode.children.push(newNode);
existingNode = newNode;
}
category = category.replace(/^\//, '');
let existingNode = currentNode.children.find((node) => node.value === part);
currentNode = existingNode;
}
}
if (!existingNode) {
const newNode: CustomEmojiFolderTree = { value: part, category, children: [] };
currentNode.children.push(newNode);
existingNode = newNode;
}
currentNode = existingNode;
}
return currentNode;
}