Merge branch 'main' into plugin-system

Author: nperez0111

docs/package.json

@@ -22,14 +22,14 @@
     "@ai-sdk/openai-compatible": "^1.0.22",
     "@aws-sdk/client-s3": "^3.609.0",
     "@aws-sdk/s3-request-presigner": "^3.609.0",
-    "@blocknote/code-block": "latest",
-    "@blocknote/server-util": "latest",
-    "@blocknote/xl-ai": "latest",
-    "@blocknote/xl-docx-exporter": "latest",
-    "@blocknote/xl-email-exporter": "latest",
-    "@blocknote/xl-multi-column": "latest",
-    "@blocknote/xl-odt-exporter": "latest",
-    "@blocknote/xl-pdf-exporter": "latest",
+    "@blocknote/code-block": "workspace:*",
+    "@blocknote/server-util": "workspace:*",
+    "@blocknote/xl-ai": "workspace:*",
+    "@blocknote/xl-docx-exporter": "workspace:*",
+    "@blocknote/xl-email-exporter": "workspace:*",
+    "@blocknote/xl-multi-column": "workspace:*",
+    "@blocknote/xl-odt-exporter": "workspace:*",
+    "@blocknote/xl-pdf-exporter": "workspace:*",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@fumadocs/mdx-remote": "1.3.0",
@@ -79,12 +79,12 @@
     "clsx": "2.1.1",
     "docx": "^9.0.2",
     "framer-motion": "^11.18.2",
-    "fumadocs-core": "^15.8.5",
-    "fumadocs-docgen": "^2.1.0",
-    "fumadocs-mdx": "^11.10.1",
-    "fumadocs-twoslash": "^3.1.8",
-    "fumadocs-typescript": "^4.0.11",
-    "fumadocs-ui": "^15.8.5",
+    "fumadocs-core": "15.5.4",
+    "fumadocs-docgen": "2.0.1",
+    "fumadocs-mdx": "11.6.9",
+    "fumadocs-twoslash": "3.1.4",
+    "fumadocs-typescript": "4.0.6",
+    "fumadocs-ui": "15.5.4",
     "import-in-the-middle": "^1.15.0",
     "next": "15.5.1",
     "nodemailer": "^6.10.1",
@@ -107,15 +107,15 @@
     "zustand": "^5.0.3"
   },
   "devDependencies": {
-    "@blocknote/ariakit": "workspace:^",
-    "@blocknote/code-block": "workspace:^",
-    "@blocknote/core": "workspace:^",
-    "@blocknote/mantine": "workspace:^",
-    "@blocknote/react": "workspace:^",
-    "@blocknote/shadcn": "workspace:^",
-    "@blocknote/xl-docx-exporter": "workspace:^",
-    "@blocknote/xl-multi-column": "workspace:^",
-    "@blocknote/xl-pdf-exporter": "workspace:^",
+    "@blocknote/ariakit": "workspace:*",
+    "@blocknote/code-block": "workspace:*",
+    "@blocknote/core": "workspace:*",
+    "@blocknote/mantine": "workspace:*",
+    "@blocknote/react": "workspace:*",
+    "@blocknote/shadcn": "workspace:*",
+    "@blocknote/xl-docx-exporter": "workspace:*",
+    "@blocknote/xl-multi-column": "workspace:*",
+    "@blocknote/xl-pdf-exporter": "workspace:*",
     "@liveblocks/react": "^2.24.3",
     "@liveblocks/react-tiptap": "^2.24.3",
     "@liveblocks/react-ui": "^2.24.3",

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

@@ -102,6 +102,7 @@ export const createCodeBlockSpec = createBlockSpec(
       const code = el.firstElementChild!;
 
       return parser.parse(code, {
+        preserveWhitespace: "full",
         topNode: schema.nodes["codeBlock"].create(),
       }).content;
     },

packages/core/src/editor/BlockNoteEditor.ts

@@ -814,13 +814,26 @@ export class BlockNoteEditor<
     return !this._tiptapEditor.isInitialized;
   }
 
+  /**
+   * Focus on the editor
+   */
   public focus() {
     if (this.headless) {
       return;
     }
     this.prosemirrorView.focus();
   }
 
