@manuscripts/track-changes-plugin 2.0.10 → 2.0.12

package/dist/cjs/ChangeSet.js

@@ -89,6 +89,9 @@ class ChangeSet {
                 currentInlineChange = undefined;
                 return;
             }
+            if (this.joinRelatedStructuralChanges(rootNodes, change)) {
+                return;
+            }
             rootNodes.push([change]);
         });
         return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== change_1.CHANGE_OPERATION.reference &&
@@ -161,6 +164,20 @@ class ChangeSet {
             change.to === nextChange.from &&
             hasMatchingOperation(change, nextChange));
     }
+    joinRelatedStructuralChanges(rootNodes, change) {
+        if (change.dataTracked.operation !== change_1.CHANGE_OPERATION.structure) {
+            return;
+        }
+        const index = rootNodes.findIndex((c) => c[0].dataTracked.operation === change_1.CHANGE_OPERATION.structure &&
+            c[0].dataTracked.moveNodeId === change.dataTracked.moveNodeId);
+        if (index !== -1) {
+            rootNodes[index] = [...rootNodes[index], change];
+        }
+        else {
+            rootNodes.push([change]);
+        }
+        return true;
+    }
     static flattenTreeToIds(changes) {
         return changes.flatMap((c) => (this.isNodeChange(c) ? [c.id, ...c.children.map((c) => c.id)] : c.id));
     }

package/dist/cjs/actions.js

@@ -12,6 +12,8 @@ var TrackChangesAction;
     TrackChangesAction["setChangeStatuses"] = "track-changes-set-change-statuses";
     TrackChangesAction["refreshChanges"] = "track-changes-refresh-changes";
     TrackChangesAction["updateMetaNode"] = "track-changes-update-meta-node";
+    TrackChangesAction["structuralChangeAction"] = "track-changes-structural-change-action";
+    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

@@ -59,7 +59,7 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, delete
     let selectionPos = startPos;
     let deletesCounter = 0;
     let isInserted = false;
