address feedback

YousefED · YousefED · commit 0920bf927b15 · 2025-10-29T13:21:18.000+01:00
diff --git a/packages/core/src/api/blockManipulation/commands/insertBlocks/insertBlocks.ts b/packages/core/src/api/blockManipulation/commands/insertBlocks/insertBlocks.ts
@@ -6,7 +6,7 @@ import {
   BlockIdentifier,
   BlockSchema,
   InlineContentSchema,
-  partialBlockToFullBlock,
+  partialBlockToBlock,
   StyleSchema,
 } from "../../../../schema/index.js";
 import { blockToNode } from "../../../nodeConversions/blockToNode.js";
@@ -20,7 +20,6 @@ export function insertBlocks<
   S extends StyleSchema,
 >(
   tr: Transaction,
-  // TBD: allow PartialBlock here?
   blocksToInsert: PartialBlock<BSchema, I, S>[],
   referenceBlock: BlockIdentifier,
   placement: "before" | "after" = "before",
@@ -30,7 +29,7 @@ export function insertBlocks<
   const pmSchema = getPmSchema(tr);
   const nodesToInsert = blocksToInsert.map((block) =>
     blockToNode(
-      partialBlockToFullBlock(getBlockNoteSchema(pmSchema), block),
+      partialBlockToBlock(getBlockNoteSchema(pmSchema), block),
       pmSchema,
     ),
   );
diff --git a/packages/core/src/api/blockManipulation/commands/replaceBlocks/replaceBlocks.ts b/packages/core/src/api/blockManipulation/commands/replaceBlocks/replaceBlocks.ts
@@ -2,7 +2,7 @@ import type { Node } from "prosemirror-model";
 import type { Transaction } from "prosemirror-state";
 import type { Block, PartialBlock } from "../../../../blocks/defaultBlocks.js";
 import {
-  partialBlockToFullBlock,
+  partialBlockToBlock,
   type BlockIdentifier,
   type BlockSchema,
   type InlineContentSchema,
@@ -30,7 +30,7 @@ export function removeAndInsertBlocks<
   // document.
   const nodesToInsert: Node[] = blocksToInsert.map((block) =>
     blockToNode(
-      partialBlockToFullBlock(getBlockNoteSchema(pmSchema), block),
+      partialBlockToBlock(getBlockNoteSchema(pmSchema), block),
       pmSchema,
     ),
   );
diff --git a/packages/core/src/api/blockManipulation/commands/updateBlock/updateBlock.ts b/packages/core/src/api/blockManipulation/commands/updateBlock/updateBlock.ts
@@ -15,10 +15,10 @@ import type {
 } from "../../../../schema/blocks/types.js";
 import type { InlineContentSchema } from "../../../../schema/inlineContent/types.js";
 import {
-  partialBlockToFullBlock,
+  partialBlockToBlock,
   partialInlineContentToInlineContent,
   partialTableContentToTableContent,
-} from "../../../../schema/partialBlockToFullBlock.js";
+} from "../../../../schema/partialBlockToBlock.js";
 import type { StyleSchema } from "../../../../schema/styles/types.js";
 import { UnreachableCaseError } from "../../../../util/typescript.js";
 import {
@@ -132,7 +132,7 @@ export function updateBlockTr<
     // currently, we calculate the new node and replace the entire node with the desired new node.
     // for this, we do a nodeToBlock on the existing block to get the children.
     // it would be cleaner to use a ReplaceAroundStep, but this is a bit simpler and it's quite an edge case
-    const newFullBlock = partialBlockToFullBlock(schema, block);
+    const newFullBlock = partialBlockToBlock(schema, block);
     if (block.children === undefined) {
       // if no children are passed in, use existing children
       const existingBlock = nodeToBlock<BSchema, I, S>(
@@ -300,7 +300,7 @@ function updateChildren<
   const schema = getBlockNoteSchema<BSchema, I, S>(pmSchema);
   if (block.children !== undefined && block.children.length > 0) {
     const childNodes = block.children.map((child) => {
-      return blockToNode(partialBlockToFullBlock(schema, child), pmSchema);
+      return blockToNode(partialBlockToBlock(schema, child), pmSchema);
     });
 
     // Checks if a blockGroup node already exists.
diff --git a/packages/core/src/api/nodeConversions/blockToNode.ts b/packages/core/src/api/nodeConversions/blockToNode.ts
@@ -282,6 +282,7 @@ function blockOrInlineContentToContentNode(
 
   // TODO: needed? came from previous code
   if (type === undefined) {
+    // TODO: remove
     type = "paragraph";
   }
 
diff --git a/packages/core/src/editor/BlockNoteEditor.ts b/packages/core/src/editor/BlockNoteEditor.ts
@@ -38,7 +38,7 @@ import { UniqueID } from "../extensions/UniqueID/UniqueID.js";
 import type { Dictionary } from "../i18n/dictionary.js";
 import { en } from "../i18n/locales/index.js";
 import {
-  partialBlockToFullBlock,
+  partialBlockToBlock,
   type BlockIdentifier,
   type BlockNoteDOMAttributes,
   type BlockSchema,
@@ -891,7 +891,7 @@ export class BlockNoteEditor<
       const schema = getSchema(tiptapOptions.extensions!);
       const pmNodes = initialContent.map((b) =>
         blockToNode(
-          partialBlockToFullBlock(this.schema, b),
+          partialBlockToBlock(this.schema, b),
           schema,
           this.schema.styleSchema,
         ).toJSON(),
diff --git a/packages/core/src/extensions/TableHandles/TableHandlesPlugin.ts b/packages/core/src/extensions/TableHandles/TableHandlesPlugin.ts
@@ -282,14 +282,7 @@ export class TableHandlesView<
       this.editor.schema.styleSchema,
     );
 
-    if (
-      blockHasType(
-        block,
-        this.editor,
-        "table",
-        defaultBlockSpecs.table.config.propSchema,
-      )
-    ) {
+    if (blockHasType(block, this.editor, "table")) {
       this.tablePos = pmNodeInfo.posBeforeNode + 1;
       tableBlock = block;
     }
diff --git a/packages/core/src/schema/index.ts b/packages/core/src/schema/index.ts
@@ -6,7 +6,7 @@ export * from "./CustomBlockNoteSchema.js";
 export * from "./inlineContent/createSpec.js";
 export * from "./inlineContent/internal.js";
 export * from "./inlineContent/types.js";
-export * from "./partialBlockToFullBlock.js";
+export * from "./partialBlockToBlock.js";
 export * from "./propTypes.js";
 export * from "./styles/createSpec.js";
 export * from "./styles/internal.js";
diff --git a/packages/core/src/schema/inlineContent/createSpec.ts b/packages/core/src/schema/inlineContent/createSpec.ts
@@ -5,7 +5,7 @@ import { inlineContentToNodes } from "../../api/nodeConversions/blockToNode.js";
 import { nodeToCustomInlineContent } from "../../api/nodeConversions/nodeToBlock.js";
 import type { BlockNoteEditor } from "../../editor/BlockNoteEditor.js";
 import { propsToAttributes } from "../blocks/internal.js";
-import { partialInlineContentToInlineContent } from "../partialBlockToFullBlock.js";
+import { partialInlineContentToInlineContent } from "../partialBlockToBlock.js";
 import { Props } from "../propTypes.js";
 import { StyleSchema } from "../styles/types.js";
 import {
diff --git a/packages/core/src/schema/partialBlockToBlock.ts b/packages/core/src/schema/partialBlockToBlock.ts
@@ -1,5 +1,5 @@
 import * as z from "zod/v4/core";
-import type { Block, BlockNoteSchema, PartialBlock } from "../blocks/index.js";
+import type { Block, PartialBlock } from "../blocks/index.js";
 import { UniqueID } from "../extensions/UniqueID/UniqueID.js";
 import { mapTableCell } from "../util/table.js";
 import { UnreachableCaseError } from "../util/typescript.js";
@@ -204,7 +204,7 @@ function partialBlockContentToBlockContent(
   }
 }
 
-export function partialBlockToFullBlock<
+export function partialBlockToBlock<
   BSchema extends BlockSchema,
   I extends InlineContentSchema,
   S extends StyleSchema,
@@ -229,9 +229,8 @@ export function partialBlockToFullBlock<
   );
 
   const children =
-    partialBlock.children?.map((child) =>
-      partialBlockToFullBlock(schema, child),
-    ) || [];
+    partialBlock.children?.map((child) => partialBlockToBlock(schema, child)) ||
+    [];
 
   return {
     id,
@@ -242,17 +241,15 @@ export function partialBlockToFullBlock<
   } as Block<BSchema, I, S>;
 }
 
-export function partialBlocksToFullBlocks<
+export function partialBlocksToBlocks<
   BSchema extends BlockSchema,
   I extends InlineContentSchema,
   S extends StyleSchema,
 >(
-  // TODO: I think this should be a CustomBlockNoteSchema,
-  // but that breaks docxExporter etc
-  schema: BlockNoteSchema<BSchema, I, S>,
+  schema: CustomBlockNoteSchema<BSchema, I, S>,
   partialBlocks: PartialBlock<BSchema, I, S>[],
 ): Block<BSchema, I, S>[] {
   return partialBlocks.map((partialBlock) =>
-    partialBlockToFullBlock(schema, partialBlock),
+    partialBlockToBlock(schema, partialBlock),
   );
 }
diff --git a/packages/server-util/src/context/ServerBlockNoteEditor.ts b/packages/server-util/src/context/ServerBlockNoteEditor.ts
@@ -15,7 +15,7 @@ import {
   createExternalHTMLExporter,
   createInternalHTMLSerializer,
   nodeToBlock,
-  partialBlockToFullBlock,
+  partialBlockToBlock,
 } from "@blocknote/core";
 
 import { BlockNoteViewRaw } from "@blocknote/react";
@@ -140,7 +140,7 @@ export class ServerBlockNoteEditor<
   ) {
     const pmSchema = this.editor.pmSchema;
     const pmNodes = blocks.map((b) =>
-      blockToNode(partialBlockToFullBlock(this.editor.schema, b), pmSchema),
+      blockToNode(partialBlockToBlock(this.editor.schema, b), pmSchema),
     );
 
     const doc = pmSchema.topNodeType.create(
diff --git a/packages/server-util/src/context/react/ReactServer.test.tsx b/packages/server-util/src/context/react/ReactServer.test.tsx
@@ -2,7 +2,7 @@ import {
   BlockNoteSchema,
   defaultBlockSpecs,
   defaultProps,
-  partialBlockToFullBlock,
+  partialBlockToBlock,
 } from "@blocknote/core";
 import { createReactBlockSpec } from "@blocknote/react";
 import { createContext, useContext } from "react";
@@ -57,7 +57,7 @@ describe("Test ServerBlockNoteEditor with React blocks", () => {
     const editor = ServerBlockNoteEditor.create({
       schema,
     });
-    const fullBlock = partialBlockToFullBlock(editor.editor.schema, {
+    const fullBlock = partialBlockToBlock(editor.editor.schema, {
       id: "1",
       type: "simpleReactCustomParagraph",
       content: "React Custom Paragraph",
@@ -76,7 +76,7 @@ describe("Test ServerBlockNoteEditor with React blocks", () => {
         <TestContext.Provider value={true}>{children}</TestContext.Provider>
       ),
       async () => {
-        const fullBlock = partialBlockToFullBlock(editor.editor.schema, {
+        const fullBlock = partialBlockToBlock(editor.editor.schema, {
           id: "1",
           type: "reactContextParagraph",
           content: "React Context Paragraph",
diff --git a/packages/xl-docx-exporter/src/docx/docxExporter.test.ts b/packages/xl-docx-exporter/src/docx/docxExporter.test.ts
@@ -2,7 +2,7 @@ import {
   BlockNoteSchema,
   createPageBreakBlockSpec,
   defaultBlockSpecs,
-  partialBlocksToFullBlocks,
+  partialBlocksToBlocks,
 } from "@blocknote/core";
 import { ColumnBlock, ColumnListBlock } from "@blocknote/xl-multi-column";
 import { testDocument } from "@shared/testDocument.js";
@@ -140,7 +140,7 @@ describe("exporter", () => {
         },
       });
       const exporter = new DOCXExporter(schema, docxDefaultSchemaMappings);
-      const blocks = partialBlocksToFullBlocks(schema, [
+      const blocks = partialBlocksToBlocks(schema, [
         {
           type: "columnList",
           children: [
diff --git a/packages/xl-multi-column/src/test/conversions/htmlConversion.test.ts b/packages/xl-multi-column/src/test/conversions/htmlConversion.test.ts
@@ -8,7 +8,7 @@ import {
   StyleSchema,
   createExternalHTMLExporter,
   createInternalHTMLSerializer,
-  partialBlocksToFullBlocks,
+  partialBlocksToBlocks,
 } from "@blocknote/core";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
@@ -25,7 +25,7 @@ async function convertToHTMLAndCompareSnapshots<
   snapshotDirectory: string,
   snapshotName: string,
 ) {
-  const fullBlocks = partialBlocksToFullBlocks(editor.schema, blocks);
+  const fullBlocks = partialBlocksToBlocks(editor.schema, blocks);
   const serializer = createInternalHTMLSerializer(editor.pmSchema, editor);
   const internalHTML = serializer.serializeBlocks(fullBlocks, {});
   const internalHTMLSnapshotPath =
diff --git a/packages/xl-multi-column/src/test/conversions/nodeConversion.test.ts b/packages/xl-multi-column/src/test/conversions/nodeConversion.test.ts
@@ -5,7 +5,7 @@ import {
   PartialBlock,
   blockToNode,
   nodeToBlock,
-  partialBlockToFullBlock,
+  partialBlockToBlock,
 } from "@blocknote/core";
 
 import { multiColumnSchemaTestCases } from "./testCases.js";
@@ -14,7 +14,7 @@ function validateConversion(
   block: PartialBlock<any, any, any>,
   editor: BlockNoteEditor<any, any, any>,
 ) {
-  const fullBlock = partialBlockToFullBlock(editor.schema, block);
+  const fullBlock = partialBlockToBlock(editor.schema, block);
   const node = blockToNode(fullBlock, editor.pmSchema);
 
   expect(node).toMatchSnapshot();
diff --git a/packages/xl-odt-exporter/src/odt/odtExporter.test.ts b/packages/xl-odt-exporter/src/odt/odtExporter.test.ts
@@ -2,8 +2,8 @@ import {
   BlockNoteSchema,
   createPageBreakBlockSpec,
   defaultBlockSpecs,
+  partialBlocksToBlocks,
 } from "@blocknote/core";
-import { partialBlocksToFullBlocks } from "@blocknote/core/src/schema/partialBlockToFullBlock.js";
 import { ColumnBlock, ColumnListBlock } from "@blocknote/xl-multi-column";
 import { testDocument } from "@shared/testDocument.js";
 import { BlobReader, TextWriter, ZipReader } from "@zip.js/zip.js";
@@ -78,7 +78,7 @@ describe("exporter", () => {
       });
       const exporter = new ODTExporter(schema, odtDefaultSchemaMappings);
       const odt = await exporter.toODTDocument(
-        partialBlocksToFullBlocks(schema, [
+        partialBlocksToBlocks(schema, [
           {
             type: "columnList",
             children: [
diff --git a/packages/xl-pdf-exporter/src/pdf/pdfExporter.test.tsx b/packages/xl-pdf-exporter/src/pdf/pdfExporter.test.tsx
@@ -7,7 +7,7 @@ import {
   defaultBlockSpecs,
   defaultInlineContentSpecs,
   defaultStyleSpecs,
-  partialBlocksToFullBlocks,
+  partialBlocksToBlocks,
 } from "@blocknote/core";
 import { ColumnBlock, ColumnListBlock } from "@blocknote/xl-multi-column";
 import { Text } from "@react-pdf/renderer";
@@ -236,7 +236,7 @@ describe("exporter", () => {
     });
     const exporter = new PDFExporter(schema, pdfDefaultSchemaMappings);
     const transformed = await exporter.toReactPDFDocument(
-      partialBlocksToFullBlocks(schema, [
+      partialBlocksToBlocks(schema, [
         {
           type: "columnList",
           children: [
diff --git a/shared/testDocument.ts b/shared/testDocument.ts
@@ -2,15 +2,15 @@ import {
   BlockNoteSchema,
   createPageBreakBlockSpec,
   defaultBlockSpecs,
-  partialBlocksToFullBlocks,
+  partialBlocksToBlocks,
 } from "@blocknote/core";
 import * as z from "zod/v4";
 
 // @ts-ignore
 const y = z; // needed to fix build
 
 // TODO: Update tests that use this to the new format and remove
-export const testDocument = partialBlocksToFullBlocks(
+export const testDocument = partialBlocksToBlocks(
   BlockNoteSchema.create({
     blockSpecs: { ...defaultBlockSpecs, pageBreak: createPageBreakBlockSpec() },
   }),
diff --git a/tests/src/unit/shared/formatConversion/export/exportTestExecutors.ts b/tests/src/unit/shared/formatConversion/export/exportTestExecutors.ts
@@ -3,8 +3,8 @@ import {
   BlockSchema,
   blockToNode,
   InlineContentSchema,
-  partialBlocksToFullBlocks,
-  partialBlockToFullBlock,
+  partialBlocksToBlocks,
+  partialBlockToBlock,
   StyleSchema,
 } from "@blocknote/core";
 import { prettify } from "htmlfy";
@@ -25,7 +25,7 @@ export const testExportBlockNoteHTML = async <
   await expect(
     prettify(
       await editor.blocksToFullHTML(
-        partialBlocksToFullBlocks(editor.schema, testCase.content),
+        partialBlocksToBlocks(editor.schema, testCase.content),
       ),
       {
         tag_wrap: true,
@@ -47,7 +47,7 @@ export const testExportHTML = async <
   await expect(
     prettify(
       await editor.blocksToHTMLLossy(
-        partialBlocksToFullBlocks(editor.schema, testCase.content),
+        partialBlocksToBlocks(editor.schema, testCase.content),
       ),
       {
         tag_wrap: true,
@@ -68,7 +68,7 @@ export const testExportMarkdown = async <
 
   await expect(
     await editor.blocksToMarkdownLossy(
-      partialBlocksToFullBlocks(editor.schema, testCase.content),
+      partialBlocksToBlocks(editor.schema, testCase.content),
     ),
   ).toMatchFileSnapshot(`./__snapshots__/markdown/${testCase.name}.md`);
 };
@@ -86,7 +86,7 @@ export const testExportNodes = async <
   await expect(
     testCase.content.map((block) =>
       blockToNode(
-        partialBlockToFullBlock(editor.schema, block),
+        partialBlockToBlock(editor.schema, block),
         editor.pmSchema,
         editor.schema.styleSchema,
       ),
diff --git a/tests/src/unit/shared/formatConversion/exportParseEquality/exportParseEqualityTestExecutors.ts b/tests/src/unit/shared/formatConversion/exportParseEquality/exportParseEqualityTestExecutors.ts

Original file line number	Diff line number	Diff line change
`@@ -282,6 +282,7 @@ function blockOrInlineContentToContentNode(`
`282`	`282`
`283`	`283`	`// TODO: needed? came from previous code`
`284`	`284`	`if (type === undefined) {`
	`285`	`+ // TODO: remove`
`285`	`286`	`type = "paragraph";`
`286`	`287`	`}`
`287`	`288`