Fix cursor not following to new node when using a react node view

packages/react/src/Editor.ts

@@ -2,7 +2,13 @@ import { Editor as CoreEditor } from '@tiptap/core'
 import React from 'react'
 
 import { EditorContentProps, EditorContentState } from './EditorContent'
+import { ReactRenderer } from './ReactRenderer'
+
+type ContentComponent = React.Component<EditorContentProps, EditorContentState> & {
+  setRenderer(id: string, renderer: ReactRenderer): void;
+  removeRenderer(id: string): void;
+}
 
 export class Editor extends CoreEditor {
-  public contentComponent: React.Component<EditorContentProps, EditorContentState> | null = null
+  public contentComponent: ContentComponent | null = null
 }

packages/react/src/EditorContent.tsx

@@ -1,13 +1,13 @@
 import React, { HTMLProps } from 'react'
-import ReactDOM from 'react-dom'
+import ReactDOM, { flushSync } from 'react-dom'
 
 import { Editor } from './Editor'
 import { ReactRenderer } from './ReactRenderer'
 
-const Portals: React.FC<{ renderers: Map<string, ReactRenderer> }> = ({ renderers }) => {
+const Portals: React.FC<{ renderers: Record<string, ReactRenderer> }> = ({ renderers }) => {
   return (
     <>
-      {Array.from(renderers).map(([key, renderer]) => {
+      {Object.entries(renderers).map(([key, renderer]) => {
         return ReactDOM.createPortal(
           renderer.reactElement,
           renderer.element,
@@ -23,18 +23,21 @@ export interface EditorContentProps extends HTMLProps<HTMLDivElement> {
 }
 
 export interface EditorContentState {
-  renderers: Map<string, ReactRenderer>
+  renderers: Record<string, ReactRenderer>
 }
 
 export class PureEditorContent extends React.Component<EditorContentProps, EditorContentState> {
   editorContentRef: React.RefObject<any>
 
+  initialized: boolean
+
   constructor(props: EditorContentProps) {
     super(props)
     this.editorContentRef = React.createRef()
+    this.initialized = false
 
     this.state = {
-      renderers: new Map(),
+      renderers: {},
     }
   }
 
@@ -65,9 +68,46 @@ export class PureEditorContent extends React.Component<EditorContentProps, Edito
       editor.contentComponent = this
 
       editor.createNodeViews()
+
+      this.initialized = true
     }
   }
 
+  maybeFlushSync(fn: () => void) {
+    // Avoid calling flushSync until the editor is initialized.
+    // Initialization happens during the componentDidMount or componentDidUpdate
+    // lifecycle methods, and React doesn't allow calling flushSync from inside
+    // a lifecycle method.
+    if (this.initialized) {
+      flushSync(fn)
+    } else {
+      fn()
+    }
+  }
+
+  setRenderer(id: string, renderer: ReactRenderer) {
+    this.maybeFlushSync(() => {
+      this.setState(({ renderers }) => ({
+        renderers: {
+          ...renderers,
+          [id]: renderer,
+        },
+      }))
+    })
+  }
+
+  removeRenderer(id: string) {
+    this.maybeFlushSync(() => {
+      this.setState(({ renderers }) => {
+        const nextRenderers = { ...renderers }
+
+        delete nextRenderers[id]
+
+        return { renderers: nextRenderers }
+      })
+    })
+  }
+
   componentWillUnmount() {
     const { editor } = this.props
 

packages/react/src/ReactRenderer.tsx

@@ -1,6 +1,5 @@
 import { Editor } from '@tiptap/core'
 import React from 'react'
-import { flushSync } from 'react-dom'
 
 import { Editor as ExtendedEditor } from './Editor'
 
@@ -78,18 +77,7 @@ export class ReactRenderer<R = unknown, P = unknown> {
 
     this.reactElement = <Component {...props } />
 
-    queueMicrotask(() => {
-      flushSync(() => {
-        if (this.editor?.contentComponent) {
-          this.editor.contentComponent.setState({
-            renderers: this.editor.contentComponent.state.renderers.set(
-              this.id,
-              this,
-            ),
-          })
-        }
-      })
-    })
+    this.editor?.contentComponent?.setRenderer(this.id, this)
   }
 
   updateProps(props: Record<string, any> = {}): void {
@@ -102,18 +90,6 @@ export class ReactRenderer<R = unknown, P = unknown> {
   }
 
   destroy(): void {
-    queueMicrotask(() => {
-      flushSync(() => {
-        if (this.editor?.contentComponent) {
-          const { renderers } = this.editor.contentComponent.state
-
-          renderers.delete(this.id)
-
-          this.editor.contentComponent.setState({
-            renderers,
-          })
-        }
-      })
-    })
+    this.editor?.contentComponent?.removeRenderer(this.id)
   }
 }