@manuscripts/track-changes-plugin 1.7.23 → 1.7.24-LEAN-3967.2

package/README.md

@@ -118,11 +118,6 @@ export const setChangeStatuses = (status: CHANGE_STATUS, ids: string[]) => Comma
  */
 export const setUserID = (userID: string) => Command
 
-/**
- * Appends a transaction that applies all 'accepted' and 'rejected' changes to the document.
- */
-export const applyAndRemoveChanges = () => Command
-
 /**
  * Runs `findChanges` to iterate over the document to collect changes into a new ChangeSet.
  */

package/dist/cjs/ChangeSet.js

@@ -79,12 +79,6 @@ class ChangeSet {
     get pending() {
         return this.changeTree.filter((c) => c.dataTracked.status === change_1.CHANGE_STATUS.pending);
     }
-    get accepted() {
-        return this.changeTree.filter((c) => c.dataTracked.status === change_1.CHANGE_STATUS.accepted);
-    }
-    get rejected() {
-        return this.changeTree.filter((c) => c.dataTracked.status === change_1.CHANGE_STATUS.rejected);
-    }
     get textChanges() {
         return this.changes.filter((c) => c.type === 'text-change');
     }

package/dist/cjs/actions.js

@@ -8,7 +8,6 @@ var TrackChangesAction;
     TrackChangesAction["setPluginStatus"] = "track-changes-set-track-status";
     TrackChangesAction["setChangeStatuses"] = "track-changes-set-change-statuses";
     TrackChangesAction["refreshChanges"] = "track-changes-refresh-changes";
-    TrackChangesAction["applyAndRemoveChanges"] = "track-changes-apply-remove-changes";
     TrackChangesAction["updateMetaNode"] = "track-changes-update-meta-node";
 })(TrackChangesAction = exports.TrackChangesAction || (exports.TrackChangesAction = {}));
 function hasAction(tr) {

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

@@ -111,21 +111,16 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
             case 'update-node-attrs':
                 const oldDataTracked = (0, nodeHelpers_1.getBlockInlineTrackedData)(c.node) || [];
                 const oldUpdate = oldDataTracked.reverse().find((d) => {
-                    if (d.operation === change_1.CHANGE_OPERATION.set_node_attributes &&
-                        (d.status === change_1.CHANGE_STATUS.pending || d.status === change_1.CHANGE_STATUS.rejected)) {
+                    if (d.operation === change_1.CHANGE_OPERATION.set_node_attributes && d.status === change_1.CHANGE_STATUS.pending) {
                         return true;
                     }
                     return false;
                 });
-                const lastChangeRejected = oldUpdate && oldUpdate.status === change_1.CHANGE_STATUS.rejected;
-                const sourceAttrs = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
-                const { dataTracked } = sourceAttrs, restAttrs = __rest(sourceAttrs, ["dataTracked"]);
-                const oldAttrs = lastChangeRejected ? oldUpdate.oldAttrs : restAttrs;
-                const newDataTracked = [
-                    ...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id || lastChangeRejected),
-                ];
+                const _a = c.node.attrs, { dataTracked } = _a, restAttrs = __rest(_a, ["dataTracked"]);
+                const oldAttrs = restAttrs;
+                const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
                 const newUpdate = oldUpdate && oldUpdate.status !== change_1.CHANGE_STATUS.rejected
-                    ? Object.assign(Object.assign({}, oldUpdate), { updatedAt: emptyAttrs.updatedAt }) : (0, nodeHelpers_1.addTrackIdIfDoesntExist)(trackUtils.createNewUpdateAttrs(emptyAttrs, lastChangeRejected ? oldAttrs : c.node.attrs));
+                    ? Object.assign(Object.assign({}, oldUpdate), { updatedAt: emptyAttrs.updatedAt }) : (0, nodeHelpers_1.addTrackIdIfDoesntExist)(trackUtils.createNewUpdateAttrs(emptyAttrs, c.node.attrs));
                 if ((JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) ||
                     c.node.type === c.node.type.schema.nodes.citation) &&
                     !oldDataTracked.find((d) => (d.operation === change_1.CHANGE_OPERATION.insert || d.operation === change_1.CHANGE_OPERATION.wrap_with_node) &&

package/dist/cjs/changes/applyChanges.js

@@ -1,15 +1,4 @@
 "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.applyAcceptedRejectedChanges = exports.getUpdatedDataTracked = void 0;
 const prosemirror_transform_1 = require("prosemirror-transform");
@@ -18,6 +7,7 @@ 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 revertChange_1 = require("./revertChange");
 const updateChangeAttrs_1 = require("./updateChangeAttrs");
 function getUpdatedDataTracked(dataTracked, changeId) {
     if (!dataTracked) {
@@ -27,30 +17,24 @@ function getUpdatedDataTracked(dataTracked, changeId) {
     return newDataTracked.length ? newDataTracked : null;
 }
 exports.getUpdatedDataTracked = getUpdatedDataTracked;
-function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new prosemirror_transform_1.Mapping()) {
-    const attrsChangesLog = new Map();
-    function addAttrLog(nodeId, changeId) {
-        const arr = attrsChangesLog.get(nodeId) || attrsChangesLog.set(nodeId, []).get(nodeId);
-        arr.push(changeId);
-    }
+function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap = new prosemirror_transform_1.Mapping()) {
     changes.sort((c1, c2) => c1.dataTracked.updatedAt - c2.dataTracked.updatedAt);
     changes.forEach((change) => {
-        const { pos: from, deleted } = deleteMap.mapResult(change.from), node = tr.doc.nodeAt(from), noChangeNeeded = deleted || !ChangeSet_1.ChangeSet.shouldDeleteChange(change);
+        if (change.dataTracked.status == change_1.CHANGE_STATUS.rejected) {
+            if (change.dataTracked.operation === change_1.CHANGE_OPERATION.node_split) {
+                return (0, revertChange_1.revertSplitNodeChange)(tr, change, changeSet);
+            }
+            if (change.dataTracked.operation === change_1.CHANGE_OPERATION.wrap_with_node) {
+                return (0, revertChange_1.revertWrapNodeChange)(tr, change);
+            }
+        }
+        const { pos: from, deleted } = deleteMap.mapResult(change.from);
+        const node = tr.doc.nodeAt(from);
+        const noChangeNeeded = deleted || !ChangeSet_1.ChangeSet.shouldDeleteChange(change);
         if (!node) {
             !deleted && logger_1.log.warn('no node found to update for change', change);
             return;
         }
-        if (change.dataTracked.status === change_1.CHANGE_STATUS.pending) {
-            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;
-                tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, attrs), { dataTracked: newDataTracked.length ? newDataTracked : null }), node.marks);
-            }
-            return;
-        }
         if (ChangeSet_1.ChangeSet.isTextChange(change) && noChangeNeeded) {
             tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_insert);
             tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_delete);
@@ -73,16 +57,12 @@ function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new prose
         }
         else if (ChangeSet_1.ChangeSet.isNodeAttrChange(change) && change.dataTracked.status === change_1.CHANGE_STATUS.accepted) {
             tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, change.newAttrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
-            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);
         }
         else if (ChangeSet_1.ChangeSet.isReferenceChange(change)) {
-            const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: null });
-            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
+            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
         }
     });
     return deleteMap;

