@manuscripts/track-changes-plugin 1.6.0 → 1.6.1-LEAN-2752

package/dist/index.cjs

@@ -530,9 +530,7 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         return tr;
     }
     const { operation } = trackedAttrs;
-    const oldTrackData = change.type === 'text-change'
-        ? getTextNodeTrackedMarkData(node, schema)
-        : getBlockInlineTrackedData(node);
+    const oldTrackData = change.type === 'text-change' ? getTextNodeTrackedMarkData(node, schema) : getBlockInlineTrackedData(node);
     if (!operation) {
         log.warn('updateChangeAttrs: unable to determine operation of change ', change);
     }
@@ -553,7 +551,15 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         tr.setNodeMarkup(change.from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
     }
     else if (change.type === 'node-change' || change.type === 'node-attr-change') {
-        const newDataTracked = (getBlockInlineTrackedData(node) || []).map((oldTrack) => {
+        const trackedDataSource = getBlockInlineTrackedData(node) || [];
+        const targetDataTracked = trackedDataSource.find((t) => change.id === t.id);
+        const newDataTracked = trackedDataSource.map((oldTrack) => {
+            if (targetDataTracked) {
+                if (oldTrack.id === targetDataTracked.id) {
+                    return { ...oldTrack, ...trackedAttrs };
+                }
+                return oldTrack;
+            }
             if (oldTrack.operation === operation) {
                 return { ...oldTrack, ...trackedAttrs };
             }
@@ -951,7 +957,7 @@ function createNewUpdateAttrs(attrs, oldAttrs) {
     return {
         ...attrs,
         operation: exports.CHANGE_OPERATION.set_node_attributes,
-        oldAttrs: restAttrs,
+        oldAttrs: JSON.parse(JSON.stringify(restAttrs)),
     };
 }
 
@@ -1198,9 +1204,11 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
  */
 function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
-    let selectionPos = 0, changeSteps = [];
+    let selectionPos = 0;
+    const changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
+        var _a, _b;
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
         log.info('TR: steps before applying delete', [...newTr.steps]);
@@ -1248,9 +1256,6 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
                 type: 'insert-slice',
                 from: textWasDeleted ? fromB : toA,
                 to: textWasDeleted ? toB - 1 : toA,
-                /* it's not entirely clear why using "fromB" is needed at all but in cases where there areno content deleted before
-                    - it will gointo infinite loop if toB -1 is used
-                */
                 sliceWasSplit,
                 slice: new prosemirrorModel.Slice(setFragmentAsInserted(newSliceContent, createNewInsertAttrs(attrs), oldState.schema), openStart, openEnd),
             });
@@ -1258,7 +1263,10 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         else {
             // Incase only deletion was applied, check whether tracked marks around deleted content can be merged
             // mergeTrackedMarks(adjustedInsertPos, newTr.doc, newTr, oldState.schema)
-            selectionPos = fromA;
+            // When DEL is used, the selection is set to the end of the deleted content
+            // TODO: 'window.event' is deprecated, find a better way to detect the key used for deletion
+            // @ts-ignore
+            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;
         }
     });
     return [changeSteps, selectionPos];
@@ -1421,15 +1429,29 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
         }
         else if (c.type === 'update-node-attrs') {
             const oldDataTracked = getBlockInlineTrackedData(c.node) || [];
-            const oldUpdate = oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.set_node_attributes && d.status === exports.CHANGE_STATUS.pending);
-            const { dataTracked, ...oldAttrs } = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
-            const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
-            const newUpdate = oldUpdate
+            const oldUpdate = oldDataTracked.reverse().find((d) => {
+                // reversing to start from the most recent change
+                if (d.operation === exports.CHANGE_OPERATION.set_node_attributes &&
+                    (d.status === exports.CHANGE_STATUS.pending || d.status === exports.CHANGE_STATUS.rejected)) {
+                    return true;
+                }
+                return false;
+            });
+            // if the selected last change is with status "rejected" we need to use oldAttrs from it because
+            // node's actual attributes represent the "rejected" values
+            const lastChangeRejected = oldUpdate && oldUpdate.status === exports.CHANGE_STATUS.rejected;
+            const sourceAttrs = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
+            const { dataTracked, ...restAttrs } = sourceAttrs;
+            const oldAttrs = lastChangeRejected ? oldUpdate.oldAttrs : restAttrs;
+            const newDataTracked = [
+                ...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id || lastChangeRejected),
+            ];
+            const newUpdate = oldUpdate && oldUpdate.status !== exports.CHANGE_STATUS.rejected
                 ? {
                     ...oldUpdate,
                     updatedAt: emptyAttrs.updatedAt,
                 }
-                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, c.node.attrs));
+                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, lastChangeRejected ? oldAttrs : c.node.attrs));
             // Dont add update changes if there exists already an insert change for this node
             if (JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) &&
                 !oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.insert)) {

package/dist/index.js

@@ -522,9 +522,7 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         return tr;
     }
     const { operation } = trackedAttrs;
