diff --git a/wax-prosemirror-services/src/TrackChangeService/track-changes/markDeletion.js b/wax-prosemirror-services/src/TrackChangeService/track-changes/markDeletion.js index 72c0073730f7207438cbc597fb0b81c59d2da6b1..4aca4db6ae6b97a15fdee2e38fa088d26ba40dd3 100644 --- a/wax-prosemirror-services/src/TrackChangeService/track-changes/markDeletion.js +++ b/wax-prosemirror-services/src/TrackChangeService/track-changes/markDeletion.js @@ -24,9 +24,7 @@ const markDeletion = (tr, from, to, user, date1, date10) => { node.isInline && node.marks.find( mark => - mark.type.name === "insertion" && - mark.attrs.user === user.userId && - !mark.attrs.approved + mark.type.name === "insertion" && mark.attrs.user === user.userId ) ) { const removeStep = new ReplaceStep( diff --git a/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js b/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js index ea73b4c23ad26c5f4a2899a56518757f8607e962..04c0aa1202d5875822acaf2187b6ed0e0459a761 100644 --- a/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js +++ b/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js @@ -20,7 +20,18 @@ import markInsertion from "./markInsertion"; import markWrapping from "./markWrapping"; const trackedTransaction = (tr, state, user) => { - console.log("user", user); + if ( + !tr.steps.length || + (tr.meta && + !Object.keys(tr.meta).every(metadata => + ["inputType", "uiEvent", "paste"].includes(metadata) + )) || + // don't replace history TRs + ["historyUndo", "historyRedo"].includes(tr.getMeta("inputType")) + ) { + return tr; + } + const approved = false; const newTr = state.tr, map = new Mapping(),