Fix input focusing on selection prop change (#319)

Expensify · Apr 18, 2024 · ad28b14 · ad28b14
1 parent cd42c45
commit ad28b14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/MarkdownTextInput.web.tsx b/src/MarkdownTextInput.web.tsx
@@ -437,9 +437,13 @@ const MarkdownTextInput = React.forwardRef<TextInput, MarkdownTextInputProps>(
         currentlyFocusedField.current = hostNode;
         setEventProps(e);
         if (divRef.current) {
-          const valueLength = value ? value.length : 0;
-          CursorUtils.setCursorPosition(divRef.current, contentSelection.current ? contentSelection.current.end : valueLength);
-          updateSelection(event);
+          if (contentSelection.current) {
+            CursorUtils.setCursorPosition(divRef.current, contentSelection.current.start, contentSelection.current.end);
+          } else {
+            const valueLength = value ? value.length : divRef.current.innerText.length;
+            CursorUtils.setCursorPosition(divRef.current, valueLength, null);
+          }
+          updateSelection(event, contentSelection.current);
         }
 
         if (onFocus) {

diff --git a/src/web/cursorUtils.ts b/src/web/cursorUtils.ts
@@ -28,6 +28,11 @@ function setPrevText(target: HTMLElement) {
 }
 
 function setCursorPosition(target: HTMLElement, start: number, end: number | null = null) {
+  // We don't want to move the cursor if the target is not focused
+  if (target !== document.activeElement) {
+    return;
+  }
+
   const range = document.createRange();
   range.selectNodeContents(target);