ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Composer: Fix extra div> text in message input (#2429)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-01-30 15:55:48 +01:00
parent d1824caa8a
commit 4c6a9216f6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/middle/composer/hooks/useMentionTooltip.ts
View File

@ -122,11 +122,12 @@ export default function useMentionTooltip(
>${getUserFirstOrLastName(user)}</a>`; >${getUserFirstOrLastName(user)}</a>`;
const containerEl = document.querySelector<HTMLDivElement>(inputSelector)!; const containerEl = document.querySelector<HTMLDivElement>(inputSelector)!;
const fixedHtmlBeforeSelection = cleanWebkitNewLines(htmlBeforeSelection);
const atIndex = htmlBeforeSelection.lastIndexOf('@'); const atIndex = fixedHtmlBeforeSelection.lastIndexOf('@');
if (atIndex !== -1) { if (atIndex !== -1) {
const newHtml = `${htmlBeforeSelection.substr(0, atIndex)}${insertedHtml}&nbsp;`; const newHtml = `${fixedHtmlBeforeSelection.substr(0, atIndex)}${insertedHtml}&nbsp;`;
const htmlAfterSelection = containerEl.innerHTML.substring(htmlBeforeSelection.length); const htmlAfterSelection = cleanWebkitNewLines(containerEl.innerHTML).substring(fixedHtmlBeforeSelection.length);
onUpdateHtml(`${newHtml}${htmlAfterSelection}`); onUpdateHtml(`${newHtml}${htmlAfterSelection}`);
requestAnimationFrame(() => { requestAnimationFrame(() => {
@ -151,6 +152,12 @@ function getUsernameFilter(html: string) {
return username ? username[0].trim() : undefined; return username ? username[0].trim() : undefined;
} }
// Webkit replaces the line break with the `<div><br /></div>` or `<div></div>` code.
// It is necessary to clean the html to a single form before processing.
function cleanWebkitNewLines(html: string) {
return html.replace(/<div>(<br>|<br\s?\/>)?<\/div>/gi, '<br>');
}
function canSuggestInlineBots(html: string) { function canSuggestInlineBots(html: string) {
return html.startsWith('@'); return html.startsWith('@');
} }