@supernova-studio/client 0.34.0 → 0.35.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supernova-studio/client",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "description": "Supernova Data Models",
   "source": "src/index.ts",
   "main": "dist/index.js",

package/src/yjs/docs-editor/blocks-to-prosemirror.ts

@@ -92,11 +92,9 @@ export function pageToProsemirrorDoc(
 
 export function blockToProsemirrorNode(
   block: PageBlockEditorModel,
-  definitions: PageBlockDefinition[]
+  definition: PageBlockDefinition
 ): ProsemirrorNode | null {
-  const definitionsMap = mapByUnique(definitions, d => d.id);
-  const nodes = internalBlocksToProsemirrorNodes([block], definitionsMap);
-  return nodes[0] ?? null;
+  return internalBlockToProsemirrorNode(block, definition);
 }
 
 //

package/src/yjs/docs-editor/prosemirror-to-blocks.ts

@@ -73,10 +73,8 @@ export function prosemirrorDocToPage(
   };
 }
 
-export function prosemirrorNodeToBlock(prosemirrorNode: ProsemirrorNode, definitions: PageBlockDefinition[]) {
-  const definitionsById = mapByUnique(definitions, d => d.id);
-  const block = internalProsemirrorNodeToBlock(prosemirrorNode, definitionsById, 0);
-  return block[0] ?? null;
+export function shallowProsemirrorNodeToBlock(prosemirrorNode: ProsemirrorNode, definition: PageBlockDefinition) {
+  return shallowProsemirrorNodeAndDefinitionToBlock(prosemirrorNode, definition);
 }
 
 //
@@ -213,30 +211,34 @@ function prosemirrorNodeAndDefinitionToBlock(
   definitionsMap: Map<string, PageBlockDefinition>,
   depth: number
 ): PageBlockEditorModel[] {
-  const richTextProperty = BlockDefinitionUtils.firstRichTextProperty(definition);
-  if (richTextProperty) {
-    const block = parseAsRichText(prosemirrorNode, definition, richTextProperty);
-    return block ? [block] : [];
-  }
-
   const multiRichTextProperty = BlockDefinitionUtils.firstMultiRichTextProperty(definition);
   if (multiRichTextProperty) {
     return parseAsMultiRichText(prosemirrorNode, definition, multiRichTextProperty, definitionsMap, depth);
   }
 
+  const block = shallowProsemirrorNodeAndDefinitionToBlock(prosemirrorNode, definition);
+  return block ? [block] : [];
+}
+
+function shallowProsemirrorNodeAndDefinitionToBlock(
+  prosemirrorNode: ProsemirrorNode,
+  definition: PageBlockDefinition
+): PageBlockEditorModel | null {
+  const richTextProperty = BlockDefinitionUtils.firstRichTextProperty(definition);
+  if (richTextProperty) {
+    return parseAsRichText(prosemirrorNode, definition, richTextProperty);
+  }
+
   const tableProperty = BlockDefinitionUtils.firstTableProperty(definition);
   if (tableProperty) {
-    const block = parseAsTable(prosemirrorNode, definition, tableProperty);
-    return block ? [block] : [];
+    return parseAsTable(prosemirrorNode, definition, tableProperty);
   }
 
   if (definition.id === "io.supernova.block.divider") {
-    const block = parseAsDivider(prosemirrorNode, definition);
-    return block ? [block] : [];
+    return parseAsDivider(prosemirrorNode, definition);
   }
 
-  const block = parseAsCustomBlock(prosemirrorNode, definition);
-  return block ? [block] : [];
+  return parseAsCustomBlock(prosemirrorNode, definition);
 }
 
 //