-    const oldTrackData = change.type === 'text-change'
-        ? getTextNodeTrackedMarkData(node, schema)
-        : getBlockInlineTrackedData(node);
+    const oldTrackData = change.type === 'text-change' ? getTextNodeTrackedMarkData(node, schema) : getBlockInlineTrackedData(node);
     if (!operation) {
         log.warn('updateChangeAttrs: unable to determine operation of change ', change);
     }
@@ -545,7 +543,15 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         tr.setNodeMarkup(change.from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
     }
     else if (change.type === 'node-change' || change.type === 'node-attr-change') {
-        const newDataTracked = (getBlockInlineTrackedData(node) || []).map((oldTrack) => {
+        const trackedDataSource = getBlockInlineTrackedData(node) || [];
+        const targetDataTracked = trackedDataSource.find((t) => change.id === t.id);
+        const newDataTracked = trackedDataSource.map((oldTrack) => {
+            if (targetDataTracked) {
+                if (oldTrack.id === targetDataTracked.id) {
+                    return { ...oldTrack, ...trackedAttrs };
+                }
+                return oldTrack;
+            }
             if (oldTrack.operation === operation) {
                 return { ...oldTrack, ...trackedAttrs };
             }
@@ -943,7 +949,7 @@ function createNewUpdateAttrs(attrs, oldAttrs) {
     return {
         ...attrs,
         operation: CHANGE_OPERATION.set_node_attributes,
-        oldAttrs: restAttrs,
+        oldAttrs: JSON.parse(JSON.stringify(restAttrs)),
     };
 }
 
@@ -1190,9 +1196,11 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
  */
 function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
-    let selectionPos = 0, changeSteps = [];
+    let selectionPos = 0;
+    const changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
+        var _a, _b;
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
         log.info('TR: steps before applying delete', [...newTr.steps]);
@@ -1240,9 +1248,6 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
                 type: 'insert-slice',
                 from: textWasDeleted ? fromB : toA,
                 to: textWasDeleted ? toB - 1 : toA,
-                /* it's not entirely clear why using "fromB" is needed at all but in cases where there areno content deleted before
-                    - it will gointo infinite loop if toB -1 is used
-                */
                 sliceWasSplit,
                 slice: new Slice(setFragmentAsInserted(newSliceContent, createNewInsertAttrs(attrs), oldState.schema), openStart, openEnd),
             });
@@ -1250,7 +1255,10 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         else {
             // Incase only deletion was applied, check whether tracked marks around deleted content can be merged
             // mergeTrackedMarks(adjustedInsertPos, newTr.doc, newTr, oldState.schema)
-            selectionPos = fromA;
+            // When DEL is used, the selection is set to the end of the deleted content
+            // TODO: 'window.event' is deprecated, find a better way to detect the key used for deletion
+            // @ts-ignore
+            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;
         }
     });
     return [changeSteps, selectionPos];
@@ -1413,15 +1421,29 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
         }
         else if (c.type === 'update-node-attrs') {
             const oldDataTracked = getBlockInlineTrackedData(c.node) || [];
-            const oldUpdate = oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.set_node_attributes && d.status === CHANGE_STATUS.pending);
-            const { dataTracked, ...oldAttrs } = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
-            const newDataTracked = [...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id)];
-            const newUpdate = oldUpdate
+            const oldUpdate = oldDataTracked.reverse().find((d) => {
+                // reversing to start from the most recent change
+                if (d.operation === CHANGE_OPERATION.set_node_attributes &&
+                    (d.status === CHANGE_STATUS.pending || d.status === CHANGE_STATUS.rejected)) {
+                    return true;
+                }
+                return false;
+            });
+            // if the selected last change is with status "rejected" we need to use oldAttrs from it because
+            // node's actual attributes represent the "rejected" values
+            const lastChangeRejected = oldUpdate && oldUpdate.status === CHANGE_STATUS.rejected;
+            const sourceAttrs = (oldUpdate === null || oldUpdate === void 0 ? void 0 : oldUpdate.oldAttrs) || c.node.attrs;
+            const { dataTracked, ...restAttrs } = sourceAttrs;
+            const oldAttrs = lastChangeRejected ? oldUpdate.oldAttrs : restAttrs;
+            const newDataTracked = [
+                ...oldDataTracked.filter((d) => !oldUpdate || d.id !== oldUpdate.id || lastChangeRejected),
+            ];
+            const newUpdate = oldUpdate && oldUpdate.status !== CHANGE_STATUS.rejected
                 ? {
                     ...oldUpdate,
                     updatedAt: emptyAttrs.updatedAt,
                 }
-                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, c.node.attrs));
+                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, lastChangeRejected ? oldAttrs : c.node.attrs));
             // Dont add update changes if there exists already an insert change for this node
             if (JSON.stringify(oldAttrs) !== JSON.stringify(c.newAttrs) &&
                 !oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.insert)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.6.0",
+  "version": "1.6.1-LEAN-2752",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",
@@ -61,6 +61,7 @@
   "scripts": {
     "build": "rollup -c",
     "watch": "rollup -cw",
+    "dev": "yarn run watch",
     "test": "jest --runInBand",
     "format": "prettier --write \"*.+(js|json|yml|yaml|ts|md|graphql|mdx)\" src/ test/",
     "typecheck": "tsc --project tsconfig.test.json --noEmit",