From 161746519c4c2bc82d08b9bb24c12e6b90ce6078 Mon Sep 17 00:00:00 2001
From: dan <dan.abramov@gmail.com>
Date: Tue, 5 Sep 2023 08:21:10 +0100
Subject: Fix caret jumps for web composer (#1374)

* Fix caret jumps for web composer

* Autofocus at the end on mount
---
 src/view/com/composer/text-input/TextInput.web.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/view/com/composer/text-input/TextInput.web.tsx')

diff --git a/src/view/com/composer/text-input/TextInput.web.tsx b/src/view/com/composer/text-input/TextInput.web.tsx
index 395263af8..77f634930 100644
--- a/src/view/com/composer/text-input/TextInput.web.tsx
+++ b/src/view/com/composer/text-input/TextInput.web.tsx
@@ -111,10 +111,7 @@ export const TextInput = React.forwardRef(
           },
         },
         content: textToEditorJson(richtext.text.toString()),
-        onFocus: ({editor: e}) => {
-          e.chain().focus().setTextSelection(richtext.text.length).run() // focus to the end of the text
-        },
-        autofocus: true,
+        autofocus: 'end',
         editable: true,
         injectCSS: true,
         onUpdate({editor: editorProp}) {
@@ -146,7 +143,7 @@ export const TextInput = React.forwardRef(
 
     const onEmojiInserted = React.useCallback(
       (emoji: Emoji) => {
-        editor?.chain().focus('end').insertContent(emoji.native).run()
+        editor?.chain().focus().insertContent(emoji.native).run()
       },
       [editor],
     )
-- 
cgit 1.4.1