-    let prevDeletedNode;
+    let prevDelete;
     changes.forEach((c) => {
         let step = newTr.steps[newTr.steps.length - 1];
         switch (c.type) {
@@ -68,10 +68,12 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, delete
                 const prevDeletedNodeInserted = isInserted;
                 const trackedData = (0, nodeHelpers_1.getBlockInlineTrackedData)(c.node);
                 const inserted = trackedData === null || trackedData === void 0 ? void 0 : trackedData.find((d) => d.operation === change_1.CHANGE_OPERATION.insert);
-                isInserted = !!inserted || (!trackedData && isInserted);
+                const structure = trackedData === null || trackedData === void 0 ? void 0 : trackedData.find((c) => c.operation === change_1.CHANGE_OPERATION.structure &&
+                    deleteAttrs.moveNodeId &&
+                    c.moveNodeId !== deleteAttrs.moveNodeId);
                 let childOfDeleted = false;
-                if (prevDeletedNode) {
-                    prevDeletedNode.descendants((node) => {
+                if (prevDelete) {
+                    prevDelete.node.descendants((node) => {
                         if (childOfDeleted) {
                             return false;
                         }
@@ -80,15 +82,20 @@ 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 ((prevDelete &&
+                    c.pos < prevDelete.nodeEnd &&
+                    isInserted &&
+                    deletesCounter > 1 &&
+                    !isMoveOperation) ||
+                    (childOfDeleted && prevDeletedNodeInserted)) {
                     return false;
                 }
                 (0, deleteNode_1.deleteOrSetNodeDeleted)(c.node, mapping.map(c.pos), newTr, deleteAttrs);
-                prevDeletedNode = c.node;
+                prevDelete = c;
+                isInserted = !!inserted || !!structure || (!trackedData && isInserted);
                 const newestStep = newTr.steps[newTr.steps.length - 1];
-                if (isInserted) {
+                if (isInserted || structure) {
                     deletedNodeMapping.appendMap(newestStep.getMap());
                 }
                 if (step !== newestStep) {

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;
@@ -26,7 +41,11 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
         return c1.dataTracked.updatedAt - c2.dataTracked.updatedAt;
     });
     changes.forEach((change) => {
-        if (change.dataTracked.operation === change_1.CHANGE_OPERATION.move) {
+        if (change.dataTracked.operation === change_1.CHANGE_OPERATION.move ||
+            change.dataTracked.operation === change_1.CHANGE_OPERATION.structure) {
+            return;
+        }
+        if (change.dataTracked.operation === change_1.CHANGE_OPERATION.delete && change.dataTracked.moveNodeId) {
             return;
         }
         const { pos: from, deleted } = deleteMap.mapResult(change.from);
@@ -56,7 +75,7 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
             deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
         }
         else if (ChangeSet_1.ChangeSet.isNodeChange(change) && noChangeNeeded) {
-            const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: null });
+            const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: (0, deleteNode_1.keepDeleteWithMoveNodeId)(node) });
             tr.setNodeMarkup(from, undefined, attrs, node.marks);
             if (node.isAtom) {
                 tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_insert);
@@ -82,7 +101,8 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
         }
     });
     changes.forEach((change) => {
-        if (change.dataTracked.operation !== change_1.CHANGE_OPERATION.move) {
+        if (change.dataTracked.operation !== change_1.CHANGE_OPERATION.move &&
+            change.dataTracked.operation !== change_1.CHANGE_OPERATION.structure) {
             return;
         }
         const { pos: from, deleted } = deleteMap.mapResult(change.from);
@@ -94,25 +114,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/changes/updateChangesStatus.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateChangesStatus = updateChangesStatus;
 const prosemirror_history_1 = require("prosemirror-history");
 const ChangeSet_1 = require("../ChangeSet");
+const dropStructureChange_1 = require("../mutate/dropStructureChange");
 const change_1 = require("../types/change");
 const applyChanges_1 = require("./applyChanges");
 const updateChangeAttrs_1 = require("./updateChangeAttrs");
@@ -46,9 +47,7 @@ function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState
                             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);
                                 }
@@ -64,6 +63,7 @@ function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState
         });
         const mapping = (0, applyChanges_1.applyAcceptedRejectedChanges)(createdTr, oldState.schema, nonTextChanges, changeSet);
         (0, applyChanges_1.applyAcceptedRejectedChanges)(createdTr, oldState.schema, textChanges, changeSet, mapping);
+        (0, dropStructureChange_1.dropOrphanChanges)(createdTr);
     }
     else {
         ids.forEach((changeId) => {

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.keepDeleteWithMoveNodeId = void 0;
 exports.deleteNode = deleteNode;
 exports.deleteOrSetNodeDeleted = deleteOrSetNodeDeleted;
 const prosemirror_model_1 = require("prosemirror-model");
 const nodeHelpers_1 = require("../compute/nodeHelpers");
 const change_1 = require("../types/change");
 const logger_1 = require("../utils/logger");
+const dropStructureChange_1 = require("./dropStructureChange");
 function deleteNode(node, pos, tr) {
     var _a;
     const startPos = tr.doc.resolve(pos + 1);
@@ -22,7 +24,14 @@ function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
     const dataTracked = (0, nodeHelpers_1.getBlockInlineTrackedData)(node);
     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 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 ||
+        (d.operation === change_1.CHANGE_OPERATION.delete && d.moveNodeId));
+    const structure = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((c) => c.operation === change_1.CHANGE_OPERATION.structure);
+    if (deleteAttrs.moveNodeId && structure && structure.moveNodeId !== deleteAttrs.moveNodeId) {
+        return newTr.delete(pos, pos + node.nodeSize);
+    }
+    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 +44,14 @@ 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);
+    if (!deleteAttrs.moveNodeId && (structure === null || structure === void 0 ? void 0 : structure.moveNodeId)) {
+        (0, dropStructureChange_1.dropStructuralChangeShadow)(structure.moveNodeId, newTr);
+    }
 }
+const keepDeleteWithMoveNodeId = (node) => {
+    var _a;
+    const dataTracked = (_a = (0, nodeHelpers_1.getBlockInlineTrackedData)(node)) === null || _a === void 0 ? void 0 : _a.filter((c) => c.operation === change_1.CHANGE_OPERATION.delete && c.moveNodeId);
+    return (dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.length) ? dataTracked : null;
+};
+exports.keepDeleteWithMoveNodeId = keepDeleteWithMoveNodeId;

package/dist/cjs/mutate/dropStructureChange.js

@@ -0,0 +1,106 @@
+"use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.joinStructureChanges = exports.dropOrphanChanges = exports.dropStructuralChangeShadow = void 0;
+const prosemirror_model_1 = require("prosemirror-model");
+const prosemirror_state_1 = require("prosemirror-state");
+const findChanges_1 = require("../changes/findChanges");
+const updateChangeAttrs_1 = require("../changes/updateChangeAttrs");
+const nodeHelpers_1 = require("../compute/nodeHelpers");
+const setFragmentAsInserted_1 = require("../compute/setFragmentAsInserted");
+const change_1 = require("../types/change");
+const track_utils_1 = require("../utils/track-utils");
+const dropStructuralChangeShadow = (moveNodeId, tr) => {
+    const changeSet = (0, findChanges_1.findChanges)(prosemirror_state_1.EditorState.create({ doc: tr.doc }));
+    const changes = changeSet.changes.filter((c) => c.type === 'node-change' && c.dataTracked.moveNodeId === moveNodeId);
+    const shadow = changes.filter((c) => c.dataTracked.operation === change_1.CHANGE_OPERATION.delete);
+    const structures = changes.filter((c) => c.dataTracked.operation === change_1.CHANGE_OPERATION.structure);
+    structures.map((c) => {
+        tr.setNodeMarkup(c.from, undefined, Object.assign(Object.assign({}, c.node.attrs), { dataTracked: null }));
+    });
+    if (shadow.length > 0) {
+        tr.delete(shadow[0].from, shadow[shadow.length - 1].to);
+    }
+    return tr;
+};
+exports.dropStructuralChangeShadow = dropStructuralChangeShadow;
+const dropOrphanChanges = (newTr, dropDataTracked) => {
+    const changeSet = (0, findChanges_1.findChanges)(prosemirror_state_1.EditorState.create({ doc: newTr.doc }));
+    const shadowIds = new Set();
+    const changesIds = new Set();
+    changeSet.changes.forEach((c) => {
+        if (c.dataTracked.moveNodeId && c.dataTracked.operation === change_1.CHANGE_OPERATION.delete) {
+            shadowIds.add(c.dataTracked.moveNodeId);
+        }
+        if (c.dataTracked.operation === change_1.CHANGE_OPERATION.structure ||
+            c.dataTracked.operation === change_1.CHANGE_OPERATION.move) {
+            changesIds.add(c.dataTracked.moveNodeId);
+        }
+    });
+    if (!shadowIds.size && !changesIds.size) {
+        return;
+    }
+    changeSet.changes.forEach((c) => {
+        if (c.dataTracked.moveNodeId &&
+            !(shadowIds.has(c.dataTracked.moveNodeId) && changesIds.has(c.dataTracked.moveNodeId))) {
+            if (c.dataTracked.operation === change_1.CHANGE_OPERATION.delete || dropDataTracked) {
+                if (c.type === 'text-change') {
+                    newTr.removeMark(c.from, c.to, newTr.doc.type.schema.marks.tracked_delete);
+                }
+                else if (c.type === 'node-change') {
+                    newTr.setNodeMarkup(c.from, undefined, Object.assign(Object.assign({}, c.node.attrs), { dataTracked: null }));
+                }
+            }
+            else if (c.type === 'node-change') {
+                const _a = c.dataTracked, { id, moveNodeId } = _a, attrs = __rest(_a, ["id", "moveNodeId"]);
+                newTr.replaceWith(c.from, c.to, (0, setFragmentAsInserted_1.setFragmentAsInserted)(prosemirror_model_1.Fragment.from(c.node), (0, track_utils_1.createNewInsertAttrs)(attrs), newTr.doc.type.schema));
+            }
+        }
+    });
+};
+exports.dropOrphanChanges = dropOrphanChanges;
+const groupStructureChanges = (tr, toNode) => {
+    const moveNodeIds = new Set();
+    const [insertStep, deleteStep] = tr.steps;
+    const fromNodes = tr.docs[1].slice(deleteStep.from, deleteStep.to).content;
+    const ignoredNode = tr.docs[1].nodeAt(deleteStep.from);
+    prosemirror_model_1.Fragment.from(toNode)
+        .append(insertStep.slice.content)
+        .append(fromNodes)
+        .descendants((node) => {
+        var _a;
+        const moveNodeId = (_a = ((0, nodeHelpers_1.getBlockInlineTrackedData)(node) || []).find((c) => c.operation === change_1.CHANGE_OPERATION.structure)) === null || _a === void 0 ? void 0 : _a.moveNodeId;
+        moveNodeId && moveNodeIds.add(moveNodeId);
+    });
+    return moveNodeIds;
+};
+const joinStructureChanges = (attrs, sliceContent, content, tr, newTr) => {
+    var _a, _b, _c;
+    const moveNodeId = attrs.moveNodeId;
+    let toNode = tr.docs[0].resolve(tr.steps[0].from).node();
+    toNode = ((_a = toNode === null || toNode === void 0 ? void 0 : toNode.type.spec.attrs) === null || _a === void 0 ? void 0 : _a.dataTracked) ? toNode : null;
+    const idsSet = groupStructureChanges(tr, toNode);
+    const changeSet = (0, findChanges_1.findChanges)(prosemirror_state_1.EditorState.create({ doc: newTr.doc }));
+    const relatedChanges = changeSet.changes.filter((c) => c.dataTracked.moveNodeId && idsSet.has(c.dataTracked.moveNodeId));
+    relatedChanges.map((c) => (0, updateChangeAttrs_1.updateChangeAttrs)(newTr, c, Object.assign(Object.assign({}, c.dataTracked), { moveNodeId }), newTr.doc.type.schema));
+    const toInsertChange = toNode && ((_b = (0, nodeHelpers_1.getBlockInlineTrackedData)(toNode)) === null || _b === void 0 ? void 0 : _b.find((c) => c.operation === change_1.CHANGE_OPERATION.insert));
+    const fromInsertChange = sliceContent.firstChild &&
+        ((_c = (0, nodeHelpers_1.getBlockInlineTrackedData)(sliceContent.firstChild)) === null || _c === void 0 ? void 0 : _c.find((c) => c.operation === change_1.CHANGE_OPERATION.insert));
+    if (toInsertChange || fromInsertChange) {
+        return (0, setFragmentAsInserted_1.setFragmentAsInserted)(content, (0, track_utils_1.createNewInsertAttrs)(attrs), newTr.doc.type.schema);
+    }
+    return (0, track_utils_1.updateBlockNodesAttrs)(sliceContent, (_, node) => {
+        return Object.assign(Object.assign({}, _), { dataTracked: [(0, nodeHelpers_1.addTrackIdIfDoesntExist)((0, track_utils_1.createNewStructureAttrs)(Object.assign(Object.assign({}, attrs), { moveNodeId })))] });
+    });
+};
+exports.joinStructureChanges = joinStructureChanges;

package/dist/cjs/steps/trackReplaceStep.js

@@ -35,8 +35,10 @@ 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 dropStructureChange_1 = require("../mutate/dropStructureChange");
 const logger_1 = require("../utils/logger");
 const trackUtils = __importStar(require("../utils/track-utils"));
 const track_utils_1 = require("../utils/track-utils");
@@ -46,11 +48,10 @@ function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResult, curr
     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, _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]);
@@ -77,16 +78,20 @@ function trackReplaceStep(step, oldState, newTr, attrsTemplate, stepResult, curr
         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'))) {
+            if ((0, track_utils_1.isStructureSteps)(tr)) {
+                fragment = (0, dropStructureChange_1.joinStructureChanges)(attrs, newSliceContent, fragment, tr, newTr);
+            }
+            else 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));
+            else if (moveID) {
+                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 +101,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,13 +68,13 @@ 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]);
             const isDelete = step.from !== step.to && step.slice.content.size < invertedStep.slice.content.size;
             let thisStepMapping = tr.mapping.slice(i + 1, i + 1);
