@magic-marker/prosemirror-suggest-changes 0.3.3-wrap-unwrap.20 → 0.3.3-wrap-unwrap.22

package/dist/__tests__/playwrightPage.d.ts

@@ -22,6 +22,7 @@ export declare class EditorPage {
         currentDoc: Node;
         expectedDoc: Node;
     }>;
+    revertSuggestion(suggestionId: number): Promise<void>;
     revertAll(): Promise<void>;
     applyAll(): Promise<void>;
     /**

package/dist/commands.js

@@ -31,6 +31,7 @@ import { applyAllStructureSuggestions, applyStructureSuggestion } from "./featur
             tr.removeNodeMark(0, markTypeToApply);
         }
     }
+    const restoredStructureSuggestionIds = new Set();
     node.descendants((child, pos)=>{
         if (from !== undefined && pos < from) {
             return true;
@@ -62,8 +63,10 @@ import { applyAllStructureSuggestions, applyStructureSuggestion } from "./featur
         const insertionTo = insertionFrom + child.nodeSize;
         if (child.isInline) {
             tr.removeMark(insertionFrom, insertionTo, markTypeToApply);
-            const reverted = maybeRevertJoinMark(tr, insertionFrom, insertionTo, child, markTypeToApply);
-            if (!reverted && child.text === ZWSP) {
+            const joinRevertResult = maybeRevertJoinMark(tr, insertionFrom, insertionTo, child, markTypeToApply);
+            // reverting a join mark may produce new structure marks that were serialized in the join metadata
+            if (joinRevertResult) joinRevertResult.restoredStructureSuggestionIds.forEach((id)=>restoredStructureSuggestionIds.add(id));
+            if (!joinRevertResult && child.text === ZWSP) {
                 tr.delete(insertionFrom, insertionTo);
             }
         } else {
@@ -71,6 +74,9 @@ import { applyAllStructureSuggestions, applyStructureSuggestion } from "./featur
         }
         return true;
     });
+    return {
+        restoredStructureSuggestionIds
+    };
 }
 function revertModifications(node, pos, tr) {
     const { modification } = getSuggestionMarks(node.type.schema);
@@ -358,12 +364,18 @@ export function applySuggestionsToRange(doc, from, to) {
         const structureTransform = revertStructureSuggestion(state.doc, suggestionId);
         // then start a clear transform from the document where the structure changes are reverted
         const suggestionsTransform = new Transform(structureTransform.doc);
-        applySuggestionsToTransform(suggestionsTransform.doc, suggestionsTransform, deletion, insertion, suggestionId, from, to);
+        const { restoredStructureSuggestionIds } = applySuggestionsToTransform(suggestionsTransform.doc, suggestionsTransform, deletion, insertion, suggestionId, from, to);
         applyModificationsToTransform(suggestionsTransform.doc, suggestionsTransform, -1, undefined, from, to);
         // replay suggestion transform on top of the structure transform
         suggestionsTransform.steps.forEach((step)=>{
             structureTransform.step(step);
         });
+        restoredStructureSuggestionIds.forEach((suggestionId)=>{
+            const restoredStructureTransform = revertStructureSuggestion(structureTransform.doc, suggestionId);
+            restoredStructureTransform.steps.forEach((step)=>{
+                structureTransform.step(step);
+            });
+        });
         // apply the structure transform to the transaction
         const transaction = state.tr;
         structureTransform.steps.forEach((step)=>{

package/dist/ensureSelectionPlugin.js

@@ -1,7 +1,7 @@
 import { Plugin, PluginKey, TextSelection } from "prosemirror-state";
 import { getSuggestionMarks } from "./utils.js";
 import { ZWSP } from "./constants.js";
-const TRACE_ENABLED = false;
+const TRACE_ENABLED = true;
 function trace(...args) {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (!TRACE_ENABLED) return;

package/dist/features/joinOnDelete/index.d.ts

@@ -2,7 +2,9 @@ import { Mark, type Node, type MarkType, type ResolvedPos } from "prosemirror-mo
 import { Transform } from "prosemirror-transform";
 import { type Transaction } from "prosemirror-state";
 import { type SuggestionId } from "../../generateId.js";
-export declare function maybeRevertJoinMark(tr: Transform, from: number, to: number, node: Node, markType: MarkType): boolean;
+export declare function maybeRevertJoinMark(tr: Transform, from: number, to: number, node: Node, markType: MarkType): false | {
+    restoredStructureSuggestionIds: Set<SuggestionId>;
+};
 /**
  * Remove ZWSP text nodes marked as deletions (except for type=join) from the given range
  */

package/dist/features/joinOnDelete/index.js

@@ -41,6 +41,23 @@ function restoreNodeMarkup(tr, pos, node) {
     tr.setNodeMarkup(pos, nodeType, node.attrs, marks);
     return true;
 }
+// collect structure suggestion IDs that will be re-introduced into the document after the join is reverted
+function getRestoredStructureSuggestionIds(joinNodes, schema) {
+    const { structure } = getSuggestionMarks(schema);
+    const restoredStructureSuggestionIds = new Set();
+    for (const node of [
+        ...joinNodes.leftNodes,
+        ...joinNodes.rightNodes
+    ]){
+        const marks = marksFromJSON(schema, node.marks);
+        for (const mark of marks){
+            if (mark.type !== structure) continue;
+            if (!guardStructureMarkAttrs(mark.attrs)) continue;
+            restoredStructureSuggestionIds.add(mark.attrs.id);
+        }
+    }
+    return restoredStructureSuggestionIds;
+}
 export function maybeRevertJoinMark(tr, from, to, node, markType) {
     const mark = node.marks.find((mark)=>mark.type === markType);
     if (!mark || !isJoinMark(mark) || node.text !== ZWSP) return false;
@@ -58,6 +75,7 @@ export function maybeRevertJoinMark(tr, from, to, node, markType) {
             return false;
         }
     }
+    const restoredStructureSuggestionIds = getRestoredStructureSuggestionIds(joinNodes, tr.doc.type.schema);
     // Reverting a join marker removes its ZWSP anchor, splits at that position,
     // and restores markup because ProseMirror split creates nodes with defaults.
     const joinDepth = joinNodes.leftNodes.length;
@@ -79,7 +97,9 @@ export function maybeRevertJoinMark(tr, from, to, node, markType) {
         // Each deeper right node starts one position inside the right node restored before it.
         rightPos += 1;
     }
-    return true;
+    return {
+        restoredStructureSuggestionIds
+    };
 }
 /**
  * Remove ZWSP text nodes marked as deletions (except for type=join) from the given range

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magic-marker/prosemirror-suggest-changes",
-  "version": "0.3.3-wrap-unwrap.20",
+  "version": "0.3.3-wrap-unwrap.22",
   "license": "MIT",
   "type": "module",
   "module": "dist/index.js",