package/dist/cjs/changes/findChanges.js

@@ -29,7 +29,7 @@ function findChanges(state) {
                     type: 'text-change',
                     from: pos,
                     to: pos + node.nodeSize,
-                    dataTracked,
+                    dataTracked: Object.assign({}, dataTracked),
                     text: node.text,
                     nodeType: node.type,
                 };
@@ -40,10 +40,10 @@ function findChanges(state) {
                     type: 'node-attr-change',
                     from: pos,
                     to: pos + node.nodeSize,
-                    dataTracked,
+                    dataTracked: Object.assign({}, dataTracked),
                     node: node,
-                    newAttrs: node.attrs,
-                    oldAttrs: dataTracked.oldAttrs,
+                    newAttrs: Object.assign({}, node.attrs),
+                    oldAttrs: Object.assign({}, dataTracked.oldAttrs),
                 };
             }
             else if (dataTracked.operation === change_1.CHANGE_OPERATION.reference) {
@@ -61,10 +61,10 @@ function findChanges(state) {
                     type: 'node-change',
                     from: pos,
                     to: pos + node.nodeSize,
-                    dataTracked,
+                    dataTracked: Object.assign({}, dataTracked),
                     node: node,
                     children: [],
-                    attrs: node.attrs,
+                    attrs: Object.assign({}, node.attrs),
                 };
             }
             current = {

package/dist/cjs/changes/revertChange.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.revertRejectedChanges = void 0;
+exports.revertWrapNodeChange = exports.revertSplitNodeChange = void 0;
 const prosemirror_transform_1 = require("prosemirror-transform");
 const nodeHelpers_1 = require("../compute/nodeHelpers");
-const change_1 = require("../types/change");
 const applyChanges_1 = require("./applyChanges");
 function revertSplitNodeChange(tr, change, changeSet) {
-    let sourceChange = changeSet.changes.find((c) => c.dataTracked.operation === 'reference' && c.dataTracked.referenceId === change.id);
+    const sourceChange = changeSet.changes.find((c) => c.dataTracked.operation === 'reference' && c.dataTracked.referenceId === change.id);
     const node = tr.doc.nodeAt(tr.mapping.map(change.from));
     tr.delete(tr.mapping.map(change.from), tr.mapping.map(change.to));
     tr.replaceWith(tr.mapping.map(sourceChange.to - 1), tr.mapping.map(sourceChange.to), node.content);
@@ -16,7 +15,8 @@ function revertSplitNodeChange(tr, change, changeSet) {
     const childSource = changeSet.changes.find((c) => c.from === change.from && c.dataTracked.operation === 'reference');
     if (childSource) {
         const node = tr.doc.nodeAt(tr.mapping.map(sourceChange.from));
-        const dataTracked = (0, nodeHelpers_1.getBlockInlineTrackedData)(node).map((c) => c.operation === 'reference' ? childSource.dataTracked : c);
+        const data = (0, nodeHelpers_1.getBlockInlineTrackedData)(node) || [];
+        const dataTracked = data.map((c) => (c.operation === 'reference' ? childSource.dataTracked : c));
         tr.setNodeMarkup(tr.mapping.map(sourceChange.from), undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked }), node.marks);
     }
     const deleteChange = changeSet.changes.find((c) => c.dataTracked.operation == 'delete' && c.from === sourceChange.from);
@@ -25,10 +25,13 @@ function revertSplitNodeChange(tr, change, changeSet) {
         tr.setNodeMarkup(tr.mapping.map(deleteChange.from), undefined, (0, applyChanges_1.getUpdatedDataTracked)(node.attrs.dataTracked, deleteChange.id));
     }
 }
