diff --git a/app/src/emoji/index.ts b/app/src/emoji/index.ts index 12e377c9f..a31e81b8d 100644 --- a/app/src/emoji/index.ts +++ b/app/src/emoji/index.ts @@ -88,13 +88,13 @@ export const filterEmoji = (key = "", max?: number, assic = false) => { category.items.forEach(emoji => { if (key) { if (window.siyuan.config.editor.emoji.includes(emoji.unicode) && - (unicode2Emoji(emoji.unicode) === key || emoji.keywords.toLowerCase().indexOf(key.toLowerCase()) > -1 || emoji.description.toLowerCase().indexOf(key.toLowerCase()) > -1 || emoji.description_zh_cn.toLowerCase().indexOf(key.toLowerCase()) > -1)) { + (unicode2Emoji(emoji.unicode, true) === key || emoji.keywords.toLowerCase().indexOf(key.toLowerCase()) > -1 || emoji.description.toLowerCase().indexOf(key.toLowerCase()) > -1 || emoji.description_zh_cn.toLowerCase().indexOf(key.toLowerCase()) > -1)) { recentEmojis.push(emoji); } if (max && maxCount > max) { return; } - if (unicode2Emoji(emoji.unicode) === key || emoji.keywords.toLowerCase().indexOf(key.toLowerCase()) > -1 || emoji.description.toLowerCase().indexOf(key.toLowerCase()) > -1 || emoji.description_zh_cn.toLowerCase().indexOf(key.toLowerCase()) > -1) { + if (unicode2Emoji(emoji.unicode, true) === key || emoji.keywords.toLowerCase().indexOf(key.toLowerCase()) > -1 || emoji.description.toLowerCase().indexOf(key.toLowerCase()) > -1 || emoji.description_zh_cn.toLowerCase().indexOf(key.toLowerCase()) > -1) { if (category.id === "custom") { customStore.push(emoji); } else { @@ -141,8 +141,8 @@ ${unicode2Emoji(item.unicode, assic)}`; let recentHTML = ""; if (recentEmojis.length > 0) { recentHTML = `
${window.siyuan.languages.recentEmoji}
`; - window.siyuan.config.editor.emoji.forEach(key => { - const emoji = recentEmojis.filter((item) => item.unicode === key); + window.siyuan.config.editor.emoji.forEach(emojiUnicode => { + const emoji = recentEmojis.filter((item) => item.unicode === emojiUnicode); if (emoji[0]) { recentHTML += `