@manuscripts/track-changes-plugin 0.4.1 → 0.4.2

package/dist/ChangeSet.d.ts

@@ -38,6 +38,7 @@ export declare class ChangeSet {
     get textChanges(): TrackedChange[];
     get nodeChanges(): TrackedChange[];
     get nodeAttrChanges(): TrackedChange[];
+    get bothNodeChanges(): TrackedChange[];
     get isEmpty(): boolean;
     /**
      * Used to determine whether `fixInconsistentChanges` has to be executed to replace eg duplicate ids or

package/dist/change-steps/diffChangeSteps.d.ts

@@ -15,7 +15,5 @@
  */
 import { Schema } from 'prosemirror-model';
 import type { Transaction } from 'prosemirror-state';
-import { ExposedFragment } from '../types/pm';
 import { ChangeStep, InsertSliceStep } from '../types/step';
-export declare function matchInserted(matchedDeleted: number, deleted: ChangeStep[], inserted: ExposedFragment, newTr: Transaction, schema: Schema): [number, ChangeStep[]];
 export declare function diffChangeSteps(deleted: ChangeStep[], inserted: InsertSliceStep[], newTr: Transaction, schema: Schema): ChangeStep[];

package/dist/change-steps/matchInserted.d.ts

@@ -0,0 +1,3 @@
+import { ExposedFragment } from '../types/pm';
+import { ChangeStep } from '../types/step';
+export declare function matchInserted(matchedDeleted: number, deleted: ChangeStep[], inserted: ExposedFragment): [number, ChangeStep[]];

package/dist/index.cjs

@@ -232,6 +232,9 @@ class ChangeSet {
     get nodeAttrChanges() {
         return this.changes.filter((c) => c.type === 'node-attr-change');
     }
+    get bothNodeChanges() {
+        return this.changes.filter((c) => c.type === 'node-change' || c.type === 'node-attr-change');
+    }
     get isEmpty() {
         return __classPrivateFieldGet(this, _ChangeSet_changes, "f").length === 0;
     }
@@ -545,11 +548,11 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         // TODO add operation based on mark type if it's undefined?
         tr.addMark(change.from, change.to, oldMark.type.create({ ...oldMark.attrs, dataTracked: { ...oldTrackData, ...trackedAttrs } }));
     }
-    else if (change.type === 'node-change' && !operation) {
+    else if ((change.type === 'node-change' || change.type === 'node-attr-change') && !operation) {
         // Very weird edge-case if this happens
         tr.setNodeMarkup(change.from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
     }
-    else if (change.type === 'node-change') {
+    else if (change.type === 'node-change' || change.type === 'node-attr-change') {
         const newDataTracked = (getBlockInlineTrackedData(node) || []).map((oldTrack) => {
             if (oldTrack.operation === operation) {
                 return { ...oldTrack, ...trackedAttrs };
@@ -619,13 +622,11 @@ function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new prose
         }
         else if (ChangeSet.isNodeAttrChange(change) &&
             change.dataTracked.status === exports.CHANGE_STATUS.accepted) {
-            const attrs = { ...node.attrs, dataTracked: null };
-            tr.setNodeMarkup(from, undefined, attrs, node.marks);
+            tr.setNodeMarkup(from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
         }
         else if (ChangeSet.isNodeAttrChange(change) &&
             change.dataTracked.status === exports.CHANGE_STATUS.rejected) {
-            const attrs = { ...change.oldAttrs, dataTracked: null };
-            tr.setNodeMarkup(from, undefined, attrs, node.marks);
+            tr.setNodeMarkup(from, undefined, { ...change.oldAttrs, dataTracked: null }, node.marks);
         }
     });
     return deleteMap;
@@ -945,10 +946,12 @@ function createNewDeleteAttrs(attrs) {
     };
 }
 function createNewUpdateAttrs(attrs, oldAttrs) {
+    // Omit dataTracked
+    const { dataTracked, ...restAttrs } = oldAttrs;
     return {
         ...attrs,
         operation: exports.CHANGE_OPERATION.set_node_attributes,
-        oldAttrs,
+        oldAttrs: restAttrs,
     };
 }
 
@@ -1419,22 +1422,18 @@ 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);
-            let newDataTracked = oldDataTracked;
-            if (oldUpdate) {
-                newDataTracked = [
-                    ...oldDataTracked.filter((d) => d === oldUpdate),
-                    {
-                        ...oldUpdate,
-                        updatedAt: emptyAttrs.updatedAt,
-                    },
-                ];
-            }
-            else if (oldDataTracked.length === 0 ||
-                oldDataTracked.find((d) => d.operation === exports.CHANGE_OPERATION.delete)) {
-                newDataTracked = [
-                    ...oldDataTracked,
-                    addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, c.node.attrs)),
-                ];
+            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
+                ? {
+                    ...oldUpdate,
+                    updatedAt: emptyAttrs.updatedAt,
+                }
+                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, 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)) {
+                newDataTracked.push(newUpdate);
             }
             newTr.setNodeMarkup(mapping.map(c.pos), undefined, {
                 ...c.newAttrs,
@@ -1449,22 +1448,39 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
     return [mapping, selectionPos];
 }
 
-/*!
- * © 2021 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.
- */
-function matchInserted(matchedDeleted, deleted, inserted, newTr, schema) {
+function matchText(adjDeleted, insNode, offset, matchedDeleted, deleted) {
+    const { pos, from, to, node: delNode } = adjDeleted;
+    let j = offset, d = from - pos, maxSteps = to - Math.max(pos, from);
+    // Match text inside the inserted text node to the deleted text node
+    for (; maxSteps !== j && insNode.text[j] !== undefined && insNode.text[j] === delNode.text[d]; j += 1, d += 1) {
+        matchedDeleted += 1;
+    }
+    // this is needed incase diffing tr.doc
+    // deleted.push({
+    //   pos: pos,
+    //   type: 'update-node-attrs',
+    //   // Should check the attrs for equality in fixInconsistentChanges? to remove dataTracked completely
+    //   oldAttrs: adjDeleted.node.attrs || {},
+    //   newAttrs: child.attrs || {},
+    // })
+    deleted = deleted.filter((d) => d !== adjDeleted);
+    if (maxSteps !== j) {
+        deleted.push({
+            pos,
+            from: from + j - offset,
+            to,
+            type: 'delete-text',
+            node: delNode,
+        });
+        return [matchedDeleted, deleted];
+    }
+    const nextTextDelete = deleted.find((d) => d.type === 'delete-text' && d.pos === to);
+    if (nextTextDelete) {
+        return matchText(nextTextDelete, insNode, j, matchedDeleted, deleted);
+    }
+    return [matchedDeleted, deleted];
+}
+function matchInserted(matchedDeleted, deleted, inserted) {
     var _a;
     let matched = [matchedDeleted, deleted];
     for (let i = 0;; i += 1) {
@@ -1478,32 +1494,7 @@ function matchInserted(matchedDeleted, deleted, inserted, newTr, schema) {
             return matched;
         }
         else if (insNode.isText && (adjDeleted === null || adjDeleted === void 0 ? void 0 : adjDeleted.node)) {
-            adjDeleted = adjDeleted;
-            const { pos, from, to, node: delNode } = adjDeleted;
-            let j = 0, d = from - pos, maxSteps = to - Math.max(pos, from);
-            // Match text inside the inserted text node to the deleted text node
-            for (; maxSteps !== j && insNode.text[j] !== undefined && insNode.text[j] === delNode.text[d]; j += 1, d += 1) {
-                matched[0] += 1;
-            }
-            // this is needed incase diffing tr.doc
-            // deleted.push({
-            //   pos: pos,
-            //   type: 'update-node-attrs',
-            //   // Should check the attrs for equality in fixInconsistentChanges? to remove dataTracked completely
-            //   oldAttrs: adjDeleted.node.attrs || {},
-            //   newAttrs: child.attrs || {},
-            // })
-            matched = [matched[0], matched[1].filter((d) => d !== adjDeleted)];
-            if (maxSteps !== j) {
-                matched[1].push({
-                    pos,
-                    from: Math.max(pos, from) + j,
-                    to,
-                    type: 'delete-text',
-                    node: delNode,
-                });
-                return matched;
-            }
+            matched = matchText(adjDeleted, insNode, 0, matched[0], matched[1]);
             continue;
         }
         else if (insNode.content.size > 0 || (adjDeleted === null || adjDeleted === void 0 ? void 0 : adjDeleted.node.content.size) > 0) {
@@ -1513,15 +1504,32 @@ function matchInserted(matchedDeleted, deleted, inserted, newTr, schema) {
         else {
             matched = [matched[0] + insNode.nodeSize, matched[1].filter((d) => d !== adjDeleted)];
         }
+        // Omit dataTracked
+        const { dataTracked, ...newAttrs } = insNode.attrs || {};
         matched[1].push({
             pos: adjDeleted.pos,
             type: 'update-node-attrs',
             node: adjDeleted.node,
-            // Should check the attrs for equality in fixInconsistentChanges? to remove dataTracked completely
-            newAttrs: insNode.attrs || {},
+            newAttrs,
         });
     }
-}
+}
+
+/*!
+ * © 2021 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.
+ */
 /**
  * Cuts a fragment similar to Fragment.cut but also removes the parent node.
  *
@@ -1543,8 +1551,8 @@ function cutFragment(matched, deleted, content) {
             newContent.push(...cut[1].content);
         }
         else if (child.isText && matched + child.nodeSize > deleted) {
-            if (matched - deleted + 1 > 0) {
-                newContent.push(child.cut(0, matched - deleted + 1));
+            if (deleted - matched > 0) {
+                newContent.push(child.cut(deleted - matched));
             }
             else {
                 newContent.push(child);
@@ -1579,7 +1587,7 @@ function diffChangeSteps(deleted, inserted, newTr, schema) {
             return;
         }
         // Start diffing from the start of the deleted range
-        const deleteStart = deleted.reduce((acc, cur) => {
+        const deleteStart = updatedDeleted.reduce((acc, cur) => {
             if (cur.type === 'delete-node') {
                 return Math.min(acc, cur.pos);
             }
@@ -1588,13 +1596,13 @@ function diffChangeSteps(deleted, inserted, newTr, schema) {
             }
             return acc;
         }, Number.MAX_SAFE_INTEGER);
-        const [inDeleted, updatedDel] = matchInserted(deleteStart, updatedDeleted, ins.slice.content);
-        if (inDeleted === deleteStart) {
+        const [matchedDeleted, updatedDel] = matchInserted(deleteStart, updatedDeleted, ins.slice.content);
+        if (matchedDeleted === deleteStart) {
             updated.push(ins);
             return;
         }
         updatedDeleted = updatedDel;
-        const newInserted = cutFragment(0, inDeleted, ins.slice.content)[1];
+        const [_, newInserted] = cutFragment(0, matchedDeleted - deleteStart, ins.slice.content);
         if (newInserted.size > 0) {
             updated.push({
                 ...ins,
@@ -1664,7 +1672,8 @@ function trackTransaction(tr, oldState, newTr, authorID) {
             const inserted = steps.filter((s) => s.type === 'insert-slice');
             steps = diffChangeSteps(deleted, inserted, newTr, oldState.schema);
             log.info('DIFFED STEPS: ', steps);
-            const [mapping, selectionPos] = processChangeSteps(steps, startPos, newTr, emptyAttrs, oldState.schema);
+            const [mapping, selectionPos] = processChangeSteps(steps, startPos || tr.selection.head, // Incase startPos is it's default value 0, use the old selection head
+            newTr, emptyAttrs, oldState.schema);
             if (!wasNodeSelection) {
                 const sel = getSelectionStaticConstructor(tr.selection);
                 // Use Selection.near to fix selections that point to a block node instead of inline content
@@ -1824,7 +1833,7 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
                     setAction(createdTr, TrackChangesAction.updateChanges, ids);
                 }
                 else if (getAction(tr, TrackChangesAction.applyAndRemoveChanges)) {
-                    const mapping = applyAcceptedRejectedChanges(createdTr, oldState.schema, changeSet.nodeChanges);
+                    const mapping = applyAcceptedRejectedChanges(createdTr, oldState.schema, changeSet.bothNodeChanges);
                     applyAcceptedRejectedChanges(createdTr, oldState.schema, changeSet.textChanges, mapping);
                     setAction(createdTr, TrackChangesAction.refreshChanges, true);
                 }

package/dist/index.js

@@ -224,6 +224,9 @@ class ChangeSet {
     get nodeAttrChanges() {
         return this.changes.filter((c) => c.type === 'node-attr-change');
     }
+    get bothNodeChanges() {
+        return this.changes.filter((c) => c.type === 'node-change' || c.type === 'node-attr-change');
+    }
     get isEmpty() {
         return __classPrivateFieldGet(this, _ChangeSet_changes, "f").length === 0;
     }
@@ -537,11 +540,11 @@ function updateChangeAttrs(tr, change, trackedAttrs, schema) {
         // TODO add operation based on mark type if it's undefined?
         tr.addMark(change.from, change.to, oldMark.type.create({ ...oldMark.attrs, dataTracked: { ...oldTrackData, ...trackedAttrs } }));
     }
-    else if (change.type === 'node-change' && !operation) {
+    else if ((change.type === 'node-change' || change.type === 'node-attr-change') && !operation) {
         // Very weird edge-case if this happens
         tr.setNodeMarkup(change.from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
     }
-    else if (change.type === 'node-change') {
+    else if (change.type === 'node-change' || change.type === 'node-attr-change') {
         const newDataTracked = (getBlockInlineTrackedData(node) || []).map((oldTrack) => {
             if (oldTrack.operation === operation) {
                 return { ...oldTrack, ...trackedAttrs };
@@ -611,13 +614,11 @@ function applyAcceptedRejectedChanges(tr, schema, changes, deleteMap = new Mappi
         }
         else if (ChangeSet.isNodeAttrChange(change) &&
             change.dataTracked.status === CHANGE_STATUS.accepted) {
-            const attrs = { ...node.attrs, dataTracked: null };
-            tr.setNodeMarkup(from, undefined, attrs, node.marks);
+            tr.setNodeMarkup(from, undefined, { ...node.attrs, dataTracked: null }, node.marks);
         }
         else if (ChangeSet.isNodeAttrChange(change) &&
             change.dataTracked.status === CHANGE_STATUS.rejected) {
-            const attrs = { ...change.oldAttrs, dataTracked: null };
-            tr.setNodeMarkup(from, undefined, attrs, node.marks);
+            tr.setNodeMarkup(from, undefined, { ...change.oldAttrs, dataTracked: null }, node.marks);
         }
     });
     return deleteMap;
@@ -937,10 +938,12 @@ function createNewDeleteAttrs(attrs) {
     };
 }
 function createNewUpdateAttrs(attrs, oldAttrs) {
+    // Omit dataTracked
+    const { dataTracked, ...restAttrs } = oldAttrs;
     return {
         ...attrs,
         operation: CHANGE_OPERATION.set_node_attributes,
-        oldAttrs,
+        oldAttrs: restAttrs,
     };
 }
 
@@ -1411,22 +1414,18 @@ 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);
-            let newDataTracked = oldDataTracked;
-            if (oldUpdate) {
-                newDataTracked = [
-                    ...oldDataTracked.filter((d) => d === oldUpdate),
-                    {
-                        ...oldUpdate,
-                        updatedAt: emptyAttrs.updatedAt,
-                    },
-                ];
-            }
-            else if (oldDataTracked.length === 0 ||
-                oldDataTracked.find((d) => d.operation === CHANGE_OPERATION.delete)) {
-                newDataTracked = [
-                    ...oldDataTracked,
-                    addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, c.node.attrs)),
-                ];
+            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
+                ? {
+                    ...oldUpdate,
+                    updatedAt: emptyAttrs.updatedAt,
+                }
+                : addTrackIdIfDoesntExist(createNewUpdateAttrs(emptyAttrs, 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)) {
+                newDataTracked.push(newUpdate);
             }
             newTr.setNodeMarkup(mapping.map(c.pos), undefined, {
                 ...c.newAttrs,
@@ -1441,22 +1440,39 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
     return [mapping, selectionPos];
 }
 
-/*!
- * © 2021 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.
- */
-function matchInserted(matchedDeleted, deleted, inserted, newTr, schema) {
+function matchText(adjDeleted, insNode, offset, matchedDeleted, deleted) {
+    const { pos, from, to, node: delNode } = adjDeleted;
+    let j = offset, d = from - pos, maxSteps = to - Math.max(pos, from);
+    // Match text inside the inserted text node to the deleted text node
+    for (; maxSteps !== j && insNode.text[j] !== undefined && insNode.text[j] === delNode.text[d]; j += 1, d += 1) {
+        matchedDeleted += 1;
+    }
+    // this is needed incase diffing tr.doc
+    // deleted.push({
+    //   pos: pos,
+    //   type: 'update-node-attrs',
+    //   // Should check the attrs for equality in fixInconsistentChanges? to remove dataTracked completely
+    //   oldAttrs: adjDeleted.node.attrs || {},
+    //   newAttrs: child.attrs || {},
+    // })
+    deleted = deleted.filter((d) => d !== adjDeleted);
+    if (maxSteps !== j) {
+        deleted.push({
+            pos,
+            from: from + j - offset,
+            to,
+            type: 'delete-text',
+            node: delNode,
+        });
+        return [matchedDeleted, deleted];
+    }
+    const nextTextDelete = deleted.find((d) => d.type === 'delete-text' && d.pos === to);
+    if (nextTextDelete) {
+        return matchText(nextTextDelete, insNode, j, matchedDeleted, deleted);
+    }
+    return [matchedDeleted, deleted];
+}
+function matchInserted(matchedDeleted, deleted, inserted) {
     var _a;
     let matched = [matchedDeleted, deleted];
     for (let i = 0;; i += 1) {
@@ -1470,32 +1486,7 @@ function matchInserted(matchedDeleted, deleted, inserted, newTr, schema) {
             return matched;
         }
         else if (insNode.isText && (adjDeleted === null || adjDeleted === void 0 ? void 0 : adjDeleted.node)) {
-            adjDeleted = adjDeleted;
-            const { pos, from, to, node: delNode } = adjDeleted;
-            let j = 0, d = from - pos, maxSteps = to - Math.max(pos, from);
-            // Match text inside the inserted text node to the deleted text node
-            for (; maxSteps !== j && insNode.text[j] !== undefined && insNode.text[j] === delNode.text[d]; j += 1, d += 1) {
-                matched[0] += 1;
-            }
-            // this is needed incase diffing tr.doc
-            // deleted.push({
-            //   pos: pos,
-            //   type: 'update-node-attrs',
-            //   // Should check the attrs for equality in fixInconsistentChanges? to remove dataTracked completely
-            //   oldAttrs: adjDeleted.node.attrs || {},
-            //   newAttrs: child.attrs || {},
-            // })
-            matched = [matched[0], matched[1].filter((d) => d !== adjDeleted)];
-            if (maxSteps !== j) {
-                matched[1].push({
-                    pos,
-                    from: Math.max(pos, from) + j,
-                    to,
-                    type: 'delete-text',
-                    node: delNode,
-                });
-                return matched;
-            }
+            matched = matchText(adjDeleted, insNode, 0, matched[0], matched[1]);
             continue;
         }
         else if (insNode.content.size > 0 || (adjDeleted === null || adjDeleted === void 0 ? void 0 : adjDeleted.node.content.size) > 0) {
@@ -1505,15 +1496,32 @@ function matchInserted(matchedDeleted, deleted, inserted, newTr, schema) {
         else {
             matched = [matched[0] + insNode.nodeSize, matched[1].filter((d) => d !== adjDeleted)];
         }
+        // Omit dataTracked
+        const { dataTracked, ...newAttrs } = insNode.attrs || {};
         matched[1].push({
             pos: adjDeleted.pos,
             type: 'update-node-attrs',
             node: adjDeleted.node,
-            // Should check the attrs for equality in fixInconsistentChanges? to remove dataTracked completely
-            newAttrs: insNode.attrs || {},
+            newAttrs,
         });
     }
-}
+}
+
+/*!
+ * © 2021 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.
+ */
 /**
  * Cuts a fragment similar to Fragment.cut but also removes the parent node.
  *
@@ -1535,8 +1543,8 @@ function cutFragment(matched, deleted, content) {
             newContent.push(...cut[1].content);
         }
         else if (child.isText && matched + child.nodeSize > deleted) {
-            if (matched - deleted + 1 > 0) {
-                newContent.push(child.cut(0, matched - deleted + 1));
+            if (deleted - matched > 0) {
+                newContent.push(child.cut(deleted - matched));
             }
             else {
                 newContent.push(child);
@@ -1571,7 +1579,7 @@ function diffChangeSteps(deleted, inserted, newTr, schema) {
             return;
         }
         // Start diffing from the start of the deleted range
-        const deleteStart = deleted.reduce((acc, cur) => {
+        const deleteStart = updatedDeleted.reduce((acc, cur) => {
             if (cur.type === 'delete-node') {
                 return Math.min(acc, cur.pos);
             }
@@ -1580,13 +1588,13 @@ function diffChangeSteps(deleted, inserted, newTr, schema) {
             }
             return acc;
         }, Number.MAX_SAFE_INTEGER);
-        const [inDeleted, updatedDel] = matchInserted(deleteStart, updatedDeleted, ins.slice.content);
-        if (inDeleted === deleteStart) {
+        const [matchedDeleted, updatedDel] = matchInserted(deleteStart, updatedDeleted, ins.slice.content);
+        if (matchedDeleted === deleteStart) {
             updated.push(ins);
             return;
         }
         updatedDeleted = updatedDel;
-        const newInserted = cutFragment(0, inDeleted, ins.slice.content)[1];
+        const [_, newInserted] = cutFragment(0, matchedDeleted - deleteStart, ins.slice.content);
         if (newInserted.size > 0) {
             updated.push({
                 ...ins,
@@ -1656,7 +1664,8 @@ function trackTransaction(tr, oldState, newTr, authorID) {
             const inserted = steps.filter((s) => s.type === 'insert-slice');
             steps = diffChangeSteps(deleted, inserted, newTr, oldState.schema);
             log.info('DIFFED STEPS: ', steps);
-            const [mapping, selectionPos] = processChangeSteps(steps, startPos, newTr, emptyAttrs, oldState.schema);
+            const [mapping, selectionPos] = processChangeSteps(steps, startPos || tr.selection.head, // Incase startPos is it's default value 0, use the old selection head
+            newTr, emptyAttrs, oldState.schema);
             if (!wasNodeSelection) {
                 const sel = getSelectionStaticConstructor(tr.selection);
                 // Use Selection.near to fix selections that point to a block node instead of inline content
@@ -1816,7 +1825,7 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
                     setAction(createdTr, TrackChangesAction.updateChanges, ids);
                 }
                 else if (getAction(tr, TrackChangesAction.applyAndRemoveChanges)) {
-                    const mapping = applyAcceptedRejectedChanges(createdTr, oldState.schema, changeSet.nodeChanges);
+                    const mapping = applyAcceptedRejectedChanges(createdTr, oldState.schema, changeSet.bothNodeChanges);
                     applyAcceptedRejectedChanges(createdTr, oldState.schema, changeSet.textChanges, mapping);
                     setAction(createdTr, TrackChangesAction.refreshChanges, true);
                 }

package/dist/types/change.d.ts

@@ -32,7 +32,7 @@ declare type InsertDeleteAttrs = {
     createdAt: number;
     updatedAt: number;
 };
-declare type UpdateAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
+export declare type UpdateAttrs = Omit<InsertDeleteAttrs, 'operation'> & {
     operation: CHANGE_OPERATION.set_node_attributes;
     oldAttrs: Record<string, any>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",