Check if docView is null in change and composition handling

FIX: Fix a crash when a view was being destroyed during input reading. Closes ProseMirror/prosemirror#1235
ProseMirror · Jan 17, 2022 · 8f246f3 · 8f246f3
1 parent b1f19a4
commit 8f246f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/domobserver.js b/src/domobserver.js
@@ -174,7 +174,7 @@ export class DOMObserver {
         checkCSS(this.view)
       }
       this.handleDOMChange(from, to, typeOver, added)
-      if (this.view.docView.dirty) this.view.updateState(this.view.state)
+      if (this.view.docView && this.view.docView.dirty) this.view.updateState(this.view.state)
       else if (!this.currentSelection.eq(sel)) selectionToDOM(this.view)
       this.currentSelection.set(sel)
     }

diff --git a/src/input.js b/src/input.js
@@ -485,7 +485,7 @@ export function endComposition(view, forceUpdate) {
   if (browser.android && view.domObserver.flushingSoon >= 0) return
   view.domObserver.forceFlush()
   clearComposition(view)
-  if (forceUpdate || view.docView.dirty) {
+  if (forceUpdate || view.docView && view.docView.dirty) {
     let sel = selectionFromDOM(view)
     if (sel && !sel.eq(view.state.selection)) view.dispatch(view.state.tr.setSelection(sel))
     else view.updateState(view.state)