@manuscripts/track-changes-plugin 1.10.7 → 1.10.8-LEAN-4160.1

package/dist/cjs/ChangeSet.js

@@ -91,7 +91,8 @@ class ChangeSet {
             }
             rootNodes.push([change]);
         });
-        return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== change_1.CHANGE_OPERATION.reference).length);
+        return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== change_1.CHANGE_OPERATION.reference &&
+            !(c.dataTracked.moveNodeId && c.dataTracked.operation === change_1.CHANGE_OPERATION.delete)).length);
     }
     get pending() {
         return this.changes.filter((c) => c.dataTracked.status === change_1.CHANGE_STATUS.pending);
@@ -167,7 +168,8 @@ class ChangeSet {
         const { status, operation } = change.dataTracked;
         return (((operation === change_1.CHANGE_OPERATION.insert ||
             operation === change_1.CHANGE_OPERATION.node_split ||
-            operation === change_1.CHANGE_OPERATION.wrap_with_node) &&
+            operation === change_1.CHANGE_OPERATION.wrap_with_node ||
+            operation === change_1.CHANGE_OPERATION.move) &&
             status === change_1.CHANGE_STATUS.rejected) ||
             (operation === change_1.CHANGE_OPERATION.delete && status === change_1.CHANGE_STATUS.accepted));
     }

package/dist/cjs/changes/applyChanges.js

@@ -20,13 +20,8 @@ exports.getUpdatedDataTracked = getUpdatedDataTracked;
 function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap = new prosemirror_transform_1.Mapping()) {
     changes.sort((c1, c2) => c1.dataTracked.updatedAt - c2.dataTracked.updatedAt);
     changes.forEach((change) => {
-        if (change.dataTracked.status == change_1.CHANGE_STATUS.rejected) {
-            if (change.dataTracked.operation === change_1.CHANGE_OPERATION.node_split) {
-                return (0, revertChange_1.revertSplitNodeChange)(tr, change, changeSet);
-            }
-            if (change.dataTracked.operation === change_1.CHANGE_OPERATION.wrap_with_node) {
-                return (0, revertChange_1.revertWrapNodeChange)(tr, change);
-            }
+        if (change.dataTracked.operation === change_1.CHANGE_OPERATION.move) {
+            return;
         }
         const { pos: from, deleted } = deleteMap.mapResult(change.from);
         const node = tr.doc.nodeAt(from);
@@ -35,9 +30,17 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
             return;
         }
         if (!node) {
-            !deleted && logger_1.log.warn('no node found to update for change', change);
+            !deleted && logger_1.log.warn('No node found to update for change', change);
             return;
         }
+        if (change.dataTracked.status === change_1.CHANGE_STATUS.rejected) {
+            if (change.dataTracked.operation === change_1.CHANGE_OPERATION.node_split) {
+                return (0, revertChange_1.revertSplitNodeChange)(tr, change, changeSet);
+            }
+            if (change.dataTracked.operation === change_1.CHANGE_OPERATION.wrap_with_node) {
+                return (0, revertChange_1.revertWrapNodeChange)(tr, change);
+            }
+        }
         if (ChangeSet_1.ChangeSet.isTextChange(change) && noChangeNeeded) {
             tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_insert);
             tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_delete);
@@ -72,6 +75,40 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
             tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
         }
     });
+    changes.forEach((change) => {
+        if (change.dataTracked.operation !== change_1.CHANGE_OPERATION.move) {
+            return;
+        }
+        const { pos: from, deleted } = deleteMap.mapResult(change.from);
+        const node = tr.doc.nodeAt(from);
+        if (deleted || !node) {
+            if (!deleted && !node) {
+                logger_1.log.warn('No node found for move change', { change });
+            }
+            return;
+        }
+        if (change.dataTracked.status === change_1.CHANGE_STATUS.accepted) {
+            const originalChange = changeSet.changes.find((c) => c.dataTracked.moveNodeId === change.dataTracked.moveNodeId &&
+                c.dataTracked.operation === change_1.CHANGE_OPERATION.delete);
+            if (originalChange) {
+                const { pos: originalFrom } = deleteMap.mapResult(originalChange.from);
+                const originalNode = tr.doc.nodeAt(originalFrom);
+                const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) });
+                tr.setNodeMarkup(from, undefined, attrs, node.marks);
+                if (originalNode) {
+                    tr.delete(originalFrom, originalFrom + originalNode.nodeSize);
+                    deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
+                }
+            }
+            else {
+                logger_1.log.warn('No original change found for move operation', { change });
+            }
+        }
+        else if (change.dataTracked.status === change_1.CHANGE_STATUS.rejected) {
+            tr.delete(from, from + node.nodeSize);
+            deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
+        }
+    });
     return deleteMap;
 }
 exports.applyAcceptedRejectedChanges = applyAcceptedRejectedChanges;

package/dist/cjs/changes/updateChangesStatus.js

@@ -23,6 +23,7 @@ const applyChanges_1 = require("./applyChanges");
 const updateChangeAttrs_1 = require("./updateChangeAttrs");
 function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState) {
     const change = changeSet.get(ids[0]);
+    const changeTime = new Date().getTime();
     if (change && status !== change_1.CHANGE_STATUS.pending) {
         const textChanges = [];
         const nonTextChanges = [];
@@ -40,6 +41,24 @@ function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState
                             nonTextChanges.push(relatedRefChange);
                         }
                     }
