fix: site editor hmr bug

prevwong · Jun 17, 2024 · fc097f4 · fc097f4
1 parent c82817e
commit fc097f4
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/site/pages/index.tsx b/site/pages/index.tsx
@@ -2,6 +2,7 @@ import { Parser } from '@rekajs/parser';
 import { RekaProvider } from '@rekajs/react';
 import { useRouter } from 'next/router';
 import * as React from 'react';
+import { flushSync } from 'react-dom';
 
 import { HeaderToolbar } from '@app/components/header/HeaderToolbar';
 import { SEO } from '@app/components/seo';
@@ -25,6 +26,17 @@ const AppEditor = () => {
   const routerRef = React.useRef(router);
   routerRef.current = router;
 
+  const disposeEditor = React.useCallback(
+    (editor: Editor) => {
+      flushSync(() => {
+        setEditor(null);
+      });
+
+      editor.dispose();
+    },
+    [setEditor]
+  );
+
   React.useEffect(() => {
     if (!router.isReady) {
       return;
@@ -37,10 +49,9 @@ const AppEditor = () => {
     setEditor(editor);
 
     return () => {
-      setEditor(null);
-      editor.dispose();
+      disposeEditor(editor);
     };
-  }, [setEditor, router.isReady]);
+  }, [setEditor, disposeEditor, router.isReady]);
 
   React.useEffect(() => {
     if (!editor) {