fix: cursor positioning

Expensify · Oct 28, 2024 · 6379bb5 · 6379bb5
1 parent e54929e
commit 6379bb5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/web/utils/blockUtils.ts b/src/web/utils/blockUtils.ts
@@ -128,4 +128,12 @@ function extendBlockStructure(
   return targetNode;
 }
 
-export {addStyleToBlock, extendBlockStructure, isBlockMarkdownType, getFirstBlockMarkdownRange};
+function getTopParentTreeNode(node: TreeNode) {
+  let currentParentNode = node.parentNode;
+  while (currentParentNode && ['text', 'br', 'line', 'syntax'].includes(currentParentNode.parentNode?.type || '')) {
+    currentParentNode = currentParentNode?.parentNode || null;
+  }
+  return currentParentNode;
+}
+
+export {addStyleToBlock, extendBlockStructure, isBlockMarkdownType, getFirstBlockMarkdownRange, getTopParentTreeNode};
diff --git a/src/web/utils/cursorUtils.ts b/src/web/utils/cursorUtils.ts
@@ -1,4 +1,5 @@
 import type {MarkdownTextInputElement} from '../../MarkdownTextInput.web';
+import {getTopParentTreeNode} from './blockUtils';
 import {findHTMLElementInTree, getTreeNodeByIndex} from './treeUtils';
 import type {TreeNode} from './treeUtils';
 
@@ -17,8 +18,15 @@ function setCursorPosition(target: MarkdownTextInputElement, startIndex: number,
   const range = document.createRange();
   range.selectNodeContents(target);
 
-  const startTreeNode = getTreeNodeByIndex(target.tree, start);
-  const endTreeNode = end && startTreeNode && (end < startTreeNode.start || end >= startTreeNode.start + startTreeNode.length) ? getTreeNodeByIndex(target.tree, end) : startTreeNode;
+  let startTreeNode = getTreeNodeByIndex(target.tree, start);
+  let endTreeNode = end && startTreeNode && (end < startTreeNode.start || end >= startTreeNode.start + startTreeNode.length) ? getTreeNodeByIndex(target.tree, end) : startTreeNode;
+
+  const parentLine = startTreeNode?.type === 'br' && getTopParentTreeNode(startTreeNode);
+  if (parentLine && parentLine?.childNodes?.some((e) => e.type === 'pre')) {
+    startTreeNode = getTreeNodeByIndex(target.tree, start - 1);
+    endTreeNode = startTreeNode;
+  }
+
   if (!startTreeNode || !endTreeNode) {
     console.error('Invalid start or end tree node');
     return;