From 5fbd3f67cdbdecc02b7c6d80060cfbea505bec31 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Wed, 1 Mar 2023 14:16:02 -0800
Subject: [PATCH] Some minor bugs

---
 src-tauri/src/main.rs                |  1 -
 src-web/App.tsx                      |  2 +-
 src-web/components/Editor/Editor.css |  5 ++--
 src-web/components/Editor/Editor.tsx | 39 +++++++++++-----------------
 4 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 94b5005a..8fa7821d 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -9,7 +9,6 @@ extern crate objc;
 
 use std::collections::HashMap;
 use std::fs::create_dir_all;
-use std::path::Path;
 
 use http::header::{HeaderName, USER_AGENT};
 use http::{HeaderMap, HeaderValue, Method};
diff --git a/src-web/App.tsx b/src-web/App.tsx
index 53468636..4bf6d0a9 100644
--- a/src-web/App.tsx
+++ b/src-web/App.tsx
@@ -69,7 +69,7 @@ function App() {
               <Editor
                 valueKey={request.id}
                 useTemplating
-                defaultValue={request.body ?? undefined}
+                defaultValue={request.body ?? ''}
                 contentType="application/json"
                 onChange={(body) => updateRequest.mutate({ body })}
               />
diff --git a/src-web/components/Editor/Editor.css b/src-web/components/Editor/Editor.css
index 2c48fedd..00dd6a95 100644
--- a/src-web/components/Editor/Editor.css
+++ b/src-web/components/Editor/Editor.css
@@ -119,9 +119,8 @@
     background-color: transparent;
 }
 
-.cm-editor.cm-focused .cm-activeLineGutter,
-.cm-editor.cm-focused .cm-activeLine {
-    background-color: hsl(var(--color-gray-100)/0.3);
+.cm-editor.cm-focused .cm-activeLineGutter {
+    color: hsl(var(--color-gray-800));
 }
 
 .cm-editor * {
diff --git a/src-web/components/Editor/Editor.tsx b/src-web/components/Editor/Editor.tsx
index f69e4086..9cdc88c2 100644
--- a/src-web/components/Editor/Editor.tsx
+++ b/src-web/components/Editor/Editor.tsx
@@ -57,15 +57,17 @@ export default function Editor({
       console.log('Failed to initialize Codemirror', e);
     }
     return () => view?.destroy();
-  }, [ref.current]);
+  }, [ref.current, valueKey]);
 
   // Update value when valueKey changes
-  useEffect(() => {
-    if (cm === null) return;
-    cm.view.dispatch({
-      changes: { from: 0, to: cm.view.state.doc.length, insert: `${defaultValue ?? ''}` },
-    });
-  }, [valueKey]);
+  // TODO: This would be more efficient but the onChange handler gets fired on update
+  // useEffect(() => {
+  //   if (cm === null) return;
+  //   console.log('NEW DOC', valueKey, defaultValue);
+  //   cm.view.dispatch({
+  //     changes: { from: 0, to: cm.view.state.doc.length, insert: `${defaultValue ?? ''}` },
+  //   });
+  // }, [valueKey]);
 
   // Update language extension when contentType changes
   useEffect(() => {
@@ -111,31 +113,20 @@ function getExtensions({
           ),
           EditorState.transactionFilter.of(
             (tr: Transaction): TransactionSpec | TransactionSpec[] => {
-              if (!tr.isUserEvent('input.paste')) {
-                return tr;
-              }
+              if (!tr.isUserEvent('input.paste')) return tr;
 
-              // let addedNewline = false;
               const trs: TransactionSpec[] = [];
               tr.changes.iterChanges((fromA, toA, fromB, toB, inserted) => {
                 let insert = '';
                 for (const line of inserted) {
                   insert += line.replace('\n', '');
                 }
-                trs.push({
-                  ...tr,
-                  selection: undefined,
-                  changes: [{ from: fromB, to: toA, insert }],
-                });
-              });
-
-              // selection: EditorSelection.create([EditorSelection.cursor(8)], 1),
-              // console.log('TRS', trs, tr);
-              trs.push({
-                selection: EditorSelection.create([EditorSelection.cursor(8)], 1),
+                const changes = [{ from: fromB, to: toA, insert }];
+                // Update selection now that the text has been changed
+                const selection = EditorSelection.create([EditorSelection.cursor(toB - 1)], 0);
+                trs.push({ ...tr, selection, changes });
               });
               return trs;
-              // return addedNewline ? [] : tr;
             },
           ),
         ]
@@ -144,7 +135,7 @@ function getExtensions({
     ...(!singleLine ? [multiLineExtensions] : []),
     ...(ext ? [ext] : []),
     EditorView.updateListener.of((update) => {
-      if (typeof onChange === 'function') {
+      if (typeof onChange === 'function' && update.docChanged) {
         onChange(update.state.doc.toString());
       }
     }),