@manuscripts/track-changes-plugin 1.7.3 → 1.7.4

package/dist/cjs/ChangeSet.js

@@ -36,14 +36,15 @@ class ChangeSet {
         const rootNodes = [];
         let currentNodeChange;
         this.changes.forEach((c) => {
-            if (currentNodeChange && c.from >= currentNodeChange.to) {
+            if (currentNodeChange &&
+                (c.from >= currentNodeChange.to ||
+                    c.dataTracked.statusUpdateAt !== currentNodeChange.dataTracked.statusUpdateAt)) {
                 rootNodes.push(currentNodeChange);
                 currentNodeChange = undefined;
             }
             if (currentNodeChange &&
                 c.from < currentNodeChange.to &&
-                !(__classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isSameNodeChange).call(this, currentNodeChange, c) &&
-                    __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isNotPendingOrDeleted).call(this, currentNodeChange))) {
+                !(__classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isSameNodeChange).call(this, currentNodeChange, c) && __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isNotPendingOrDeleted).call(this, currentNodeChange))) {
                 currentNodeChange.children.push(c);
             }
             else if (c.type === 'node-change') {
@@ -101,15 +102,13 @@ class ChangeSet {
         return __classPrivateFieldGet(this, _ChangeSet_changes, "f").find((c) => c.id === id);
     }
     getIn(ids) {
-        return ids
-            .map((id) => __classPrivateFieldGet(this, _ChangeSet_changes, "f").find((c) => c.id === id))
-            .filter((c) => c !== undefined);
+        return ids.map((id) => __classPrivateFieldGet(this, _ChangeSet_changes, "f").find((c) => c.id === id)).filter((c) => c !== undefined);
     }
     getNotIn(ids) {
         return __classPrivateFieldGet(this, _ChangeSet_changes, "f").filter((c) => ids.includes(c.id));
     }
     static flattenTreeToIds(changes) {
-        return changes.flatMap((c) => this.isNodeChange(c) ? [c.id, ...c.children.map((c) => c.id)] : c.id);
+        return changes.flatMap((c) => (this.isNodeChange(c) ? [c.id, ...c.children.map((c) => c.id)] : c.id));
     }
     static shouldDeleteChange(change) {
         const { status, operation } = change.dataTracked;

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.diffChangeSteps = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
-const matchInserted_1 = require("./matchInserted");
 const logger_1 = require("../utils/logger");
+const matchInserted_1 = require("./matchInserted");
 function cutFragment(matched, deleted, content) {
     const newContent = [];
     for (let i = 0; matched <= deleted && i < content.childCount; i += 1) {

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

@@ -36,12 +36,12 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processChangeSteps = void 0;
 const prosemirror_transform_1 = require("prosemirror-transform");
-const logger_1 = require("../utils/logger");
-const change_1 = require("../types/change");
+const nodeHelpers_1 = require("../compute/nodeHelpers");
 const deleteNode_1 = require("../mutate/deleteNode");
 const deleteText_1 = require("../mutate/deleteText");
 const mergeTrackedMarks_1 = require("../mutate/mergeTrackedMarks");
-const nodeHelpers_1 = require("../compute/nodeHelpers");
+const change_1 = require("../types/change");
+const logger_1 = require("../utils/logger");
 const trackUtils = __importStar(require("../utils/track-utils"));
 function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
     const mapping = new prosemirror_transform_1.Mapping();
@@ -52,13 +52,14 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
     changes.forEach((c) => {
         let step = newTr.steps[newTr.steps.length - 1];
         switch (c.type) {
-            case "delete-node":
+            case 'delete-node':
                 deletesCounter++;
                 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);
-                if (isInserted && deletesCounter > 1)
+                if (isInserted && deletesCounter > 1) {
                     return false;
+                }
                 (0, deleteNode_1.deleteOrSetNodeDeleted)(c.node, mapping.map(c.pos), newTr, deleteAttrs);
                 const newestStep = newTr.steps[newTr.steps.length - 1];
                 if (step !== newestStep) {
@@ -67,7 +68,7 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
                 }
                 (0, mergeTrackedMarks_1.mergeTrackedMarks)(mapping.map(c.pos), newTr.doc, newTr, schema);
                 break;
-            case "delete-text":
+            case 'delete-text':
                 const node = newTr.doc.nodeAt(mapping.map(c.pos));
                 if (!node) {
                     logger_1.log.error(`processChangeSteps: no text node found for text-change`, c);

package/dist/cjs/changes/applyChanges.js

@@ -14,15 +14,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyAcceptedRejectedChanges = void 0;
 const prosemirror_transform_1 = require("prosemirror-transform");
 const ChangeSet_1 = require("../ChangeSet");
-const change_1 = require("../types/change");
-const logger_1 = require("../utils/logger");
 const deleteNode_1 = require("../mutate/deleteNode");
 const mergeNode_1 = require("../mutate/mergeNode");
+const change_1 = require("../types/change");
+const logger_1 = require("../utils/logger");
 const updateChangeAttrs_1 = require("./updateChangeAttrs");
 function getUpdatedDataTracked(dataTracked, changeId) {
     if (!dataTracked) {
         return null;
     }
+    console.log(dataTracked);
     const newDataTracked = dataTracked.filter((c) => c.id !== changeId);
     return newDataTracked.length ? newDataTracked : null;
 }
@@ -42,7 +43,9 @@ function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new prose
             if (ChangeSet_1.ChangeSet.isNodeAttrChange(change)) {
                 const _a = change.newAttrs, { dataTracked } = _a, attrs = __rest(_a, ["dataTracked"]);
                 const changeLog = attrsChangesLog.get(node.attrs.id);
-                const newDataTracked = changeLog && changeLog.length ? dataTracked.filter((c) => !changeLog.includes(c.id)) : dataTracked;
+                const newDataTracked = changeLog && changeLog.length
+                    ? dataTracked.filter((c) => !changeLog.includes(c.id))
+                    : dataTracked;
                 tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, attrs), { dataTracked: newDataTracked.length ? newDataTracked : null }), node.marks);
             }
             return;
@@ -72,6 +75,7 @@ function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new prose
             addAttrLog(node.attrs.id, change.dataTracked.id);
         }
         else if (ChangeSet_1.ChangeSet.isNodeAttrChange(change) && change.dataTracked.status === change_1.CHANGE_STATUS.rejected) {
+            console.log('GETTING IN ---- CHANGE_STATUS.rejected');
             tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, change.oldAttrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
             addAttrLog(node.attrs.id, change.dataTracked.id);
         }

package/dist/cjs/changes/findChanges.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findChanges = void 0;
 const ChangeSet_1 = require("../ChangeSet");
-const change_1 = require("../types/change");
 const nodeHelpers_1 = require("../compute/nodeHelpers");
+const change_1 = require("../types/change");
 function findChanges(state) {
     const changes = [];
     let current;

package/dist/cjs/changes/fixInconsistentChanges.js

@@ -8,8 +8,8 @@ function fixInconsistentChanges(changeSet, currentUserID, newTr, schema) {
     const iteratedIds = new Set();
     let changed = false;
     changeSet.invalidChanges.forEach((c) => {
-        const { id, authorID, operation, reviewedByID, status, createdAt, updatedAt } = c.dataTracked;
-        const newAttrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!id || iteratedIds.has(id) || id.length === 0) && { id: (0, uuidv4_1.uuidv4)() })), (!authorID && { authorID: currentUserID })), (!reviewedByID && { reviewedByID: null })), (!status && { status: change_1.CHANGE_STATUS.pending })), (!createdAt && { createdAt: Date.now() })), (!updatedAt && { updatedAt: Date.now() }));
+        const { id, authorID, operation, reviewedByID, status, createdAt, statusUpdateAt, updatedAt } = c.dataTracked;
+        const newAttrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!id || iteratedIds.has(id) || id.length === 0) && { id: (0, uuidv4_1.uuidv4)() })), (!authorID && { authorID: currentUserID })), (!reviewedByID && { reviewedByID: null })), (!status && { status: change_1.CHANGE_STATUS.pending })), (!createdAt && { createdAt: Date.now() })), (!updatedAt && { updatedAt: Date.now() })), (!statusUpdateAt && { statusUpdateAt: 0 }));
         if (Object.keys(newAttrs).length > 0) {
             (0, updateChangeAttrs_1.updateChangeAttrs)(newTr, c, Object.assign(Object.assign({}, c.dataTracked), newAttrs), schema);
             changed = true;

package/dist/cjs/changes/updateChangeAttrs.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateChangeChildrenAttributes = exports.updateChangeAttrs = void 0;
-const logger_1 = require("../utils/logger");
 const ChangeSet_1 = require("../ChangeSet");
 const nodeHelpers_1 = require("../compute/nodeHelpers");
+const logger_1 = require("../utils/logger");
 function updateChangeAttrs(tr, change, trackedAttrs, schema) {
     const node = tr.doc.nodeAt(change.from);
     if (!node) {

package/dist/cjs/compute/nodeHelpers.js

@@ -18,9 +18,7 @@ function getTextNodeTrackedMarkData(node, schema) {
     const marksTrackedData = [];
     node.marks.forEach((mark) => {
         if (mark.type === schema.marks.tracked_insert || mark.type === schema.marks.tracked_delete) {
-            const operation = mark.type === schema.marks.tracked_insert
-                ? change_1.CHANGE_OPERATION.insert
-                : change_1.CHANGE_OPERATION.delete;
+            const operation = mark.type === schema.marks.tracked_insert ? change_1.CHANGE_OPERATION.insert : change_1.CHANGE_OPERATION.delete;
             marksTrackedData.push(Object.assign(Object.assign({}, mark.attrs.dataTracked), { operation }));
         }
     });
@@ -65,9 +63,7 @@ function shouldMergeTrackedAttributes(left, right) {
         });
         return false;
     }
-    return (left.status === right.status &&
-        left.operation === right.operation &&
-        left.authorID === right.authorID);
+    return (left.status === right.status && left.operation === right.operation && left.authorID === right.authorID);
 }
 exports.shouldMergeTrackedAttributes = shouldMergeTrackedAttributes;
 function getMergeableMarkTrackedAttrs(node, attrs, schema) {

package/dist/cjs/compute/setFragmentAsInserted.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setFragmentAsInserted = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
-const logger_1 = require("../utils/logger");
 const change_1 = require("../types/change");
+const logger_1 = require("../utils/logger");
 const nodeHelpers_1 = require("./nodeHelpers");
 function markInlineNodeChange(node, newTrackAttrs, schema) {
     const filtered = node.marks.filter((m) => m.type !== schema.marks.tracked_insert && m.type !== schema.marks.tracked_delete);

package/dist/cjs/compute/splitSliceIntoMergedParts.js

@@ -32,9 +32,7 @@ function splitSliceIntoMergedParts(insertSlice, mergeEqualSides = false) {
     const { openStart, openEnd, content: { firstChild, lastChild, content: nodes }, } = insertSlice;
     let updatedSliceNodes = nodes;
     const mergeSides = openStart !== openEnd || mergeEqualSides;
-    const firstMergedNode = openStart > 0 && mergeSides && firstChild
-        ? getMergedNode(firstChild, 1, openStart, true)
-        : undefined;
+    const firstMergedNode = openStart > 0 && mergeSides && firstChild ? getMergedNode(firstChild, 1, openStart, true) : undefined;
     const lastMergedNode = openEnd > 0 && mergeSides && lastChild ? getMergedNode(lastChild, 1, openEnd, false) : undefined;
     if (firstMergedNode) {
         updatedSliceNodes = updatedSliceNodes.slice(1);

package/dist/cjs/mutate/deleteAndMergeSplitNodes.js

@@ -25,8 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteAndMergeSplitNodes = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
-const splitSliceIntoMergedParts_1 = require("../compute/splitSliceIntoMergedParts");
 const setFragmentAsInserted_1 = require("../compute/setFragmentAsInserted");
+const splitSliceIntoMergedParts_1 = require("../compute/splitSliceIntoMergedParts");
 const trackUtils = __importStar(require("../utils/track-utils"));
 function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackAttrs, insertSlice) {
     const steps = [];
@@ -42,16 +42,12 @@ function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackA
     let mergingStartSide = true;
     startDoc.nodesBetween(from, to, (node, pos) => {
         const nodeEnd = pos + node.nodeSize;
-        const wasWithinGap = gap &&
-            ((!node.isText && pos >= gap.start) ||
-                (node.isText && pos >= gap.start && nodeEnd <= gap.end));
+        const wasWithinGap = gap && ((!node.isText && pos >= gap.start) || (node.isText && pos >= gap.start && nodeEnd <= gap.end));
         if (nodeEnd > from && !wasWithinGap) {
             const nodeCompletelyDeleted = pos >= from && nodeEnd <= to;
             const endTokenDeleted = nodeEnd <= to;
             const startTokenDeleted = pos >= from;
-            if (node.isText ||
-                (!endTokenDeleted && startTokenDeleted) ||
-                (endTokenDeleted && !startTokenDeleted)) {
+            if (node.isText || (!endTokenDeleted && startTokenDeleted) || (endTokenDeleted && !startTokenDeleted)) {
                 if (!endTokenDeleted && startTokenDeleted) {
                     mergingStartSide = false;
                 }
@@ -96,9 +92,7 @@ function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackA
     });
     return {
         sliceWasSplit: !!(firstMergedNode || lastMergedNode),
-        newSliceContent: updatedSliceNodes
-            ? prosemirror_model_1.Fragment.fromArray(updatedSliceNodes)
-            : insertSlice.content,
+        newSliceContent: updatedSliceNodes ? prosemirror_model_1.Fragment.fromArray(updatedSliceNodes) : insertSlice.content,
         steps,
     };
 }

package/dist/cjs/mutate/deleteNode.js

@@ -2,18 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOrSetNodeDeleted = exports.deleteNode = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
-const prosemirror_transform_1 = require("prosemirror-transform");
-const logger_1 = require("../utils/logger");
-const change_1 = require("../types/change");
 const nodeHelpers_1 = require("../compute/nodeHelpers");
+const change_1 = require("../types/change");
+const logger_1 = require("../utils/logger");
 function deleteNode(node, pos, tr) {
     var _a;
     const startPos = tr.doc.resolve(pos + 1);
-    const range = startPos.blockRange(tr.doc.resolve(startPos.pos - 2 + node.nodeSize));
-    const targetDepth = range && (0, prosemirror_transform_1.liftTarget)(range);
-    if (range && typeof targetDepth === 'number') {
-        return tr.lift(range, targetDepth);
-    }
     const resPos = tr.doc.resolve(pos);
     const canMergeToNodeAbove = resPos.parent !== tr.doc && resPos.nodeBefore && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
     if (canMergeToNodeAbove) {
@@ -26,14 +20,18 @@ function deleteNode(node, pos, tr) {
 exports.deleteNode = deleteNode;
 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);
+    const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.insert && d.status === change_1.CHANGE_STATUS.pending);
     const deleted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.delete);
     const updated = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.set_node_attributes);
     if (inserted && inserted.authorID === deleteAttrs.authorID) {
         return deleteNode(node, pos, newTr);
     }
     if (!newTr.doc.nodeAt(pos)) {
-        logger_1.log.error(`deleteOrSetNodeDeleted: no node found for deletion`, { pos, node, newTr });
+        logger_1.log.error(`deleteOrSetNodeDeleted: no node found for deletion`, {
+            pos,
+            node,
+            newTr,
+        });
         return;
     }
     const newDeleted = deleted

package/dist/cjs/plugin.js

@@ -14,14 +14,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackChangesPlugin = exports.trackChangesPluginKey = void 0;
 const prosemirror_state_1 = require("prosemirror-state");
 const actions_1 = require("./actions");
-const ChangeSet_1 = require("./ChangeSet");
-const logger_1 = require("./utils/logger");
 const applyChanges_1 = require("./changes/applyChanges");
 const findChanges_1 = require("./changes/findChanges");
 const fixInconsistentChanges_1 = require("./changes/fixInconsistentChanges");
-const trackTransaction_1 = require("./steps/trackTransaction");
 const updateChangeAttrs_1 = require("./changes/updateChangeAttrs");
+const ChangeSet_1 = require("./ChangeSet");
+const trackTransaction_1 = require("./steps/trackTransaction");
 const track_1 = require("./types/track");
+const logger_1 = require("./utils/logger");
 exports.trackChangesPluginKey = new prosemirror_state_1.PluginKey('track-changes');
 const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
     const { userID, debug, skipTrsWithMetas = [] } = opts;
@@ -82,18 +82,24 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
             trs.forEach((tr) => {
                 const wasAppended = tr.getMeta('appendedTransaction');
                 const skipMetaUsed = skipTrsWithMetas.some((m) => tr.getMeta(m) || (wasAppended === null || wasAppended === void 0 ? void 0 : wasAppended.getMeta(m)));
-                const skipTrackUsed = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.skipTrack) || (wasAppended && (0, actions_1.getAction)(wasAppended, actions_1.TrackChangesAction.skipTrack));
-                if (tr.docChanged && !skipMetaUsed && !skipTrackUsed && !tr.getMeta('history$') && !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
+                const skipTrackUsed = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.skipTrack) ||
+                    (wasAppended && (0, actions_1.getAction)(wasAppended, actions_1.TrackChangesAction.skipTrack));
+                if (tr.docChanged &&
+                    !skipMetaUsed &&
+                    !skipTrackUsed &&
+                    !tr.getMeta('history$') &&
+                    !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
                     createdTr = (0, trackTransaction_1.trackTransaction)(tr, oldState, createdTr, userID);
                 }
                 docChanged = docChanged || tr.docChanged;
                 const setChangeStatuses = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.setChangeStatuses);
                 if (setChangeStatuses) {
                     const { status, ids } = setChangeStatuses;
+                    const changeTime = new Date().getTime();
                     ids.forEach((changeId) => {
                         const change = changeSet === null || changeSet === void 0 ? void 0 : changeSet.get(changeId);
                         if (change) {
-                            createdTr = (0, updateChangeAttrs_1.updateChangeAttrs)(createdTr, change, Object.assign(Object.assign({}, change.dataTracked), { status, reviewedByID: userID }), oldState.schema);
+                            createdTr = (0, updateChangeAttrs_1.updateChangeAttrs)(createdTr, change, Object.assign(Object.assign({}, change.dataTracked), { status, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
                         }
                     });
                 }
@@ -103,7 +109,8 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
                     (0, actions_1.setAction)(createdTr, actions_1.TrackChangesAction.refreshChanges, true);
                 }
             });
-            const changed = pluginState.changeSet.hasInconsistentData && (0, fixInconsistentChanges_1.fixInconsistentChanges)(pluginState.changeSet, userID, createdTr, oldState.schema);
+            const changed = pluginState.changeSet.hasInconsistentData &&
+                (0, fixInconsistentChanges_1.fixInconsistentChanges)(pluginState.changeSet, userID, createdTr, oldState.schema);
             if (changed) {
                 logger_1.log.warn('had to fix inconsistent changes in', createdTr);
             }

package/dist/cjs/steps/trackReplaceAroundStep.js

@@ -25,11 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackReplaceAroundStep = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
-const deleteAndMergeSplitNodes_1 = require("../mutate/deleteAndMergeSplitNodes");
+const actions_1 = require("../actions");
 const setFragmentAsInserted_1 = require("../compute/setFragmentAsInserted");
+const deleteAndMergeSplitNodes_1 = require("../mutate/deleteAndMergeSplitNodes");
 const logger_1 = require("../utils/logger");
 const trackUtils = __importStar(require("../utils/track-utils"));
-const actions_1 = require("../actions");
 function trackReplaceAroundStep(step, oldState, tr, newTr, attrs) {
     logger_1.log.info('###### ReplaceAroundStep ######');
     const { from, to, gapFrom, gapTo, insert, slice, structure, } = step;

package/dist/cjs/steps/trackReplaceStep.js

@@ -25,8 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackReplaceStep = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
-const deleteAndMergeSplitNodes_1 = require("../mutate/deleteAndMergeSplitNodes");
 const setFragmentAsInserted_1 = require("../compute/setFragmentAsInserted");
+const deleteAndMergeSplitNodes_1 = require("../mutate/deleteAndMergeSplitNodes");
 const logger_1 = require("../utils/logger");
 const trackUtils = __importStar(require("../utils/track-utils"));
 function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
@@ -71,7 +71,9 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
             });
         }
         else {
-            selectionPos = ((_a = window.event) === null || _a === void 0 ? void 0 : _a.code) === 'Delete' || ((_b = window.event) === null || _b === void 0 ? void 0 : _b.inputType) === 'deleteContentForward' ? toA : fromA;
+            const isDeleteEvent = ((_a = window.event) === null || _a === void 0 ? void 0 : _a.code) === 'Delete';
+            const isDeleteContentForward = ((_b = window.event) === null || _b === void 0 ? void 0 : _b.inputType) === 'deleteContentForward';
+            selectionPos = isDeleteEvent || isDeleteContentForward ? toA : fromA;
         }
     });
     return [changeSteps, selectionPos];

package/dist/cjs/steps/trackTransaction.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackTransaction = void 0;
 const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_transform_1 = require("prosemirror-transform");
-const logger_1 = require("../utils/logger");
+const diffChangeSteps_1 = require("../change-steps/diffChangeSteps");
+const processChangeSteps_1 = require("../change-steps/processChangeSteps");
 const change_1 = require("../types/change");
+const logger_1 = require("../utils/logger");
 const trackReplaceAroundStep_1 = require("./trackReplaceAroundStep");
 const trackReplaceStep_1 = require("./trackReplaceStep");
-const processChangeSteps_1 = require("../change-steps/processChangeSteps");
-const diffChangeSteps_1 = require("../change-steps/diffChangeSteps");
 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) {
@@ -18,6 +18,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         reviewedByID: null,
         createdAt: tr.time,
         updatedAt: tr.time,
+        statusUpdateAt: 0,
         status: change_1.CHANGE_STATUS.pending,
     };
     const wasNodeSelection = tr.selection instanceof prosemirror_state_1.NodeSelection;
@@ -39,8 +40,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         }
         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 (((_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])) {
                 continue;
             }
             const newStep = step.invert(tr.docs[i]);

