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

Text Formatter: Fix unexpected appearance and emoji wrapping (#1911)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-06-27 22:02:42 +02:00
parent 8569c8a1fb
commit fc4c529e8e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/middle/composer/MessageInput.tsx
View File

@ -204,9 +204,14 @@ const MessageInput: FC<OwnProps & StateProps> = ({
openTextFormatter();
}
function processSelectionWithTimeout() {
// Small delay to allow browser properly recalculate selection
setTimeout(processSelection, 1);
}
function handleMouseDown(e: React.MouseEvent<HTMLDivElement, MouseEvent>) {
if (e.button !== 2) {
e.target.addEventListener('mouseup', processSelection, { once: true });
e.target.addEventListener('mouseup', processSelectionWithTimeout, { once: true });
return;
}
@ -261,7 +266,7 @@ const MessageInput: FC<OwnProps & StateProps> = ({
e.preventDefault();
editLastMessage();
} else {
e.target.addEventListener('keyup', processSelection, { once: true });
e.target.addEventListener('keyup', processSelectionWithTimeout, { once: true });
}
}
@ -383,7 +388,7 @@ const MessageInput: FC<OwnProps & StateProps> = ({
onKeyDown={handleKeyDown}
onMouseDown={handleMouseDown}
onContextMenu={IS_ANDROID ? stopEvent : undefined}
onTouchCancel={IS_ANDROID ? processSelection : undefined}
onTouchCancel={IS_ANDROID ? processSelectionWithTimeout : undefined}
aria-label={placeholder}
/>
<div ref={cloneRef} className={buildClassName(className, 'clone')} dir="auto" />

3
src/components/middle/composer/TextFormatter.tsx
View File

@ -133,8 +133,7 @@ const TextFormatter: FC<OwnProps> = ({
if (!selectedRange) {
return undefined;
}
fragmentEl.innerText = selectedRange.toString();
fragmentEl.replaceChildren(selectedRange.cloneContents());
return fragmentEl.innerHTML;
}, [selectedRange]);