@tiptap/y-tiptap 3.0.0 → 3.0.2

package/dist/y-tiptap.cjs

@@ -330,7 +330,7 @@ const restoreRelativeSelection = (tr, relSel, binding) => {
         relSel.anchor,
         binding.mapping
       );
-      tr.setSelection(prosemirrorState.NodeSelection.create(tr.doc, anchor));
+      tr.setSelection(createSafeNodeSelection(tr, anchor));
     } else {
       const anchor = relativePositionToAbsolutePosition(
         binding.doc,
@@ -351,6 +351,23 @@ const restoreRelativeSelection = (tr, relSel, binding) => {
   }
 };
 
+/**
+ * @param {import('prosemirror-state').Transaction} tr
+ * @param {number} pos
+ * @returns {import('prosemirror-state').Selection}
+ *
+ * Creates a NodeSelection if the position points to a valid node, otherwise
+ * creates a TextSelection near the position.
+ */
+const createSafeNodeSelection = (tr, pos) => {
+  const $pos = tr.doc.resolve(pos);
+  if ($pos.nodeAfter) {
+    return prosemirrorState.NodeSelection.create(tr.doc, pos)
+  } else {
+    return prosemirrorState.TextSelection.near($pos)
+  }
+};
+
 /**
  * @param {ProsemirrorBinding} pmbinding
  * @param {import('prosemirror-state').EditorState} state
@@ -1033,9 +1050,18 @@ const equalYTextPText = (ytext, ptexts) => {
     delta.every(/** @type {(d:any,i:number) => boolean} */ (d, i) =>
       d.insert === /** @type {any} */ (ptexts[i]).text &&
       object__namespace.keys(d.attributes || {}).length === ptexts[i].marks.length &&
-      object__namespace.every(d.attributes, (attr, yattrname) => {
+      object__namespace.every(d.attributes, (attr, /** @type {string} */ yattrname) => {
         const markname = yattr2markname(yattrname);
         const pmarks = ptexts[i].marks;
+
+        const pmark = pmarks.find(/** @param {any} mark */ mark => mark.type.name === markname);
+
+        // Ensure the pmark is present in the ptexts before checking equality. When replacing a mark with another mark
+        // the pmark will be missing from the ptexts and the equalAttrs will throw an error.
+        if (!pmark) {
+          return false
+        }
+
         return equalAttrs(attr, pmarks.find(/** @param {any} mark */ mark => mark.type.name === markname)?.attrs)
       })
     )
@@ -1816,7 +1842,11 @@ function yXmlFragmentToProsemirrorJSON (xmlFragment) {
  * @param {any} _user user data
  * @return {boolean}
  */
-const defaultAwarenessStateFilter = (currentClientId, userClientId, _user) => currentClientId !== userClientId;
+const defaultAwarenessStateFilter = (
+  currentClientId,
+  userClientId,
+  _user
+) => currentClientId !== userClientId;
 
 /**
  * Default generator for a cursor element
@@ -1870,10 +1900,14 @@ const createDecorations = (
   createSelection
 ) => {
   const ystate = ySyncPluginKey.getState(state);
+  if (ystate == null || ystate.doc == null || ystate.binding == null) {
+    return prosemirrorView.DecorationSet.create(state.doc, [])
+  }
   const y = ystate.doc;
   const decorations = [];
   if (
-    ystate.snapshot != null || ystate.prevSnapshot != null ||
+    ystate.snapshot != null ||
+    ystate.prevSnapshot != null ||
     ystate.binding.mapping.size === 0
   ) {
     // do not render cursors while snapshot is active