@manuscripts/track-changes-plugin 2.0.10 → 2.0.11

package/dist/cjs/actions.js

@@ -12,6 +12,7 @@ var TrackChangesAction;
     TrackChangesAction["setChangeStatuses"] = "track-changes-set-change-statuses";
     TrackChangesAction["refreshChanges"] = "track-changes-refresh-changes";
     TrackChangesAction["updateMetaNode"] = "track-changes-update-meta-node";
+    TrackChangesAction["indentationAction"] = "track-changes-indentation-action";
 })(TrackChangesAction || (exports.TrackChangesAction = TrackChangesAction = {}));
 function hasAction(tr) {
     return Object.values(TrackChangesAction).some((action) => !!tr.getMeta(action));

package/dist/cjs/change-steps/processChangeSteps.js

@@ -82,7 +82,10 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, delete
                 }
                 const nodeAtMappedPos = newTr.doc.nodeAt(mapping.map(c.pos));
                 const nodeWasAlreadyDeleted = !nodeAtMappedPos || nodeAtMappedPos !== c.node;
-                if ((isInserted && deletesCounter > 1) || (childOfDeleted && prevDeletedNodeInserted) || nodeWasAlreadyDeleted) {
+                const isMoveOperation = !!emptyAttrs.moveNodeId;
+                if ((isInserted && deletesCounter > 1 && !isMoveOperation) ||
+                    (childOfDeleted && prevDeletedNodeInserted) ||
+                    nodeWasAlreadyDeleted) {
                     return false;
                 }
                 (0, deleteNode_1.deleteOrSetNodeDeleted)(c.node, mapping.map(c.pos), newTr, deleteAttrs);

package/dist/cjs/changes/applyChanges.js

@@ -10,6 +10,21 @@ const change_1 = require("../types/change");
 const logger_1 = require("../utils/logger");
 const revertChange_1 = require("./revertChange");
 const updateChangeAttrs_1 = require("./updateChangeAttrs");
+function collectMoveNodeIds(containerNode, primaryMoveNodeId) {
+    const moveNodeIds = new Set();
+    moveNodeIds.add(primaryMoveNodeId);
+    containerNode.descendants((childNode) => {
+        const dataTracked = childNode.attrs.dataTracked;
+        if (Array.isArray(dataTracked)) {
+            dataTracked.forEach((trackingData) => {
+                if (trackingData.moveNodeId) {
+                    moveNodeIds.add(trackingData.moveNodeId);
+                }
+            });
+        }
+    });
+    return moveNodeIds;
+}
 function getUpdatedDataTracked(dataTracked, changeId) {
     if (!dataTracked) {
         return null;
@@ -29,6 +44,9 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
         if (change.dataTracked.operation === change_1.CHANGE_OPERATION.move) {
             return;
         }
+        if (change.dataTracked.operation === change_1.CHANGE_OPERATION.delete && change.dataTracked.moveNodeId) {
+            return;
+        }
         const { pos: from, deleted } = deleteMap.mapResult(change.from);
         const node = tr.doc.nodeAt(from);
         const noChangeNeeded = !ChangeSet_1.ChangeSet.shouldDeleteChange(change);
@@ -94,25 +112,49 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
             return;
         }
         if (change.dataTracked.status === change_1.CHANGE_STATUS.accepted) {
-            const originalChange = changeSet.changes.find((c) => c.dataTracked.moveNodeId === change.dataTracked.moveNodeId &&
+            const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) });
+            tr.setNodeMarkup(from, undefined, attrs, node.marks);
+            const originalChanges = changeSet.changes.filter((c) => c.dataTracked.moveNodeId === change.dataTracked.moveNodeId &&
                 c.dataTracked.operation === change_1.CHANGE_OPERATION.delete);
-            if (originalChange) {
-                const { pos: originalFrom } = deleteMap.mapResult(originalChange.from);
+            if (originalChanges.length === 0) {
+                logger_1.log.warn('No original change found for move operation', { change });
+            }
+            originalChanges.forEach((originalChange) => {
+                const { pos: originalFrom, deleted } = deleteMap.mapResult(originalChange.from);
+                if (deleted) {
+                    return;
+                }
                 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) {
+            const moveNodeIdsToRestore = collectMoveNodeIds(node, change.dataTracked.moveNodeId);
             tr.delete(from, from + node.nodeSize);
             deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
+            changeSet.changes
+                .filter((c) => c.dataTracked.operation === change_1.CHANGE_OPERATION.delete &&
+                c.dataTracked.moveNodeId &&
+                moveNodeIdsToRestore.has(c.dataTracked.moveNodeId) &&
+                ChangeSet_1.ChangeSet.isNodeChange(c))
+                .forEach((orig) => {
+                const { pos } = deleteMap.mapResult(orig.from);
+                const node = tr.doc.nodeAt(pos);
+                if (!node) {
+                    return;
+                }
+                const dataTracked = node.attrs.dataTracked || [];
+                const hasMoved = dataTracked.some((d) => d.operation === change_1.CHANGE_OPERATION.move && d.status === change_1.CHANGE_STATUS.pending);
+                if (hasMoved) {
+                    tr.delete(pos, pos + node.nodeSize);
+                    deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
+                    return;
+                }
+                (0, updateChangeAttrs_1.restoreNode)(tr, node, pos, schema);
+            });
         }
     });
     return deleteMap;

package/dist/cjs/changes/updateChangeAttrs.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateChangeAttrs = updateChangeAttrs;
 exports.updateChangeChildrenAttributes = updateChangeChildrenAttributes;
+exports.restoreNode = restoreNode;
 const ChangeSet_1 = require("../ChangeSet");
 const nodeHelpers_1 = require("../compute/nodeHelpers");
 const change_1 = require("../types/change");
@@ -83,3 +84,9 @@ function updateChangeChildrenAttributes(changes, tr, mapping) {
         }
     });
 }
