fix: fix usage with react strict mode

immediately unregister file
CodinGame · Jun 11, 2024 · 01a6732 · 01a6732
1 parent 85d6e70
commit 01a6732
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/src/MonacoEditor.tsx b/src/MonacoEditor.tsx
@@ -202,16 +202,15 @@ function MonacoEditor ({
       editorRef.current!.setModel(null)
       return
     }
-    let cancelled = false
-    async function updateModel () {
+    const disposableStore = new DisposableStore()
+    async function updateModel (): Promise<void> {
       modelRef.current = undefined
       editorRef.current!.setModel(null)
       setModelReady(false)
 
       const value = valueRef.current
       let modelIRef: IReference<ITextFileEditorModel> | undefined
       let model: monaco.editor.ITextModel
-      const disposableStore = new DisposableStore()
       if (fileUri != null) {
         const uri = monaco.Uri.parse(fileUri)
 
@@ -224,9 +223,8 @@ function MonacoEditor ({
           }
         })
         modelIRef = (await modelIRefPromise)!
-        if (cancelled) {
-          modelIRef.dispose()
-          return () => {}
+        if (disposableStore.isDisposed) {
+          return
         }
         disposableStore.add(modelIRef.object.onDidSave(lastOnDidSave))
         model = modelIRef.object.textEditorModel!
@@ -243,17 +241,17 @@ function MonacoEditor ({
       if (editorRef.current != null) {
         lastRestoreViewState(editorRef.current, model)
       }
-      return () => {
-        if (editorRef.current != null) {
-          lastSaveViewState(editorRef.current, model)
+      disposableStore.add({
+        dispose () {
+          if (editorRef.current != null) {
+            lastSaveViewState(editorRef.current, model)
+          }
         }
-        disposableStore.dispose()
-      }
+      })
     }
-    const disposePromise = updateModel()
+    updateModel().catch(console.error)
     return () => {
-      cancelled = true
-      disposePromise.then(dispose => dispose(), console.error)
+      disposableStore.dispose()
     }
   }, [monacoLanguage, fileUri, valueRef, lastSaveViewState, lastRestoreViewState, hasValue, lastOnDidSave])