+  /**
+   * Blur the editor
+   */
+  public blur() {
+    if (this.headless) {
+      return;
+    }
+    this.prosemirrorView.dom.blur();
+  }
+
   // TODO move to extension
   public onUploadStart(callback: (blockId?: string) => void) {
     this.onUploadStartCallbacks.push(callback);

packages/core/src/extensions/BackgroundColor/BackgroundColorMark.ts

@@ -727,6 +727,8 @@ export const SideMenuProsemirrorPlugin = createExtension((editor) => {
       if (view) {
         view.isDragOrigin = false;
       }
+
+      editor.blur();
     },
 
     /**

packages/core/src/extensions/SideMenu/SideMenuPlugin.ts

@@ -81,6 +81,8 @@ export type CustomInlineContentImplementation<
         contentDOM?: HTMLElement;
       }
     | undefined;
+
+  runsBefore?: string[];
 };
 
 export function getInlineContentParseRules<C extends CustomInlineContentConfig>(
@@ -220,6 +222,7 @@ export function createInlineContentSpec<
     node,
     inlineContentConfig.propSchema,
     {
+      ...inlineContentImplementation,
       toExternalHTML: inlineContentImplementation.toExternalHTML,
       render(inlineContent, updateInlineContent, editor) {
         const output = inlineContentImplementation.render(

packages/core/src/extensions/TextColor/TextColorMark.ts

@@ -43,6 +43,7 @@ export type InlineContentImplementation<T extends InlineContentConfig> =
           ignoreMutation?: (mutation: ViewMutationRecord) => boolean;
           destroy?: () => void;
         };
+        runsBefore?: string[];
       };
 
 export type InlineContentSchemaWithInlineContent<

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

@@ -81,9 +81,13 @@ export class CustomBlockNoteSchema<
 
   private init() {
     const getPriority = sortByDependencies(
-      Object.entries(this.opts.blockSpecs).map(([key, val]) => ({
+      Object.entries({
+        ...this.opts.blockSpecs,
+        ...this.opts.inlineContentSpecs,
+        ...this.opts.styleSpecs,
+      }).map(([key, val]) => ({
         key: key,
-        runsBefore: val.implementation.runsBefore,
+        runsBefore: val.implementation?.runsBefore ?? [],
       })),
     );
 
@@ -105,19 +109,58 @@ export class CustomBlockNoteSchema<
         : never;
     };
 
+    const inlineContentSpecs = Object.fromEntries(
+      Object.entries(this.opts.inlineContentSpecs).map(
+        ([key, inlineContentSpec]) => {
+          // Case for text and links.
+          if (typeof inlineContentSpec.config !== "object") {
+            return [key, inlineContentSpec];
+          }
+
+          return [
+            key,
+            {
+              ...inlineContentSpec,
+              implementation: {
+                ...inlineContentSpec.implementation,
+                node: inlineContentSpec.implementation?.node.extend({
+                  priority: getPriority(key),
+                }),
+              },
+            },
+          ];
+        },
+      ),
+    ) as InlineContentSpecs;
+
+    const styleSpecs = Object.fromEntries(
+      Object.entries(this.opts.styleSpecs).map(([key, styleSpec]) => [
+        key,
+        {
+          ...styleSpec,
+          implementation: {
+            ...styleSpec.implementation,
+            mark: styleSpec.implementation?.mark.extend({
+              priority: getPriority(key),
+            }),
+          },
+        },
+      ]),
+    ) as StyleSpecs;
+
     return {
       blockSpecs,
       blockSchema: Object.fromEntries(
         Object.entries(blockSpecs).map(([key, blockDef]) => {
           return [key, blockDef.config];
         }),
       ) as any,
-      inlineContentSpecs: removeUndefined(this.opts.inlineContentSpecs),
-      styleSpecs: removeUndefined(this.opts.styleSpecs),
+      inlineContentSpecs: removeUndefined(inlineContentSpecs),
+      styleSpecs: removeUndefined(styleSpecs),
       inlineContentSchema: getInlineContentSchemaFromSpecs(
-        this.opts.inlineContentSpecs,
+        inlineContentSpecs,
       ) as any,
-      styleSchema: getStyleSchemaFromSpecs(this.opts.styleSpecs) as any,
+      styleSchema: getStyleSchemaFromSpecs(styleSpecs) as any,
     };
   }
 

packages/core/src/schema/inlineContent/types.ts

@@ -22,6 +22,7 @@ export type CustomStyleImplementation<T extends StyleConfig> = {
   parse?: (
     element: HTMLElement,
   ) => (T["propSchema"] extends "boolean" ? true : string) | undefined;
+  runsBefore?: string[];
 };
 
 export function getStyleParseRules<T extends StyleConfig>(
@@ -46,6 +47,10 @@ export function getStyleParseRules<T extends StyleConfig>(
   if (customParseFunction) {
     rules.push({
       tag: "*",
+      // By default, styles can overlap each other, so the rules should not
+      // completely consume the element they parse (which can have multiple
+      // styles).
+      consuming: false,
       getAttrs(node: string | HTMLElement) {
         if (typeof node === "string") {
           return false;
@@ -107,6 +112,7 @@ export function createStyleSpec<const T extends StyleConfig>(
   });
 
   return createInternalStyleSpec(styleConfig, {
+    ...styleImplementation,
     mark,
     render: (value) => {
       const renderResult = styleImplementation.render(value as any);