@magic-marker/prosemirror-suggest-changes 0.2.1-wrap-unwrap.0 → 0.2.1-wrap-unwrap.2

package/dist/commands.js

@@ -5,7 +5,7 @@ import { suggestChangesKey } from "./plugin.js";
 import { getSuggestionMarks } from "./utils.js";
 import { ZWSP } from "./constants.js";
 import { maybeRevertJoinMark } from "./features/joinOnDelete/index.js";
-import { revertAllStructureSuggestions } from "./features/wrapUnwrap/revertStructureSuggestion.js";
+import { applyStructureSuggestion, isStructureSuggestion, revertAllStructureSuggestions, revertStructureSuggestion } from "./features/wrapUnwrap/revertStructureSuggestion.js";
 /**
  * Given a node and a transform, add a set of steps to the
  * transform that applies all marks of type markTypeToApply
@@ -194,6 +194,9 @@ export function applySuggestionsToRange(doc, from, to) {
  * contents left in the doc.
  */ export function applySuggestion(suggestionId, from, to) {
     return (state, dispatch)=>{
+        if (isStructureSuggestion(suggestionId, state.tr)) {
+            return applyStructureSuggestion(suggestionId)(state, dispatch);
+        }
         const { deletion, insertion } = getSuggestionMarks(state.schema);
         const tr = state.tr;
         applySuggestionsToTransform(state.doc, tr, insertion, deletion, suggestionId, from, to);
@@ -252,6 +255,9 @@ export function applySuggestionsToRange(doc, from, to) {
  * Modifications tracked in modification marks will be reverted.
  */ export function revertSuggestion(suggestionId, from, to) {
     return (state, dispatch)=>{
+        if (isStructureSuggestion(suggestionId, state.tr)) {
+            return revertStructureSuggestion(suggestionId)(state, dispatch);
+        }
         const { deletion, insertion } = getSuggestionMarks(state.schema);
         const tr = state.tr;
         applySuggestionsToTransform(state.doc, tr, deletion, insertion, suggestionId, from, to);

package/dist/features/wrapUnwrap/revertStructureSuggestion.d.ts

@@ -1,6 +1,44 @@
 import { type Transaction, type Command } from "prosemirror-state";
 import { type SuggestionId } from "../../generateId.js";
-import { type Node } from "prosemirror-model";
+import { type Node, type Mark } from "prosemirror-model";
+import { type Transform } from "prosemirror-transform";
+export declare function isStructureSuggestion(suggestionId: SuggestionId, tr: Transaction): boolean;
 export declare function revertAllStructureSuggestions(doc: Node, tr: Transaction): void;
 export declare function revertStructureSuggestion(suggestionId: SuggestionId): Command;
+export declare function applyStructureSuggestion(suggestionId: SuggestionId): Command;
 export declare function revertStructureSuggestions(suggestionIds: SuggestionId[]): Command;
+export declare function applyStructureMarkGroup(group: {
+    type: "replaceAround";
+    markFrom: {
+        pos: number;
+        node: Node;
+        mark: Mark;
+    };
+    markTo: {
+        pos: number;
+        node: Node;
+        mark: Mark;
+    };
+    markGapFrom: {
+        pos: number;
+        node: Node;
+        mark: Mark;
+    };
+    markGapTo: {
+        pos: number;
+        node: Node;
+        mark: Mark;
+    };
+} | {
+    type: "replace";
+    markFrom: {
+        pos: number;
+        node: Node;
+        mark: Mark;
+    };
+    markTo: {
+        pos: number;
+        node: Node;
+        mark: Mark;
+    };
+}, tr: Transform): void;

package/dist/features/wrapUnwrap/revertStructureSuggestion.js

@@ -2,6 +2,15 @@ import { suggestChangesKey } from "../../plugin.js";
 import { getSuggestionMarks } from "../../utils.js";
 import { Slice } from "prosemirror-model";
 import { ReplaceAroundStep, ReplaceStep } from "prosemirror-transform";
+export function isStructureSuggestion(suggestionId, tr) {
+    try {
+        findStructureMarkGroupBySuggestionId(suggestionId, tr);
+        return true;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    } catch (error) {
+        return false;
+    }
+}
 export function revertAllStructureSuggestions(doc, tr) {
     const { structure } = getSuggestionMarks(doc.type.schema);
     // find structure mark in the doc
@@ -38,6 +47,18 @@ export function revertStructureSuggestion(suggestionId) {
         return true;
     };
 }
+export function applyStructureSuggestion(suggestionId) {
+    return (state, dispatch)=>{
+        const tr = state.tr;
+        performStructureRevert(suggestionId, tr, "apply");
+        if (!tr.steps.length) return false;
+        tr.setMeta(suggestChangesKey, {
+            skip: true
+        });
+        dispatch?.(tr);
+        return true;
+    };
+}
 export function revertStructureSuggestions(suggestionIds) {
     return (state, dispatch)=>{
         const tr = state.tr;
@@ -52,7 +73,7 @@ export function revertStructureSuggestions(suggestionIds) {
         return true;
     };
 }
-function performStructureRevert(suggestionId, tr) {
+function performStructureRevert(suggestionId, tr, direction = "revert") {
     console.groupCollapsed(// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
     `performStructureRevert, suggestionId = ${suggestionId}`);
     const { structure } = getSuggestionMarks(tr.doc.type.schema);
@@ -167,7 +188,11 @@ function performStructureRevert(suggestionId, tr) {
     const markIds = Array.from(structureMarkGroups.values()).sort((a, b)=>Number(b) - Number(a));
     markIds.forEach((id)=>{
         const group = findStructureMarkGroupBySuggestionId(id, tr);
-        revertStructureMarkGroup(group, tr);
+        if (direction === "apply") {
+            applyStructureMarkGroup(group, tr);
+        } else {
+            revertStructureMarkGroup(group, tr);
+        }
     });
     console.groupEnd();
 }
@@ -188,6 +213,25 @@ function getPosFromMark(mark, pos, node) {
     }
     return null;
 }
+export function applyStructureMarkGroup(group, tr) {
+    console.groupCollapsed("apply structure group, id = ", group.markFrom.mark.attrs["id"]);
+    console.log({
+        group
+    });
+    if (group.type === "replace") {
+        const { markFrom, markTo } = group;
+        tr.removeNodeMark(markFrom.pos, markFrom.mark);
+        tr.removeNodeMark(markTo.pos, markTo.mark);
+        console.groupEnd();
+        return;
+    }
+    const { markFrom, markTo, markGapFrom, markGapTo } = group;
+    tr.removeNodeMark(markFrom.pos, markFrom.mark);
+    tr.removeNodeMark(markTo.pos, markTo.mark);
+    tr.removeNodeMark(markGapFrom.pos, markGapFrom.mark);
+    tr.removeNodeMark(markGapTo.pos, markGapTo.mark);
+    console.groupEnd();
+}
 function revertStructureMarkGroup(group, tr) {
     console.groupCollapsed("revert structure group, id = ", group.markFrom.mark.attrs["id"]);
     console.log({

package/package.json

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