notebooks: fix cursor jumping and color in markdown blocks (#34227)

sourcegraph · Apr 26, 2022 · da6609f · da6609f
1 parent 59cc7f0
commit da6609f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/client/web/src/notebooks/blocks/markdown/NotebookMarkdownBlock.module.scss b/client/web/src/notebooks/blocks/markdown/NotebookMarkdownBlock.module.scss
@@ -13,6 +13,7 @@
 
         :global(.cm-content) {
             font-family: var(--code-font-family);
+            caret-color: var(--body-color);
         }
 
         :global(.cm-scroller) {

diff --git a/client/web/src/notebooks/blocks/markdown/NotebookMarkdownBlock.tsx b/client/web/src/notebooks/blocks/markdown/NotebookMarkdownBlock.tsx
@@ -80,11 +80,13 @@ const staticExtensions: Extension[] = [
 ]
 
 function focusInput(editor: EditorView): void {
-    editor.focus()
-    editor.dispatch({
-        selection: { anchor: editor.state.doc.length },
-        scrollIntoView: true,
-    })
+    if (!editor.hasFocus) {
+        editor.focus()
+        editor.dispatch({
+            selection: { anchor: editor.state.doc.length },
+            scrollIntoView: true,
+        })
+    }
 }
 
 interface NotebookMarkdownBlockProps extends BlockProps<MarkdownBlock>, ThemeProps {