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

Composer: Fix jumping cursor when entering emoji (#1527)

Browse Source
This commit is contained in:
Alexander Zinchuk 2021-11-05 21:56:43 +03:00
parent 6028e0b4ce
commit 539e9885ed
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ import focusEditableElement from '../../../util/focusEditableElement';
import buildClassName from '../../../util/buildClassName'; import buildClassName from '../../../util/buildClassName';
import { pick } from '../../../util/iteratees'; import { pick } from '../../../util/iteratees';
import { import {
IS_ANDROID, IS_IOS, IS_SINGLE_COLUMN_LAYOUT, IS_TOUCH_ENV, IS_ANDROID, IS_EMOJI_SUPPORTED, IS_IOS, IS_SINGLE_COLUMN_LAYOUT, IS_TOUCH_ENV,
} from '../../../util/environment'; } from '../../../util/environment';
import captureKeyboardListeners from '../../../util/captureKeyboardListeners'; import captureKeyboardListeners from '../../../util/captureKeyboardListeners';
import useLayoutEffectWithPrevDeps from '../../../hooks/useLayoutEffectWithPrevDeps'; import useLayoutEffectWithPrevDeps from '../../../hooks/useLayoutEffectWithPrevDeps';
@ -279,7 +279,12 @@ const MessageInput: FC<OwnProps & StateProps & DispatchProps> = ({
onUpdate(innerHTML === SAFARI_BR ? '' : innerHTML); onUpdate(innerHTML === SAFARI_BR ? '' : innerHTML);
// Reset focus on the input to remove any active styling when input is cleared // Reset focus on the input to remove any active styling when input is cleared
if (!IS_TOUCH_ENV && (!textContent || !textContent.length)) { if (
!IS_TOUCH_ENV
&& (!textContent || !textContent.length)
// When emojis are not supported, innerHTML contains an emoji img tag that doesn't exist in the textContext
&& !(!IS_EMOJI_SUPPORTED && innerHTML.includes('emoji-small'))
) {
const selection = window.getSelection()!; const selection = window.getSelection()!;
if (selection) { if (selection) {
inputRef.current!.blur(); inputRef.current!.blur();