fix(Editor): solve callbacks not updating

DevoInc · Dec 4, 2023 · b721d05 · b721d05
1 parent a1f324e
commit b721d05
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/packages/code/src/components/Editor/hooks/editor/useEditor.ts b/packages/code/src/components/Editor/hooks/editor/useEditor.ts
@@ -87,7 +87,13 @@ export const useEditor: UseEditor = ({
       });
       onMount?.(editorRef.current, monaco);
     }
+    return () => {
+      editorRef.current?.dispose();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
+  React.useEffect(() => {
     ////////////////////////////////////////////
     // Call onChange callback on content change
     const { dispose: disposeOnModelChange } =
@@ -101,7 +107,12 @@ export const useEditor: UseEditor = ({
           );
         },
       );
+    return () => {
+      disposeOnModelChange();
+    };
+  }, [onChange]);
 
+  React.useEffect(() => {
     ////////////////////////////////////////////
     // Call onValidate callback on model markers change
     /**
@@ -132,12 +143,10 @@ export const useEditor: UseEditor = ({
       });
 
     return () => {
-      disposeOnModelChange();
       disposeOnMarkersChange();
-      editorRef.current?.dispose();
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [onValidate]);
 
   useUpdateEffect(() => {
     ////////////////////////////////////////////