+function restoreNode(tr, node, pos, schema) {
+    const updatedAttrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: null });
+    tr.setNodeMarkup(pos, undefined, updatedAttrs, node.marks);
+    tr.removeMark(pos, pos + node.nodeSize, schema.marks.tracked_insert);
+    tr.removeMark(pos, pos + node.nodeSize, schema.marks.tracked_delete);
+}

package/dist/cjs/compute/setFragmentAsInserted.js

@@ -95,10 +95,10 @@ function setFragmentAsWrapChange(inserted, attrs, schema) {
     });
     return prosemirror_model_1.Fragment.from(content);
 }
-function setFragmentAsMoveChange(fragment, attrs) {
+function setFragmentAsMoveChange(fragment, moveAttrs) {
     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));
+        content.push(node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [(0, nodeHelpers_1.addTrackIdIfDoesntExist)(moveAttrs)] }), node.content, node.marks));
     });
     return prosemirror_model_1.Fragment.from(content);
 }

package/dist/cjs/index.js

@@ -36,12 +36,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeSet = exports.enableDebug = exports.trackCommands = exports.skipTracking = exports.trackChangesPlugin = exports.trackChangesPluginKey = void 0;
+exports.ChangeSet = exports.enableDebug = exports.trackCommands = exports.TrackChangesAction = exports.setAction = exports.skipTracking = exports.trackChangesPlugin = exports.trackChangesPluginKey = void 0;
 var plugin_1 = require("./plugin");
 Object.defineProperty(exports, "trackChangesPluginKey", { enumerable: true, get: function () { return plugin_1.trackChangesPluginKey; } });
 Object.defineProperty(exports, "trackChangesPlugin", { enumerable: true, get: function () { return plugin_1.trackChangesPlugin; } });
 var actions_1 = require("./actions");
 Object.defineProperty(exports, "skipTracking", { enumerable: true, get: function () { return actions_1.skipTracking; } });
+Object.defineProperty(exports, "setAction", { enumerable: true, get: function () { return actions_1.setAction; } });
+Object.defineProperty(exports, "TrackChangesAction", { enumerable: true, get: function () { return actions_1.TrackChangesAction; } });
 exports.trackCommands = __importStar(require("./commands"));
 var logger_1 = require("./utils/logger");
 Object.defineProperty(exports, "enableDebug", { enumerable: true, get: function () { return logger_1.enableDebug; } });

package/dist/cjs/mutate/deleteNode.js

@@ -23,6 +23,7 @@ function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
     const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => (d.operation === change_1.CHANGE_OPERATION.insert || d.operation === change_1.CHANGE_OPERATION.wrap_with_node) &&
         (d.status === change_1.CHANGE_STATUS.pending || d.status === change_1.CHANGE_STATUS.accepted));
     const updated = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.set_node_attributes || d.operation === change_1.CHANGE_OPERATION.reference);
+    const moved = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.move && d.status === change_1.CHANGE_STATUS.pending);
     if (inserted) {
         return deleteNode(node, pos, newTr);
     }