+exports.revertSplitNodeChange = revertSplitNodeChange;
 function revertWrapNodeChange(tr, change) {
-    tr.doc.nodesBetween(change.from, change.to, (node, pos) => {
-        const $fromPos = tr.doc.resolve(tr.mapping.map(pos));
-        const $toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1));
+    const from = tr.mapping.map(change.from);
+    const to = tr.mapping.map(change.to);
+    tr.doc.nodesBetween(from, to, (node, pos) => {
+        const $fromPos = tr.doc.resolve(pos);
+        const $toPos = tr.doc.resolve(pos + node.nodeSize - 1);
         const nodeRange = $fromPos.blockRange($toPos);
         if (!nodeRange) {
             return;
@@ -39,18 +42,4 @@ function revertWrapNodeChange(tr, change) {
         }
     });
 }
-function revertRejectedChanges(tr, schema, ids, changeSet, status) {
-    if (status !== change_1.CHANGE_STATUS.rejected) {
-        return;
-    }
-    ids.forEach((id) => {
-        const change = changeSet.get(id);
-        if (change.dataTracked.operation === change_1.CHANGE_OPERATION.node_split) {
-            revertSplitNodeChange(tr, change, changeSet);
-        }
-        if (change.dataTracked.operation === change_1.CHANGE_OPERATION.wrap_with_node) {
-            revertWrapNodeChange(tr, change);
-        }
-    });
-}
-exports.revertRejectedChanges = revertRejectedChanges;
+exports.revertWrapNodeChange = revertWrapNodeChange;

package/dist/cjs/changes/updateChangeAttrs.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateChangeChildrenAttributes = exports.updateChangeAttrs = void 0;
 const ChangeSet_1 = require("../ChangeSet");
 const nodeHelpers_1 = require("../compute/nodeHelpers");
+const change_1 = require("../types/change");
 const logger_1 = require("../utils/logger");
 function updateChangeAttrs(tr, change, trackedAttrs, schema) {
     const node = tr.doc.nodeAt(change.from);
@@ -24,27 +25,47 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
             logger_1.log.warn('updateChangeAttrs: no track marks for a text-change ', change);
             return tr;
         }
-        tr.addMark(change.from, change.to, oldMark.type.create(Object.assign(Object.assign({}, oldMark.attrs), { dataTracked: Object.assign(Object.assign({}, oldTrackData), trackedAttrs) })));
+        if (trackedAttrs.status === change_1.CHANGE_STATUS.accepted || trackedAttrs.status === change_1.CHANGE_STATUS.rejected) {
+            tr.removeMark(change.from, change.to, oldMark);
+        }
+        else {
+            tr.addMark(change.from, change.to, oldMark.type.create(Object.assign(Object.assign({}, oldMark.attrs), { dataTracked: Object.assign(Object.assign({}, oldTrackData), trackedAttrs) })));
+        }
     }
     else if ((change.type === 'node-change' || change.type === 'node-attr-change') && !operation) {
         tr.setNodeMarkup(change.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: null }), node.marks);
     }
     else if (change.type === 'node-change' || change.type === 'node-attr-change') {
+        let restoredAttrs = undefined;
+        if (trackedAttrs.operation === change_1.CHANGE_OPERATION.set_node_attributes &&
+            trackedAttrs.status === change_1.CHANGE_STATUS.rejected) {
+            restoredAttrs = trackedAttrs.oldAttrs;
+        }
         const trackedDataSource = (0, nodeHelpers_1.getBlockInlineTrackedData)(node) || [];
         const targetDataTracked = trackedDataSource.find((t) => change.id === t.id);
-        const newDataTracked = trackedDataSource.map((oldTrack) => {
+        const newDataTracked = trackedDataSource
+            .map((oldTrack) => {
             if (targetDataTracked) {
                 if (oldTrack.id === targetDataTracked.id) {
+                    if (trackedAttrs.status === change_1.CHANGE_STATUS.accepted ||
+                        trackedAttrs.status === change_1.CHANGE_STATUS.rejected) {
+                        return null;
+                    }
                     return Object.assign(Object.assign({}, oldTrack), trackedAttrs);
                 }
                 return oldTrack;
             }
             if (oldTrack.operation === operation) {
+                if (trackedAttrs.status === change_1.CHANGE_STATUS.accepted ||
+                    trackedAttrs.status === change_1.CHANGE_STATUS.rejected) {
+                    return null;
+                }
                 return Object.assign(Object.assign({}, oldTrack), trackedAttrs);
             }
             return oldTrack;
-        });
-        tr.setNodeMarkup(change.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: newDataTracked.length === 0 ? null : newDataTracked }), node.marks);
+        })
+            .filter(Boolean);
+        tr.setNodeMarkup(change.from, undefined, Object.assign(Object.assign({}, (restoredAttrs || node.attrs)), { dataTracked: newDataTracked.length === 0 ? null : newDataTracked }), node.marks);
     }
     return tr;
 }

package/dist/cjs/changes/updateChangesStatus.js

