fix: prevent bug when editor is destroyed very fast

ueberdosis · May 28, 2021 · 939fc3d · 939fc3d
1 parent 5858871
commit 939fc3d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
@@ -87,10 +87,13 @@ export class Editor extends EventEmitter {
     this.on('destroy', this.options.onDestroy)
 
     window.setTimeout(() => {
+      if (this.isDestroyed) {
+        return
+      }
+
       this.commands.focus(this.options.autofocus)
       this.emit('create', { editor: this })
     }, 0)
-
   }
 
   /**

diff --git a/packages/vue-2/src/EditorContent.ts b/packages/vue-2/src/EditorContent.ts
@@ -48,6 +48,10 @@ export const EditorContent: Component = {
   beforeDestroy(this: EditorContentInterface) {
     const { editor } = this
 
+    if (!editor) {
+      return
+    }
+
     if (!editor.isDestroyed) {
       editor.view.setProps({
         nodeViews: {},

diff --git a/packages/vue-3/src/EditorContent.ts b/packages/vue-3/src/EditorContent.ts
@@ -56,6 +56,10 @@ export const EditorContent = defineComponent({
     onBeforeUnmount(() => {
       const editor = props.editor
 
+      if (!editor) {
+        return
+      }
+
       // destroy nodeviews before vue removes dom element
       if (!editor.isDestroyed) {
         editor.view.setProps({