From 1892b709b87683082e4dce230d052e0c41218264 Mon Sep 17 00:00:00 2001
From: Cameron Hessler <cameronhessler123@gmail.com>
Date: Sun, 29 Oct 2023 02:43:47 -0500
Subject: [PATCH] Remove intermediate render cycle from useEditor

Possibly fixes #3345
---
 demos/src/Commands/Cut/React/index.jsx                    | 4 ----
 demos/src/Examples/Book/React/index.jsx                   | 4 ----
 demos/src/Examples/CSSModules/React/index.jsx             | 4 ----
 demos/src/Examples/CodeBlockLanguage/React/index.jsx      | 4 ----
 demos/src/Examples/Default/React/index.jsx                | 4 ----
 demos/src/Examples/Formatting/React/index.jsx             | 4 ----
 demos/src/Examples/Tables/React/index.jsx                 | 4 ----
 demos/src/Experiments/IsolatingClear/React/index.jsx      | 4 ----
 demos/src/Extensions/CharacterCount/React/index.jsx       | 4 ----
 demos/src/Extensions/Color/React/index.jsx                | 4 ----
 demos/src/Extensions/History/React/index.jsx              | 4 ----
 demos/src/Extensions/ListKeymap/React/index.jsx           | 4 ----
 demos/src/Extensions/TextAlign/React/index.jsx            | 4 ----
 demos/src/GuideContent/ExportJSON/React/index.jsx         | 8 --------
 demos/src/GuideContent/ReadOnly/React/index.jsx           | 8 --------
 .../GuideNodeViews/TableOfContents/React/Component.jsx    | 4 ----
 demos/src/GuideNodeViews/TableOfContents/React/index.jsx  | 4 ----
 demos/src/Marks/Bold/React/index.jsx                      | 4 ----
 demos/src/Marks/Code/React/index.jsx                      | 4 ----
 demos/src/Marks/Highlight/React/index.jsx                 | 4 ----
 demos/src/Marks/Italic/React/index.jsx                    | 4 ----
 demos/src/Marks/Link/React/index.jsx                      | 4 ----
 demos/src/Marks/Strike/React/index.jsx                    | 4 ----
 demos/src/Marks/Subscript/React/index.jsx                 | 4 ----
 demos/src/Marks/Superscript/React/index.jsx               | 4 ----
 demos/src/Marks/TextStyle/React/index.jsx                 | 4 ----
 demos/src/Marks/Underline/React/index.jsx                 | 4 ----
 demos/src/Nodes/Blockquote/React/index.jsx                | 4 ----
 demos/src/Nodes/BulletList/React/index.jsx                | 4 ----
 demos/src/Nodes/CodeBlock/React/index.jsx                 | 4 ----
 demos/src/Nodes/CodeBlockLowlight/React/index.jsx         | 4 ----
 demos/src/Nodes/Document/React/index.jsx                  | 4 ----
 demos/src/Nodes/HardBreak/React/index.jsx                 | 4 ----
 demos/src/Nodes/Heading/React/index.jsx                   | 4 ----
 demos/src/Nodes/HorizontalRule/React/index.jsx            | 4 ----
 demos/src/Nodes/Image/React/index.jsx                     | 4 ----
 demos/src/Nodes/ListItem/React/index.jsx                  | 4 ----
 demos/src/Nodes/Mention/React/index.jsx                   | 4 ----
 demos/src/Nodes/OrderedList/React/index.jsx               | 4 ----
 demos/src/Nodes/Paragraph/React/index.jsx                 | 4 ----
 demos/src/Nodes/Table/React/index.jsx                     | 4 ----
 demos/src/Nodes/TaskItem/React/index.jsx                  | 4 ----
 demos/src/Nodes/TaskList/React/index.jsx                  | 4 ----
 demos/src/Nodes/Text/React/index.jsx                      | 4 ----
 demos/src/Nodes/Youtube/React/index.jsx                   | 4 ----
 demos/src/Tutorials/1-2-tiptap/React/Note.tsx             | 2 +-
 packages/react/src/Context.tsx                            | 4 ----
 packages/react/src/EditorContent.tsx                      | 6 +-----
 packages/react/src/useEditor.ts                           | 8 ++------
 49 files changed, 4 insertions(+), 204 deletions(-)

