@manuscripts/track-changes-plugin 1.10.5-LEAN-4160.5 → 1.10.7

package/dist/cjs/ChangeSet.js

@@ -91,8 +91,7 @@ class ChangeSet {
             }
             rootNodes.push([change]);
         });
-        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);
+        return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== change_1.CHANGE_OPERATION.reference).length);
     }
     get pending() {
         return this.changes.filter((c) => c.dataTracked.status === change_1.CHANGE_STATUS.pending);
@@ -150,11 +149,16 @@ class ChangeSet {
     canJoinAdjacentInlineChanges(change, index) {
         const nextChange = this.changeTree.at(index + 1);
         const isInline = (c) => c.type === 'text-change' || (c.type === 'node-change' && c.node.isInline);
+        const hasMatchingOperation = (c1, c2) => c1.dataTracked.operation === c2.dataTracked.operation ||
+            (c1.dataTracked.operation === 'wrap_with_node' &&
+                (c2.dataTracked.operation === 'insert' || c2.dataTracked.operation === 'set_attrs')) ||
+            (c2.dataTracked.operation === 'wrap_with_node' &&
+                (c1.dataTracked.operation === 'insert' || c1.dataTracked.operation === 'set_attrs'));
         return (isInline(change) &&
             nextChange &&
             isInline(nextChange) &&
             change.to === nextChange.from &&
-            change.dataTracked.operation === nextChange.dataTracked.operation);
+            hasMatchingOperation(change, nextChange));
     }
     static flattenTreeToIds(changes) {
         return changes.flatMap((c) => (this.isNodeChange(c) ? [c.id, ...c.children.map((c) => c.id)] : c.id));
@@ -163,8 +167,7 @@ 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.move) &&
+            operation === change_1.CHANGE_OPERATION.wrap_with_node) &&
             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,6 +20,14 @@ 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);
+            }
+        }
         const { pos: from, deleted } = deleteMap.mapResult(change.from);
         const node = tr.doc.nodeAt(from);
         const noChangeNeeded = !ChangeSet_1.ChangeSet.shouldDeleteChange(change);
@@ -27,45 +35,9 @@ 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 (change.dataTracked.operation === change_1.CHANGE_OPERATION.move) {
-                tr.delete(from, from + node.nodeSize);
-                return deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
-            }
-        }
-        else if (change.dataTracked.status === change_1.CHANGE_STATUS.accepted) {
-            if (change.dataTracked.operation === change_1.CHANGE_OPERATION.move) {
-                const originalNodeChange = changeSet.changes.find((c) => c.dataTracked.moveNodeId === change.dataTracked.moveNodeId &&
-                    c.dataTracked.operation === change_1.CHANGE_OPERATION.delete);
-                if (originalNodeChange) {
-                    const { pos: originalFrom, deleted: originalDeleted } = deleteMap.mapResult(originalNodeChange.from);
-                    const originalNode = tr.doc.nodeAt(originalFrom);
-                    if (originalDeleted) {
-                        return;
-                    }
-                    if (!originalNode) {
-                        return;
-                    }
-                    tr.delete(originalFrom, originalFrom + originalNode.nodeSize);
-                    deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
-                }
-                else {
-                    logger_1.log.warn('No original node change found for move', { change });
-                }
-                const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) });
-                tr.setNodeMarkup(from, undefined, attrs, node.marks);
-                return;
-            }
-        }
         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);

package/dist/cjs/changes/updateChangesStatus.js

@@ -23,7 +23,6 @@ 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 = [];
@@ -41,24 +40,6 @@ 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);
-                        }
-                    }
                 }
             }
         });