+                    if (c.dataTracked.operation === change_1.CHANGE_OPERATION.move) {
+                        const oldChange = changeSet.changeTree.find((c) => ChangeSet_1.ChangeSet.isNodeChange(c) &&
+                            c.dataTracked.operation === 'delete' &&
+                            c.dataTracked.moveNodeId === change.dataTracked.moveNodeId);
+                        if (oldChange && ChangeSet_1.ChangeSet.isNodeChange(oldChange)) {
+                            createdTr = (0, updateChangeAttrs_1.updateChangeAttrs)(createdTr, oldChange, Object.assign(Object.assign({}, oldChange.dataTracked), { status, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
+                            oldChange.children.forEach((child) => {
+                                createdTr = (0, updateChangeAttrs_1.updateChangeAttrs)(createdTr, child, Object.assign(Object.assign({}, child.dataTracked), { status, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
+                                if (ChangeSet_1.ChangeSet.isTextChange(child)) {
+                                    textChanges.push(child);
+                                }
+                                else {
+                                    nonTextChanges.push(child);
+                                }
+                            });
+                            nonTextChanges.push(oldChange);
+                        }
+                    }
                 }
             }
         });
@@ -47,7 +66,6 @@ function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState
         (0, applyChanges_1.applyAcceptedRejectedChanges)(createdTr, oldState.schema, textChanges, changeSet, mapping);
     }
     else {
-        const changeTime = new Date().getTime();
         ids.forEach((changeId) => {
             const change = changeSet === null || changeSet === void 0 ? void 0 : changeSet.get(changeId);
             if (change) {

package/dist/cjs/compute/setFragmentAsInserted.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setFragmentAsNodeSplit = exports.setFragmentAsWrapChange = exports.setFragmentAsInserted = void 0;
+exports.setFragmentAsNodeSplit = exports.setFragmentAsMoveChange = exports.setFragmentAsWrapChange = exports.setFragmentAsInserted = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
 const change_1 = require("../types/change");
 const logger_1 = require("../utils/logger");
@@ -84,6 +84,14 @@ function setFragmentAsWrapChange(inserted, attrs, schema) {
     return prosemirror_model_1.Fragment.from(content);
 }
 exports.setFragmentAsWrapChange = setFragmentAsWrapChange;
+function setFragmentAsMoveChange(fragment, attrs) {
+    const content = [];
+    fragment.forEach((node) => {
+        content.push(node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [(0, nodeHelpers_1.addTrackIdIfDoesntExist)(trackUtils.createNewMoveAttrs(attrs))] }), node.content, node.marks));
+    });
+    return prosemirror_model_1.Fragment.from(content);
+}
+exports.setFragmentAsMoveChange = setFragmentAsMoveChange;
 function setFragmentAsNodeSplit($pos, newTr, inserted, attrs) {
     const lastChild = inserted.lastChild;
     const referenceId = (0, uuidv4_1.uuidv4)();

package/dist/cjs/plugin.js

@@ -100,7 +100,7 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous', initialStatu
                     !skipTrackUsed &&
                     !(0, track_utils_1.trFromHistory)(tr) &&
                     !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
-                    createdTr = (0, trackTransaction_1.trackTransaction)(tr, oldState, createdTr, userID);
+                    createdTr = (0, trackTransaction_1.trackTransaction)(tr, oldState, createdTr, userID, changeSet);
                 }
                 docChanged = docChanged || tr.docChanged;
                 if (setChangeStatuses) {

package/dist/cjs/steps/trackReplaceStep.js

@@ -30,10 +30,15 @@ const deleteAndMergeSplitNodes_1 = require("../mutate/deleteAndMergeSplitNodes")
 const logger_1 = require("../utils/logger");
 const trackUtils = __importStar(require("../utils/track-utils"));
 const track_utils_1 = require("../utils/track-utils");
-function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc, tr) {
+function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResult, currentStepDoc, tr, moveID) {
     logger_1.log.info('###### ReplaceStep ######');
     let selectionPos = 0;
     const changeSteps = [];
+    const attrs = Object.assign({}, attrsTemplate);
+    if (moveID) {
+        console.log('Detected Node Moving ReplaceStep and assigning the following movenodeID: ' + moveID);
+        attrs.moveNodeId = moveID;
+    }
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         var _a, _b;
         logger_1.log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
@@ -60,13 +65,15 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
             changeSteps.splice(changeSteps.indexOf(backSpacedText));
         }
         const textWasDeleted = !!changeSteps.length && !(fromA === fromB);
-        console.log(textWasDeleted);
         if (!backSpacedText && newSliceContent.size > 0) {
             logger_1.log.info('newSliceContent', newSliceContent);
             let fragment = (0, setFragmentAsInserted_1.setFragmentAsInserted)(newSliceContent, trackUtils.createNewInsertAttrs(attrs), oldState.schema);
             if ((0, track_utils_1.isSplitStep)(step, oldState.selection, tr.getMeta('uiEvent'))) {
                 fragment = (0, setFragmentAsInserted_1.setFragmentAsNodeSplit)(newTr.doc.resolve(step.from), newTr, fragment, attrs);
             }
+            if (moveID) {
+                fragment = (0, setFragmentAsInserted_1.setFragmentAsMoveChange)(newSliceContent, trackUtils.createNewMoveAttrs(attrs));
+            }
             const openStart = slice.openStart !== slice.openEnd ? 0 : slice.openStart;
             const openEnd = slice.openStart !== slice.openEnd ? 0 : slice.openEnd;
             changeSteps.push({

package/dist/cjs/steps/trackTransaction.js

@@ -13,13 +13,14 @@ const nodeHelpers_1 = require("../compute/nodeHelpers");
 const change_1 = require("../types/change");
 const logger_1 = require("../utils/logger");
 const mapChangeStep_1 = require("../utils/mapChangeStep");
+const track_utils_1 = require("../utils/track-utils");
 const uuidv4_1 = require("../utils/uuidv4");
 const trackAttrsChange_1 = __importDefault(require("./trackAttrsChange"));
 const trackReplaceAroundStep_1 = require("./trackReplaceAroundStep");
 const trackReplaceStep_1 = require("./trackReplaceStep");
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
 const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.nodes.highlight_marker;
-function trackTransaction(tr, oldState, newTr, authorID) {
+function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     var _a, _b, _c, _d, _e;
     const emptyAttrs = {
         authorID,
@@ -35,7 +36,10 @@ function trackTransaction(tr, oldState, newTr, authorID) {
     let iters = 0;
     logger_1.log.info('ORIGINAL transaction', tr);
     let trContext = {};
-    for (let i = tr.steps.length - 1; i >= 0; i--) {
+    const movingStepsAssociated = (0, track_utils_1.HasMoveOperations)(tr);
+    (0, track_utils_1.handleDirectPendingMoveDeletions)(tr, newTr, movingStepsAssociated);
+    const cleanSteps = (0, track_utils_1.filterMeaninglessMoveSteps)(tr, movingStepsAssociated);
+    for (let i = cleanSteps.length - 1; i >= 0; i--) {
         const step = tr.steps[i];
         logger_1.log.info('transaction step', step);
         iters += 1;
@@ -64,7 +68,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
             }
             const newStep = new prosemirror_transform_1.ReplaceStep(thisStepMapping.map(invertedStep.from), thisStepMapping.map(invertedStep.to), invertedStep.slice);
             const stepResult = newTr.maybeStep(newStep);
-            let [steps, startPos] = (0, trackReplaceStep_1.trackReplaceStep)(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i], tr);
+            let [steps, startPos] = (0, trackReplaceStep_1.trackReplaceStep)(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i], tr, movingStepsAssociated.get(step));
             if (steps.length === 1) {
                 const step = steps[0];
                 if (isHighlightMarkerNode((step === null || step === void 0 ? void 0 : step.node) || ((_d = (_c = step === null || step === void 0 ? void 0 : step.slice) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.content[0]))) {
@@ -78,7 +82,8 @@ function trackTransaction(tr, oldState, newTr, authorID) {
             const inserted = steps.filter((s) => s.type === 'insert-slice');
             steps = (0, diffChangeSteps_1.diffChangeSteps)(deleted, inserted);
             logger_1.log.info('DIFFED STEPS: ', steps);
-            const [mapping, selectionPos] = (0, processChangeSteps_1.processChangeSteps)(steps, startPos || tr.selection.head, newTr, emptyAttrs, oldState.schema, deletedNodeMapping);
+            const [mapping, selectionPos] = (0, processChangeSteps_1.processChangeSteps)(steps, startPos || tr.selection.head, newTr, movingStepsAssociated.has(step)
+                ? Object.assign(Object.assign({}, emptyAttrs), { moveNodeId: movingStepsAssociated.get(step) }) : emptyAttrs, oldState.schema, deletedNodeMapping);
             if (!wasNodeSelection && !setsNewSelection) {
                 const sel = getSelectionStaticConstructor(tr.selection);
                 const near = sel.near(newTr.doc.resolve(selectionPos), -1);

package/dist/cjs/types/change.js

@@ -24,6 +24,7 @@ var CHANGE_OPERATION;
     CHANGE_OPERATION["wrap_with_node"] = "wrap_with_node";
     CHANGE_OPERATION["node_split"] = "node_split";
     CHANGE_OPERATION["reference"] = "reference";
+    CHANGE_OPERATION["move"] = "move";
 })(CHANGE_OPERATION = exports.CHANGE_OPERATION || (exports.CHANGE_OPERATION = {}));
 var CHANGE_STATUS;
 (function (CHANGE_STATUS) {

package/dist/cjs/utils/track-utils.js

@@ -11,8 +11,10 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trFromHistory = exports.stepIsLift = exports.isLiftStep = exports.isWrapStep = exports.isSplitStep = exports.createNewUpdateAttrs = exports.createNewDeleteAttrs = exports.createNewReferenceAttrs = exports.createNewSplitAttrs = exports.createNewWrapAttrs = exports.createNewInsertAttrs = void 0;
+exports.filterMeaninglessMoveSteps = exports.handleDirectPendingMoveDeletions = exports.isDirectPendingMoveDeletion = exports.isDeletingPendingMovedNode = exports.HasMoveOperations = exports.trFromHistory = exports.stepIsLift = exports.isLiftStep = exports.isWrapStep = exports.isSplitStep = exports.createNewUpdateAttrs = exports.createNewMoveAttrs = exports.createNewDeleteAttrs = exports.createNewReferenceAttrs = exports.createNewSplitAttrs = exports.createNewWrapAttrs = exports.createNewInsertAttrs = void 0;
+const prosemirror_transform_1 = require("prosemirror-transform");
 const change_1 = require("../types/change");
+const uuidv4_1 = require("./uuidv4");
 function createNewInsertAttrs(attrs) {
     return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.insert });
 }
@@ -33,6 +35,10 @@ function createNewDeleteAttrs(attrs) {
     return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.delete });
 }
 exports.createNewDeleteAttrs = createNewDeleteAttrs;
+function createNewMoveAttrs(attrs) {
+    return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.move });
+}
+exports.createNewMoveAttrs = createNewMoveAttrs;
 function createNewUpdateAttrs(attrs, oldAttrs) {
     const { dataTracked } = oldAttrs, restAttrs = __rest(oldAttrs, ["dataTracked"]);
     return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.set_node_attributes, oldAttrs: JSON.parse(JSON.stringify(restAttrs)) });
@@ -84,3 +90,119 @@ function stepIsLift(gap, node, to) {
 exports.stepIsLift = stepIsLift;
 const trFromHistory = (tr) => Object.keys(tr.meta).find((s) => s.startsWith('history$'));
 exports.trFromHistory = trFromHistory;
+const HasMoveOperations = (tr) => {
+    const movingAssoc = new Map();
+    if (tr.steps.length < 2) {
+        return movingAssoc;
+    }
+    const matched = [];
+    for (let i = 0; i < tr.steps.length; i++) {
+        if (matched.includes(i)) {
+            continue;
+        }
+        const step = tr.steps[i];
+        const doc = tr.docs[i];
+        const stepDeletesContent = step.from !== step.to && step.slice.size === 0;
+        const stepInsertsContent = step.slice.size && step.slice.content.firstChild ? true : false;
+        console.log('stepDeletesContent', stepDeletesContent);
+        console.log('stepInsertsContent', stepInsertsContent);
+        for (let g = 0; g < tr.steps.length; g++) {
+            if (g === i || matched.includes(g)) {
+                continue;
+            }
+            const peerStep = tr.steps[g];
+            const peerStepInsertsContent = peerStep.slice.size && peerStep.slice.content.firstChild;
+            const peerStepDeletesContent = peerStep.from !== peerStep.to && peerStep.slice.size === 0;
+            if (stepDeletesContent) {
+                const deletedContent = doc.slice(step.from, step.to);
+                if (peerStepInsertsContent &&
+                    deletedContent.content.firstChild &&
+                    peerStep.slice.content.firstChild.toString() === deletedContent.content.firstChild.toString()) {
+                    const commonID = (0, uuidv4_1.uuidv4)();
+                    movingAssoc.set(peerStep, commonID);
+                    movingAssoc.set(step, commonID);
+                    matched.push(i, g);
+                }
+                continue;
+            }
+            if (stepInsertsContent && peerStepDeletesContent) {
+                const insertedContent = step.slice;
+                const deletedPeerContent = tr.docs[g].slice(peerStep.from, peerStep.to);
+                if (insertedContent.content.firstChild &&
+                    deletedPeerContent.content.firstChild &&
+                    insertedContent.content.firstChild.toString() === deletedPeerContent.content.firstChild.toString()) {
+                    const commonID = (0, uuidv4_1.uuidv4)();
+                    movingAssoc.set(peerStep, commonID);
+                    movingAssoc.set(step, commonID);
+                }
+                matched.push(i, g);
+            }
+        }
+    }
+    return movingAssoc;
+};
+exports.HasMoveOperations = HasMoveOperations;
+const isDeletingPendingMovedNode = (step, doc) => {
+    if (!step.slice || step.from === step.to || step.slice.content.size > 0) {
+        return undefined;
+    }
+    const node = doc.nodeAt(step.from);
+    if (!node) {
+        return undefined;
+    }
+    const trackedAttrs = node.attrs.dataTracked;
+    const found = trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.find((tracked) => tracked.operation === change_1.CHANGE_OPERATION.move && tracked.status === change_1.CHANGE_STATUS.pending);
+    if (found === null || found === void 0 ? void 0 : found.moveNodeId) {
+        return found.moveNodeId;
+    }
+    return undefined;
+};
+exports.isDeletingPendingMovedNode = isDeletingPendingMovedNode;
+const isDirectPendingMoveDeletion = (step, doc, movingSteps) => {
+    if (step.from === step.to || step.slice.content.size > 0) {
+        return false;
+    }
+    if (movingSteps.has(step)) {
+        return false;
+    }
+    const node = doc.nodeAt(step.from);
+    if (!node) {
+        return false;
+    }
+    const trackedAttrs = node.attrs.dataTracked;
+    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === change_1.CHANGE_OPERATION.move && t.status === change_1.CHANGE_STATUS.pending));
+};
+exports.isDirectPendingMoveDeletion = isDirectPendingMoveDeletion;
+const handleDirectPendingMoveDeletions = (tr, newTr, movingSteps) => {
+    tr.steps.forEach((step) => {
+        if (step instanceof prosemirror_transform_1.ReplaceStep) {
+            const doc = tr.docs[tr.steps.indexOf(step)];
+            if ((0, exports.isDirectPendingMoveDeletion)(step, doc, movingSteps)) {
+                const node = doc.nodeAt(step.from);
+                if (node === null || node === void 0 ? void 0 : node.attrs.dataTracked) {
+                    newTr.setNodeMarkup(step.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: node.attrs.dataTracked.filter((t) => !(t.operation === change_1.CHANGE_OPERATION.move && t.status === change_1.CHANGE_STATUS.pending)) }));
+                }
+            }
+        }
+    });
+};
+exports.handleDirectPendingMoveDeletions = handleDirectPendingMoveDeletions;
+const filterMeaninglessMoveSteps = (tr, movingSteps) => {
+    const cleanSteps = [];
+    for (let i = 0; i < tr.steps.length; i++) {
+        const step = tr.steps[i];
+        const moveID = movingSteps.get(step);
+        const prevMoveID = (0, exports.isDeletingPendingMovedNode)(step, tr.docs[i]);
+        if (moveID && prevMoveID) {
+            movingSteps.forEach((replaceStepMoveID, replaceStep) => {
+                if (replaceStep !== step && moveID === replaceStepMoveID) {
+                    movingSteps.set(replaceStep, prevMoveID);
+                }
+            });
+            continue;
+        }
+        cleanSteps.push(step);
+    }
+    return cleanSteps;
+};
+exports.filterMeaninglessMoveSteps = filterMeaninglessMoveSteps;

package/dist/es/ChangeSet.js

@@ -88,7 +88,8 @@ export class ChangeSet {
             }
             rootNodes.push([change]);
         });
