diff --git a/app/src/emoji/index.ts b/app/src/emoji/index.ts index 7328538da..12e377c9f 100644 --- a/app/src/emoji/index.ts +++ b/app/src/emoji/index.ts @@ -38,7 +38,7 @@ export const unicode2Emoji = (unicode: string, assic = false) => { return emoji; }; -export const lazyLoadEmoji = (element: HTMLElement) => { +export const lazyLoadEmoji = (element: HTMLElement, assic = false) => { const emojiIntersectionObserver = new IntersectionObserver((entries) => { entries.forEach((entrie: IntersectionObserverEntry & { target: HTMLImageElement }) => { const index = entrie.target.getAttribute("data-index"); @@ -46,7 +46,7 @@ export const lazyLoadEmoji = (element: HTMLElement) => { let html = ""; window.siyuan.emojis[parseInt(index)].items.forEach(emoji => { html += ``; +${unicode2Emoji(emoji.unicode, assic)}`; }); entrie.target.innerHTML = html; entrie.target.removeAttribute("data-index"); @@ -58,7 +58,7 @@ ${unicode2Emoji(emoji.unicode)}`; }); }; -export const filterEmoji = (key = "", max?: number) => { +export const filterEmoji = (key = "", max?: number, assic = false) => { let html = ""; const recentEmojis: { unicode: string, @@ -99,7 +99,7 @@ export const filterEmoji = (key = "", max?: number) => { customStore.push(emoji); } else { keyHTML += ``; +${unicode2Emoji(emoji.unicode, assic)}`; } maxCount++; } @@ -109,7 +109,7 @@ ${unicode2Emoji(emoji.unicode)}`; } if (index < 2) { html += ``; +${unicode2Emoji(emoji.unicode, assic)}`; } } }); @@ -134,7 +134,7 @@ ${unicode2Emoji(emoji.unicode)}`; return 0; }).forEach(item => { html += ``; +${unicode2Emoji(item.unicode, assic)}`; }); html = html + keyHTML + ""; } @@ -145,7 +145,7 @@ ${unicode2Emoji(item.unicode)}`; const emoji = recentEmojis.filter((item) => item.unicode === key); if (emoji[0]) { recentHTML += ``; } }); diff --git a/app/src/protyle/hint/index.ts b/app/src/protyle/hint/index.ts index c2caf6724..562bf4217 100644 --- a/app/src/protyle/hint/index.ts +++ b/app/src/protyle/hint/index.ts @@ -76,7 +76,7 @@ export class Hint { let html = ""; window.siyuan.emojis[parseInt(index)].items.forEach(emoji => { html += ``; +${unicode2Emoji(emoji.unicode, true)}`; }); titleElement.nextElementSibling.innerHTML = html; titleElement.nextElementSibling.removeAttribute("data-index"); @@ -322,7 +322,7 @@ ${unicode2Emoji(emoji.unicode)}`; } const panelElement = this.element.querySelector(".emojis__panel"); if (panelElement) { - panelElement.innerHTML = filterEmoji(value, 256); + panelElement.innerHTML = filterEmoji(value, 256, true); if (value) { panelElement.nextElementSibling.classList.add("fn__none"); } else { @@ -330,21 +330,21 @@ ${unicode2Emoji(emoji.unicode)}`; } } else { this.element.innerHTML = `