@@ -0,0 +1,60 @@
+"use strict";
+/*!
+ * © 2023 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateChangesStatus = void 0;
+const prosemirror_history_1 = require("prosemirror-history");
+const ChangeSet_1 = require("../ChangeSet");
+const change_1 = require("../types/change");
+const applyChanges_1 = require("./applyChanges");
+const updateChangeAttrs_1 = require("./updateChangeAttrs");
+function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState) {
+    const change = changeSet.get(ids[0]);
+    if (change && status !== change_1.CHANGE_STATUS.pending) {
+        const textChanges = [];
+        const nonTextChanges = [];
+        changeSet.changes.forEach((c) => {
+            if (ids.includes(c.id)) {
+                c.dataTracked.status = status;
+                if (ChangeSet_1.ChangeSet.isTextChange(c)) {
+                    textChanges.push(c);
+                }
+                else {
+                    nonTextChanges.push(c);
+                    if (c.dataTracked.operation === change_1.CHANGE_OPERATION.node_split) {
+                        const relatedRefChange = changeSet.changes.find((c) => c.dataTracked.operation === 'reference' && c.dataTracked.referenceId === change.id);
+                        if (relatedRefChange) {
+                            nonTextChanges.push(relatedRefChange);
+                        }
+                    }
+                }
+            }
+        });
+        const mapping = (0, applyChanges_1.applyAcceptedRejectedChanges)(createdTr, oldState.schema, nonTextChanges, changeSet);
+        (0, applyChanges_1.applyAcceptedRejectedChanges)(createdTr, oldState.schema, textChanges, changeSet, mapping);
+    }
+    else {
+        const changeTime = new Date().getTime();
+        ids.forEach((changeId) => {
+            const change = changeSet === null || changeSet === void 0 ? void 0 : changeSet.get(changeId);
+            if (change) {
+                createdTr = (0, updateChangeAttrs_1.updateChangeAttrs)(createdTr, change, Object.assign(Object.assign({}, change.dataTracked), { status, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
+            }
+        });
+    }
+    (0, prosemirror_history_1.closeHistory)(createdTr);
+}
+exports.updateChangesStatus = updateChangesStatus;

package/dist/cjs/commands.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refreshChanges = exports.applyAndRemoveChanges = exports.setUserID = exports.setChangeStatuses = exports.setTrackingStatus = void 0;
+exports.refreshChanges = exports.setUserID = exports.setChangeStatuses = exports.setTrackingStatus = void 0;
 const actions_1 = require("./actions");
 const plugin_1 = require("./plugin");
 const track_1 = require("./types/track");
@@ -35,11 +35,6 @@ const setUserID = (userID) => (state, dispatch) => {
     return true;
 };
 exports.setUserID = setUserID;
-const applyAndRemoveChanges = () => (state, dispatch) => {
-    dispatch && dispatch((0, actions_1.setAction)(state.tr, actions_1.TrackChangesAction.applyAndRemoveChanges, true));
-    return true;
-};
-exports.applyAndRemoveChanges = applyAndRemoveChanges;
 const refreshChanges = () => (state, dispatch) => {
     dispatch && dispatch((0, actions_1.setAction)(state.tr, actions_1.TrackChangesAction.refreshChanges, true));
     return true;

package/dist/cjs/compute/nodeHelpers.js

@@ -33,7 +33,7 @@ function getBlockInlineTrackedData(node) {
     if (dataTracked && !Array.isArray(dataTracked)) {
         return [dataTracked];
     }
-    return dataTracked;
+    return dataTracked || [];
 }
 exports.getBlockInlineTrackedData = getBlockInlineTrackedData;
 function getNodeTrackedData(node, schema) {

package/dist/cjs/compute/setFragmentAsInserted.js

@@ -92,7 +92,7 @@ function setFragmentAsNodeSplit($pos, newTr, inserted, attrs) {
     const oldDataTracked = (0, nodeHelpers_1.getBlockInlineTrackedData)(parent) || [];
     newTr.setNodeMarkup(parentPos, undefined, Object.assign(Object.assign({}, parent.attrs), { dataTracked: [
             ...oldDataTracked.filter((c) => c.operation !== 'reference'),
-            Object.assign({}, (0, nodeHelpers_1.addTrackIdIfDoesntExist)(trackUtils.createNewSplitSourceAttrs(Object.assign(Object.assign({}, attrs), { status: change_1.CHANGE_STATUS.rejected }), referenceId))),
+            Object.assign({}, (0, nodeHelpers_1.addTrackIdIfDoesntExist)(trackUtils.createNewSplitSourceAttrs(Object.assign(Object.assign({}, attrs), { status: change_1.CHANGE_STATUS.pending }), referenceId))),
         ] }));
     const splitSource = oldDataTracked.find((c) => c.operation === 'reference');
     const dataTracked = Object.assign(Object.assign({}, trackUtils.createNewSplitAttrs(Object.assign({}, attrs))), { id: referenceId });

package/dist/cjs/plugin.js

@@ -14,11 +14,9 @@ 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 applyChanges_1 = require("./changes/applyChanges");
 const findChanges_1 = require("./changes/findChanges");
 const fixInconsistentChanges_1 = require("./changes/fixInconsistentChanges");
-const revertChange_1 = require("./changes/revertChange");
-const updateChangeAttrs_1 = require("./changes/updateChangeAttrs");
+const updateChangesStatus_1 = require("./changes/updateChangesStatus");
 const ChangeSet_1 = require("./ChangeSet");
 const trackTransaction_1 = require("./steps/trackTransaction");
 const track_1 = require("./types/track");
@@ -62,7 +60,9 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous', initialStatu
                     return Object.assign(Object.assign({}, pluginState), { changeSet: new ChangeSet_1.ChangeSet() });
                 }
                 let { changeSet } = pluginState, rest = __rest(pluginState, ["changeSet"]);
-                if ((0, actions_1.getAction)(tr, actions_1.TrackChangesAction.refreshChanges)) {
+                if ((0, actions_1.getAction)(tr, actions_1.TrackChangesAction.refreshChanges) ||
+                    tr.getMeta('history$') ||
+                    tr.getMeta('history$1')) {
                     changeSet = (0, findChanges_1.findChanges)(newState);
                 }
                 return Object.assign({ changeSet }, rest);
@@ -92,31 +92,21 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous', initialStatu
                     docChanged = true;
                     return;
                 }
+                const setChangeStatuses = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.setChangeStatuses);
                 const skipTrackUsed = (0, actions_1.getAction)(tr, actions_1.TrackChangesAction.skipTrack) ||
                     (wasAppended && (0, actions_1.getAction)(wasAppended, actions_1.TrackChangesAction.skipTrack));
-                if (tr.docChanged &&
+                if (!setChangeStatuses &&
+                    tr.docChanged &&
                     !skipMetaUsed &&
                     !skipTrackUsed &&
-                    !tr.getMeta('history$') &&
+                    !(tr.getMeta('history$') || tr.getMeta('history$1')) &&
                     !(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, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
-                        }
-                    });
-                    (0, revertChange_1.revertRejectedChanges)(createdTr, oldState.schema, ids, changeSet, status);
-                }
-                else if ((0, actions_1.getAction)(tr, actions_1.TrackChangesAction.applyAndRemoveChanges)) {
-                    const mapping = (0, applyChanges_1.applyAcceptedRejectedChanges)(createdTr, oldState.schema, changeSet.bothNodeChanges);
-                    (0, applyChanges_1.applyAcceptedRejectedChanges)(createdTr, oldState.schema, changeSet.textChanges, mapping);
+                    (0, updateChangesStatus_1.updateChangesStatus)(createdTr, changeSet, ids, status, userID, oldState);
                     (0, actions_1.setAction)(createdTr, actions_1.TrackChangesAction.refreshChanges, true);
                 }
             });

package/dist/es/ChangeSet.js

@@ -76,12 +76,6 @@ export class ChangeSet {
     get pending() {
         return this.changeTree.filter((c) => c.dataTracked.status === CHANGE_STATUS.pending);
     }
-    get accepted() {
-        return this.changeTree.filter((c) => c.dataTracked.status === CHANGE_STATUS.accepted);
-    }
-    get rejected() {
-        return this.changeTree.filter((c) => c.dataTracked.status === CHANGE_STATUS.rejected);
-    }
     get textChanges() {
         return this.changes.filter((c) => c.type === 'text-change');
     }

package/dist/es/actions.js

@@ -5,7 +5,6 @@ export var TrackChangesAction;
     TrackChangesAction["setPluginStatus"] = "track-changes-set-track-status";
     TrackChangesAction["setChangeStatuses"] = "track-changes-set-change-statuses";
     TrackChangesAction["refreshChanges"] = "track-changes-refresh-changes";
-    TrackChangesAction["applyAndRemoveChanges"] = "track-changes-apply-remove-changes";
     TrackChangesAction["updateMetaNode"] = "track-changes-update-meta-node";
 })(TrackChangesAction || (TrackChangesAction = {}));
 export function hasAction(tr) {

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

@@ -85,21 +85,16 @@ export function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema)
             case 'update-node-attrs':
                 const oldDataTracked = getBlockInlineTrackedData(c.node) || [];
                 const oldUpdate = oldDataTracked.reverse().find((d) => {
-                    if (d.operation === CHANGE_OPERATION.set_node_attributes &&
-                        (d.status === CHANGE_STATUS.pending || d.status === CHANGE_STATUS.rejected)) {
+                    if (d.operation === CHANGE_OPERATION.set_node_attributes && d.status === CHANGE_STATUS.pending) {
                         return true;
                     }
                     return false;
                 });
-                const lastChangeRejected = oldUpdate && oldUpdate.status === CHANGE_STATUS.rejected;
-                const sourceAttrs = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
-                const { dataTracked } = sourceAttrs, restAttrs = __rest(sourceAttrs, ["dataTracked"]);
-                const oldAttrs = lastChangeRejected ? oldUpdate.oldAttrs : restAttrs;
-                const newDataTracked = [
-                    ...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id || lastChangeRejected),
-                ];
+                const _a = c.node.attrs, { dataTracked } = _a, restAttrs = __rest(_a, ["dataTracked"]);
+                const oldAttrs = restAttrs;
+                const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
                 const newUpdate = oldUpdate && oldUpdate.status !== CHANGE_STATUS.rejected
-                    ? Object.assign(Object.assign({}, oldUpdate), { updatedAt: emptyAttrs.updatedAt }) : addTrackIdIfDoesntExist(trackUtils.createNewUpdateAttrs(emptyAttrs, lastChangeRejected ? oldAttrs : c.node.attrs));
+                    ? Object.assign(Object.assign({}, oldUpdate), { updatedAt: emptyAttrs.updatedAt }) : addTrackIdIfDoesntExist(trackUtils.createNewUpdateAttrs(emptyAttrs, c.node.attrs));
                 if ((JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) ||
                     c.node.type === c.node.type.schema.nodes.citation) &&
                     !oldDataTracked.find((d) => (d.operation === CHANGE_OPERATION.insert || d.operation === CHANGE_OPERATION.wrap_with_node) &&

package/dist/es/changes/applyChanges.js

@@ -1,20 +1,10 @@
-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;
-};
 import { Mapping } from 'prosemirror-transform';
 import { ChangeSet } from '../ChangeSet';
 import { deleteNode } from '../mutate/deleteNode';
 import { mergeNode } from '../mutate/mergeNode';
-import { CHANGE_STATUS } from '../types/change';
+import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
 import { log } from '../utils/logger';
+import { revertSplitNodeChange, revertWrapNodeChange } from './revertChange';
 import { updateChangeChildrenAttributes } from './updateChangeAttrs';
 export function getUpdatedDataTracked(dataTracked, changeId) {
     if (!dataTracked) {
@@ -23,30 +13,24 @@ export function getUpdatedDataTracked(dataTracked, changeId) {
     const newDataTracked = dataTracked.filter((c) => c.id !== changeId);
     return newDataTracked.length ? newDataTracked : null;
 }
-export function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new Mapping()) {
-    const attrsChangesLog = new Map();
-    function addAttrLog(nodeId, changeId) {
-        const arr = attrsChangesLog.get(nodeId) || attrsChangesLog.set(nodeId, []).get(nodeId);
-        arr.push(changeId);
-    }
+export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap = new Mapping()) {
     changes.sort((c1, c2) => c1.dataTracked.updatedAt - c2.dataTracked.updatedAt);
     changes.forEach((change) => {
-        const { pos: from, deleted } = deleteMap.mapResult(change.from), node = tr.doc.nodeAt(from), noChangeNeeded = deleted || !ChangeSet.shouldDeleteChange(change);
+        if (change.dataTracked.status == CHANGE_STATUS.rejected) {
+            if (change.dataTracked.operation === CHANGE_OPERATION.node_split) {
+                return revertSplitNodeChange(tr, change, changeSet);
+            }
+            if (change.dataTracked.operation === CHANGE_OPERATION.wrap_with_node) {
+                return revertWrapNodeChange(tr, change);
+            }
+        }
+        const { pos: from, deleted } = deleteMap.mapResult(change.from);
+        const node = tr.doc.nodeAt(from);
+        const noChangeNeeded = deleted || !ChangeSet.shouldDeleteChange(change);
         if (!node) {
             !deleted && log.warn('no node found to update for change', change);
             return;
         }
-        if (change.dataTracked.status === CHANGE_STATUS.pending) {
-            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;
-                tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, attrs), { dataTracked: newDataTracked.length ? newDataTracked : null }), node.marks);
-            }
-            return;
-        }
         if (ChangeSet.isTextChange(change) && noChangeNeeded) {
             tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_insert);
             tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_delete);
@@ -69,16 +53,12 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = ne
         }
         else if (ChangeSet.isNodeAttrChange(change) && change.dataTracked.status === CHANGE_STATUS.accepted) {
             tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, change.newAttrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
-            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);
         }
         else if (ChangeSet.isReferenceChange(change)) {
-            const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: null });
-            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
+            tr.setNodeMarkup(from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) }), node.marks);
         }
     });
     return deleteMap;

package/dist/es/changes/findChanges.js

@@ -26,7 +26,7 @@ export function findChanges(state) {
                     type: 'text-change',
                     from: pos,
                     to: pos + node.nodeSize,
-                    dataTracked,
+                    dataTracked: Object.assign({}, dataTracked),
                     text: node.text,
                     nodeType: node.type,
                 };
@@ -37,10 +37,10 @@ export function findChanges(state) {
                     type: 'node-attr-change',
                     from: pos,
                     to: pos + node.nodeSize,
-                    dataTracked,
+                    dataTracked: Object.assign({}, dataTracked),
                     node: node,
-                    newAttrs: node.attrs,
-                    oldAttrs: dataTracked.oldAttrs,
+                    newAttrs: Object.assign({}, node.attrs),
+                    oldAttrs: Object.assign({}, dataTracked.oldAttrs),
                 };
             }
             else if (dataTracked.operation === CHANGE_OPERATION.reference) {
@@ -58,10 +58,10 @@ export function findChanges(state) {
                     type: 'node-change',
                     from: pos,
                     to: pos + node.nodeSize,
-                    dataTracked,
+                    dataTracked: Object.assign({}, dataTracked),
                     node: node,
                     children: [],
-                    attrs: node.attrs,
+                    attrs: Object.assign({}, node.attrs),
                 };
             }
             current = {

package/dist/es/changes/revertChange.js

@@ -1,9 +1,8 @@
 import { liftTarget } from 'prosemirror-transform';
 import { getBlockInlineTrackedData } from '../compute/nodeHelpers';
-import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
 import { getUpdatedDataTracked } from './applyChanges';
-function revertSplitNodeChange(tr, change, changeSet) {
-    let sourceChange = changeSet.changes.find((c) => c.dataTracked.operation === 'reference' && c.dataTracked.referenceId === change.id);
+export function revertSplitNodeChange(tr, change, changeSet) {
+    const sourceChange = changeSet.changes.find((c) => c.dataTracked.operation === 'reference' && c.dataTracked.referenceId === change.id);
     const node = tr.doc.nodeAt(tr.mapping.map(change.from));
     tr.delete(tr.mapping.map(change.from), tr.mapping.map(change.to));
     tr.replaceWith(tr.mapping.map(sourceChange.to - 1), tr.mapping.map(sourceChange.to), node.content);
@@ -13,7 +12,8 @@ function revertSplitNodeChange(tr, change, changeSet) {
     const childSource = changeSet.changes.find((c) => c.from === change.from && c.dataTracked.operation === 'reference');
     if (childSource) {
         const node = tr.doc.nodeAt(tr.mapping.map(sourceChange.from));
-        const dataTracked = getBlockInlineTrackedData(node).map((c) => c.operation === 'reference' ? childSource.dataTracked : c);
+        const data = getBlockInlineTrackedData(node) || [];
+        const dataTracked = data.map((c) => (c.operation === 'reference' ? childSource.dataTracked : c));
         tr.setNodeMarkup(tr.mapping.map(sourceChange.from), undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked }), node.marks);
     }
     const deleteChange = changeSet.changes.find((c) => c.dataTracked.operation == 'delete' && c.from === sourceChange.from);
@@ -22,10 +22,12 @@ function revertSplitNodeChange(tr, change, changeSet) {
         tr.setNodeMarkup(tr.mapping.map(deleteChange.from), undefined, getUpdatedDataTracked(node.attrs.dataTracked, deleteChange.id));
     }
 }
-function revertWrapNodeChange(tr, change) {
-    tr.doc.nodesBetween(change.from, change.to, (node, pos) => {
-        const $fromPos = tr.doc.resolve(tr.mapping.map(pos));
-        const $toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1));
+export function revertWrapNodeChange(tr, change) {
+    const from = tr.mapping.map(change.from);
+    const to = tr.mapping.map(change.to);
+    tr.doc.nodesBetween(from, to, (node, pos) => {
+        const $fromPos = tr.doc.resolve(pos);
+        const $toPos = tr.doc.resolve(pos + node.nodeSize - 1);
         const nodeRange = $fromPos.blockRange($toPos);
         if (!nodeRange) {
             return;
@@ -36,17 +38,3 @@ function revertWrapNodeChange(tr, change) {
         }
     });
 }
-export function revertRejectedChanges(tr, schema, ids, changeSet, status) {
-    if (status !== CHANGE_STATUS.rejected) {
-        return;
-    }
-    ids.forEach((id) => {
-        const change = changeSet.get(id);
-        if (change.dataTracked.operation === CHANGE_OPERATION.node_split) {
-            revertSplitNodeChange(tr, change, changeSet);
-        }
-        if (change.dataTracked.operation === CHANGE_OPERATION.wrap_with_node) {
-            revertWrapNodeChange(tr, change);
-        }
-    });
-}

package/dist/es/changes/updateChangeAttrs.js

@@ -1,5 +1,6 @@
 import { ChangeSet } from '../ChangeSet';
-import { getBlockInlineTrackedData, getTextNodeTrackedMarkData, } from '../compute/nodeHelpers';
+import { getBlockInlineTrackedData, getTextNodeTrackedMarkData } from '../compute/nodeHelpers';
+import { CHANGE_OPERATION, CHANGE_STATUS, } from '../types/change';
 import { log } from '../utils/logger';
 export function updateChangeAttrs(tr, change, trackedAttrs, schema) {
     const node = tr.doc.nodeAt(change.from);
@@ -21,27 +22,47 @@ export function updateChangeAttrs(tr, change, trackedAttrs, schema) {
             log.warn('updateChangeAttrs: no track marks for a text-change ', change);
             return tr;
         }
-        tr.addMark(change.from, change.to, oldMark.type.create(Object.assign(Object.assign({}, oldMark.attrs), { dataTracked: Object.assign(Object.assign({}, oldTrackData), trackedAttrs) })));
+        if (trackedAttrs.status === CHANGE_STATUS.accepted || trackedAttrs.status === CHANGE_STATUS.rejected) {
+            tr.removeMark(change.from, change.to, oldMark);
+        }
+        else {
+            tr.addMark(change.from, change.to, oldMark.type.create(Object.assign(Object.assign({}, oldMark.attrs), { dataTracked: Object.assign(Object.assign({}, oldTrackData), trackedAttrs) })));
+        }
     }
     else if ((change.type === 'node-change' || change.type === 'node-attr-change') && !operation) {
         tr.setNodeMarkup(change.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: null }), node.marks);
     }
     else if (change.type === 'node-change' || change.type === 'node-attr-change') {
+        let restoredAttrs = undefined;
+        if (trackedAttrs.operation === CHANGE_OPERATION.set_node_attributes &&
+            trackedAttrs.status === CHANGE_STATUS.rejected) {
+            restoredAttrs = trackedAttrs.oldAttrs;
+        }
         const trackedDataSource = getBlockInlineTrackedData(node) || [];
         const targetDataTracked = trackedDataSource.find((t) => change.id === t.id);
-        const newDataTracked = trackedDataSource.map((oldTrack) => {
+        const newDataTracked = trackedDataSource
+            .map((oldTrack) => {
             if (targetDataTracked) {
                 if (oldTrack.id === targetDataTracked.id) {
+                    if (trackedAttrs.status === CHANGE_STATUS.accepted ||
+                        trackedAttrs.status === CHANGE_STATUS.rejected) {
+                        return null;
+                    }
                     return Object.assign(Object.assign({}, oldTrack), trackedAttrs);
                 }
                 return oldTrack;
             }
             if (oldTrack.operation === operation) {
+                if (trackedAttrs.status === CHANGE_STATUS.accepted ||
+                    trackedAttrs.status === CHANGE_STATUS.rejected) {
+                    return null;
+                }
                 return Object.assign(Object.assign({}, oldTrack), trackedAttrs);
             }
             return oldTrack;
-        });
-        tr.setNodeMarkup(change.from, undefined, Object.assign(Object.assign({}, node.attrs), { dataTracked: newDataTracked.length === 0 ? null : newDataTracked }), node.marks);
+        })
+            .filter(Boolean);
+        tr.setNodeMarkup(change.from, undefined, Object.assign(Object.assign({}, (restoredAttrs || node.attrs)), { dataTracked: newDataTracked.length === 0 ? null : newDataTracked }), node.marks);
     }
     return tr;
 }

package/dist/es/changes/updateChangesStatus.js

@@ -0,0 +1,56 @@
+/*!
+ * © 2023 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { closeHistory } from 'prosemirror-history';
+import { ChangeSet } from '../ChangeSet';
+import { CHANGE_OPERATION, CHANGE_STATUS } from '../types/change';
+import { applyAcceptedRejectedChanges } from './applyChanges';
+import { updateChangeAttrs } from './updateChangeAttrs';
+export function updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState) {
+    const change = changeSet.get(ids[0]);
+    if (change && status !== CHANGE_STATUS.pending) {
+        const textChanges = [];
+        const nonTextChanges = [];
+        changeSet.changes.forEach((c) => {
+            if (ids.includes(c.id)) {
+                c.dataTracked.status = status;
+                if (ChangeSet.isTextChange(c)) {
+                    textChanges.push(c);
+                }
+                else {
+                    nonTextChanges.push(c);
+                    if (c.dataTracked.operation === CHANGE_OPERATION.node_split) {
+                        const relatedRefChange = changeSet.changes.find((c) => c.dataTracked.operation === 'reference' && c.dataTracked.referenceId === change.id);
+                        if (relatedRefChange) {
+                            nonTextChanges.push(relatedRefChange);
+                        }
+                    }
+                }
+            }
+        });
+        const mapping = applyAcceptedRejectedChanges(createdTr, oldState.schema, nonTextChanges, changeSet);
+        applyAcceptedRejectedChanges(createdTr, oldState.schema, textChanges, changeSet, mapping);
+    }
+    else {
+        const changeTime = new Date().getTime();
+        ids.forEach((changeId) => {
+            const change = changeSet === null || changeSet === void 0 ? void 0 : changeSet.get(changeId);
+            if (change) {
+                createdTr = updateChangeAttrs(createdTr, change, Object.assign(Object.assign({}, change.dataTracked), { status, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
+            }
+        });
+    }
+    closeHistory(createdTr);
+}

package/dist/es/commands.js

@@ -29,10 +29,6 @@ export const setUserID = (userID) => (state, dispatch) => {
     dispatch && dispatch(setAction(state.tr, TrackChangesAction.setUserID, userID));
     return true;
 };
-export const applyAndRemoveChanges = () => (state, dispatch) => {
-    dispatch && dispatch(setAction(state.tr, TrackChangesAction.applyAndRemoveChanges, true));
-    return true;
-};
 export const refreshChanges = () => (state, dispatch) => {
     dispatch && dispatch(setAction(state.tr, TrackChangesAction.refreshChanges, true));
     return true;

package/dist/es/compute/nodeHelpers.js

@@ -28,7 +28,7 @@ export function getBlockInlineTrackedData(node) {
     if (dataTracked && !Array.isArray(dataTracked)) {
         return [dataTracked];
     }
-    return dataTracked;
+    return dataTracked || [];
 }
 export function getNodeTrackedData(node, schema) {
     let tracked;

package/dist/es/compute/setFragmentAsInserted.js

@@ -64,7 +64,7 @@ export function setFragmentAsNodeSplit($pos, newTr, inserted, attrs) {
     const oldDataTracked = getBlockInlineTrackedData(parent) || [];
     newTr.setNodeMarkup(parentPos, undefined, Object.assign(Object.assign({}, parent.attrs), { dataTracked: [
             ...oldDataTracked.filter((c) => c.operation !== 'reference'),
-            Object.assign({}, addTrackIdIfDoesntExist(trackUtils.createNewSplitSourceAttrs(Object.assign(Object.assign({}, attrs), { status: CHANGE_STATUS.rejected }), referenceId))),
+            Object.assign({}, addTrackIdIfDoesntExist(trackUtils.createNewSplitSourceAttrs(Object.assign(Object.assign({}, attrs), { status: CHANGE_STATUS.pending }), referenceId))),
         ] }));
     const splitSource = oldDataTracked.find((c) => c.operation === 'reference');
     const dataTracked = Object.assign(Object.assign({}, trackUtils.createNewSplitAttrs(Object.assign({}, attrs))), { id: referenceId });

package/dist/es/plugin.js

@@ -11,11 +11,9 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { Plugin, PluginKey } from 'prosemirror-state';
 import { getAction, hasAction, setAction, TrackChangesAction } from './actions';
-import { applyAcceptedRejectedChanges } from './changes/applyChanges';
 import { findChanges } from './changes/findChanges';
 import { fixInconsistentChanges } from './changes/fixInconsistentChanges';
-import { revertRejectedChanges } from './changes/revertChange';
-import { updateChangeAttrs } from './changes/updateChangeAttrs';
+import { updateChangesStatus } from './changes/updateChangesStatus';
 import { ChangeSet } from './ChangeSet';
 import { trackTransaction } from './steps/trackTransaction';
 import { TrackChangesStatus } from './types/track';
@@ -59,7 +57,9 @@ export const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous', initi
                     return Object.assign(Object.assign({}, pluginState), { changeSet: new ChangeSet() });
                 }
                 let { changeSet } = pluginState, rest = __rest(pluginState, ["changeSet"]);
-                if (getAction(tr, TrackChangesAction.refreshChanges)) {
+                if (getAction(tr, TrackChangesAction.refreshChanges) ||
+                    tr.getMeta('history$') ||
+                    tr.getMeta('history$1')) {
                     changeSet = findChanges(newState);
                 }
                 return Object.assign({ changeSet }, rest);
@@ -89,31 +89,21 @@ export const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous', initi
                     docChanged = true;
                     return;
                 }
+                const setChangeStatuses = getAction(tr, TrackChangesAction.setChangeStatuses);
                 const skipTrackUsed = getAction(tr, TrackChangesAction.skipTrack) ||
                     (wasAppended && getAction(wasAppended, TrackChangesAction.skipTrack));
-                if (tr.docChanged &&
+                if (!setChangeStatuses &&
+                    tr.docChanged &&
                     !skipMetaUsed &&
                     !skipTrackUsed &&
-                    !tr.getMeta('history$') &&
+                    !(tr.getMeta('history$') || tr.getMeta('history$1')) &&
                     !(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, statusUpdateAt: changeTime, reviewedByID: userID }), oldState.schema);
-                        }
-                    });
-                    revertRejectedChanges(createdTr, oldState.schema, ids, changeSet, status);
-                }
-                else if (getAction(tr, TrackChangesAction.applyAndRemoveChanges)) {
-                    const mapping = applyAcceptedRejectedChanges(createdTr, oldState.schema, changeSet.bothNodeChanges);
-                    applyAcceptedRejectedChanges(createdTr, oldState.schema, changeSet.textChanges, mapping);
+                    updateChangesStatus(createdTr, changeSet, ids, status, userID, oldState);
                     setAction(createdTr, TrackChangesAction.refreshChanges, true);
                 }
             });

package/dist/types/ChangeSet.d.ts

@@ -6,8 +6,6 @@ export declare class ChangeSet {
     get invalidChanges(): (TrackedChange | IncompleteChange)[];
     get changeTree(): TrackedChange[];
     get pending(): TrackedChange[];
-    get accepted(): TrackedChange[];
-    get rejected(): TrackedChange[];
     get textChanges(): TrackedChange[];
     get nodeChanges(): TrackedChange[];
     get nodeAttrChanges(): TrackedChange[];

package/dist/types/actions.d.ts

@@ -7,7 +7,6 @@ export declare enum TrackChangesAction {
     setPluginStatus = "track-changes-set-track-status",
     setChangeStatuses = "track-changes-set-change-statuses",
     refreshChanges = "track-changes-refresh-changes",
-    applyAndRemoveChanges = "track-changes-apply-remove-changes",
     updateMetaNode = "track-changes-update-meta-node"
 }
 export type TrackChangesActionParams = {
@@ -19,7 +18,6 @@ export type TrackChangesActionParams = {
         ids: string[];
     };
     [TrackChangesAction.refreshChanges]: boolean;
-    [TrackChangesAction.applyAndRemoveChanges]: boolean;
     [TrackChangesAction.updateMetaNode]: boolean;
 };
 export declare function hasAction(tr: Transaction): boolean;

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

@@ -1,6 +1,7 @@
 import { Schema } from 'prosemirror-model';
 import { Transaction } from 'prosemirror-state';
 import { Mapping } from 'prosemirror-transform';
+import { ChangeSet } from '../ChangeSet';
 import { TrackedAttrs, TrackedChange } from '../types/change';
 export declare function getUpdatedDataTracked(dataTracked: TrackedAttrs[] | null, changeId: string): TrackedAttrs[] | null;
-export declare function applyAcceptedRejectedChanges(tr: Transaction, schema: Schema, changes: TrackedChange[], deleteMap?: Mapping): Mapping;
+export declare function applyAcceptedRejectedChanges(tr: Transaction, schema: Schema, changes: TrackedChange[], changeSet: ChangeSet, deleteMap?: Mapping): Mapping;

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

@@ -1,5 +1,5 @@
-import { Schema } from 'prosemirror-model';
 import { Transaction } from 'prosemirror-state';
 import { ChangeSet } from '../ChangeSet';
-import { CHANGE_STATUS } from '../types/change';
-export declare function revertRejectedChanges(tr: Transaction, schema: Schema, ids: string[], changeSet: ChangeSet, status: CHANGE_STATUS): void;
+import { IncompleteChange } from '../types/change';
+export declare function revertSplitNodeChange(tr: Transaction, change: IncompleteChange, changeSet: ChangeSet): void;
+export declare function revertWrapNodeChange(tr: Transaction, change: IncompleteChange): void;

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

@@ -0,0 +1,19 @@
+/*!
+ * © 2023 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { EditorState, Transaction } from 'prosemirror-state';
+import { ChangeSet } from '../ChangeSet';
+import { CHANGE_STATUS } from '../types/change';
+export declare function updateChangesStatus(createdTr: Transaction, changeSet: ChangeSet, ids: string[], status: CHANGE_STATUS, userID: string, oldState: EditorState): void;

package/dist/types/commands.d.ts

@@ -4,5 +4,4 @@ import { TrackChangesStatus } from './types/track';
 export declare const setTrackingStatus: (status?: TrackChangesStatus) => Command;
 export declare const setChangeStatuses: (status: CHANGE_STATUS, ids: string[]) => Command;
 export declare const setUserID: (userID: string) => Command;
-export declare const applyAndRemoveChanges: () => Command;
 export declare const refreshChanges: () => Command;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.7.23",
+  "version": "1.7.24-LEAN-3967.2",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",
@@ -58,7 +58,7 @@
     "debug": "^4.3.4",
     "prosemirror-commands": "^1.5.0",
     "prosemirror-example-setup": "^1.2.1",
-    "prosemirror-history": "^1.3.0",
+    "prosemirror-history": "^1.4.1",
     "prosemirror-keymap": "^1.2.0",
     "prosemirror-model": "^1.18.3",
     "prosemirror-schema-list": "^1.2.2",

package/src/styles.css

@@ -1,18 +1,6 @@
 .ProseMirror .inserted.pending {
   background: greenyellow;
 }
-.ProseMirror .inserted.accepted {
-  background: #92c7ff;
-}
-.ProseMirror .inserted.rejected {
-  background: #cac5c7;
-}
 .ProseMirror .deleted.pending {
   background: #ffa4a4;
 }
-.ProseMirror .deleted.accepted {
-  background: #ffb747;
-}
-.ProseMirror .deleted.rejected {
-  text-decoration: none;
-}