-        return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== CHANGE_OPERATION.reference).length);
+        return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== CHANGE_OPERATION.reference &&
+            !(c.dataTracked.moveNodeId && c.dataTracked.operation === CHANGE_OPERATION.delete)).length);
     }
     get pending() {
         return this.changes.filter((c) => c.dataTracked.status === CHANGE_STATUS.pending);
@@ -164,7 +165,8 @@ export class ChangeSet {
         const { status, operation } = change.dataTracked;
         return (((operation === CHANGE_OPERATION.insert ||
             operation === CHANGE_OPERATION.node_split ||
-            operation === CHANGE_OPERATION.wrap_with_node) &&
+            operation === CHANGE_OPERATION.wrap_with_node ||
+            operation === CHANGE_OPERATION.move) &&
             status === CHANGE_STATUS.rejected) ||
             (operation === CHANGE_OPERATION.delete && status === CHANGE_STATUS.accepted));
     }

package/dist/es/changes/applyChanges.js

@@ -16,13 +16,8 @@ export function getUpdatedDataTracked(dataTracked, changeId) {
 export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap = new Mapping()) {
     changes.sort((c1, c2) => c1.dataTracked.updatedAt - c2.dataTracked.updatedAt);
     changes.forEach((change) => {
-        if (change.dataTracked.status == CHANGE_STATUS.rejected) {
-            if (change.dataTracked.operation === CHANGE_OPERATION.node_split) {
-                return revertSplitNodeChange(tr, change, changeSet);
-            }
-            if (change.dataTracked.operation === CHANGE_OPERATION.wrap_with_node) {
-                return revertWrapNodeChange(tr, change);
-            }
+        if (change.dataTracked.operation === CHANGE_OPERATION.move) {
+            return;
         }
         const { pos: from, deleted } = deleteMap.mapResult(change.from);
         const node = tr.doc.nodeAt(from);
@@ -31,9 +26,17 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, del
             return;
         }
         if (!node) {
-            !deleted && log.warn('no node found to update for change', change);
+            !deleted && log.warn('No node found to update for change', change);
             return;
         }
+        if (change.dataTracked.status === CHANGE_STATUS.rejected) {
+            if (change.dataTracked.operation === CHANGE_OPERATION.node_split) {
+                return revertSplitNodeChange(tr, change, changeSet);
+            }
+            if (change.dataTracked.operation === CHANGE_OPERATION.wrap_with_node) {
+                return revertWrapNodeChange(tr, change);
+            }
+        }
         if (ChangeSet.isTextChange(change) && noChangeNeeded) {
             tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_insert);
             tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_delete);
@@ -68,5 +71,39 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, del
             tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
         }
     });