@@ -66,6 +47,7 @@ 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.setFragmentAsMoveChange = exports.setFragmentAsWrapChange = exports.setFragmentAsInserted = void 0;
+exports.setFragmentAsNodeSplit = 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,14 +84,6 @@ 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, changeSet);
+                    createdTr = (0, trackTransaction_1.trackTransaction)(tr, oldState, createdTr, userID);
                 }
                 docChanged = docChanged || tr.docChanged;
                 if (setChangeStatuses) {

package/dist/cjs/steps/trackReplaceStep.js

@@ -60,15 +60,13 @@ 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 (attrs.moveNodeId) {
-                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,14 +13,13 @@ 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, changeSet) {
+function trackTransaction(tr, oldState, newTr, authorID) {
     var _a, _b, _c, _d, _e;
     const emptyAttrs = {
         authorID,
@@ -36,23 +35,6 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     let iters = 0;
     logger_1.log.info('ORIGINAL transaction', tr);
     let trContext = {};
-    tr.steps.forEach((step) => {
-        var _a;
-        if (step instanceof prosemirror_transform_1.ReplaceStep) {
-            const doc = tr.docs[tr.steps.indexOf(step)];
-            if ((0, track_utils_1.isDeletingPendingMovedNode)(step, doc)) {
-                const node = doc.nodeAt(step.from);
-                (_a = node === null || node === void 0 ? void 0 : node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.forEach((tracked) => {
-                    if (tracked.operation === change_1.CHANGE_OPERATION.move && tracked.status === change_1.CHANGE_STATUS.pending) {
-                        newTr.setNodeMarkup(step.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: node.attrs.dataTracked.map((t) => t.id === tracked.id ? Object.assign(Object.assign({}, t), { status: change_1.CHANGE_STATUS.rejected }) : t) }));
-                    }
-                });
-            }
-        }
-    });
-    if ((0, track_utils_1.isNodeMoveOperation)(tr)) {
-        emptyAttrs.moveNodeId = (0, uuidv4_1.uuidv4)();
-    }
     for (let i = tr.steps.length - 1; i >= 0; i--) {
         const step = tr.steps[i];
         logger_1.log.info('transaction step', step);

package/dist/cjs/types/change.js

@@ -24,7 +24,6 @@ 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,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDeletingPendingMovedNode = exports.isNodeMoveOperation = 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");
+exports.trFromHistory = exports.stepIsLift = exports.isLiftStep = exports.isWrapStep = exports.isSplitStep = exports.createNewUpdateAttrs = exports.createNewDeleteAttrs = exports.createNewReferenceAttrs = exports.createNewSplitAttrs = exports.createNewWrapAttrs = exports.createNewInsertAttrs = void 0;
 const change_1 = require("../types/change");
 function createNewInsertAttrs(attrs) {
     return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.insert });
@@ -34,10 +33,6 @@ 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)) });
@@ -89,47 +84,3 @@ function stepIsLift(gap, node, to) {
 exports.stepIsLift = stepIsLift;
 const trFromHistory = (tr) => Object.keys(tr.meta).find((s) => s.startsWith('history$'));
 exports.trFromHistory = trFromHistory;
-const isNodeMoveOperation = (tr) => {
-    if (tr.steps.length < 2) {
-        return false;
-    }
-    if (!tr.steps.every((step) => step instanceof prosemirror_transform_1.ReplaceStep)) {
-        return false;
-    }
-    const deletedHashes = new Set();
-    const insertedHashes = new Set();
-    for (let i = 0; i < tr.steps.length; i++) {
-        const step = tr.steps[i];
-        const doc = tr.docs[i];
-        const content = step.slice.size === 0 ? doc.slice(step.from, step.to) : step.slice;
-        if (step.from !== step.to && step.slice.size === 0) {
-            if (content.content.firstChild) {
-                deletedHashes.add(content.content.firstChild.toString());
-            }
-        }
-        else if (step.slice.size > 0) {
-            if (content.content.firstChild) {
-                insertedHashes.add(content.content.firstChild.toString());
-            }
-        }
-    }
-    if (deletedHashes.size !== insertedHashes.size) {
-        return false;
-    }
-    for (const hash of insertedHashes) {
-        if (!deletedHashes.has(hash)) {
-            return false;
-        }
-    }
-    return true;
-};
-exports.isNodeMoveOperation = isNodeMoveOperation;
-const isDeletingPendingMovedNode = (step, doc) => {
-    var _a;
-    if (step.from === step.to || step.slice.content.size > 0) {
-        return false;
-    }
-    const node = doc.nodeAt(step.from);
-    return !!((_a = node === null || node === void 0 ? void 0 : node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.find((tracked) => tracked.operation === change_1.CHANGE_OPERATION.move && tracked.status === change_1.CHANGE_STATUS.pending));
-};
-exports.isDeletingPendingMovedNode = isDeletingPendingMovedNode;

package/dist/es/ChangeSet.js

@@ -88,8 +88,7 @@ export class ChangeSet {
             }
             rootNodes.push([change]);
         });
