fix: Make sure editor is available on first render (ueberdosis#2282), f…

…ix ueberdosis#2040, fix ueberdosis#2182
trybaseplate · Dec 16, 2021 · 42d61f7 · 42d61f7
1 parent 15f29bf
commit 42d61f7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/useEditor.ts b/src/useEditor.ts
@@ -9,13 +9,18 @@ function useForceUpdate() {
 }
 
 export const useEditor = (options: Partial<EditorOptions> = {}, deps: DependencyList = []) => {
-  const [editor, setEditor] = useState<Editor | null>(null)
+  const [editor, setEditor] = useState<Editor>(() => new Editor(options))
   const forceUpdate = useForceUpdate()
 
   useEffect(() => {
-    const instance = new Editor(options)
+    let instance: Editor
 
-    setEditor(instance)
+    if (editor.isDestroyed) {
+      instance = new Editor(options)
+      setEditor(instance)
+    } else {
+      instance = editor
+    }
 
     instance.on('transaction', () => {
       requestAnimationFrame(() => {