fix: Custom blocks without inline content (#312)

* Updated `nodeConversions.tsx`

* Small cleanup

* Small cleanup

Author: matthewlipski

packages/core/src/api/nodeConversions/nodeConversions.ts

@@ -16,9 +16,9 @@ import {
   Styles,
   ToggledStyle,
 } from "../../extensions/Blocks/api/inlineContentTypes";
-import { getBlockInfoFromPos } from "../../extensions/Blocks/helpers/getBlockInfoFromPos";
 import UniqueID from "../../extensions/UniqueID/UniqueID";
 import { UnreachableCaseError } from "../../shared/utils";
+import { getBlockInfo } from "../../extensions/Blocks/helpers/getBlockInfoFromPos";
 
 const toggleStyles = new Set<ToggledStyle>([
   "bold",
@@ -369,7 +369,7 @@ export function nodeToBlock<BSchema extends BlockSchema>(
     return cachedBlock;
   }
 
-  const blockInfo = getBlockInfoFromPos(node, 0)!;
+  const blockInfo = getBlockInfo(node);
 
   let id = blockInfo.id;
 
@@ -380,7 +380,7 @@ export function nodeToBlock<BSchema extends BlockSchema>(
 
   const props: any = {};
   for (const [attr, value] of Object.entries({
-    ...blockInfo.node.attrs,
+    ...node.attrs,
     ...blockInfo.contentNode.attrs,
   })) {
     const blockSpec = blockSchema[blockInfo.contentType.name];
@@ -414,7 +414,7 @@ export function nodeToBlock<BSchema extends BlockSchema>(
   const children: Block<BSchema>[] = [];
   for (let i = 0; i < blockInfo.numChildBlocks; i++) {
     children.push(
-      nodeToBlock(blockInfo.node.lastChild!.child(i), blockSchema, blockCache)
+      nodeToBlock(node.lastChild!.child(i), blockSchema, blockCache)
     );
   }
 

packages/core/src/extensions/Blocks/helpers/getBlockInfoFromPos.ts

@@ -1,16 +1,40 @@
 import { Node, NodeType } from "prosemirror-model";
 
-export type BlockInfo = {
+export type BlockInfoWithoutPositions = {
   id: string;
   node: Node;
   contentNode: Node;
   contentType: NodeType;
   numChildBlocks: number;
+};
+
+export type BlockInfo = BlockInfoWithoutPositions & {
   startPos: number;
   endPos: number;
   depth: number;
 };
 
+/**
+ * Helper function for `getBlockInfoFromPos`, returns information regarding
+ * provided blockContainer node.
+ * @param blockContainer The blockContainer node to retrieve info for.
+ */
+export function getBlockInfo(blockContainer: Node): BlockInfoWithoutPositions {
+  const id = blockContainer.attrs["id"];
+  const contentNode = blockContainer.firstChild!;
+  const contentType = contentNode.type;
+  const numChildBlocks =
+    blockContainer.childCount === 2 ? blockContainer.lastChild!.childCount : 0;
+
+  return {
+    id,
+    node: blockContainer,
+    contentNode,
+    contentType,
+    numChildBlocks,
+  };
+}
+
 /**
  * Retrieves information regarding the nearest blockContainer node in a
  * ProseMirror doc, relative to a position.
@@ -72,10 +96,7 @@ export function getBlockInfoFromPos(doc: Node, pos: number): BlockInfo {
     node = $pos.node(depth);
   }
 
-  const id = node.attrs["id"];
-  const contentNode = node.firstChild!;
-  const contentType = contentNode.type;
-  const numChildBlocks = node.childCount === 2 ? node.lastChild!.childCount : 0;
+  const { id, contentNode, contentType, numChildBlocks } = getBlockInfo(node);
 
   const startPos = $pos.start(depth);
   const endPos = $pos.end(depth);