Merge branch 'main' into new-release

Author: matthewlipski

docs/next.config.mjs

@@ -118,6 +118,11 @@ const nextConfig = withAnalyzer(
         destination: "/docs/advanced/vanilla-js",
         permanent: true,
       },
+      {
+        source: "/examples/basic/all-blocks",
+        destination: "/examples/basic/default-blocks",
+        permanent: true,
+      },
     ],
     experimental: {
       externalDir: true,

docs/pages/docs/advanced/real-time-collaboration.mdx

@@ -38,6 +38,9 @@ const editor = useCreateBlockNote({
       name: "My Username",
       color: "#ff0000",
     },
+    // When to show user labels on the collaboration cursor. Set by default to
+    // "activity" (show when the cursor moves), but can also be set to "always".
+    showCursorLabels: "activity"
   },
   // ...
 });

docs/pages/docs/editor-basics/default-schema.mdx

@@ -14,7 +14,7 @@ BlockNote supports a number of built-in blocks, inline content types, and styles
 
 The demo below showcases each of BlockNote's built-in block and inline content types:
 
-<Example name="basic/all-blocks" />
+<Example name="basic/default-blocks" />
 
 ## Default Blocks
 

examples/01-basic/04-all-blocks/.bnexample.json

@@ -0,0 +1,6 @@
+{
+  "playground": true,
+  "docs": true,
+  "author": "yousefed",
+  "tags": ["Basic", "Blocks", "Inline Content"]
+}

examples/01-basic/04-default-blocks/.bnexample.json

@@ -1,33 +1,11 @@
-import {
-  BlockNoteSchema,
-  combineByGroup,
-  filterSuggestionItems,
-  locales,
-} from "@blocknote/core";
 import "@blocknote/core/fonts/inter.css";
 import { BlockNoteView } from "@blocknote/mantine";
 import "@blocknote/mantine/style.css";
-import {
-  SuggestionMenuController,
-  getDefaultReactSlashMenuItems,
-  useCreateBlockNote,
-} from "@blocknote/react";
-import {
-  getMultiColumnSlashMenuItems,
-  multiColumnDropCursor,
-  locales as multiColumnLocales,
-  withMultiColumn,
-} from "@blocknote/xl-multi-column";
-import { useMemo } from "react";
+import { useCreateBlockNote } from "@blocknote/react";
+
 export default function App() {
   // Creates a new editor instance.
   const editor = useCreateBlockNote({
-    schema: withMultiColumn(BlockNoteSchema.create()),
-    dropCursor: multiColumnDropCursor,
-    dictionary: {
-      ...locales.en,
-      multi_column: multiColumnLocales.en,
-    },
     initialContent: [
       {
         type: "paragraph",
@@ -50,35 +28,6 @@ export default function App() {
         type: "paragraph",
         content: "Paragraph",
       },
-      {
-        type: "columnList",
-        children: [
-          {
-            type: "column",
-            props: {
-              width: 0.8,
-            },
-            children: [
-              {
-                type: "paragraph",
-                content: "Hello to the left!",
-              },
-            ],
-          },
-          {
-            type: "column",
-            props: {
-              width: 1.2,
-            },
-            children: [
-              {
-                type: "paragraph",
-                content: "Hello to the right!",
-              },
-            ],
-          },
-        ],
-      },
       {
         type: "heading",
         content: "Heading",
@@ -188,20 +137,6 @@ export default function App() {
     ],
   });
 
-  const slashMenuItems = useMemo(() => {
-    return combineByGroup(
-      getDefaultReactSlashMenuItems(editor),
-      getMultiColumnSlashMenuItems(editor)
-    );
-  }, [editor]);
-
   // Renders the editor instance using a React component.
-  return (
-    <BlockNoteView editor={editor} slashMenu={false}>
-      <SuggestionMenuController
-        triggerCharacter={"/"}
-        getItems={async (query) => filterSuggestionItems(slashMenuItems, query)}
-      />
-    </BlockNoteView>
-  );
+  return <BlockNoteView editor={editor} />;
 }

examples/01-basic/04-all-blocks/App.tsx renamed to examples/01-basic/04-default-blocks/App.tsx

@@ -1,5 +1,5 @@
 {
-  "name": "@blocknote/example-all-blocks",
+  "name": "@blocknote/example-default-blocks",
   "description": "AUTO-GENERATED FILE, DO NOT EDIT DIRECTLY",
   "private": true,
   "version": "0.12.4",
@@ -17,8 +17,7 @@
     "@blocknote/mantine": "latest",
     "@blocknote/shadcn": "latest",
     "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "@blocknote/xl-multi-column": "latest"
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
     "@types/react": "^18.0.25",