Merge pull request #609 from FalkorDB/fix-editor

Fix #608 fix editor
FalkorDB · Jan 15, 2025 · 368b7d0 · 368b7d0
2 parents 99d06e2 + 64f2a32
commit 368b7d0
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/app/components/EditorComponent.tsx b/app/components/EditorComponent.tsx
@@ -78,7 +78,7 @@ const KEYWORDS = [
     "ORDER BY",
     "SKIP",
     "LIMIT",
-    "MARGE",
+    "MERGE",
     "DELETE",
     "SET",
     "WITH",
@@ -357,6 +357,8 @@ export default function EditorComponent({ currentQuery, historyQueries, setCurre
         if (!graph.Id || (!monacoInstance && !monacoI)) return
         const m = monacoI || monacoInstance
         const sug: Suggestions = getEmptySuggestions()
+
+        sugProvider?.dispose()
 
         await Promise.all([
             addLabelsSuggestions(sug.labels),
@@ -463,20 +465,16 @@ export default function EditorComponent({ currentQuery, historyQueries, setCurre
         run()
     }, [graph])
 
-
-    useEffect(() => {
-        getSuggestions()
-    }, [graph.Id])
-
     useEffect(() => {
         const interval = setInterval(() => {
             getSuggestions()
         }, 5000)
 
         return () => {
             clearInterval(interval)
+            sugProvider?.dispose()
         }
-    }, [])
+    }, [graph.Id])
 
     const handleEditorWillMount = (monacoI: Monaco) => {
         monacoI.languages.setMonarchTokensProvider('custom-language', {
@@ -557,7 +555,6 @@ export default function EditorComponent({ currentQuery, historyQueries, setCurre
             updatePlaceholderVisibility();
         });
 
-        // Initial check
         updatePlaceholderVisibility();
 
         setMonacoInstance(monacoI)
@@ -572,7 +569,7 @@ export default function EditorComponent({ currentQuery, historyQueries, setCurre
             setBlur(false)
         })
 
-        const isFirstLine = e.createContextKey('isFirstLine', false as boolean);
+        const isFirstLine = e.createContextKey<boolean>('isFirstLine', true);
 
         // Update the context key value based on the cursor position
         e.onDidChangeCursorPosition(() => {