Change what getCurrentCursorPosition returns when selection is not found

Expensify · Mar 5, 2024 · 4504afb · 4504afb
1 parent 226da3f
commit 4504afb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/MarkdownTextInput.web.tsx b/src/MarkdownTextInput.web.tsx
@@ -312,7 +312,7 @@ const MarkdownTextInput = React.forwardRef<TextInput, MarkdownTextInputProps>(
       }
       const currentSelection = CursorUtils.getCurrentCursorPosition(divRef.current);
 
-      if (contentSelection.current.start !== currentSelection.start || contentSelection.current.end !== currentSelection.end) {
+      if (currentSelection && (contentSelection.current.start !== currentSelection.start || contentSelection.current.end !== currentSelection.end)) {
         if (contentSelection.current.start >= 0 && contentSelection.current.end >= 0) {
           updateRefSelectionVariables(contentSelection.current.start, contentSelection.current.end);
           contentSelection.current = currentSelection;

diff --git a/src/web/cursorUtils.ts b/src/web/cursorUtils.ts
@@ -75,7 +75,7 @@ function getCurrentCursorPosition(target: HTMLElement) {
     const end = start + range.toString().length;
     return {start, end};
   }
-  return {start: -1, end: -1};
+  return null;
 }
 
 function removeSelection() {

diff --git a/src/web/parserUtils.ts b/src/web/parserUtils.ts
@@ -166,7 +166,8 @@ function parseText(target: HTMLElement, text: string, curosrPositionIndex: numbe
   let cursorPosition: number | null = curosrPositionIndex;
   const isFocused = document.activeElement === target;
   if (isFocused && curosrPositionIndex === null) {
-    cursorPosition = CursorUtils.getCurrentCursorPosition(target).start;
+    const selection = CursorUtils.getCurrentCursorPosition(target);
+    cursorPosition = selection ? selection.end : null;
   }
   const ranges = global.parseExpensiMarkToRanges(text);
 
@@ -182,7 +183,7 @@ function parseText(target: HTMLElement, text: string, curosrPositionIndex: numbe
   }
 
   if (isFocused) {
-    if (alwaysMoveCursorToTheEnd || (cursorPosition !== null && cursorPosition < 0)) {
+    if (alwaysMoveCursorToTheEnd || cursorPosition === null) {
       CursorUtils.moveCursorToEnd(target);
     } else if (cursorPosition !== null) {
       CursorUtils.setCursorPosition(target, cursorPosition);