Add selection removing on blur

Expensify · Mar 1, 2024 · b625b61 · b625b61
1 parent 0ee944c
commit b625b61
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/src/MarkdownTextInput.web.tsx b/src/MarkdownTextInput.web.tsx
@@ -422,6 +422,7 @@ const MarkdownTextInput = React.forwardRef<TextInput, MarkdownTextInputProps>(
     const handleBlur: FocusEventHandler<HTMLDivElement> = useCallback(
       (event) => {
         const e = event as unknown as NativeSyntheticEvent<TextInputFocusEventData>;
+        CursorUtils.removeSelection();
         currentlyFocusedField.current = null;
         if (onBlur) {
           setEventProps(e);

diff --git a/src/web/cursorUtils.ts b/src/web/cursorUtils.ts
@@ -1,20 +1,22 @@
+function findTextNodes(textNodes: Text[], node: ChildNode) {
+  if (node.nodeType === 3) {
+    textNodes.push(node as Text);
+  } else {
+    for (let i = 0, len = node.childNodes.length; i < len; ++i) {
+      const childNode = node.childNodes[i];
+      if (childNode) {
+        findTextNodes(textNodes, childNode);
+      }
+    }
+  }
+}
+
 function setCursorPosition(target: HTMLElement, start: number, end: number | null = null) {
   const range = document.createRange();
   range.selectNodeContents(target);
 
   const textNodes: Text[] = [];
-  (function findTextNodes(node: ChildNode) {
-    if (node.nodeType === 3) {
-      textNodes.push(node as Text);
-    } else {
-      for (let i = 0, len = node.childNodes.length; i < len; ++i) {
-        const childNode = node.childNodes[i];
-        if (childNode) {
-          findTextNodes(childNode);
-        }
-      }
-    }
-  })(target);
+  findTextNodes(textNodes, target);
 
   let charCount = 0;
   let startNode: Text | null = null;
@@ -80,4 +82,11 @@ function getCurrentCursorPosition(target: HTMLElement) {
   return {start: -1, end: -1};
 }
 
-export {getCurrentCursorPosition, moveCursorToEnd, setCursorPosition};
+function removeSelection() {
+  const sel = window.getSelection();
+  if (sel) {
+    sel.removeAllRanges();
+  }
+}
+
+export {getCurrentCursorPosition, moveCursorToEnd, setCursorPosition, removeSelection};