fix(react): the editor passed into EditorContent can be null

ueberdosis · Aug 13, 2024 · d4d99e8 · d4d99e8
1 parent 6d1621c
commit d4d99e8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/gentle-ads-poke.md b/.changeset/gentle-ads-poke.md
@@ -0,0 +1,5 @@
+---
+"@tiptap/react": patch
+---
+
+When changing the types, a bug was introduced where null could no longer be a valid value
diff --git a/packages/react/src/Editor.ts b/packages/react/src/Editor.ts
@@ -3,7 +3,7 @@ import { ReactPortal } from 'react'
 
 import { ReactRenderer } from './ReactRenderer.js'
 
-export type EditorWithContentComponent = Editor & { contentComponent: ContentComponent | null }
+export type EditorWithContentComponent = Editor & { contentComponent?: ContentComponent | null }
 export type ContentComponent = {
   setRenderer(id: string, renderer: ReactRenderer): void;
   removeRenderer(id: string): void;

diff --git a/packages/react/src/EditorContent.tsx b/packages/react/src/EditorContent.tsx
@@ -108,7 +108,7 @@ export class PureEditorContent extends React.Component<
     this.initialized = false
 
     this.state = {
-      hasContentComponentInitialized: Boolean((props.editor as EditorWithContentComponent).contentComponent),
+      hasContentComponentInitialized: Boolean((props.editor as EditorWithContentComponent | null)?.contentComponent),
     }
   }
 
@@ -121,7 +121,7 @@ export class PureEditorContent extends React.Component<
   }
 
   init() {
-    const editor = this.props.editor as EditorWithContentComponent
+    const editor = this.props.editor as EditorWithContentComponent | null
 
     if (editor && !editor.isDestroyed && editor.options.element) {
       if (editor.contentComponent) {
@@ -165,7 +165,7 @@ export class PureEditorContent extends React.Component<
   }
 
   componentWillUnmount() {
-    const editor = this.props.editor as EditorWithContentComponent
+    const editor = this.props.editor as EditorWithContentComponent | null
 
     if (!editor) {
       return