package/dist/es/ChangeSet.js

@@ -33,14 +33,15 @@ export class ChangeSet {
         const rootNodes = [];
         let currentNodeChange;
         this.changes.forEach((c) => {
-            if (currentNodeChange && c.from >= currentNodeChange.to) {
+            if (currentNodeChange &&
+                (c.from >= currentNodeChange.to ||
+                    c.dataTracked.statusUpdateAt !== currentNodeChange.dataTracked.statusUpdateAt)) {
                 rootNodes.push(currentNodeChange);
                 currentNodeChange = undefined;
             }
             if (currentNodeChange &&
                 c.from < currentNodeChange.to &&
-                !(__classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isSameNodeChange).call(this, currentNodeChange, c) &&
-                    __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isNotPendingOrDeleted).call(this, currentNodeChange))) {
+                !(__classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isSameNodeChange).call(this, currentNodeChange, c) && __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isNotPendingOrDeleted).call(this, currentNodeChange))) {
                 currentNodeChange.children.push(c);
             }
             else if (c.type === 'node-change') {
@@ -98,15 +99,13 @@ export class ChangeSet {
         return __classPrivateFieldGet(this, _ChangeSet_changes, "f").find((c) => c.id === id);
     }
     getIn(ids) {
-        return ids
-            .map((id) => __classPrivateFieldGet(this, _ChangeSet_changes, "f").find((c) => c.id === id))
-            .filter((c) => c !== undefined);
+        return ids.map((id) => __classPrivateFieldGet(this, _ChangeSet_changes, "f").find((c) => c.id === id)).filter((c) => c !== undefined);
     }
     getNotIn(ids) {
         return __classPrivateFieldGet(this, _ChangeSet_changes, "f").filter((c) => ids.includes(c.id));
     }
     static flattenTreeToIds(changes) {
-        return changes.flatMap((c) => this.isNodeChange(c) ? [c.id, ...c.children.map((c) => c.id)] : c.id);
+        return changes.flatMap((c) => (this.isNodeChange(c) ? [c.id, ...c.children.map((c) => c.id)] : c.id));
     }
     static shouldDeleteChange(change) {
         const { status, operation } = change.dataTracked;

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

@@ -1,6 +1,6 @@
 import { Fragment, Slice } from 'prosemirror-model';
-import { matchInserted } from './matchInserted';
 import { log } from '../utils/logger';
+import { matchInserted } from './matchInserted';
 function cutFragment(matched, deleted, content) {
     const newContent = [];
     for (let i = 0; matched <= deleted && i < content.childCount; i += 1) {

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

@@ -10,12 +10,12 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { Mapping, ReplaceStep } from 'prosemirror-transform';
-import { log } from '../utils/logger';
-import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
+import { addTrackIdIfDoesntExist, getBlockInlineTrackedData } from '../compute/nodeHelpers';
 import { deleteOrSetNodeDeleted } from '../mutate/deleteNode';
 import { deleteTextIfInserted } from '../mutate/deleteText';
 import { mergeTrackedMarks } from '../mutate/mergeTrackedMarks';
-import { addTrackIdIfDoesntExist, getBlockInlineTrackedData } from '../compute/nodeHelpers';
+import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
+import { log } from '../utils/logger';
 import * as trackUtils from '../utils/track-utils';
 export function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
     const mapping = new Mapping();
@@ -26,13 +26,14 @@ export function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema)
     changes.forEach((c) => {
         let step = newTr.steps[newTr.steps.length - 1];
         switch (c.type) {
-            case "delete-node":
+            case 'delete-node':
                 deletesCounter++;
                 const trackedData = getBlockInlineTrackedData(c.node);
                 const inserted = trackedData === null || trackedData === void 0 ? void 0 : trackedData.find((d) => d.operation === CHANGE_OPERATION.insert);
                 isInserted = !!inserted || (!trackedData && isInserted);
-                if (isInserted && deletesCounter > 1)
+                if (isInserted && deletesCounter > 1) {
                     return false;
+                }
                 deleteOrSetNodeDeleted(c.node, mapping.map(c.pos), newTr, deleteAttrs);
                 const newestStep = newTr.steps[newTr.steps.length - 1];
                 if (step !== newestStep) {
@@ -41,7 +42,7 @@ export function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema)
                 }
                 mergeTrackedMarks(mapping.map(c.pos), newTr.doc, newTr, schema);
                 break;
-            case "delete-text":
+            case 'delete-text':
                 const node = newTr.doc.nodeAt(mapping.map(c.pos));
                 if (!node) {
                     log.error(`processChangeSteps: no text node found for text-change`, c);

package/dist/es/changes/applyChanges.js

@@ -11,15 +11,16 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { Mapping } from 'prosemirror-transform';
 import { ChangeSet } from '../ChangeSet';
-import { CHANGE_STATUS } from '../types/change';
-import { log } from '../utils/logger';
 import { deleteNode } from '../mutate/deleteNode';
 import { mergeNode } from '../mutate/mergeNode';
+import { CHANGE_STATUS } from '../types/change';
+import { log } from '../utils/logger';
 import { updateChangeChildrenAttributes } from './updateChangeAttrs';
 function getUpdatedDataTracked(dataTracked, changeId) {
     if (!dataTracked) {
         return null;
     }
+    console.log(dataTracked);
     const newDataTracked = dataTracked.filter((c) => c.id !== changeId);
     return newDataTracked.length ? newDataTracked : null;
 }
@@ -39,7 +40,9 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = ne
             if (ChangeSet.isNodeAttrChange(change)) {
                 const _a = change.newAttrs, { dataTracked } = _a, attrs = __rest(_a, ["dataTracked"]);
                 const changeLog = attrsChangesLog.get(node.attrs.id);
-                const newDataTracked = changeLog && changeLog.length ? dataTracked.filter((c) => !changeLog.includes(c.id)) : dataTracked;
+                const newDataTracked = changeLog && changeLog.length
+                    ? dataTracked.filter((c) => !changeLog.includes(c.id))
+                    : dataTracked;
                 tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, attrs), { dataTracked: newDataTracked.length ? newDataTracked : null }), node.marks);
             }
             return;
@@ -69,6 +72,7 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = ne
             addAttrLog(node.attrs.id, change.dataTracked.id);
         }
         else if (ChangeSet.isNodeAttrChange(change) && change.dataTracked.status === CHANGE_STATUS.rejected) {
+            console.log('GETTING IN ---- CHANGE_STATUS.rejected');
             tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, change.oldAttrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
             addAttrLog(node.attrs.id, change.dataTracked.id);
         }

package/dist/es/changes/findChanges.js

@@ -1,6 +1,6 @@
 import { ChangeSet } from '../ChangeSet';
+import { equalMarks, getNodeTrackedData } from '../compute/nodeHelpers';
 import { CHANGE_OPERATION, } from '../types/change';
-import { getNodeTrackedData, equalMarks } from '../compute/nodeHelpers';
 export function findChanges(state) {
     const changes = [];
     let current;

package/dist/es/changes/fixInconsistentChanges.js

@@ -5,8 +5,8 @@ export function fixInconsistentChanges(changeSet, currentUserID, newTr, schema)
     const iteratedIds = new Set();
     let changed = false;
     changeSet.invalidChanges.forEach((c) => {
-        const { id, authorID, operation, reviewedByID, status, createdAt, updatedAt } = c.dataTracked;
-        const newAttrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!id || iteratedIds.has(id) || id.length === 0) && { id: uuidv4() })), (!authorID && { authorID: currentUserID })), (!reviewedByID && { reviewedByID: null })), (!status && { status: CHANGE_STATUS.pending })), (!createdAt && { createdAt: Date.now() })), (!updatedAt && { updatedAt: Date.now() }));
+        const { id, authorID, operation, reviewedByID, status, createdAt, statusUpdateAt, updatedAt } = c.dataTracked;
+        const newAttrs = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!id || iteratedIds.has(id) || id.length === 0) && { id: uuidv4() })), (!authorID && { authorID: currentUserID })), (!reviewedByID && { reviewedByID: null })), (!status && { status: CHANGE_STATUS.pending })), (!createdAt && { createdAt: Date.now() })), (!updatedAt && { updatedAt: Date.now() })), (!statusUpdateAt && { statusUpdateAt: 0 }));
         if (Object.keys(newAttrs).length > 0) {
             updateChangeAttrs(newTr, c, Object.assign(Object.assign({}, c.dataTracked), newAttrs), schema);
             changed = true;

package/dist/es/changes/updateChangeAttrs.js

@@ -1,6 +1,6 @@
-import { log } from '../utils/logger';
 import { ChangeSet } from '../ChangeSet';
-import { getTextNodeTrackedMarkData, getBlockInlineTrackedData } from '../compute/nodeHelpers';
+import { getBlockInlineTrackedData, getTextNodeTrackedMarkData, } from '../compute/nodeHelpers';
+import { log } from '../utils/logger';
 export function updateChangeAttrs(tr, change, trackedAttrs, schema) {
     const node = tr.doc.nodeAt(change.from);
     if (!node) {

package/dist/es/compute/nodeHelpers.js

@@ -14,9 +14,7 @@ export function getTextNodeTrackedMarkData(node, schema) {
     const marksTrackedData = [];
     node.marks.forEach((mark) => {
         if (mark.type === schema.marks.tracked_insert || mark.type === schema.marks.tracked_delete) {
-            const operation = mark.type === schema.marks.tracked_insert
-                ? CHANGE_OPERATION.insert
-                : CHANGE_OPERATION.delete;
+            const operation = mark.type === schema.marks.tracked_insert ? CHANGE_OPERATION.insert : CHANGE_OPERATION.delete;
             marksTrackedData.push(Object.assign(Object.assign({}, mark.attrs.dataTracked), { operation }));
         }
     });
@@ -57,9 +55,7 @@ export function shouldMergeTrackedAttributes(left, right) {
         });
         return false;
     }
-    return (left.status === right.status &&
-        left.operation === right.operation &&
-        left.authorID === right.authorID);
+    return (left.status === right.status && left.operation === right.operation && left.authorID === right.authorID);
 }
 export function getMergeableMarkTrackedAttrs(node, attrs, schema) {
     const nodeAttrs = getTextNodeTrackedMarkData(node, schema);

package/dist/es/compute/setFragmentAsInserted.js

@@ -1,6 +1,6 @@
 import { Fragment } from 'prosemirror-model';
-import { log } from '../utils/logger';
 import { CHANGE_OPERATION } from '../types/change';
+import { log } from '../utils/logger';
 import { addTrackIdIfDoesntExist, equalMarks, getTextNodeTrackedMarkData } from './nodeHelpers';
 function markInlineNodeChange(node, newTrackAttrs, schema) {
     const filtered = node.marks.filter((m) => m.type !== schema.marks.tracked_insert && m.type !== schema.marks.tracked_delete);

package/dist/es/compute/splitSliceIntoMergedParts.js

@@ -29,9 +29,7 @@ export function splitSliceIntoMergedParts(insertSlice, mergeEqualSides = false)
     const { openStart, openEnd, content: { firstChild, lastChild, content: nodes }, } = insertSlice;
     let updatedSliceNodes = nodes;
     const mergeSides = openStart !== openEnd || mergeEqualSides;
-    const firstMergedNode = openStart > 0 && mergeSides && firstChild
-        ? getMergedNode(firstChild, 1, openStart, true)
-        : undefined;
+    const firstMergedNode = openStart > 0 && mergeSides && firstChild ? getMergedNode(firstChild, 1, openStart, true) : undefined;
     const lastMergedNode = openEnd > 0 && mergeSides && lastChild ? getMergedNode(lastChild, 1, openEnd, false) : undefined;
     if (firstMergedNode) {
         updatedSliceNodes = updatedSliceNodes.slice(1);

package/dist/es/mutate/deleteAndMergeSplitNodes.js

@@ -1,6 +1,6 @@
 import { Fragment } from 'prosemirror-model';
-import { splitSliceIntoMergedParts } from '../compute/splitSliceIntoMergedParts';
 import { setFragmentAsInserted } from '../compute/setFragmentAsInserted';
+import { splitSliceIntoMergedParts } from '../compute/splitSliceIntoMergedParts';
 import * as trackUtils from '../utils/track-utils';
 export function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackAttrs, insertSlice) {
     const steps = [];
@@ -16,16 +16,12 @@ export function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema,
     let mergingStartSide = true;
     startDoc.nodesBetween(from, to, (node, pos) => {
         const nodeEnd = pos + node.nodeSize;
-        const wasWithinGap = gap &&
-            ((!node.isText && pos >= gap.start) ||
-                (node.isText && pos >= gap.start && nodeEnd <= gap.end));
+        const wasWithinGap = gap && ((!node.isText && pos >= gap.start) || (node.isText && pos >= gap.start && nodeEnd <= gap.end));
         if (nodeEnd > from && !wasWithinGap) {
             const nodeCompletelyDeleted = pos >= from && nodeEnd <= to;
             const endTokenDeleted = nodeEnd <= to;
             const startTokenDeleted = pos >= from;
-            if (node.isText ||
-                (!endTokenDeleted && startTokenDeleted) ||
-                (endTokenDeleted && !startTokenDeleted)) {
+            if (node.isText || (!endTokenDeleted && startTokenDeleted) || (endTokenDeleted && !startTokenDeleted)) {
                 if (!endTokenDeleted && startTokenDeleted) {
                     mergingStartSide = false;
                 }
@@ -70,9 +66,7 @@ export function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema,
     });
     return {
         sliceWasSplit: !!(firstMergedNode || lastMergedNode),
-        newSliceContent: updatedSliceNodes
-            ? Fragment.fromArray(updatedSliceNodes)
-            : insertSlice.content,
+        newSliceContent: updatedSliceNodes ? Fragment.fromArray(updatedSliceNodes) : insertSlice.content,
         steps,
     };
 }

package/dist/es/mutate/deleteNode.js

@@ -1,16 +1,10 @@
 import { Fragment } from 'prosemirror-model';
-import { liftTarget } from 'prosemirror-transform';
-import { log } from '../utils/logger';
-import { CHANGE_OPERATION } from '../types/change';
 import { addTrackIdIfDoesntExist, getBlockInlineTrackedData } from '../compute/nodeHelpers';
+import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
+import { log } from '../utils/logger';
 export function deleteNode(node, pos, tr) {
     var _a;
     const startPos = tr.doc.resolve(pos + 1);
-    const range = startPos.blockRange(tr.doc.resolve(startPos.pos - 2 + node.nodeSize));
-    const targetDepth = range && liftTarget(range);
-    if (range && typeof targetDepth === 'number') {
-        return tr.lift(range, targetDepth);
-    }
     const resPos = tr.doc.resolve(pos);
     const canMergeToNodeAbove = resPos.parent !== tr.doc && resPos.nodeBefore && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
     if (canMergeToNodeAbove) {
@@ -22,14 +16,18 @@ export function deleteNode(node, pos, tr) {
 }
 export function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
     const dataTracked = getBlockInlineTrackedData(node);
-    const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.insert);
+    const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.insert && d.status === CHANGE_STATUS.pending);
     const deleted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.delete);
     const updated = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.set_node_attributes);
     if (inserted && inserted.authorID === deleteAttrs.authorID) {
         return deleteNode(node, pos, newTr);
     }
     if (!newTr.doc.nodeAt(pos)) {
-        log.error(`deleteOrSetNodeDeleted: no node found for deletion`, { pos, node, newTr });
+        log.error(`deleteOrSetNodeDeleted: no node found for deletion`, {
+            pos,
+            node,
+            newTr,
+        });
         return;
     }
     const newDeleted = deleted

package/dist/es/plugin.js

@@ -11,14 +11,14 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { getAction, setAction, TrackChangesAction } from './actions';
-import { ChangeSet } from './ChangeSet';
-import { log, enableDebug } from './utils/logger';
 import { applyAcceptedRejectedChanges } from './changes/applyChanges';
 import { findChanges } from './changes/findChanges';
 import { fixInconsistentChanges } from './changes/fixInconsistentChanges';
-import { trackTransaction } from './steps/trackTransaction';
 import { updateChangeAttrs } from './changes/updateChangeAttrs';
+import { ChangeSet } from './ChangeSet';
+import { trackTransaction } from './steps/trackTransaction';
 import { TrackChangesStatus } from './types/track';
+import { enableDebug, log } from './utils/logger';
 export const trackChangesPluginKey = new PluginKey('track-changes');
 export const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
     const { userID, debug, skipTrsWithMetas = [] } = opts;
@@ -79,18 +79,24 @@ export const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) =>
             trs.forEach((tr) => {
                 const wasAppended = tr.getMeta('appendedTransaction');
                 const skipMetaUsed = skipTrsWithMetas.some((m) => tr.getMeta(m) || (wasAppended === null || wasAppended === void 0 ? void 0 : wasAppended.getMeta(m)));
-                const skipTrackUsed = getAction(tr, TrackChangesAction.skipTrack) || (wasAppended && getAction(wasAppended, TrackChangesAction.skipTrack));
-                if (tr.docChanged && !skipMetaUsed && !skipTrackUsed && !tr.getMeta('history$') && !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
+                const skipTrackUsed = getAction(tr, TrackChangesAction.skipTrack) ||
+                    (wasAppended && getAction(wasAppended, TrackChangesAction.skipTrack));
+                if (tr.docChanged &&
+                    !skipMetaUsed &&
+                    !skipTrackUsed &&
+                    !tr.getMeta('history$') &&
+                    !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
                     createdTr = trackTransaction(tr, oldState, createdTr, userID);
                 }
                 docChanged = docChanged || tr.docChanged;
                 const setChangeStatuses = getAction(tr, TrackChangesAction.setChangeStatuses);
                 if (setChangeStatuses) {
                     const { status, ids } = setChangeStatuses;
+                    const changeTime = new Date().getTime();
                     ids.forEach((changeId) => {
                         const change = changeSet === null || changeSet === void 0 ? void 0 : changeSet.get(changeId);
                         if (change) {
-                            createdTr = updateChangeAttrs(createdTr, change, Object.assign(Object.assign({}, change.dataTracked), { status, reviewedByID: userID }), oldState.schema);
+                            createdTr = updateChangeAttrs(createdTr, change, Object.assign(Object.assign({}, change.dataTracked), { status, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
                         }
                     });
                 }
@@ -100,7 +106,8 @@ export const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) =>
                     setAction(createdTr, TrackChangesAction.refreshChanges, true);
                 }
             });
-            const changed = pluginState.changeSet.hasInconsistentData && fixInconsistentChanges(pluginState.changeSet, userID, createdTr, oldState.schema);
+            const changed = pluginState.changeSet.hasInconsistentData &&
+                fixInconsistentChanges(pluginState.changeSet, userID, createdTr, oldState.schema);
             if (changed) {
                 log.warn('had to fix inconsistent changes in', createdTr);
             }

package/dist/es/steps/trackReplaceAroundStep.js

@@ -1,9 +1,9 @@
 import { Slice } from 'prosemirror-model';
-import { deleteAndMergeSplitNodes } from '../mutate/deleteAndMergeSplitNodes';
+import { TrackChangesAction } from '../actions';
 import { setFragmentAsInserted } from '../compute/setFragmentAsInserted';
+import { deleteAndMergeSplitNodes } from '../mutate/deleteAndMergeSplitNodes';
 import { log } from '../utils/logger';
 import * as trackUtils from '../utils/track-utils';
-import { TrackChangesAction } from '../actions';
 export function trackReplaceAroundStep(step, oldState, tr, newTr, attrs) {
     log.info('###### ReplaceAroundStep ######');
     const { from, to, gapFrom, gapTo, insert, slice, structure, } = step;

package/dist/es/steps/trackReplaceStep.js

@@ -1,6 +1,6 @@
 import { Slice } from 'prosemirror-model';
-import { deleteAndMergeSplitNodes } from '../mutate/deleteAndMergeSplitNodes';
 import { setFragmentAsInserted } from '../compute/setFragmentAsInserted';
+import { deleteAndMergeSplitNodes } from '../mutate/deleteAndMergeSplitNodes';
 import { log } from '../utils/logger';
 import * as trackUtils from '../utils/track-utils';
 export function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
@@ -45,7 +45,9 @@ export function trackReplaceStep(step, oldState, newTr, attrs, stepResult, curre
             });
         }
         else {
-            selectionPos = ((_a = window.event) === null || _a === void 0 ? void 0 : _a.code) === 'Delete' || ((_b = window.event) === null || _b === void 0 ? void 0 : _b.inputType) === 'deleteContentForward' ? toA : fromA;
+            const isDeleteEvent = ((_a = window.event) === null || _a === void 0 ? void 0 : _a.code) === 'Delete';
+            const isDeleteContentForward = ((_b = window.event) === null || _b === void 0 ? void 0 : _b.inputType) === 'deleteContentForward';
+            selectionPos = isDeleteEvent || isDeleteContentForward ? toA : fromA;
         }
     });
     return [changeSteps, selectionPos];

package/dist/es/steps/trackTransaction.js

@@ -1,11 +1,11 @@
 import { NodeSelection as NodeSelectionClass } from 'prosemirror-state';
 import { ReplaceAroundStep, ReplaceStep } from 'prosemirror-transform';
-import { log } from '../utils/logger';
+import { diffChangeSteps } from '../change-steps/diffChangeSteps';
+import { processChangeSteps } from '../change-steps/processChangeSteps';
 import { CHANGE_STATUS } from '../types/change';
+import { log } from '../utils/logger';
 import { trackReplaceAroundStep } from './trackReplaceAroundStep';
 import { trackReplaceStep } from './trackReplaceStep';
-import { processChangeSteps } from '../change-steps/processChangeSteps';
-import { diffChangeSteps } from '../change-steps/diffChangeSteps';
 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) {
@@ -15,6 +15,7 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
         reviewedByID: null,
         createdAt: tr.time,
         updatedAt: tr.time,
+        statusUpdateAt: 0,
         status: CHANGE_STATUS.pending,
     };
     const wasNodeSelection = tr.selection instanceof NodeSelectionClass;
@@ -36,8 +37,7 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
         }
         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 (((_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])) {
                 continue;
             }
             const newStep = step.invert(tr.docs[i]);