@@ -35,5 +36,5 @@ function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
         return;
     }
     const newDeleted = (0, nodeHelpers_1.addTrackIdIfDoesntExist)(deleteAttrs);
-    newTr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: updated ? [newDeleted, updated] : [newDeleted] }), node.marks);
+    newTr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: updated ? [newDeleted, updated] : moved ? [newDeleted, moved] : [newDeleted] }), node.marks);
 }

package/dist/cjs/steps/trackReplaceStep.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackReplaceStep = trackReplaceStep;
 const prosemirror_model_1 = require("prosemirror-model");
+const actions_1 = require("../actions");
 const setFragmentAsInserted_1 = require("../compute/setFragmentAsInserted");
 const deleteAndMergeSplitNodes_1 = require("../mutate/deleteAndMergeSplitNodes");
 const logger_1 = require("../utils/logger");
@@ -50,7 +51,7 @@ function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResult, curr
         attrs.moveNodeId = moveID;
     }
     step.getMap().forEach((fromA, toA, fromB, toB) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         logger_1.log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
         logger_1.log.info('TR: steps before applying delete', [...newTr.steps]);
@@ -81,12 +82,13 @@ function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResult, curr
                 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 indentationType = (_a = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.indentationAction)) === null || _a === void 0 ? void 0 : _a.action;
+                fragment = (0, setFragmentAsInserted_1.setFragmentAsMoveChange)(newSliceContent, trackUtils.createNewMoveAttrs(attrs, indentationType));
             }
             const openStart = slice.openStart !== slice.openEnd ? 0 : slice.openStart;
             const openEnd = slice.openStart !== slice.openEnd ? 0 : slice.openEnd;
             const textWasDeleted = !!changeSteps.length && !(fromA === fromB);
-            const isBlock = !!((_a = fragment.firstChild) === null || _a === void 0 ? void 0 : _a.isBlock);
+            const isBlock = !!((_b = fragment.firstChild) === null || _b === void 0 ? void 0 : _b.isBlock);
             changeSteps.push({
                 type: 'insert-slice',
                 from: textWasDeleted ? fromB : isBlock ? toA : fromA,
@@ -96,8 +98,8 @@ function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResult, curr
             });
         }
         else {
-            const isDeleteEvent = ((_b = window.event) === null || _b === void 0 ? void 0 : _b.code) === 'Delete';
-            const isDeleteContentForward = ((_c = window.event) === null || _c === void 0 ? void 0 : _c.inputType) === 'deleteContentForward';
+            const isDeleteEvent = ((_c = window.event) === null || _c === void 0 ? void 0 : _c.code) === 'Delete';
+            const isDeleteContentForward = ((_d = window.event) === null || _d === void 0 ? void 0 : _d.inputType) === 'deleteContentForward';
             selectionPos = isDeleteEvent || isDeleteContentForward ? toA : fromA;
         }
     });

package/dist/cjs/steps/trackTransaction.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackTransaction = trackTransaction;
 const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_transform_1 = require("prosemirror-transform");
+const actions_1 = require("../actions");
 const diffChangeSteps_1 = require("../change-steps/diffChangeSteps");
 const processChangeSteps_1 = require("../change-steps/processChangeSteps");
 const updateChangeAttrs_1 = require("../changes/updateChangeAttrs");
@@ -21,7 +22,7 @@ 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) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const emptyAttrs = {
         authorID,
         reviewedByID: null,
@@ -30,13 +31,23 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
         statusUpdateAt: 0,
         status: change_1.CHANGE_STATUS.pending,
     };
+    const action = (_a = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.indentationAction)) === null || _a === void 0 ? void 0 : _a.action;
+    const isIndentation = action === 'indent' || action === 'unindent';
     const wasNodeSelection = tr.selection instanceof prosemirror_state_1.NodeSelection;
     const setsNewSelection = tr.selectionSet;
     const deletedNodeMapping = new prosemirror_transform_1.Mapping();
     let iters = 0;
     logger_1.log.info('ORIGINAL transaction', tr);
     let trContext = {};