-        return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== CHANGE_OPERATION.reference &&
-            !(c.dataTracked.moveNodeId && c.dataTracked.operation === CHANGE_OPERATION.delete)).length);
+        return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== CHANGE_OPERATION.reference).length);
     }
     get pending() {
         return this.changes.filter((c) => c.dataTracked.status === CHANGE_STATUS.pending);
@@ -147,11 +146,16 @@ export class ChangeSet {
     canJoinAdjacentInlineChanges(change, index) {
         const nextChange = this.changeTree.at(index + 1);
         const isInline = (c) => c.type === 'text-change' || (c.type === 'node-change' && c.node.isInline);
+        const hasMatchingOperation = (c1, c2) => c1.dataTracked.operation === c2.dataTracked.operation ||
+            (c1.dataTracked.operation === 'wrap_with_node' &&
+                (c2.dataTracked.operation === 'insert' || c2.dataTracked.operation === 'set_attrs')) ||
+            (c2.dataTracked.operation === 'wrap_with_node' &&
+                (c1.dataTracked.operation === 'insert' || c1.dataTracked.operation === 'set_attrs'));
         return (isInline(change) &&
             nextChange &&
             isInline(nextChange) &&
             change.to === nextChange.from &&
-            change.dataTracked.operation === nextChange.dataTracked.operation);
+            hasMatchingOperation(change, nextChange));
     }
     static flattenTreeToIds(changes) {
         return changes.flatMap((c) => (this.isNodeChange(c) ? [c.id, ...c.children.map((c) => c.id)] : c.id));
@@ -160,8 +164,7 @@ 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.move) &&
+            operation === CHANGE_OPERATION.wrap_with_node) &&
             status === CHANGE_STATUS.rejected) ||
             (operation === CHANGE_OPERATION.delete && status === CHANGE_STATUS.accepted));
     }

package/dist/es/changes/applyChanges.js

@@ -16,6 +16,14 @@ 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);
+            }
+        }
         const { pos: from, deleted } = deleteMap.mapResult(change.from);
         const node = tr.doc.nodeAt(from);
         const noChangeNeeded = !ChangeSet.shouldDeleteChange(change);
@@ -23,45 +31,9 @@ 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 (change.dataTracked.operation === CHANGE_OPERATION.move) {
-                tr.delete(from, from + node.nodeSize);
-                return deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
-            }
-        }
-        else if (change.dataTracked.status === CHANGE_STATUS.accepted) {
-            if (change.dataTracked.operation === CHANGE_OPERATION.move) {
-                const originalNodeChange = changeSet.changes.find((c) => c.dataTracked.moveNodeId === change.dataTracked.moveNodeId &&
-                    c.dataTracked.operation === CHANGE_OPERATION.delete);
-                if (originalNodeChange) {
-                    const { pos: originalFrom, deleted: originalDeleted } = deleteMap.mapResult(originalNodeChange.from);
-                    const originalNode = tr.doc.nodeAt(originalFrom);
-                    if (originalDeleted) {
-                        return;
-                    }
-                    if (!originalNode) {
-                        return;
-                    }
-                    tr.delete(originalFrom, originalFrom + originalNode.nodeSize);
-                    deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
-                }
-                else {
-                    log.warn('No original node change found for move', { change });
-                }
-                const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) });
-                tr.setNodeMarkup(from, undefined, attrs, node.marks);
-                return;
-            }
-        }
         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);

package/dist/es/changes/updateChangesStatus.js

@@ -20,7 +20,6 @@ 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 = [];
@@ -38,24 +37,6 @@ 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);
-                        }
-                    }
                 }
             }
         });
