fix: rm heading & code-block opts

Author: nperez0111

examples/04-theming/06-code-block/src/App.tsx

@@ -4,11 +4,16 @@ import "@blocknote/mantine/style.css";
 import { useCreateBlockNote } from "@blocknote/react";
 // This packages some of the most used languages in on-demand bundle
 import { codeBlock } from "@blocknote/code-block";
+import { BlockNoteSchema, createCodeBlockSpec } from "@blocknote/core";
 
 export default function App() {
   // Creates a new editor instance.
   const editor = useCreateBlockNote({
-    codeBlock,
+    schema: BlockNoteSchema.create().extend({
+      blockSpecs: {
+        codeBlock: createCodeBlockSpec(codeBlock),
+      },
+    }),
     initialContent: [
       {
         type: "codeBlock",

packages/code-block/src/index.ts

@@ -202,4 +202,4 @@ export const codeBlock = {
       themes: ["github-dark", "github-light"],
       langs: [],
     }),
-} as CodeBlockOptions;
+} satisfies CodeBlockOptions;

packages/core/src/blocks/Code/shiki.ts

@@ -22,7 +22,7 @@ export function lazyShikiPlugin(options: CodeBlockOptions) {
       if (process.env.NODE_ENV === "development" && !hasWarned) {
         // eslint-disable-next-line no-console
         console.log(
-          "For syntax highlighting of code blocks, you must provide a `codeBlock.createHighlighter` function",
+          "For syntax highlighting of code blocks, you must provide a `createCodeBlockSpec({ createHighlighter: () => ... })` function",
         );
         hasWarned = true;
       }

packages/core/src/blocks/defaultBlockTypeGuards.ts

@@ -25,6 +25,7 @@ export function editorHasBlockWithType<
               [PN in keyof Props]: {
                 default: undefined;
                 type: Props[PN];
+                values?: any[];
               };
             }
           >

packages/core/src/editor/BlockNoteEditor.ts

@@ -70,7 +70,6 @@ import {
   markdownToBlocks,
   markdownToHTML,
 } from "../api/parsers/markdown/parseMarkdown.js";
-import { CodeBlockOptions } from "../blocks/Code/block.js";
 import { editorHasBlockWithType } from "../blocks/defaultBlockTypeGuards.js";
 import type { ThreadStore, User } from "../comments/index.js";
 import { BlockChangePlugin } from "../extensions/BlockChange/BlockChangePlugin.js";
@@ -190,11 +189,6 @@ export type BlockNoteEditorOptions<
     showCursorLabels?: "always" | "activity";
   };
 
-  /**
-   * Options for code blocks.
-   */
-  codeBlock?: CodeBlockOptions;
-
   /**
    * Configuration for the comments feature, requires a `threadStore`.
    *
@@ -253,18 +247,6 @@ export type BlockNoteEditorOptions<
     class?: string;
   }) => Plugin;
 
-  /**
-   * Configuration for headings
-   */
-  heading?: {
-    /**
-     * The levels of headings that should be available in the editor.
-     * @note Configurable up to 6 levels of headings.
-     * @default [1, 2, 3]
-     */
-    levels?: (1 | 2 | 3 | 4 | 5 | 6)[];
-  };
-
   /**
    * The content that should be in the editor when it's created, represented as an array of {@link PartialBlock} objects.
    *
@@ -585,10 +567,6 @@ export class BlockNoteEditor<
       cellTextColor: boolean;
       headers: boolean;
     };
-    codeBlock: CodeBlockOptions;
-    heading: {
-      levels: (1 | 2 | 3 | 4 | 5 | 6)[];
-    };
   };
 
   public static create<
@@ -638,15 +616,6 @@ export class BlockNoteEditor<
         cellTextColor: options?.tables?.cellTextColor ?? false,
         headers: options?.tables?.headers ?? false,
       },
-      codeBlock: {
-        indentLineWithTab: options?.codeBlock?.indentLineWithTab ?? true,
-        defaultLanguage: options?.codeBlock?.defaultLanguage ?? "text",
-        supportedLanguages: options?.codeBlock?.supportedLanguages ?? {},
-        createHighlighter: options?.codeBlock?.createHighlighter ?? undefined,
-      },
-      heading: {
-        levels: options?.heading?.levels ?? [1, 2, 3],
-      },
     };
 
     // apply defaults

packages/core/src/extensions/SuggestionMenu/getDefaultSlashMenuItems.ts

@@ -354,8 +354,10 @@ export function getDefaultSlashMenuItems<
         ...editor.dictionary.slash_menu.toggle_heading_3,
       },
     );
+  }
 
-    editor.settings.heading.levels
+  if (editorHasBlockWithType(editor, "heading", { level: "number" })) {
+    (editor.schema.blockSchema.heading.propSchema.level.values || [])
       .filter((level): level is 4 | 5 | 6 => level > 3)
       .forEach((level) => {
         items.push({

packages/core/src/schema/blocks/createSpec.ts

@@ -307,7 +307,7 @@ export function createBlockSpec<
     | (TOptions extends undefined
         ? () => BlockNoteExtension<any>[]
         : (options: Partial<TOptions>) => BlockNoteExtension<any>[]),
-): (options?: TOptions) => BlockSpec<TName, TProps, TContent> {
+): (options?: Partial<TOptions>) => BlockSpec<TName, TProps, TContent> {
   return (options = {} as TOptions) => {
     const blockConfig =
       typeof blockConfigOrCreator === "function"

tests/src/unit/core/createTestEditor.ts

@@ -2,6 +2,7 @@ import {
   BlockNoteEditor,
   BlockNoteSchema,
   BlockSchema,
+  createCodeBlockSpec,
   initializeESMDependencies,
   InlineContentSchema,
   StyleSchema,
@@ -23,25 +24,25 @@ export const createTestEditor = <
     (window as any).__TEST_OPTIONS = (window as any).__TEST_OPTIONS || {};
 
     editor = BlockNoteEditor.create({
-      codeBlock: {
-        supportedLanguages: {
-          javascript: {
-            name: "JavaScript",
-            aliases: ["js"],
-          },
-          python: {
-            name: "Python",
-            aliases: ["py"],
-          },
+      schema: schema.extend({
+        blockSpecs: {
+          codeBlock: createCodeBlockSpec({
+            supportedLanguages: {
+              javascript: {
+                name: "JavaScript",
+                aliases: ["js"],
+              },
+              python: {
+                name: "Python",
+                aliases: ["py"],
+              },
+            },
+          }),
         },
-      },
-      heading: {
-        levels: [1, 2, 3, 4, 5, 6],
-      },
-      schema,
+      }),
       trailingBlock: false,
       uploadFile: uploadToTmpFilesDotOrg_DEV_ONLY,
-    });
+    }) as any;
     editor.mount(div);
 
     await initializeESMDependencies();