-    const movingStepsAssociated = (0, track_utils_1.HasMoveOperations)(tr);
+    let movingStepsAssociated = (0, track_utils_1.HasMoveOperations)(tr);
+    if (isIndentation) {
+        const moveId = (0, uuidv4_1.uuidv4)();
+        tr.steps.forEach((step) => {
+            if (step instanceof prosemirror_transform_1.ReplaceStep) {
+                movingStepsAssociated.set(step, moveId);
+            }
+        });
+    }
     (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--) {
@@ -57,7 +68,7 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
         }
         else if (step instanceof prosemirror_transform_1.ReplaceStep) {
             const { slice } = step;
-            if (((_b = (_a = slice === null || slice === void 0 ? void 0 : slice.content) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.length) === 1 && isHighlightMarkerNode(slice.content.content[0])) {
+            if (((_c = (_b = slice === null || slice === void 0 ? void 0 : slice.content) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c.length) === 1 && isHighlightMarkerNode(slice.content.content[0])) {
                 continue;
             }
             const invertedStep = step.invert(tr.docs[i]);
@@ -71,7 +82,7 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
             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]))) {
+                if (isHighlightMarkerNode((step === null || step === void 0 ? void 0 : step.node) || ((_e = (_d = step === null || step === void 0 ? void 0 : step.slice) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.content[0]))) {
                     continue;
                 }
             }
@@ -104,7 +115,7 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
             const [mapping, selectionPos] = (0, processChangeSteps_1.processChangeSteps)(changeSteps, tr.selection.from, newTr, emptyAttrs, oldState.schema, deletedNodeMapping);
         }
         else if (step instanceof prosemirror_transform_1.AddMarkStep) {
-            const dataTracked = (_e = (0, nodeHelpers_1.getNodeTrackedData)(newTr.doc.nodeAt(step.from), oldState.schema)) === null || _e === void 0 ? void 0 : _e.pop();
+            const dataTracked = (_f = (0, nodeHelpers_1.getNodeTrackedData)(newTr.doc.nodeAt(step.from), oldState.schema)) === null || _f === void 0 ? void 0 : _f.pop();
             if (dataTracked) {
                 (0, updateChangeAttrs_1.updateChangeAttrs)(newTr, { id: dataTracked.id, from: step.from, to: step.to, type: 'text-change', dataTracked }, Object.assign(Object.assign({}, dataTracked), { id: (0, uuidv4_1.uuidv4)() }), oldState.schema);
             }

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

@@ -38,8 +38,8 @@ function createNewReferenceAttrs(attrs, id) {
 function createNewDeleteAttrs(attrs) {
     return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.delete });
 }
-function createNewMoveAttrs(attrs) {
-    return Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.move });
+function createNewMoveAttrs(attrs, indentationType) {
+    return Object.assign(Object.assign(Object.assign({}, attrs), { operation: change_1.CHANGE_OPERATION.move }), (indentationType && { indentationType }));
 }
 function createNewUpdateAttrs(attrs, oldAttrs) {
     const { dataTracked } = oldAttrs, restAttrs = __rest(oldAttrs, ["dataTracked"]);

package/dist/es/actions.js

@@ -6,6 +6,7 @@ export var TrackChangesAction;
     TrackChangesAction["setChangeStatuses"] = "track-changes-set-change-statuses";
     TrackChangesAction["refreshChanges"] = "track-changes-refresh-changes";
     TrackChangesAction["updateMetaNode"] = "track-changes-update-meta-node";
+    TrackChangesAction["indentationAction"] = "track-changes-indentation-action";
 })(TrackChangesAction || (TrackChangesAction = {}));
 export function hasAction(tr) {
     return Object.values(TrackChangesAction).some((action) => !!tr.getMeta(action));

package/dist/es/change-steps/processChangeSteps.js

@@ -46,7 +46,10 @@ export function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema,
                 }
                 const nodeAtMappedPos = newTr.doc.nodeAt(mapping.map(c.pos));
                 const nodeWasAlreadyDeleted = !nodeAtMappedPos || nodeAtMappedPos !== c.node;