diff --git a/demos/src/Commands/Cut/React/index.jsx b/demos/src/Commands/Cut/React/index.jsx
index 3b5164055e3..0ede480b679 100644
--- a/demos/src/Commands/Cut/React/index.jsx
+++ b/demos/src/Commands/Cut/React/index.jsx
@@ -8,10 +8,6 @@ import StarterKit from '@tiptap/starter-kit'
 import React, { useCallback } from 'react'
 
 const MenuBar = ({ editor }) => {
-  if (!editor) {
-    return null
-  }
-
   const onCutToStart = useCallback(() => {
     editor.chain().cut({ from: editor.state.selection.$from.pos, to: editor.state.selection.$to.pos }, 1).run()
   }, [editor])
diff --git a/demos/src/Examples/Book/React/index.jsx b/demos/src/Examples/Book/React/index.jsx
index b09b08eebcd..09f498b74db 100644
--- a/demos/src/Examples/Book/React/index.jsx
+++ b/demos/src/Examples/Book/React/index.jsx
@@ -7,10 +7,6 @@ import React from 'react'
 import { content } from '../content.js'
 
 const MenuBar = ({ editor }) => {
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Examples/CSSModules/React/index.jsx b/demos/src/Examples/CSSModules/React/index.jsx
index 3f2a1b8fe2a..f3de262e110 100644
--- a/demos/src/Examples/CSSModules/React/index.jsx
+++ b/demos/src/Examples/CSSModules/React/index.jsx
@@ -7,10 +7,6 @@ import React from 'react'
 import styles from './index.module.css'
 
 const MenuBar = ({ editor }) => {
-  if (!editor) {
-    return null
-  }
-
   return (
     <div className={`toolbar ${styles.toolbar}`}>
       <button
diff --git a/demos/src/Examples/CodeBlockLanguage/React/index.jsx b/demos/src/Examples/CodeBlockLanguage/React/index.jsx
index f73505b3154..4ef7164f86c 100644
--- a/demos/src/Examples/CodeBlockLanguage/React/index.jsx
+++ b/demos/src/Examples/CodeBlockLanguage/React/index.jsx
@@ -25,10 +25,6 @@ lowlight.registerLanguage('js', js)
 lowlight.registerLanguage('ts', ts)
 
 const MenuBar = ({ editor }) => {
-  if (!editor) {
-    return null
-  }
-
   return (
     <button onClick={() => editor.chain().focus().toggleCodeBlock().run()} className={editor.isActive('codeBlock') ? 'is-active' : ''}>
       code block
diff --git a/demos/src/Examples/Default/React/index.jsx b/demos/src/Examples/Default/React/index.jsx
index 00c9f575486..d236a99b6fa 100644
--- a/demos/src/Examples/Default/React/index.jsx
+++ b/demos/src/Examples/Default/React/index.jsx
@@ -10,10 +10,6 @@ import React from 'react'
 const MenuBar = () => {
   const { editor } = useCurrentEditor()
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Examples/Formatting/React/index.jsx b/demos/src/Examples/Formatting/React/index.jsx
index e5225ca8600..89112451244 100644
--- a/demos/src/Examples/Formatting/React/index.jsx
+++ b/demos/src/Examples/Formatting/React/index.jsx
@@ -7,10 +7,6 @@ import StarterKit from '@tiptap/starter-kit'
 import React from 'react'
 
 const MenuBar = ({ editor }) => {
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button onClick={() => editor.chain().focus().toggleHeading({ level: 1 }).run()} className={editor.isActive('heading', { level: 1 }) ? 'is-active' : ''}>
diff --git a/demos/src/Examples/Tables/React/index.jsx b/demos/src/Examples/Tables/React/index.jsx
index 7fab5915897..4a19bf9115d 100644
--- a/demos/src/Examples/Tables/React/index.jsx
+++ b/demos/src/Examples/Tables/React/index.jsx
@@ -55,10 +55,6 @@ export const tableHTML = `
 `
 
 const MenuBar = ({ editor }) => {
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button onClick={() => editor.chain().focus().insertTable({ rows: 3, cols: 3, withHeaderRow: true }).run()}>
diff --git a/demos/src/Experiments/IsolatingClear/React/index.jsx b/demos/src/Experiments/IsolatingClear/React/index.jsx
index 9358f84f688..7b14b94f312 100644
--- a/demos/src/Experiments/IsolatingClear/React/index.jsx
+++ b/demos/src/Experiments/IsolatingClear/React/index.jsx
@@ -27,10 +27,6 @@ const WrapperBlock = Node.create({
 })
 
 const MenuBar = ({ editor }) => {
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Extensions/CharacterCount/React/index.jsx b/demos/src/Extensions/CharacterCount/React/index.jsx
index c33d235f119..31c8d195dd0 100644
--- a/demos/src/Extensions/CharacterCount/React/index.jsx
+++ b/demos/src/Extensions/CharacterCount/React/index.jsx
@@ -26,10 +26,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <div>
       <EditorContent editor={editor} />
diff --git a/demos/src/Extensions/Color/React/index.jsx b/demos/src/Extensions/Color/React/index.jsx
index 3a706fa1b7f..a3b2c0710c4 100644
--- a/demos/src/Extensions/Color/React/index.jsx
+++ b/demos/src/Extensions/Color/React/index.jsx
@@ -14,10 +14,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <div>
       <input
diff --git a/demos/src/Extensions/History/React/index.jsx b/demos/src/Extensions/History/React/index.jsx
index addb44b7c3a..fe2157b8670 100644
--- a/demos/src/Extensions/History/React/index.jsx
+++ b/demos/src/Extensions/History/React/index.jsx
@@ -18,10 +18,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <div>
       <button onClick={() => editor.chain().focus().undo().run()} disabled={!editor.can().undo()}>
diff --git a/demos/src/Extensions/ListKeymap/React/index.jsx b/demos/src/Extensions/ListKeymap/React/index.jsx
index 87a34be1df3..55123ce1e15 100644
--- a/demos/src/Extensions/ListKeymap/React/index.jsx
+++ b/demos/src/Extensions/ListKeymap/React/index.jsx
@@ -20,10 +20,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Extensions/TextAlign/React/index.jsx b/demos/src/Extensions/TextAlign/React/index.jsx
index bf8d9682518..9ed26dacd16 100644
--- a/demos/src/Extensions/TextAlign/React/index.jsx
+++ b/demos/src/Extensions/TextAlign/React/index.jsx
@@ -24,10 +24,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <div>
       <button
diff --git a/demos/src/GuideContent/ExportJSON/React/index.jsx b/demos/src/GuideContent/ExportJSON/React/index.jsx
index 15bd1bf026f..e6c411dcb39 100644
--- a/demos/src/GuideContent/ExportJSON/React/index.jsx
+++ b/demos/src/GuideContent/ExportJSON/React/index.jsx
@@ -16,10 +16,6 @@ export default () => {
   })
 
   useEffect(() => {
-    if (!editor) {
-      return undefined
-    }
-
     // Get the initial content …
     setJson(editor.getJSON())
 
@@ -57,10 +53,6 @@ export default () => {
     editor.chain().clearContent(true).focus().run()
   }, [editor])
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <div className="actions">
diff --git a/demos/src/GuideContent/ReadOnly/React/index.jsx b/demos/src/GuideContent/ReadOnly/React/index.jsx
index d832aa3743c..b58e99c4243 100644
--- a/demos/src/GuideContent/ReadOnly/React/index.jsx
+++ b/demos/src/GuideContent/ReadOnly/React/index.jsx
@@ -20,17 +20,9 @@ export default () => {
   })
 
   useEffect(() => {
-    if (!editor) {
-      return undefined
-    }
-
     editor.setEditable(editable)
   }, [editor, editable])
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <div className="checkbox">
diff --git a/demos/src/GuideNodeViews/TableOfContents/React/Component.jsx b/demos/src/GuideNodeViews/TableOfContents/React/Component.jsx
index 843cefe0303..251a7b5bb53 100644
--- a/demos/src/GuideNodeViews/TableOfContents/React/Component.jsx
+++ b/demos/src/GuideNodeViews/TableOfContents/React/Component.jsx
@@ -40,10 +40,6 @@ export default ({ editor }) => {
   useEffect(handleUpdate, [])
 
   useEffect(() => {
-    if (!editor) {
-      return null
-    }
-
     editor.on('update', handleUpdate)
 
     return () => {
diff --git a/demos/src/GuideNodeViews/TableOfContents/React/index.jsx b/demos/src/GuideNodeViews/TableOfContents/React/index.jsx
index 36794d1ba9f..923f30dbc88 100644
--- a/demos/src/GuideNodeViews/TableOfContents/React/index.jsx
+++ b/demos/src/GuideNodeViews/TableOfContents/React/index.jsx
@@ -24,9 +24,5 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return <EditorContent editor={editor} />
 }
diff --git a/demos/src/Marks/Bold/React/index.jsx b/demos/src/Marks/Bold/React/index.jsx
index 932d985611d..531a9a1037b 100644
--- a/demos/src/Marks/Bold/React/index.jsx
+++ b/demos/src/Marks/Bold/React/index.jsx
@@ -19,10 +19,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Marks/Code/React/index.jsx b/demos/src/Marks/Code/React/index.jsx
index 9144f526597..b80402be094 100644
--- a/demos/src/Marks/Code/React/index.jsx
+++ b/demos/src/Marks/Code/React/index.jsx
@@ -16,10 +16,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Marks/Highlight/React/index.jsx b/demos/src/Marks/Highlight/React/index.jsx
index 02de5428969..d154850e890 100644
--- a/demos/src/Marks/Highlight/React/index.jsx
+++ b/demos/src/Marks/Highlight/React/index.jsx
@@ -18,10 +18,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Marks/Italic/React/index.jsx b/demos/src/Marks/Italic/React/index.jsx
index eaf14756dfa..df9a0584705 100644
--- a/demos/src/Marks/Italic/React/index.jsx
+++ b/demos/src/Marks/Italic/React/index.jsx
@@ -16,10 +16,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Marks/Link/React/index.jsx b/demos/src/Marks/Link/React/index.jsx
index 53b3134a93f..e0f746f917c 100644
--- a/demos/src/Marks/Link/React/index.jsx
+++ b/demos/src/Marks/Link/React/index.jsx
@@ -51,10 +51,6 @@ export default () => {
       .run()
   }, [editor])
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button onClick={setLink} className={editor.isActive('link') ? 'is-active' : ''}>
diff --git a/demos/src/Marks/Strike/React/index.jsx b/demos/src/Marks/Strike/React/index.jsx
index 063caef2694..06295b46b8d 100644
--- a/demos/src/Marks/Strike/React/index.jsx
+++ b/demos/src/Marks/Strike/React/index.jsx
@@ -17,10 +17,6 @@ export default () => {
         `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Marks/Subscript/React/index.jsx b/demos/src/Marks/Subscript/React/index.jsx
index a36f25d1045..8c9f5c96e5a 100644
--- a/demos/src/Marks/Subscript/React/index.jsx
+++ b/demos/src/Marks/Subscript/React/index.jsx
@@ -15,10 +15,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Marks/Superscript/React/index.jsx b/demos/src/Marks/Superscript/React/index.jsx
index 0a928f9f33f..4b005044383 100644
--- a/demos/src/Marks/Superscript/React/index.jsx
+++ b/demos/src/Marks/Superscript/React/index.jsx
@@ -15,10 +15,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Marks/TextStyle/React/index.jsx b/demos/src/Marks/TextStyle/React/index.jsx
index 86aad472281..fa00a79fed5 100644
--- a/demos/src/Marks/TextStyle/React/index.jsx
+++ b/demos/src/Marks/TextStyle/React/index.jsx
@@ -14,9 +14,5 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return <EditorContent editor={editor} />
 }
diff --git a/demos/src/Marks/Underline/React/index.jsx b/demos/src/Marks/Underline/React/index.jsx
index 79a9b7940eb..9c7e51d0c7d 100644
--- a/demos/src/Marks/Underline/React/index.jsx
+++ b/demos/src/Marks/Underline/React/index.jsx
@@ -15,10 +15,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/Blockquote/React/index.jsx b/demos/src/Nodes/Blockquote/React/index.jsx
index 39553a84c01..70fc32b1395 100644
--- a/demos/src/Nodes/Blockquote/React/index.jsx
+++ b/demos/src/Nodes/Blockquote/React/index.jsx
@@ -23,10 +23,6 @@ export default () => {
     `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <div>
       <button
diff --git a/demos/src/Nodes/BulletList/React/index.jsx b/demos/src/Nodes/BulletList/React/index.jsx
index ef05fd223ef..8732d09397a 100644
--- a/demos/src/Nodes/BulletList/React/index.jsx
+++ b/demos/src/Nodes/BulletList/React/index.jsx
@@ -19,10 +19,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/CodeBlock/React/index.jsx b/demos/src/Nodes/CodeBlock/React/index.jsx
index 84420ccd4ff..90dcb7bb7c7 100644
--- a/demos/src/Nodes/CodeBlock/React/index.jsx
+++ b/demos/src/Nodes/CodeBlock/React/index.jsx
@@ -31,10 +31,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/CodeBlockLowlight/React/index.jsx b/demos/src/Nodes/CodeBlockLowlight/React/index.jsx
index e6bef15c228..af080fe985f 100644
--- a/demos/src/Nodes/CodeBlockLowlight/React/index.jsx
+++ b/demos/src/Nodes/CodeBlockLowlight/React/index.jsx
@@ -53,10 +53,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/Document/React/index.jsx b/demos/src/Nodes/Document/React/index.jsx
index 72e0c9b3406..527f20c9c55 100644
--- a/demos/src/Nodes/Document/React/index.jsx
+++ b/demos/src/Nodes/Document/React/index.jsx
@@ -12,9 +12,5 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return <EditorContent editor={editor} />
 }
diff --git a/demos/src/Nodes/HardBreak/React/index.jsx b/demos/src/Nodes/HardBreak/React/index.jsx
index 1e372d0a95b..2452a3e980d 100644
--- a/demos/src/Nodes/HardBreak/React/index.jsx
+++ b/demos/src/Nodes/HardBreak/React/index.jsx
@@ -22,10 +22,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button onClick={() => editor.chain().focus().setHardBreak().run()}>setHardBreak</button>
diff --git a/demos/src/Nodes/Heading/React/index.jsx b/demos/src/Nodes/Heading/React/index.jsx
index d80f5b84711..cb55f0ece0b 100644
--- a/demos/src/Nodes/Heading/React/index.jsx
+++ b/demos/src/Nodes/Heading/React/index.jsx
@@ -23,10 +23,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/HorizontalRule/React/index.jsx b/demos/src/Nodes/HorizontalRule/React/index.jsx
index 310edc77b14..e09069344ed 100644
--- a/demos/src/Nodes/HorizontalRule/React/index.jsx
+++ b/demos/src/Nodes/HorizontalRule/React/index.jsx
@@ -19,10 +19,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button onClick={() => editor.chain().focus().setHorizontalRule().run()}>
diff --git a/demos/src/Nodes/Image/React/index.jsx b/demos/src/Nodes/Image/React/index.jsx
index 292fac6179d..4369426497d 100644
--- a/demos/src/Nodes/Image/React/index.jsx
+++ b/demos/src/Nodes/Image/React/index.jsx
@@ -26,10 +26,6 @@ export default () => {
     }
   }, [editor])
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <div>
       <button onClick={addImage}>setImage</button>
diff --git a/demos/src/Nodes/ListItem/React/index.jsx b/demos/src/Nodes/ListItem/React/index.jsx
index 851edb9db25..cda6cdb12b5 100644
--- a/demos/src/Nodes/ListItem/React/index.jsx
+++ b/demos/src/Nodes/ListItem/React/index.jsx
@@ -35,10 +35,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/Mention/React/index.jsx b/demos/src/Nodes/Mention/React/index.jsx
index 42424739992..6c2612839e7 100644
--- a/demos/src/Nodes/Mention/React/index.jsx
+++ b/demos/src/Nodes/Mention/React/index.jsx
@@ -27,9 +27,5 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return <EditorContent editor={editor} />
 }
diff --git a/demos/src/Nodes/OrderedList/React/index.jsx b/demos/src/Nodes/OrderedList/React/index.jsx
index 8c37a01a98e..0d175308e70 100644
--- a/demos/src/Nodes/OrderedList/React/index.jsx
+++ b/demos/src/Nodes/OrderedList/React/index.jsx
@@ -24,10 +24,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/Paragraph/React/index.jsx b/demos/src/Nodes/Paragraph/React/index.jsx
index 295e3646164..8d82a926e61 100644
--- a/demos/src/Nodes/Paragraph/React/index.jsx
+++ b/demos/src/Nodes/Paragraph/React/index.jsx
@@ -12,9 +12,5 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return <EditorContent editor={editor} />
 }
diff --git a/demos/src/Nodes/Table/React/index.jsx b/demos/src/Nodes/Table/React/index.jsx
index 46ff9646a5f..ebb2da6f687 100644
--- a/demos/src/Nodes/Table/React/index.jsx
+++ b/demos/src/Nodes/Table/React/index.jsx
@@ -43,10 +43,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/TaskItem/React/index.jsx b/demos/src/Nodes/TaskItem/React/index.jsx
index 6532f647a9d..3dea2bcfac3 100644
--- a/demos/src/Nodes/TaskItem/React/index.jsx
+++ b/demos/src/Nodes/TaskItem/React/index.jsx
@@ -27,10 +27,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/TaskList/React/index.jsx b/demos/src/Nodes/TaskList/React/index.jsx
index 6532f647a9d..3dea2bcfac3 100644
--- a/demos/src/Nodes/TaskList/React/index.jsx
+++ b/demos/src/Nodes/TaskList/React/index.jsx
@@ -27,10 +27,6 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <>
       <button
diff --git a/demos/src/Nodes/Text/React/index.jsx b/demos/src/Nodes/Text/React/index.jsx
index 3f3d40c974b..a70e3256ac5 100644
--- a/demos/src/Nodes/Text/React/index.jsx
+++ b/demos/src/Nodes/Text/React/index.jsx
@@ -12,9 +12,5 @@ export default () => {
       `,
   })
 
-  if (!editor) {
-    return null
-  }
-
   return <EditorContent editor={editor} />
 }
diff --git a/demos/src/Nodes/Youtube/React/index.jsx b/demos/src/Nodes/Youtube/React/index.jsx
index b0f664647a7..b241dd63114 100644
--- a/demos/src/Nodes/Youtube/React/index.jsx
+++ b/demos/src/Nodes/Youtube/React/index.jsx
@@ -16,10 +16,6 @@ const MenuBar = ({ editor }) => {
     }
   }, [widthRef.current, heightRef.current])
 
-  if (!editor) {
-    return null
-  }
-
   const addYoutubeVideo = () => {
     const url = prompt('Enter YouTube URL')
 
diff --git a/demos/src/Tutorials/1-2-tiptap/React/Note.tsx b/demos/src/Tutorials/1-2-tiptap/React/Note.tsx
index 7c7c726aa05..f514fb352ff 100644
--- a/demos/src/Tutorials/1-2-tiptap/React/Note.tsx
+++ b/demos/src/Tutorials/1-2-tiptap/React/Note.tsx
@@ -17,7 +17,7 @@ export default ({ note }: { note: TNote }) => {
       },
     },
     onUpdate() {
-      setModelValue(editor?.getText() ?? '')
+      setModelValue(editor.getText() ?? '')
     },
     extensions: [
       StarterKit,
diff --git a/packages/react/src/Context.tsx b/packages/react/src/Context.tsx
index 7a47ed354f6..15fd85cfcb2 100644
--- a/packages/react/src/Context.tsx
+++ b/packages/react/src/Context.tsx
@@ -28,10 +28,6 @@ export const EditorProvider = ({
 }: EditorProviderProps) => {
   const editor = useEditor(editorOptions)
 
-  if (!editor) {
-    return null
-  }
-
   return (
     <EditorContext.Provider value={{ editor }}>
       {slotBefore}
diff --git a/packages/react/src/EditorContent.tsx b/packages/react/src/EditorContent.tsx
index df40df31974..558959f3601 100644
--- a/packages/react/src/EditorContent.tsx
+++ b/packages/react/src/EditorContent.tsx
@@ -15,7 +15,7 @@ const Portals: React.FC<{ renderers: Record<string, ReactRenderer> }> = ({ rende
 }
 
 export interface EditorContentProps extends HTMLProps<HTMLDivElement> {
-  editor: Editor | null;
+  editor: Editor;
 }
 
 export interface EditorContentState {
@@ -107,10 +107,6 @@ export class PureEditorContent extends React.Component<EditorContentProps, Edito
   componentWillUnmount() {
     const { editor } = this.props
 
-    if (!editor) {
-      return
-    }
-
     this.initialized = false
 
     if (!editor.isDestroyed) {
diff --git a/packages/react/src/useEditor.ts b/packages/react/src/useEditor.ts
index 2805eedec64..a7fc7303e8f 100644
--- a/packages/react/src/useEditor.ts
+++ b/packages/react/src/useEditor.ts
@@ -15,7 +15,7 @@ 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()
 
@@ -42,10 +42,6 @@ export const useEditor = (options: Partial<EditorOptions> = {}, deps: Dependency
   // This effect will handle updating the editor instance
   // when the event handlers change.
   useEffect(() => {
-    if (!editor) {
-      return
-    }
-
     if (onBeforeCreate) {
       editor.off('beforeCreate', onBeforeCreateRef.current)
       editor.on('beforeCreate', onBeforeCreate)
@@ -119,7 +115,7 @@ export const useEditor = (options: Partial<EditorOptions> = {}, deps: Dependency
 
   useEffect(() => {
     return () => {
-      editor?.destroy()
+      editor.destroy()
     }
   }, [editor])