@@ -63,6 +44,7 @@ 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,13 +56,6 @@ 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, changeSet);
+                    createdTr = trackTransaction(tr, oldState, createdTr, userID);
                 }
                 docChanged = docChanged || tr.docChanged;
                 if (setChangeStatuses) {

package/dist/es/steps/trackReplaceStep.js

@@ -1,5 +1,5 @@
 import { Slice } from 'prosemirror-model';
-import { setFragmentAsInserted, setFragmentAsMoveChange, setFragmentAsNodeSplit, } from '../compute/setFragmentAsInserted';
+import { setFragmentAsInserted, setFragmentAsNodeSplit } from '../compute/setFragmentAsInserted';
 import { deleteAndMergeSplitNodes } from '../mutate/deleteAndMergeSplitNodes';
 import { log } from '../utils/logger';
 import * as trackUtils from '../utils/track-utils';
@@ -34,15 +34,13 @@ 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 (attrs.moveNodeId) {
-                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

@@ -4,17 +4,16 @@ import { diffChangeSteps } from '../change-steps/diffChangeSteps';
 import { processChangeSteps } from '../change-steps/processChangeSteps';
 import { updateChangeAttrs } from '../changes/updateChangeAttrs';
 import { getNodeTrackedData } from '../compute/nodeHelpers';
-import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
+import { CHANGE_STATUS } from '../types/change';
 import { log } from '../utils/logger';
 import { mapChangeSteps } from '../utils/mapChangeStep';
-import { isDeletingPendingMovedNode, isNodeMoveOperation } 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, changeSet) {
+export function trackTransaction(tr, oldState, newTr, authorID) {
     var _a, _b, _c, _d, _e;
     const emptyAttrs = {
         authorID,
@@ -30,23 +29,6 @@ export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
     let trContext = {};
-    tr.steps.forEach((step) => {
-        var _a;
-        if (step instanceof ReplaceStep) {
-            const doc = tr.docs[tr.steps.indexOf(step)];
-            if (isDeletingPendingMovedNode(step, doc)) {
-                const node = doc.nodeAt(step.from);
-                (_a = node === null || node === void 0 ? void 0 : node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.forEach((tracked) => {
-                    if (tracked.operation === CHANGE_OPERATION.move && tracked.status === CHANGE_STATUS.pending) {
-                        newTr.setNodeMarkup(step.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: node.attrs.dataTracked.map((t) => t.id === tracked.id ? Object.assign(Object.assign({}, t), { status: CHANGE_STATUS.rejected }) : t) }));
-                    }
-                });
-            }
-        }
-    });
-    if (isNodeMoveOperation(tr)) {
-        emptyAttrs.moveNodeId = uuidv4();
-    }
     for (let i = tr.steps.length - 1; i >= 0; i--) {
         const step = tr.steps[i];
         log.info('transaction step', step);

package/dist/es/types/change.js

@@ -21,7 +21,6 @@ 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,8 +9,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { ReplaceStep } from 'prosemirror-transform';
-import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
+import { CHANGE_OPERATION } from '../types/change';
 export function createNewInsertAttrs(attrs) {
     return Object.assign(Object.assign({}, attrs), { operation: CHANGE_OPERATION.insert });
 }
@@ -26,9 +25,6 @@ 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)) });
@@ -74,45 +70,3 @@ 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 isNodeMoveOperation = (tr) => {
-    if (tr.steps.length < 2) {
-        return false;
-    }
-    if (!tr.steps.every((step) => step instanceof ReplaceStep)) {
-        return false;
-    }
-    const deletedHashes = new Set();
-    const insertedHashes = new Set();
-    for (let i = 0; i < tr.steps.length; i++) {
-        const step = tr.steps[i];
-        const doc = tr.docs[i];
-        const content = step.slice.size === 0 ? doc.slice(step.from, step.to) : step.slice;
-        if (step.from !== step.to && step.slice.size === 0) {
-            if (content.content.firstChild) {
-                deletedHashes.add(content.content.firstChild.toString());
-            }
-        }
-        else if (step.slice.size > 0) {
-            if (content.content.firstChild) {
-                insertedHashes.add(content.content.firstChild.toString());
-            }
-        }
-    }
-    if (deletedHashes.size !== insertedHashes.size) {
-        return false;
-    }
-    for (const hash of insertedHashes) {
-        if (!deletedHashes.has(hash)) {
-            return false;
-        }
-    }
-    return true;
-};
-export const isDeletingPendingMovedNode = (step, doc) => {
-    var _a;
-    if (step.from === step.to || step.slice.content.size > 0) {
-        return false;
-    }
-    const node = doc.nodeAt(step.from);
-    return !!((_a = node === null || node === void 0 ? void 0 : node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.find((tracked) => tracked.operation === CHANGE_OPERATION.move && tracked.status === CHANGE_STATUS.pending));
-};

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

@@ -3,5 +3,4 @@ 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/trackTransaction.d.ts

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

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

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

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

@@ -7,7 +7,6 @@ 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;
@@ -19,5 +18,3 @@ export declare function stepIsLift(gap: {
     insert: number;
 }, node: PMNode, to: number): boolean;
 export declare const trFromHistory: (tr: Transaction) => string | undefined;
-export declare const isNodeMoveOperation: (tr: Transaction) => boolean;
-export declare const isDeletingPendingMovedNode: (step: ReplaceStep, doc: PMNode) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.10.5-LEAN-4160.5",
+  "version": "1.10.7",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@manuscripts/eslint-config": "^0.5.1",
-    "@manuscripts/transform": "3.0.45",
+    "@manuscripts/transform": "3.0.48",
     "@types/debug": "^4.1.7",
     "@types/jest": "27.5.1",
     "@types/node": "^18.7.18",