chore: avoid withMultiColumn

Author: nperez0111

docs/app/(home)/hero/DemoEditor.tsx

@@ -16,7 +16,8 @@ import {
   getMultiColumnSlashMenuItems,
   locales as multiColumnLocales,
   multiColumnDropCursor,
-  withMultiColumn,
+  ColumnListBlock,
+  ColumnBlock,
 } from "@blocknote/xl-multi-column";
 import "@blocknote/mantine/style.css";
 import { useTheme } from "next-themes";
@@ -90,7 +91,12 @@ export default function DemoEditor() {
         ...locales.en,
         multi_column: multiColumnLocales.en,
       },
-      schema: withMultiColumn(BlockNoteSchema.create()),
+      schema: BlockNoteSchema.create().extend({
+        blockSpecs: {
+          column: ColumnBlock,
+          columnList: ColumnListBlock,
+        },
+      }),
       dropCursor: multiColumnDropCursor,
       collaboration: {
         provider,

examples/01-basic/03-multi-column/src/App.tsx

@@ -13,17 +13,23 @@ import {
   useCreateBlockNote,
 } from "@blocknote/react";
 import {
+  ColumnBlock,
+  ColumnListBlock,
   getMultiColumnSlashMenuItems,
   multiColumnDropCursor,
   locales as multiColumnLocales,
-  withMultiColumn,
 } from "@blocknote/xl-multi-column";
 import { useMemo } from "react";
 export default function App() {
   // Creates a new editor instance.
   const editor = useCreateBlockNote({
     // Adds column and column list blocks to the schema.
-    schema: withMultiColumn(BlockNoteSchema.create()),
+    schema: BlockNoteSchema.create().extend({
+      blockSpecs: {
+        column: ColumnBlock,
+        columnList: ColumnListBlock,
+      },
+    }),
     // The default drop cursor only shows up above and below blocks - we replace
     // it with the multi-column one that also shows up on the sides of blocks.
     dropCursor: multiColumnDropCursor,

examples/05-interoperability/05-converting-blocks-to-pdf/src/App.tsx

@@ -22,7 +22,8 @@ import {
   getMultiColumnSlashMenuItems,
   multiColumnDropCursor,
   locales as multiColumnLocales,
-  withMultiColumn,
+  ColumnListBlock,
+  ColumnBlock,
 } from "@blocknote/xl-multi-column";
 import { PDFViewer } from "@react-pdf/renderer";
 import { useEffect, useMemo, useState } from "react";
@@ -35,13 +36,13 @@ export default function App() {
 
   // Creates a new editor instance with some initial content.
   const editor = useCreateBlockNote({
-    schema: withMultiColumn(
-      BlockNoteSchema.create().extend({
-        blockSpecs: {
-          pageBreak: createPageBreakBlockSpec(),
-        },
-      }),
-    ),
+    schema: BlockNoteSchema.create().extend({
+      blockSpecs: {
+        pageBreak: createPageBreakBlockSpec(),
+        column: ColumnBlock,
+        columnList: ColumnListBlock,
+      },
+    }),
     dropCursor: multiColumnDropCursor,
     dictionary: {
       ...locales.en,

examples/05-interoperability/06-converting-blocks-to-docx/src/App.tsx

@@ -22,7 +22,8 @@ import {
   getMultiColumnSlashMenuItems,
   multiColumnDropCursor,
   locales as multiColumnLocales,
-  withMultiColumn,
+  ColumnListBlock,
+  ColumnBlock,
 } from "@blocknote/xl-multi-column";
 import { useMemo } from "react";
 
@@ -31,13 +32,13 @@ import "./styles.css";
 export default function App() {
   // Creates a new editor instance with some initial content.
   const editor = useCreateBlockNote({
-    schema: withMultiColumn(
-      BlockNoteSchema.create().extend({
-        blockSpecs: {
-          pageBreak: createPageBreakBlockSpec(),
-        },
-      }),
-    ),
+    schema: BlockNoteSchema.create().extend({
+      blockSpecs: {
+        pageBreak: createPageBreakBlockSpec(),
+        column: ColumnBlock,
+        columnList: ColumnListBlock,
+      },
+    }),
     dropCursor: multiColumnDropCursor,
     dictionary: {
       ...locales.en,

examples/05-interoperability/07-converting-blocks-to-odt/src/App.tsx

@@ -22,7 +22,8 @@ import {
   getMultiColumnSlashMenuItems,
   multiColumnDropCursor,
   locales as multiColumnLocales,
-  withMultiColumn,
+  ColumnBlock,
+  ColumnListBlock,
 } from "@blocknote/xl-multi-column";
 import { useMemo } from "react";
 
@@ -31,10 +32,12 @@ import "./styles.css";
 export default function App() {
   // Creates a new editor instance with some initial content.
   const editor = useCreateBlockNote({
-    schema: withMultiColumn(
+    schema: (
       BlockNoteSchema.create().extend({
         blockSpecs: {
           pageBreak: createPageBreakBlockSpec(),
+          column: ColumnBlock,
+          columnList: ColumnListBlock,
         },
       }),
     ),

packages/xl-ai/src/testUtil/cases/schemas/mention.ts

@@ -1,8 +1,4 @@
-import {
-  BlockNoteSchema,
-  createInlineContentSpec,
-  defaultInlineContentSpecs,
-} from "@blocknote/core";
+import { BlockNoteSchema, createInlineContentSpec } from "@blocknote/core";
 
 export const mention = createInlineContentSpec(
   {
@@ -23,12 +19,11 @@ export const mention = createInlineContentSpec(
         dom: mention,
       };
     },
-  }
+  },
 );
 
-export const schemaWithMention = BlockNoteSchema.create({
+export const schemaWithMention = BlockNoteSchema.create().extend({
   inlineContentSpecs: {
     mention,
-    ...defaultInlineContentSpecs,
   },
 });

packages/xl-multi-column/src/blocks/schema.ts

@@ -23,21 +23,10 @@ export const withMultiColumn = <
 >(
   schema: BlockNoteSchema<B, I, S>,
 ) => {
-  return BlockNoteSchema.create({
+  return schema.extend({
     blockSpecs: {
-      ...schema.blockSpecs,
       column: ColumnBlock,
       columnList: ColumnListBlock,
     },
-    inlineContentSpecs: schema.inlineContentSpecs,
-    styleSpecs: schema.styleSpecs,
-  }) as any as BlockNoteSchema<
-    // typescript needs some help here
-    B & {
-      column: typeof ColumnBlock.config;
-      columnList: typeof ColumnListBlock.config;
-    },
-    I,
-    S
-  >;
+  });
 };