-            if (isDelete) {
+            if (isDelete || (0, track_utils_1.isStructureSteps)(tr)) {
                 thisStepMapping = deletedNodeMapping;
             }
             const newStep = new prosemirror_transform_1.ReplaceStep(thisStepMapping.map(invertedStep.from), thisStepMapping.map(invertedStep.to), invertedStep.slice);
@@ -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);
             }
@@ -113,7 +124,19 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
         tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
     }
     if (setsNewSelection && tr.selection instanceof prosemirror_state_1.TextSelection) {
-        const newPos = newTr.doc.resolve(tr.selection.from);
+        let from = tr.selection.from;
+        if ((0, track_utils_1.isStructureSteps)(tr)) {
+            const selectionMapping = new prosemirror_transform_1.Mapping();
+            tr.steps.map((step) => {
+                const isDeleteStep = step instanceof prosemirror_transform_1.ReplaceStep && step.from !== step.to && step.slice.size === 0;
+                if (isDeleteStep) {
+                    selectionMapping.appendMap(step.getMap().invert());
+                }
+            });
+            selectionMapping.appendMapping(deletedNodeMapping);
+            from = selectionMapping.map(tr.selection.from);
+        }
+        const newPos = newTr.doc.resolve(from);
         newTr.setSelection(new prosemirror_state_1.TextSelection(newPos));
     }
     if (wasNodeSelection) {

package/dist/cjs/types/change.js

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