From e71da4e37d827b6fe7ec14f475f28802b610deaf Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sat, 9 May 2020 14:10:28 +0300
Subject: [PATCH] don't track certain events
---
.../track-changes/markDeletion.js | 4 +---
.../track-changes/trackedTransaction.js | 13 ++++++++++++-
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/wax-prosemirror-services/src/TrackChangeService/track-changes/markDeletion.js b/wax-prosemirror-services/src/TrackChangeService/track-changes/markDeletion.js
index 72c007373..4aca4db6a 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 ea73b4c23..04c0aa120 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(),
--
GitLab