+    changes.forEach((change) => {
+        if (change.dataTracked.operation !== CHANGE_OPERATION.move) {
+            return;
+        }
+        const { pos: from, deleted } = deleteMap.mapResult(change.from);
+        const node = tr.doc.nodeAt(from);
+        if (deleted || !node) {
+            if (!deleted && !node) {
+                log.warn('No node found for move change', { change });
+            }
+            return;
+        }
+        if (change.dataTracked.status === CHANGE_STATUS.accepted) {
+            const originalChange = changeSet.changes.find((c) => c.dataTracked.moveNodeId === change.dataTracked.moveNodeId &&
+                c.dataTracked.operation === CHANGE_OPERATION.delete);
+            if (originalChange) {
+                const { pos: originalFrom } = deleteMap.mapResult(originalChange.from);
+                const originalNode = tr.doc.nodeAt(originalFrom);
+                const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) });
+                tr.setNodeMarkup(from, undefined, attrs, node.marks);
+                if (originalNode) {
+                    tr.delete(originalFrom, originalFrom + originalNode.nodeSize);
+                    deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
+                }
+            }
+            else {
+                log.warn('No original change found for move operation', { change });
+            }
+        }
+        else if (change.dataTracked.status === CHANGE_STATUS.rejected) {
+            tr.delete(from, from + node.nodeSize);
+            deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
+        }
+    });
     return deleteMap;
 }

