From 868bb7a5d5f6ab8cbd2bdf86af45971f3d6f3856 Mon Sep 17 00:00:00 2001 From: Kristina Date: Tue, 27 May 2025 06:53:06 +0400 Subject: [PATCH] Fix everyone/here mentions (#9109) --- .../src/components/markup/ObjectNode.svelte | 10 ++++++-- .../src/components/extension/reference.ts | 25 +++++++++++++------ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/packages/presentation/src/components/markup/ObjectNode.svelte b/packages/presentation/src/components/markup/ObjectNode.svelte index a5cc70af18..44976987cc 100644 --- a/packages/presentation/src/components/markup/ObjectNode.svelte +++ b/packages/presentation/src/components/markup/ObjectNode.svelte @@ -14,7 +14,7 @@ --> {#if !doc && title} + + - {#if icon}{' '}{:else}@{/if}{title} + {#if icon}{' '}{:else}@{/if}{#if _id === contact.mention.Here}{:else if _id === contact.mention.Everyone}{:else}{title}{/if} {:else if doc} { + const renderLabel = async (props: ReferenceNodeProps): Promise => { root.setAttribute('data-label', props.label) - titleSpan.innerText = `${iconUrl !== '' ? '' : options.suggestion.char}${props.label ?? props.id}` + + if (props.id === contact.mention.Here) { + const trans = await translate(contact.string.Here, {}) + titleSpan.innerText = `${iconUrl !== '' ? '' : options.suggestion.char}${trans}` + root.classList.add('lower') + } else if (props.id === contact.mention.Everyone) { + const trans = await translate(contact.string.Everyone, {}) + titleSpan.innerText = `${iconUrl !== '' ? '' : options.suggestion.char}${trans}` + root.classList.add('lower') + } else { + titleSpan.innerText = `${iconUrl !== '' ? '' : options.suggestion.char}${props.label ?? props.id}` + } if (broken) { root.classList.add('broken') } else { @@ -166,14 +177,14 @@ export const ReferenceExtension = ReferenceNode.extend { const obj = result[0] broken = obj === undefined if (broken) { - renderLabel({ id, objectclass, label: node.attrs.label }) + void renderLabel({ id, objectclass, label: node.attrs.label }) resetTooltipHandle(undefined) } else { const label = await getReferenceLabel(objectclass, id, obj) @@ -184,7 +195,7 @@ export const ReferenceExtension = ReferenceNode.extend