From fa3a0b57f92edd18e3b2285398ad3ff091a3a2f9 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Tue, 4 Nov 2025 13:44:18 -0800
Subject: [PATCH] Fix Editor.tsx wonkiness

---
 src-web/components/GrpcRequestPane.tsx             |  1 -
 src-web/components/HttpRequestPane.tsx             |  1 -
 src-web/components/WebsocketRequestPane.tsx        |  1 -
 src-web/components/core/Editor/Editor.tsx          | 12 ++----------
 src-web/components/core/Editor/filter/extension.ts |  1 -
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src-web/components/GrpcRequestPane.tsx b/src-web/components/GrpcRequestPane.tsx
index 9836115b..2b6eb466 100644
--- a/src-web/components/GrpcRequestPane.tsx
+++ b/src-web/components/GrpcRequestPane.tsx
@@ -265,7 +265,6 @@ export function GrpcRequestPane({
         </HStack>
       </div>
       <Tabs
-        key={forceUpdateKey}
         value={activeTab}
         label="Request"
         onChangeValue={setActiveTab}
diff --git a/src-web/components/HttpRequestPane.tsx b/src-web/components/HttpRequestPane.tsx
index 7221181b..fe33fe0c 100644
--- a/src-web/components/HttpRequestPane.tsx
+++ b/src-web/components/HttpRequestPane.tsx
@@ -354,7 +354,6 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
             isLoading={activeResponse != null && activeResponse.state !== 'closed'}
           />
           <Tabs
-            key={activeRequest.id} // Freshen tabs on request change
             value={activeTab}
             label="Request"
             onChangeValue={setActiveTab}
diff --git a/src-web/components/WebsocketRequestPane.tsx b/src-web/components/WebsocketRequestPane.tsx
index 63028265..ded69a1d 100644
--- a/src-web/components/WebsocketRequestPane.tsx
+++ b/src-web/components/WebsocketRequestPane.tsx
@@ -229,7 +229,6 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
             />
           </div>
           <Tabs
-            key={activeRequest.id} // Freshen tabs on request change
             value={activeTab}
             label="Request"
             onChangeValue={setActiveTab}
diff --git a/src-web/components/core/Editor/Editor.tsx b/src-web/components/core/Editor/Editor.tsx
index 6c3fcb66..b71018e1 100644
--- a/src-web/components/core/Editor/Editor.tsx
+++ b/src-web/components/core/Editor/Editor.tsx
@@ -376,7 +376,7 @@ export function Editor({
 
   // Initialize the editor when ref mounts
   const initEditorRef = useCallback(
-    function initializeCodemirror(container: HTMLDivElement | null) {
+    function initEditorRef(container: HTMLDivElement | null) {
       if (container === null) {
         cm.current?.view.destroy();
         cm.current = null;
@@ -455,17 +455,9 @@ export function Editor({
       }
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [],
+    [forceUpdateKey],
   );
 
-  // Update editor doc when force update key changes
-  useEffect(() => {
-    if (cm.current?.view != null) {
-      updateContents(cm.current.view, defaultValue || '');
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [forceUpdateKey]);
-
   // For read-only mode, update content when `defaultValue` changes
   useEffect(
     function updateReadOnlyEditor() {
diff --git a/src-web/components/core/Editor/filter/extension.ts b/src-web/components/core/Editor/filter/extension.ts
index 95a87b23..87477edd 100644
--- a/src-web/components/core/Editor/filter/extension.ts
+++ b/src-web/components/core/Editor/filter/extension.ts
@@ -112,7 +112,6 @@ function fieldValueCompletions(
 ): Completion[] | null {
   if (!def || !def.values) return null;
   const vals = Array.isArray(def.values) ? def.values : def.values();
-  // console.log("HELLO", v, v.match(IDENT));
   return vals.map((v) => ({
     label: v.match(IDENT_ONLY) ? v : `"${v}"`,
     displayLabel: v,