-                if ((isInserted && deletesCounter > 1) || (childOfDeleted && prevDeletedNodeInserted) || nodeWasAlreadyDeleted) {
+                const isMoveOperation = !!emptyAttrs.moveNodeId;
+                if ((isInserted && deletesCounter > 1 && !isMoveOperation) ||
+                    (childOfDeleted && prevDeletedNodeInserted) ||
+                    nodeWasAlreadyDeleted) {
                     return false;
                 }
                 deleteOrSetNodeDeleted(c.node, mapping.map(c.pos), newTr, deleteAttrs);

package/dist/es/changes/applyChanges.js

@@ -5,7 +5,22 @@ import { mergeNode } from '../mutate/mergeNode';
 import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
 import { log } from '../utils/logger';
 import { revertSplitNodeChange, revertWrapNodeChange } from './revertChange';
-import { updateChangeChildrenAttributes } from './updateChangeAttrs';
+import { restoreNode, updateChangeChildrenAttributes } from './updateChangeAttrs';
+function collectMoveNodeIds(containerNode, primaryMoveNodeId) {
+    const moveNodeIds = new Set();
+    moveNodeIds.add(primaryMoveNodeId);
+    containerNode.descendants((childNode) => {
+        const dataTracked = childNode.attrs.dataTracked;
+        if (Array.isArray(dataTracked)) {
+            dataTracked.forEach((trackingData) => {
+                if (trackingData.moveNodeId) {
+                    moveNodeIds.add(trackingData.moveNodeId);
+                }
+            });
+        }
+    });
+    return moveNodeIds;
+}
 export function getUpdatedDataTracked(dataTracked, changeId) {
     if (!dataTracked) {
         return null;
@@ -25,6 +40,9 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, del
         if (change.dataTracked.operation === CHANGE_OPERATION.move) {
             return;
         }
+        if (change.dataTracked.operation === CHANGE_OPERATION.delete && change.dataTracked.moveNodeId) {
+            return;
+        }
         const { pos: from, deleted } = deleteMap.mapResult(change.from);
         const node = tr.doc.nodeAt(from);
         const noChangeNeeded = !ChangeSet.shouldDeleteChange(change);
@@ -90,25 +108,49 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, del
             return;
         }
         if (change.dataTracked.status === CHANGE_STATUS.accepted) {
-            const originalChange = changeSet.changes.find((c) => c.dataTracked.moveNodeId === change.dataTracked.moveNodeId &&
+            const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) });
+            tr.setNodeMarkup(from, undefined, attrs, node.marks);
+            const originalChanges = changeSet.changes.filter((c) => c.dataTracked.moveNodeId === change.dataTracked.moveNodeId &&
                 c.dataTracked.operation === CHANGE_OPERATION.delete);
-            if (originalChange) {
-                const { pos: originalFrom } = deleteMap.mapResult(originalChange.from);
+            if (originalChanges.length === 0) {
+                log.warn('No original change found for move operation', { change });
+            }
+            originalChanges.forEach((originalChange) => {
+                const { pos: originalFrom, deleted } = deleteMap.mapResult(originalChange.from);
+                if (deleted) {
+                    return;
+                }
                 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) {
+            const moveNodeIdsToRestore = collectMoveNodeIds(node, change.dataTracked.moveNodeId);
             tr.delete(from, from + node.nodeSize);
             deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
+            changeSet.changes
+                .filter((c) => c.dataTracked.operation === CHANGE_OPERATION.delete &&
+                c.dataTracked.moveNodeId &&
+                moveNodeIdsToRestore.has(c.dataTracked.moveNodeId) &&
+                ChangeSet.isNodeChange(c))
+                .forEach((orig) => {
+                const { pos } = deleteMap.mapResult(orig.from);
+                const node = tr.doc.nodeAt(pos);
+                if (!node) {
+                    return;
+                }
+                const dataTracked = node.attrs.dataTracked || [];
+                const hasMoved = dataTracked.some((d) => d.operation === CHANGE_OPERATION.move && d.status === CHANGE_STATUS.pending);
+                if (hasMoved) {
+                    tr.delete(pos, pos + node.nodeSize);
+                    deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
+                    return;
+                }
+                restoreNode(tr, node, pos, schema);
+            });
         }
     });
     return deleteMap;

package/dist/es/changes/updateChangeAttrs.js

@@ -79,3 +79,9 @@ export function updateChangeChildrenAttributes(changes, tr, mapping) {
         }
     });
 }
+export function restoreNode(tr, node, pos, schema) {
+    const updatedAttrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: null });
+    tr.setNodeMarkup(pos, undefined, updatedAttrs, node.marks);
+    tr.removeMark(pos, pos + node.nodeSize, schema.marks.tracked_insert);
+    tr.removeMark(pos, pos + node.nodeSize, schema.marks.tracked_delete);
+}

package/dist/es/compute/setFragmentAsInserted.js

@@ -56,10 +56,10 @@ export function setFragmentAsWrapChange(inserted, attrs, schema) {
     });
     return Fragment.from(content);
 }
-export function setFragmentAsMoveChange(fragment, attrs) {
+export function setFragmentAsMoveChange(fragment, moveAttrs) {
     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));
