fix: get back on mainline y/prosemirror

Author: nperez0111

examples/07-collaboration/14-multi-doc-versioning/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite-plus/client" />

packages/core/src/y/extensions/YSync.ts

@@ -130,7 +130,7 @@ export const YSyncExtension = createExtension(
           // container => schema-invalid. No schema change / storage transform
           // needed; `blockContainer` already whitelists the `y-attributed-*`
           // marks. See blockMatchNodes.ts.
-          matchNodes: blockMatchNodes,
+          customCompare: blockMatchNodes,
         }),
       ],
       runsBefore: ["default"],

packages/core/src/y/extensions/blockMatchNodes.ts

@@ -1,12 +1,16 @@
 import * as delta from "lib0/delta";
+import * as schema from "lib0/schema";
+import { $prosemirrorDelta } from "@y/prosemirror";
 
 /**
  * Canonical name of a content delta's first block child (the child carried by an
  * insert op), or `null`. For a BlockNote `blockContainer` (content
  * `blockContent blockGroup?`) this is its block-content type (paragraph,
  * heading, image, ...).
  */
-const firstChildName = (d: delta.DeltaAny): string | null => {
+const firstChildName = (
+  d: schema.Unwrap<typeof $prosemirrorDelta>,
+): string | null => {
   for (const op of (d as any).children) {
     if (delta.$insertOp.check(op)) {
       for (const it of op.insert) {
@@ -42,9 +46,8 @@ const firstChildName = (d: delta.DeltaAny): string | null => {
  * @returns whether `a` and `b` are the same node (diff in place) vs different (replace)
  */
 export const blockMatchNodes = (
-  a: delta.DeltaAny,
-  b: delta.DeltaAny,
+  a: schema.Unwrap<typeof $prosemirrorDelta>,
+  b: schema.Unwrap<typeof $prosemirrorDelta>,
 ): boolean =>
-  (a as any).name === (b as any).name &&
-  ((a as any).name !== "blockContainer" ||
-    firstChildName(a) === firstChildName(b));
+  a.name === b.name &&
+  (a.name !== "blockContainer" || firstChildName(a) === firstChildName(b));