package/dist/es/changes/updateChangesStatus.js

@@ -20,6 +20,7 @@ import { applyAcceptedRejectedChanges } from './applyChanges';
 import { updateChangeAttrs } from './updateChangeAttrs';
 export function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState) {
     const change = changeSet.get(ids[0]);
+    const changeTime = new Date().getTime();
     if (change && status !== CHANGE_STATUS.pending) {
         const textChanges = [];
         const nonTextChanges = [];
@@ -37,6 +38,24 @@ export function updateChangesStatus(createdTr, changeSet, ids, status, userID, o
                             nonTextChanges.push(relatedRefChange);
                         }
                     }
+                    if (c.dataTracked.operation === CHANGE_OPERATION.move) {
+                        const oldChange = changeSet.changeTree.find((c) => ChangeSet.isNodeChange(c) &&
+                            c.dataTracked.operation === 'delete' &&
+                            c.dataTracked.moveNodeId === change.dataTracked.moveNodeId);
+                        if (oldChange && ChangeSet.isNodeChange(oldChange)) {
+                            createdTr = updateChangeAttrs(createdTr, oldChange, Object.assign(Object.assign({}, oldChange.dataTracked), { status, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
+                            oldChange.children.forEach((child) => {
+                                createdTr = updateChangeAttrs(createdTr, child, Object.assign(Object.assign({}, child.dataTracked), { status, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
+                                if (ChangeSet.isTextChange(child)) {
+                                    textChanges.push(child);
+                                }
+                                else {
+                                    nonTextChanges.push(child);
+                                }
+                            });
+                            nonTextChanges.push(oldChange);
+                        }
+                    }
                 }
             }
         });
@@ -44,7 +63,6 @@ export function updateChangesStatus(createdTr, changeSet, ids, status, userID, o
         applyAcceptedRejectedChanges(createdTr, oldState.schema, textChanges, changeSet, mapping);
     }
     else {
-        const changeTime = new Date().getTime();
         ids.forEach((changeId) => {
             const change = changeSet === null || changeSet === void 0 ? void 0 : changeSet.get(changeId);
             if (change) {

package/dist/es/compute/setFragmentAsInserted.js

@@ -56,6 +56,13 @@ export function setFragmentAsWrapChange(inserted, attrs, schema) {
     });
     return Fragment.from(content);
 }
+export function setFragmentAsMoveChange(fragment, attrs) {
+    const content = [];
+    fragment.forEach((node) => {
+        content.push(node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [addTrackIdIfDoesntExist(trackUtils.createNewMoveAttrs(attrs))] }), node.content, node.marks));
+    });
+    return Fragment.from(content);
+}
 export function setFragmentAsNodeSplit($pos, newTr, inserted, attrs) {
     const lastChild = inserted.lastChild;
     const referenceId = uuidv4();

package/dist/es/plugin.js

@@ -97,7 +97,7 @@ export const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous', initi
                     !skipTrackUsed &&
                     !trFromHistory(tr) &&
                     !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
-                    createdTr = trackTransaction(tr, oldState, createdTr, userID);
+                    createdTr = trackTransaction(tr, oldState, createdTr, userID, changeSet);
                 }
                 docChanged = docChanged || tr.docChanged;
                 if (setChangeStatuses) {

package/dist/es/steps/trackReplaceStep.js

@@ -1,13 +1,18 @@
 import { Slice } from 'prosemirror-model';
-import { setFragmentAsInserted, setFragmentAsNodeSplit } from '../compute/setFragmentAsInserted';
+import { setFragmentAsInserted, setFragmentAsMoveChange, setFragmentAsNodeSplit, } from '../compute/setFragmentAsInserted';
 import { deleteAndMergeSplitNodes } from '../mutate/deleteAndMergeSplitNodes';
 import { log } from '../utils/logger';
 import * as trackUtils from '../utils/track-utils';
 import { isSplitStep } from '../utils/track-utils';
-export function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc, tr) {
+export function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResult, currentStepDoc, tr, moveID) {
     log.info('###### ReplaceStep ######');
     let selectionPos = 0;
     const changeSteps = [];
+    const attrs = Object.assign({}, attrsTemplate);
+    if (moveID) {
+        console.log('Detected Node Moving ReplaceStep and assigning the following movenodeID: ' + moveID);
+        attrs.moveNodeId = moveID;
+    }
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         var _a, _b;
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
@@ -34,13 +39,15 @@ export function trackReplaceStep(step, oldState, newTr, attrs, stepResult, curre
             changeSteps.splice(changeSteps.indexOf(backSpacedText));
         }
         const textWasDeleted = !!changeSteps.length && !(fromA === fromB);
-        console.log(textWasDeleted);
         if (!backSpacedText && newSliceContent.size > 0) {
             log.info('newSliceContent', newSliceContent);
             let fragment = setFragmentAsInserted(newSliceContent, trackUtils.createNewInsertAttrs(attrs), oldState.schema);
             if (isSplitStep(step, oldState.selection, tr.getMeta('uiEvent'))) {
                 fragment = setFragmentAsNodeSplit(newTr.doc.resolve(step.from), newTr, fragment, attrs);
             }
+            if (moveID) {
+                fragment = setFragmentAsMoveChange(newSliceContent, trackUtils.createNewMoveAttrs(attrs));
+            }
             const openStart = slice.openStart !== slice.openEnd ? 0 : slice.openStart;
             const openEnd = slice.openStart !== slice.openEnd ? 0 : slice.openEnd;
             changeSteps.push({

package/dist/es/steps/trackTransaction.js

@@ -7,13 +7,14 @@ import { getNodeTrackedData } from '../compute/nodeHelpers';
 import { CHANGE_STATUS } from '../types/change';
 import { log } from '../utils/logger';
 import { mapChangeSteps } from '../utils/mapChangeStep';
+import { filterMeaninglessMoveSteps, handleDirectPendingMoveDeletions, HasMoveOperations, } from '../utils/track-utils';
 import { uuidv4 } from '../utils/uuidv4';
 import trackAttrsChange from './trackAttrsChange';
 import { trackReplaceAroundStep } from './trackReplaceAroundStep';
 import { trackReplaceStep } from './trackReplaceStep';
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
 const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.nodes.highlight_marker;
-export function trackTransaction(tr, oldState, newTr, authorID) {
+export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     var _a, _b, _c, _d, _e;
     const emptyAttrs = {
         authorID,
@@ -29,7 +30,10 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
     let trContext = {};
-    for (let i = tr.steps.length - 1; i >= 0; i--) {
+    const movingStepsAssociated = HasMoveOperations(tr);
+    handleDirectPendingMoveDeletions(tr, newTr, movingStepsAssociated);
+    const cleanSteps = filterMeaninglessMoveSteps(tr, movingStepsAssociated);
+    for (let i = cleanSteps.length - 1; i >= 0; i--) {
         const step = tr.steps[i];
         log.info('transaction step', step);
         iters += 1;
@@ -58,7 +62,7 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
             }
             const newStep = new ReplaceStep(thisStepMapping.map(invertedStep.from), thisStepMapping.map(invertedStep.to), invertedStep.slice);
             const stepResult = newTr.maybeStep(newStep);
-            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i], tr);
+            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i], tr, movingStepsAssociated.get(step));
             if (steps.length === 1) {
                 const step = steps[0];
                 if (isHighlightMarkerNode((step === null || step === void 0 ? void 0 : step.node) || ((_d = (_c = step === null || step === void 0 ? void 0 : step.slice) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.content[0]))) {
@@ -72,7 +76,8 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
             const inserted = steps.filter((s) => s.type === 'insert-slice');
             steps = diffChangeSteps(deleted, inserted);
             log.info('DIFFED STEPS: ', steps);
-            const [mapping, selectionPos] = processChangeSteps(steps, startPos || tr.selection.head, newTr, emptyAttrs, oldState.schema, deletedNodeMapping);
+            const [mapping, selectionPos] = processChangeSteps(steps, startPos || tr.selection.head, newTr, movingStepsAssociated.has(step)
+                ? Object.assign(Object.assign({}, emptyAttrs), { moveNodeId: movingStepsAssociated.get(step) }) : emptyAttrs, oldState.schema, deletedNodeMapping);
             if (!wasNodeSelection && !setsNewSelection) {
                 const sel = getSelectionStaticConstructor(tr.selection);
                 const near = sel.near(newTr.doc.resolve(selectionPos), -1);

package/dist/es/types/change.js

@@ -21,6 +21,7 @@ export var CHANGE_OPERATION;
     CHANGE_OPERATION["wrap_with_node"] = "wrap_with_node";
     CHANGE_OPERATION["node_split"] = "node_split";
     CHANGE_OPERATION["reference"] = "reference";
+    CHANGE_OPERATION["move"] = "move";
 })(CHANGE_OPERATION || (CHANGE_OPERATION = {}));
 export var CHANGE_STATUS;
 (function (CHANGE_STATUS) {

package/dist/es/utils/track-utils.js

@@ -9,7 +9,9 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { CHANGE_OPERATION } from '../types/change';
+import { ReplaceStep } from 'prosemirror-transform';
+import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
+import { uuidv4 } from './uuidv4';
 export function createNewInsertAttrs(attrs) {
     return Object.assign(Object.assign({}, attrs), { operation: CHANGE_OPERATION.insert });
 }
@@ -25,6 +27,9 @@ export function createNewReferenceAttrs(attrs, id) {
 export function createNewDeleteAttrs(attrs) {
     return Object.assign(Object.assign({}, attrs), { operation: CHANGE_OPERATION.delete });
 }
+export function createNewMoveAttrs(attrs) {
+    return Object.assign(Object.assign({}, attrs), { operation: CHANGE_OPERATION.move });
+}
 export function createNewUpdateAttrs(attrs, oldAttrs) {
     const { dataTracked } = oldAttrs, restAttrs = __rest(oldAttrs, ["dataTracked"]);
     return Object.assign(Object.assign({}, attrs), { operation: CHANGE_OPERATION.set_node_attributes, oldAttrs: JSON.parse(JSON.stringify(restAttrs)) });
@@ -70,3 +75,114 @@ export function stepIsLift(gap, node, to) {
     return gap.start < gap.end && gap.insert === 0 && gap.end === to && !node.isText;
 }
 export const trFromHistory = (tr) => Object.keys(tr.meta).find((s) => s.startsWith('history$'));
+export const HasMoveOperations = (tr) => {
+    const movingAssoc = new Map();
+    if (tr.steps.length < 2) {
+        return movingAssoc;
+    }
+    const matched = [];
+    for (let i = 0; i < tr.steps.length; i++) {
+        if (matched.includes(i)) {
+            continue;
+        }
+        const step = tr.steps[i];
+        const doc = tr.docs[i];
+        const stepDeletesContent = step.from !== step.to && step.slice.size === 0;
+        const stepInsertsContent = step.slice.size && step.slice.content.firstChild ? true : false;
+        console.log('stepDeletesContent', stepDeletesContent);
+        console.log('stepInsertsContent', stepInsertsContent);
+        for (let g = 0; g < tr.steps.length; g++) {
+            if (g === i || matched.includes(g)) {
+                continue;
+            }
+            const peerStep = tr.steps[g];
+            const peerStepInsertsContent = peerStep.slice.size && peerStep.slice.content.firstChild;
+            const peerStepDeletesContent = peerStep.from !== peerStep.to && peerStep.slice.size === 0;
+            if (stepDeletesContent) {
+                const deletedContent = doc.slice(step.from, step.to);
+                if (peerStepInsertsContent &&
+                    deletedContent.content.firstChild &&
+                    peerStep.slice.content.firstChild.toString() === deletedContent.content.firstChild.toString()) {
+                    const commonID = uuidv4();
+                    movingAssoc.set(peerStep, commonID);
+                    movingAssoc.set(step, commonID);
+                    matched.push(i, g);
+                }
+                continue;
+            }
+            if (stepInsertsContent && peerStepDeletesContent) {
+                const insertedContent = step.slice;
+                const deletedPeerContent = tr.docs[g].slice(peerStep.from, peerStep.to);
+                if (insertedContent.content.firstChild &&
+                    deletedPeerContent.content.firstChild &&
+                    insertedContent.content.firstChild.toString() === deletedPeerContent.content.firstChild.toString()) {
+                    const commonID = uuidv4();
+                    movingAssoc.set(peerStep, commonID);
+                    movingAssoc.set(step, commonID);
+                }
+                matched.push(i, g);
+            }
+        }
+    }
+    return movingAssoc;
+};
+export const isDeletingPendingMovedNode = (step, doc) => {
+    if (!step.slice || step.from === step.to || step.slice.content.size > 0) {
+        return undefined;
+    }
+    const node = doc.nodeAt(step.from);
+    if (!node) {
+        return undefined;
+    }
+    const trackedAttrs = node.attrs.dataTracked;
+    const found = trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.find((tracked) => tracked.operation === CHANGE_OPERATION.move && tracked.status === CHANGE_STATUS.pending);
+    if (found === null || found === void 0 ? void 0 : found.moveNodeId) {
+        return found.moveNodeId;
+    }
+    return undefined;
+};
+export const isDirectPendingMoveDeletion = (step, doc, movingSteps) => {
+    if (step.from === step.to || step.slice.content.size > 0) {
+        return false;
+    }
+    if (movingSteps.has(step)) {
+        return false;
+    }
+    const node = doc.nodeAt(step.from);
+    if (!node) {
+        return false;
+    }
+    const trackedAttrs = node.attrs.dataTracked;
+    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === CHANGE_OPERATION.move && t.status === CHANGE_STATUS.pending));
+};
+export const handleDirectPendingMoveDeletions = (tr, newTr, movingSteps) => {
+    tr.steps.forEach((step) => {
+        if (step instanceof ReplaceStep) {
+            const doc = tr.docs[tr.steps.indexOf(step)];
+            if (isDirectPendingMoveDeletion(step, doc, movingSteps)) {
+                const node = doc.nodeAt(step.from);
+                if (node === null || node === void 0 ? void 0 : node.attrs.dataTracked) {
+                    newTr.setNodeMarkup(step.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: node.attrs.dataTracked.filter((t) => !(t.operation === CHANGE_OPERATION.move && t.status === CHANGE_STATUS.pending)) }));
+                }
+            }
+        }
+    });
+};
+export const filterMeaninglessMoveSteps = (tr, movingSteps) => {
+    const cleanSteps = [];
+    for (let i = 0; i < tr.steps.length; i++) {
+        const step = tr.steps[i];
+        const moveID = movingSteps.get(step);
+        const prevMoveID = isDeletingPendingMovedNode(step, tr.docs[i]);
+        if (moveID && prevMoveID) {
+            movingSteps.forEach((replaceStepMoveID, replaceStep) => {
+                if (replaceStep !== step && moveID === replaceStepMoveID) {
+                    movingSteps.set(replaceStep, prevMoveID);
+                }
+            });
+            continue;
+        }
+        cleanSteps.push(step);
+    }
+    return cleanSteps;
+};

package/dist/types/compute/setFragmentAsInserted.d.ts

@@ -3,4 +3,5 @@ import { Transaction } from 'prosemirror-state';
 import { NewEmptyAttrs, NewInsertAttrs } from '../types/track';
 export declare function setFragmentAsInserted(inserted: Fragment, insertAttrs: NewInsertAttrs, schema: Schema): Fragment;
 export declare function setFragmentAsWrapChange(inserted: Fragment, attrs: NewEmptyAttrs, schema: Schema): Fragment;
+export declare function setFragmentAsMoveChange(fragment: Fragment, attrs: NewEmptyAttrs): Fragment;
 export declare function setFragmentAsNodeSplit($pos: ResolvedPos, newTr: Transaction, inserted: Fragment, attrs: NewEmptyAttrs): Fragment;

package/dist/types/steps/trackReplaceStep.d.ts

@@ -3,4 +3,4 @@ import type { EditorState, Transaction } from 'prosemirror-state';
 import { ReplaceStep, StepResult } from 'prosemirror-transform';
 import { ChangeStep } from '../types/step';
 import { NewEmptyAttrs } from '../types/track';
-export declare function trackReplaceStep(step: ReplaceStep, oldState: EditorState, newTr: Transaction, attrs: NewEmptyAttrs, stepResult: StepResult, currentStepDoc: PMNode, tr: Transaction): [ChangeStep[], number];
+export declare function trackReplaceStep(step: ReplaceStep, oldState: EditorState, newTr: Transaction, attrsTemplate: NewEmptyAttrs, stepResult: StepResult, currentStepDoc: PMNode, tr: Transaction, moveID?: string): [ChangeStep[], number];

package/dist/types/steps/trackTransaction.d.ts

@@ -1,2 +1,3 @@
 import { EditorState, Transaction } from 'prosemirror-state';
-export declare function trackTransaction(tr: Transaction, oldState: EditorState, newTr: Transaction, authorID: string): Transaction;
+import { ChangeSet } from '../ChangeSet';
+export declare function trackTransaction(tr: Transaction, oldState: EditorState, newTr: Transaction, authorID: string, changeSet: ChangeSet): Transaction;

package/dist/types/types/change.d.ts

@@ -20,7 +20,8 @@ export declare enum CHANGE_OPERATION {
     set_node_attributes = "set_attrs",
     wrap_with_node = "wrap_with_node",
     node_split = "node_split",
-    reference = "reference"
+    reference = "reference",
+    move = "move"
 }
 export declare enum CHANGE_STATUS {
     accepted = "accepted",
@@ -36,6 +37,7 @@ type InsertDeleteAttrs = {
     statusUpdateAt: number;
     createdAt: number;
     updatedAt: number;
+    moveNodeId?: string;
 };
 export type UpdateAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
     operation: CHANGE_OPERATION.set_node_attributes;
@@ -51,7 +53,10 @@ export type ReferenceAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
     operation: CHANGE_OPERATION.reference;
     referenceId: string;
 };
-export type TrackedAttrs = InsertDeleteAttrs | UpdateAttrs | WrapAttrs | NodeSplitAttrs | ReferenceAttrs;
+export type NodeMoveAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
+    operation: CHANGE_OPERATION.move;
+};
+export type TrackedAttrs = InsertDeleteAttrs | UpdateAttrs | WrapAttrs | NodeSplitAttrs | ReferenceAttrs | NodeMoveAttrs;
 type Change = {
     id: string;
     from: number;

package/dist/types/types/track.d.ts

@@ -16,7 +16,7 @@ export interface TrackChangesState {
 }
 export type NewEmptyAttrs = Omit<TrackedAttrs, 'id' | 'operation'>;
 export type NewInsertAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
-    operation: CHANGE_OPERATION.insert | CHANGE_OPERATION.wrap_with_node;
+    operation: CHANGE_OPERATION.insert | CHANGE_OPERATION.wrap_with_node | CHANGE_OPERATION.move;
 };
 export type NewDeleteAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
     operation: CHANGE_OPERATION.delete;

package/dist/types/utils/track-utils.d.ts

@@ -1,12 +1,13 @@
 import { Node as PMNode, Slice } from 'prosemirror-model';
 import { Selection, Transaction } from 'prosemirror-state';
-import { ReplaceAroundStep, ReplaceStep } from 'prosemirror-transform';
+import { ReplaceAroundStep, ReplaceStep, Step } from 'prosemirror-transform';
 import { NewDeleteAttrs, NewEmptyAttrs, NewInsertAttrs, NewReferenceAttrs, NewSplitNodeAttrs, NewUpdateAttrs } from '../types/track';
 export declare function createNewInsertAttrs(attrs: NewEmptyAttrs): NewInsertAttrs;
 export declare function createNewWrapAttrs(attrs: NewEmptyAttrs): NewInsertAttrs;
 export declare function createNewSplitAttrs(attrs: NewEmptyAttrs): NewSplitNodeAttrs;
 export declare function createNewReferenceAttrs(attrs: NewEmptyAttrs, id: string): NewReferenceAttrs;
 export declare function createNewDeleteAttrs(attrs: NewEmptyAttrs): NewDeleteAttrs;
+export declare function createNewMoveAttrs(attrs: NewEmptyAttrs): NewInsertAttrs;
 export declare function createNewUpdateAttrs(attrs: NewEmptyAttrs, oldAttrs: Record<string, any>): NewUpdateAttrs;
 export declare const isSplitStep: (step: ReplaceStep, selection: Selection, uiEvent: string) => boolean;
 export declare const isWrapStep: (step: ReplaceAroundStep) => boolean;
@@ -18,3 +19,8 @@ export declare function stepIsLift(gap: {
     insert: number;
 }, node: PMNode, to: number): boolean;
 export declare const trFromHistory: (tr: Transaction) => string | undefined;
+export declare const HasMoveOperations: (tr: Transaction) => Map<ReplaceStep, string>;
+export declare const isDeletingPendingMovedNode: (step: ReplaceStep, doc: PMNode) => string | undefined;
+export declare const isDirectPendingMoveDeletion: (step: ReplaceStep, doc: PMNode, movingSteps: Map<ReplaceStep, string>) => boolean;
+export declare const handleDirectPendingMoveDeletions: (tr: Transaction, newTr: Transaction, movingSteps: Map<ReplaceStep, string>) => void;
+export declare const filterMeaninglessMoveSteps: (tr: Transaction, movingSteps: Map<ReplaceStep, string>) => Step[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.10.7",
+  "version": "1.10.8-LEAN-4160.1",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",