+        content.push(node.type.create(Object.assign(Object.assign({}, node.attrs), { dataTracked: [addTrackIdIfDoesntExist(moveAttrs)] }), node.content, node.marks));
     });
     return Fragment.from(content);
 }

package/dist/es/index.js

@@ -1,5 +1,5 @@
 export { trackChangesPluginKey, trackChangesPlugin } from './plugin';
-export { skipTracking } from './actions';
+export { skipTracking, setAction, TrackChangesAction } from './actions';
 export * as trackCommands from './commands';
 export { enableDebug } from './utils/logger';
 export { ChangeSet } from './ChangeSet';

package/dist/es/mutate/deleteNode.js

@@ -19,6 +19,7 @@ export function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
     const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => (d.operation === CHANGE_OPERATION.insert || d.operation === CHANGE_OPERATION.wrap_with_node) &&
         (d.status === CHANGE_STATUS.pending || d.status === CHANGE_STATUS.accepted));
     const updated = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.set_node_attributes || d.operation === CHANGE_OPERATION.reference);
+    const moved = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.move && d.status === CHANGE_STATUS.pending);
     if (inserted) {
         return deleteNode(node, pos, newTr);
     }
@@ -31,5 +32,5 @@ export function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
         return;
     }
     const newDeleted = addTrackIdIfDoesntExist(deleteAttrs);
-    newTr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: updated ? [newDeleted, updated] : [newDeleted] }), node.marks);
+    newTr.setNodeMarkup(pos, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: updated ? [newDeleted, updated] : moved ? [newDeleted, moved] : [newDeleted] }), node.marks);
 }

package/dist/es/steps/trackReplaceStep.js

@@ -1,4 +1,5 @@
 import { Slice } from 'prosemirror-model';
+import { getAction, TrackChangesAction } from '../actions';
 import { setFragmentAsInserted, setFragmentAsMoveChange, setFragmentAsNodeSplit, } from '../compute/setFragmentAsInserted';
 import { deleteAndMergeSplitNodes } from '../mutate/deleteAndMergeSplitNodes';
 import { log } from '../utils/logger';
@@ -14,7 +15,7 @@ export function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResul
         attrs.moveNodeId = moveID;
     }
     step.getMap().forEach((fromA, toA, fromB, toB) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
         log.info('TR: steps before applying delete', [...newTr.steps]);
@@ -45,12 +46,13 @@ export function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResul
                 fragment = setFragmentAsNodeSplit(newTr.doc.resolve(step.from), newTr, fragment, attrs);
             }
             if (moveID) {
-                fragment = setFragmentAsMoveChange(newSliceContent, trackUtils.createNewMoveAttrs(attrs));
+                const indentationType = (_a = getAction(tr, TrackChangesAction.indentationAction)) === null || _a === void 0 ? void 0 : _a.action;
+                fragment = setFragmentAsMoveChange(newSliceContent, trackUtils.createNewMoveAttrs(attrs, indentationType));
             }
             const openStart = slice.openStart !== slice.openEnd ? 0 : slice.openStart;
             const openEnd = slice.openStart !== slice.openEnd ? 0 : slice.openEnd;
             const textWasDeleted = !!changeSteps.length && !(fromA === fromB);
-            const isBlock = !!((_a = fragment.firstChild) === null || _a === void 0 ? void 0 : _a.isBlock);
+            const isBlock = !!((_b = fragment.firstChild) === null || _b === void 0 ? void 0 : _b.isBlock);
             changeSteps.push({
                 type: 'insert-slice',
                 from: textWasDeleted ? fromB : isBlock ? toA : fromA,
@@ -60,8 +62,8 @@ export function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResul
             });
         }
         else {
-            const isDeleteEvent = ((_b = window.event) === null || _b === void 0 ? void 0 : _b.code) === 'Delete';
-            const isDeleteContentForward = ((_c = window.event) === null || _c === void 0 ? void 0 : _c.inputType) === 'deleteContentForward';
+            const isDeleteEvent = ((_c = window.event) === null || _c === void 0 ? void 0 : _c.code) === 'Delete';
+            const isDeleteContentForward = ((_d = window.event) === null || _d === void 0 ? void 0 : _d.inputType) === 'deleteContentForward';
             selectionPos = isDeleteEvent || isDeleteContentForward ? toA : fromA;
         }
     });

package/dist/es/steps/trackTransaction.js

