move react() check higher up

nytimes · Nov 16, 2023 · 99f1811 · 99f1811
1 parent 4c572c5
commit 99f1811
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/hooks/useNodePos.tsx b/src/hooks/useNodePos.tsx
@@ -15,10 +15,7 @@ export function NodePosProvider({ nodeKey, children }: Props) {
   const editorState = useEditorState();
   if (!editorState) return <>{children}</>;
   const pluginState = reactPluginKey.getState(editorState);
-  if (!pluginState)
-    throw new Error(
-      "Can't find the react() ProseMirror plugin. Was it added to the EditorState.plugins?"
-    );
+  if (!pluginState) return <>{children}</>;
   return (
     <NodePosContext.Provider value={pluginState.keyToPos.get(nodeKey) ?? 0}>
       {children}

diff --git a/src/nodeViews/createReactNodeViewConstructor.tsx b/src/nodeViews/createReactNodeViewConstructor.tsx
@@ -166,9 +166,12 @@ export function createReactNodeViewConstructor(
         ? "span"
         : "div");
 
-    const nodeKey =
-      reactPluginKey.getState(editorView.state)?.posToKey.get(getPos()) ??
-      createNodeKey();
+    const reactPluginState = reactPluginKey.getState(editorView.state);
+    if (!reactPluginState)
+      throw new Error(
+        "Can't find the react() ProseMirror plugin, required for useNodeViews(). Was it added to the EditorState.plugins?"
+      );
+    const nodeKey = reactPluginState.posToKey.get(getPos()) ?? createNodeKey();
 
     /**
      * Wrapper component to provide some imperative handles for updating