feat: preliminary support for tiptap v3

Author: nperez0111

package-lock.json

@@ -69,25 +69,24 @@
   "dependencies": {
     "@emoji-mart/data": "^1.2.1",
     "@shikijs/types": "3.2.1",
-    "@tiptap/core": "^2.11.5",
-    "@tiptap/extension-bold": "^2.11.5",
-    "@tiptap/extension-code": "^2.11.5",
-    "@tiptap/extension-collaboration": "^2.11.5",
-    "@tiptap/extension-collaboration-cursor": "^2.11.5",
-    "@tiptap/extension-gapcursor": "^2.11.5",
-    "@tiptap/extension-hard-break": "^2.11.5",
-    "@tiptap/extension-undo-redo": "^2.11.5",
-    "@tiptap/extension-horizontal-rule": "^2.11.5",
-    "@tiptap/extension-italic": "^2.11.5",
-    "@tiptap/extension-link": "^2.11.5",
-    "@tiptap/extension-paragraph": "^2.11.5",
-    "@tiptap/extension-strike": "^2.11.5",
-    "@tiptap/extension-table-cell": "^2.11.5",
-    "@tiptap/extension-table-header": "^2.11.5",
-    "@tiptap/extension-table-row": "^2.11.5",
-    "@tiptap/extension-text": "^2.11.5",
-    "@tiptap/extension-underline": "^2.11.5",
-    "@tiptap/pm": "^2.11.5",
+    "@tiptap/core": "3.0.0-next.7",
+    "@tiptap/extension-bold": "3.0.0-next.7",
+    "@tiptap/extension-code": "3.0.0-next.7",
+    "@tiptap/extension-collaboration": "3.0.0-next.7",
+    "@tiptap/extension-collaboration-caret": "3.0.0-next.7",
+    "@tiptap/extension-gapcursor": "3.0.0-next.7",
+    "@tiptap/extensions": "3.0.0-next.7",
+    "@tiptap/extension-hard-break": "3.0.0-next.7",
+    "@tiptap/extension-history": "3.0.0-next.7",
+    "@tiptap/extension-horizontal-rule": "3.0.0-next.7",
+    "@tiptap/extension-italic": "3.0.0-next.7",
+    "@tiptap/extension-link": "3.0.0-next.7",
+    "@tiptap/extension-paragraph": "3.0.0-next.7",
+    "@tiptap/extension-strike": "3.0.0-next.7",
+    "@tiptap/extension-table": "3.0.0-next.7",
+    "@tiptap/extension-text": "3.0.0-next.7",
+    "@tiptap/extension-underline": "3.0.0-next.7",
+    "@tiptap/pm": "3.0.0-next.7",
     "emoji-mart": "^5.6.0",
     "hast-util-from-dom": "^5.0.1",
     "prosemirror-dropcursor": "^1.8.1",
@@ -112,6 +111,7 @@
     "yjs": "^13.6.15"
   },
   "devDependencies": {
+    "@hocuspocus/provider": "^2.15.2",
     "@types/emoji-mart": "^3.0.14",
     "@types/hast": "^3.0.0",
     "@types/uuid": "^8.3.4",
@@ -142,5 +142,9 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
+  "overrides": {
+    "@tiptap/y-tiptap": "y-prosemirror@1.2.17",
+    "y-prosemirror": "1.2.17"
+  },
   "gitHead": "37614ab348dcc7faa830a9a88437b37197a2162d"
 }

packages/core/package.json

@@ -1,6 +1,4 @@
-import { TableCell } from "@tiptap/extension-table-cell";
-import { TableHeader } from "@tiptap/extension-table-header";
-import { TableRow } from "@tiptap/extension-table-row";
+import { TableCell, TableHeader, TableRow } from "@tiptap/extension-table";
 import { Node as PMNode } from "prosemirror-model";
 import { TableView } from "prosemirror-tables";
 

packages/core/src/blocks/TableBlockContent/TableBlockContent.ts

@@ -1,7 +1,5 @@
+import { Gapcursor, UndoRedo } from "@tiptap/extensions";
 import { /*AnyExtension,*/ Extension, extensions } from "@tiptap/core";
-import { Gapcursor } from "@tiptap/extension-gapcursor";
-import { HardBreak } from "@tiptap/extension-hard-break";
-import { UndoRedo } from "@tiptap/extension-undo-redo";
 import { Link } from "@tiptap/extension-link";
 import { Text } from "@tiptap/extension-text";
 import { Plugin } from "prosemirror-state";

packages/core/src/editor/BlockNoteExtensions.ts

@@ -8,7 +8,6 @@ import { EditorState, Transaction } from "@tiptap/pm/state";
 import { blockToNode } from "../api/nodeConversions/blockToNode.js";
 import { PartialBlock } from "../blocks/defaultBlocks.js";
 import { StyleSchema } from "../schema/index.js";
-import type { BlockNoteEditor } from "./BlockNoteEditor.js";
 
 export type BlockNoteTipTapEditorOptions = Partial<
   Omit<EditorOptions, "content">

packages/core/src/editor/BlockNoteTipTapEditor.ts

@@ -1,5 +1,5 @@
 import Collaboration from "@tiptap/extension-collaboration";
-import CollaborationCursor from "@tiptap/extension-collaboration-cursor";
+import CollaborationCursor from "@tiptap/extension-collaboration-caret";
 import { Awareness } from "y-protocols/awareness";
 import * as Y from "yjs";
 

packages/core/src/extensions/Collaboration/createCollaborationExtensions.ts

@@ -63,8 +63,8 @@ export function createReactStyleSpec<T extends StyleConfig>(
   // this is a bit of a hack to register an `addMarkView` function on the mark type
   //
   // we can clean this once MarkViews land in tiptap
-  mark.config.addMarkView =
-    (editor: BlockNoteEditor<any, any, any>) => (mark: any, view: any) => {
+  mark.config.addMarkView = ((editor: BlockNoteEditor<any, any, any>) =>
+    (mark: any, view: any) => {
       const markView = new ReactMarkView({
         editor,
         inline: true,
@@ -77,7 +77,7 @@ export function createReactStyleSpec<T extends StyleConfig>(
       });
       markView.render();
       return markView;
-    };
+    }) as any; // TODO implement real mark views
 
   return createInternalStyleSpec(styleConfig, {
     mark,

packages/react/src/schema/ReactStyleSpec.tsx

@@ -47,7 +47,7 @@
   "dependencies": {
     "@blocknote/core": "^0.26.0",
     "@blocknote/react": "^0.26.0",
-    "@tiptap/core": "^2.7.1",
+    "@tiptap/core": "3.0.0-next.7",
     "prosemirror-model": "^1.23.0",
     "prosemirror-state": "^1.4.3",
     "prosemirror-tables": "^1.3.7",