@@ -1,5 +1,6 @@
 import { NodeSelection as NodeSelectionClass, TextSelection, } from 'prosemirror-state';
 import { AddMarkStep, AttrStep, Mapping, ReplaceAroundStep, ReplaceStep, } from 'prosemirror-transform';
+import { getAction, TrackChangesAction } from '../actions';
 import { diffChangeSteps } from '../change-steps/diffChangeSteps';
 import { processChangeSteps } from '../change-steps/processChangeSteps';
 import { updateChangeAttrs } from '../changes/updateChangeAttrs';
@@ -15,7 +16,7 @@ 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) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const emptyAttrs = {
         authorID,
         reviewedByID: null,
@@ -24,13 +25,23 @@ export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
         statusUpdateAt: 0,
         status: CHANGE_STATUS.pending,
     };
+    const action = (_a = getAction(tr, TrackChangesAction.indentationAction)) === null || _a === void 0 ? void 0 : _a.action;
+    const isIndentation = action === 'indent' || action === 'unindent';
     const wasNodeSelection = tr.selection instanceof NodeSelectionClass;
     const setsNewSelection = tr.selectionSet;
     const deletedNodeMapping = new Mapping();
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
     let trContext = {};
-    const movingStepsAssociated = HasMoveOperations(tr);
+    let movingStepsAssociated = HasMoveOperations(tr);
+    if (isIndentation) {
+        const moveId = uuidv4();
+        tr.steps.forEach((step) => {
+            if (step instanceof ReplaceStep) {
+                movingStepsAssociated.set(step, moveId);
+            }
+        });
+    }
     handleDirectPendingMoveDeletions(tr, newTr, movingStepsAssociated);
     const cleanSteps = filterMeaninglessMoveSteps(tr, movingStepsAssociated);
     for (let i = cleanSteps.length - 1; i >= 0; i--) {
@@ -51,7 +62,7 @@ export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
         }
         else if (step instanceof ReplaceStep) {
             const { slice } = step;
-            if (((_b = (_a = slice === null || slice === void 0 ? void 0 : slice.content) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.length) === 1 && isHighlightMarkerNode(slice.content.content[0])) {
+            if (((_c = (_b = slice === null || slice === void 0 ? void 0 : slice.content) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c.length) === 1 && isHighlightMarkerNode(slice.content.content[0])) {
                 continue;
             }
             const invertedStep = step.invert(tr.docs[i]);
@@ -65,7 +76,7 @@ export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
             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]))) {
+                if (isHighlightMarkerNode((step === null || step === void 0 ? void 0 : step.node) || ((_e = (_d = step === null || step === void 0 ? void 0 : step.slice) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.content[0]))) {
                     continue;
                 }
             }
@@ -98,7 +109,7 @@ export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
             const [mapping, selectionPos] = processChangeSteps(changeSteps, tr.selection.from, newTr, emptyAttrs, oldState.schema, deletedNodeMapping);
         }
         else if (step instanceof AddMarkStep) {
-            const dataTracked = (_e = getNodeTrackedData(newTr.doc.nodeAt(step.from), oldState.schema)) === null || _e === void 0 ? void 0 : _e.pop();
+            const dataTracked = (_f = getNodeTrackedData(newTr.doc.nodeAt(step.from), oldState.schema)) === null || _f === void 0 ? void 0 : _f.pop();
             if (dataTracked) {
                 updateChangeAttrs(newTr, { id: dataTracked.id, from: step.from, to: step.to, type: 'text-change', dataTracked }, Object.assign(Object.assign({}, dataTracked), { id: uuidv4() }), oldState.schema);
             }

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

@@ -27,8 +27,8 @@ 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 createNewMoveAttrs(attrs, indentationType) {
+    return Object.assign(Object.assign(Object.assign({}, attrs), { operation: CHANGE_OPERATION.move }), (indentationType && { indentationType }));
 }
 export function createNewUpdateAttrs(attrs, oldAttrs) {
     const { dataTracked } = oldAttrs, restAttrs = __rest(oldAttrs, ["dataTracked"]);

package/dist/types/actions.d.ts

@@ -7,7 +7,8 @@ export declare enum TrackChangesAction {
     setPluginStatus = "track-changes-set-track-status",
     setChangeStatuses = "track-changes-set-change-statuses",
     refreshChanges = "track-changes-refresh-changes",
-    updateMetaNode = "track-changes-update-meta-node"
+    updateMetaNode = "track-changes-update-meta-node",
+    indentationAction = "track-changes-indentation-action"
 }
 export type TrackChangesActionParams = {
     [TrackChangesAction.skipTrack]: boolean;
@@ -19,6 +20,9 @@ export type TrackChangesActionParams = {
     };
     [TrackChangesAction.refreshChanges]: boolean;
     [TrackChangesAction.updateMetaNode]: boolean;
+    [TrackChangesAction.indentationAction]: {
+        action: 'indent' | 'unindent';
+    };
 };
 export declare function hasAction(tr: Transaction): boolean;
 export declare function getAction<K extends keyof TrackChangesActionParams>(tr: Transaction, action: K): TrackChangesActionParams[K] | undefined;

package/dist/types/changes/updateChangeAttrs.d.ts

@@ -4,3 +4,4 @@ import { Mapping } from 'prosemirror-transform';
 import { IncompleteChange, TrackedAttrs, TrackedChange } from '../types/change';
 export declare function updateChangeAttrs(tr: Transaction, change: IncompleteChange, trackedAttrs: Partial<TrackedAttrs>, schema: Schema): Transaction;
 export declare function updateChangeChildrenAttributes(changes: TrackedChange[], tr: Transaction, mapping: Mapping): void;
+export declare function restoreNode(tr: Transaction, node: any, pos: number, schema: Schema): void;

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

@@ -1,7 +1,7 @@
 import { Fragment, ResolvedPos, Schema } from 'prosemirror-model';
 import { Transaction } from 'prosemirror-state';
-import { NewEmptyAttrs, NewInsertAttrs } from '../types/track';
+import { NewEmptyAttrs, NewInsertAttrs, NewMoveAttrs } 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 setFragmentAsMoveChange(fragment: Fragment, moveAttrs: NewMoveAttrs): Fragment;
 export declare function setFragmentAsNodeSplit($pos: ResolvedPos, newTr: Transaction, inserted: Fragment, attrs: NewEmptyAttrs): Fragment;

package/dist/types/index.d.ts

@@ -1,5 +1,5 @@
 export { trackChangesPluginKey, trackChangesPlugin } from './plugin';
-export { skipTracking } from './actions';
+export { skipTracking, setAction, TrackChangesAction } from './actions';
 export * as trackCommands from './commands';
 export { enableDebug } from './utils/logger';
 export { ChangeSet } from './ChangeSet';

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

@@ -55,6 +55,7 @@ export type ReferenceAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
 };
 export type NodeMoveAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
     operation: CHANGE_OPERATION.move;
+    indentationType?: 'indent' | 'unindent';
 };
 export type TrackedAttrs = InsertDeleteAttrs | UpdateAttrs | WrapAttrs | NodeSplitAttrs | ReferenceAttrs | NodeMoveAttrs;
 type Change = {

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;
@@ -28,11 +28,15 @@ export type NewUpdateAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
 export type NewSplitNodeAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
     operation: CHANGE_OPERATION.node_split;
 };
