From c6d1b8a9c4d40ac93d29e208767e9adfed1e8716 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Sat, 19 Jun 2021 16:31:24 +0300 Subject: [PATCH] Emoji Tooltip: Fix for Firefox (#1189) --- src/components/middle/composer/hooks/useEmojiTooltip.ts | 2 +- src/components/middle/composer/hooks/useMentionTooltip.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/middle/composer/hooks/useEmojiTooltip.ts b/src/components/middle/composer/hooks/useEmojiTooltip.ts index 98e9fb1ea..63fd9f885 100644 --- a/src/components/middle/composer/hooks/useEmojiTooltip.ts +++ b/src/components/middle/composer/hooks/useEmojiTooltip.ts @@ -168,7 +168,7 @@ export default function useEmojiTooltip( function getEmojiCode(html: string) { const tempEl = document.createElement('div'); tempEl.innerHTML = html.replace('
', '\n'); - const text = tempEl.innerText; + const text = tempEl.innerText.replace(/\n$/i, ''); const lastSymbol = text[text.length - 1]; const lastWord = text.split(RE_NOT_EMOJI_SEARCH).pop(); diff --git a/src/components/middle/composer/hooks/useMentionTooltip.ts b/src/components/middle/composer/hooks/useMentionTooltip.ts index d6d11adb3..cd3c8e326 100644 --- a/src/components/middle/composer/hooks/useMentionTooltip.ts +++ b/src/components/middle/composer/hooks/useMentionTooltip.ts @@ -102,7 +102,7 @@ export default function useMentionTooltip( function getUsernameFilter(html: string) { const tempEl = document.createElement('div'); tempEl.innerHTML = html; - const text = tempEl.innerText; + const text = tempEl.innerText.replace(/\n$/i, ''); const lastSymbol = text[text.length - 1]; const lastWord = text.split(RE_NOT_USERNAME_SEARCH).pop();