package/dist/types/ChangeSet.d.ts

@@ -1,4 +1,4 @@
-import { NodeChange, IncompleteChange, TextChange, TrackedAttrs, TrackedChange, NodeAttrChange } from './types/change';
+import { IncompleteChange, NodeAttrChange, NodeChange, TextChange, TrackedAttrs, TrackedChange } from './types/change';
 export declare class ChangeSet {
     #private;
     constructor(changes?: (TrackedChange | IncompleteChange)[]);

package/dist/types/mutate/deleteAndMergeSplitNodes.d.ts

@@ -1,8 +1,8 @@
 import { Fragment, Node as PMNode, Schema } from 'prosemirror-model';
 import type { Transaction } from 'prosemirror-state';
 import { ExposedSlice } from '../types/pm';
-import { NewEmptyAttrs } from '../types/track';
 import { ChangeStep } from '../types/step';
+import { NewEmptyAttrs } from '../types/track';
 export declare function deleteAndMergeSplitNodes(from: number, to: number, gap: {
     start: number;
     end: number;

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

@@ -1,5 +1,5 @@
 import type { EditorState, Transaction } from 'prosemirror-state';
 import { ReplaceAroundStep } from 'prosemirror-transform';
-import { NewEmptyAttrs } from '../types/track';
 import { ChangeStep } from '../types/step';
+import { NewEmptyAttrs } from '../types/track';
 export declare function trackReplaceAroundStep(step: ReplaceAroundStep, oldState: EditorState, tr: Transaction, newTr: Transaction, attrs: NewEmptyAttrs): ChangeStep[];

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

@@ -1,6 +1,6 @@
 import { Node as PMNode } from 'prosemirror-model';
 import type { EditorState, Transaction } from 'prosemirror-state';
 import { ReplaceStep, StepResult } from 'prosemirror-transform';
-import { NewEmptyAttrs } from '../types/track';
 import { ChangeStep } from '../types/step';
+import { NewEmptyAttrs } from '../types/track';
 export declare function trackReplaceStep(step: ReplaceStep, oldState: EditorState, newTr: Transaction, attrs: NewEmptyAttrs, stepResult: StepResult, currentStepDoc: PMNode): [ChangeStep[], number];

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

@@ -14,6 +14,7 @@ type InsertDeleteAttrs = {
     reviewedByID: string | null;
     operation: CHANGE_OPERATION.insert | CHANGE_OPERATION.delete;
     status: CHANGE_STATUS;
+    statusUpdateAt: number;
     createdAt: number;
     updatedAt: number;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",
@@ -15,27 +15,47 @@
     "build": "npm-run-all --parallel 'build:* --project tsconfig.json'",
     "build:cjs": "tsc --outDir dist/cjs --module commonjs",
     "build:es": "tsc --outDir dist/es --declarationDir dist/types --declaration",
-    "dev": "npm-run-all --parallel 'build:* --project tsconfig.build.json --watch'",
+    "dev": "npm-run-all --parallel 'build:* --project tsconfig.json --watch'",
     "test": "jest --runInBand",
+    "test-rs": "jest -i test/diff/diff.test.ts",
     "format": "prettier --write \"*.+(js|json|yml|yaml|ts|md|graphql|mdx)\" src/ test/",
     "typecheck": "tsc --project tsconfig.test.json --noEmit",
     "lint": "eslint --cache --ext .js,.ts, ./src ./test",
-    "lint:fix": "eslint --fix --ext .js,.ts, ./src ./test"
+    "lint:fix": "eslint --fix --ext .js,.ts, ./src ./test",
+    "prepare": "husky install"
   },
   "devDependencies": {
+    "@manuscripts/eslint-config": "^0.5.1",
     "@manuscripts/transform": "^1.5.1",
     "@types/debug": "^4.1.7",
     "@types/jest": "27.5.1",
     "@types/node": "^18.7.18",
+    "@typescript-eslint/eslint-plugin": "^5.47.0",
+    "@typescript-eslint/parser": "^5.47.0",
+    "eslint": "^8.46.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-header": "^3.1.1",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^27.1.7",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
+    "eslint-plugin-mdx": "2.0.4",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-react": "^7.31.11",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-simple-import-sort": "^8.0.0",
+    "husky": "^8.0.1",
     "jest": "27.5.1",
     "jest-environment-jsdom": "27.5.1",
     "jsdom": "^20.0.0",
     "npm-run-all": "^4.1.5",
+    "prettier": "^2.8.1",
     "ts-jest": "27.1.4",
     "tslib": "^2.4.0",
     "typescript": "^4.8.3"
   },
   "dependencies": {
+    "debug": "^4.3.4",
     "prosemirror-commands": "^1.5.0",
     "prosemirror-example-setup": "^1.2.1",
     "prosemirror-history": "^1.3.0",
@@ -44,7 +64,9 @@
     "prosemirror-schema-list": "^1.2.2",
     "prosemirror-state": "^1.4.2",
     "prosemirror-transform": "^1.7.0",
-    "prosemirror-view": "^1.29.1",
-    "debug": "^4.3.4"
+    "prosemirror-view": "^1.29.1"
+  },
+  "resolutions": {
+    "eslint-mdx": "2.0.5"
   }
 }