+export type NewMoveAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
+    operation: CHANGE_OPERATION.move;
+    indentationType?: 'indent' | 'unindent';
+};
 export type NewReferenceAttrs = Omit<TrackedAttrs, 'id' | 'operation'> & {
     operation: CHANGE_OPERATION.reference;
     referenceId: string;
 };
-export type NewTrackedAttrs = NewInsertAttrs | NewDeleteAttrs | NewUpdateAttrs;
+export type NewTrackedAttrs = NewInsertAttrs | NewDeleteAttrs | NewUpdateAttrs | NewMoveAttrs;
 export declare enum TrackChangesStatus {
     enabled = "enabled",
     viewSnapshots = "view-snapshots",

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

@@ -2,13 +2,13 @@ import { Node as PMNode, Slice } from 'prosemirror-model';
 import { Selection, Transaction } from 'prosemirror-state';
 import { ReplaceAroundStep, ReplaceStep, Step } from 'prosemirror-transform';
 import { CHANGE_OPERATION, TrackedAttrs } from '../types/change';
-import { NewDeleteAttrs, NewEmptyAttrs, NewInsertAttrs, NewReferenceAttrs, NewSplitNodeAttrs, NewUpdateAttrs } from '../types/track';
+import { NewDeleteAttrs, NewEmptyAttrs, NewInsertAttrs, NewMoveAttrs, 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 createNewMoveAttrs(attrs: NewEmptyAttrs, indentationType?: 'indent' | 'unindent'): NewMoveAttrs;
 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;

package/package.json

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