From 946a5394e51b71ec7adec432450f3ee14518a673 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Tue, 23 Jun 2020 00:59:19 +0300
Subject: [PATCH] don't track comments
---
editors/editoria/src/Editoria.js | 2 +-
.../src/components/rightArea/RightArea.js | 1 +
.../TrackChangeService/track-changes/helpers/addMarkStep.js | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/editors/editoria/src/Editoria.js b/editors/editoria/src/Editoria.js
index 8861e583a..f94f3052f 100644
--- a/editors/editoria/src/Editoria.js
+++ b/editors/editoria/src/Editoria.js
@@ -51,7 +51,7 @@ const Editoria = () => (
// value={`<p class="paragraph"><span class="comment" data-id="834ba3c5-1fcf-4a42-8e2f-1f975f229716" data-conversation="[]" data-group="main">and a </span><span class="insertion" data-id="" data-user="1234" data-username="demo" data-date="26541557" data-group=""><span class="comment" data-id="834ba3c5-1fcf-4a42-8e2f-1f975f229716" data-conversation="[]" data-group="main">sdasdssd</span></span><span class="comment" data-id="834ba3c5-1fcf-4a42-8e2f-1f975f229716" data-conversation="[]" data-group="main">paragraph</span></p><p class="paragraph">more</p>`}
layout={EditoriaLayout}
TrackChange
- onChange={source => console.log(source)}
+ // onChange={source => console.log(source)}
user={user}
/>
</Fragment>
diff --git a/wax-prosemirror-components/src/components/rightArea/RightArea.js b/wax-prosemirror-components/src/components/rightArea/RightArea.js
index 31eaea800..e23a710e7 100644
--- a/wax-prosemirror-components/src/components/rightArea/RightArea.js
+++ b/wax-prosemirror-components/src/components/rightArea/RightArea.js
@@ -152,6 +152,7 @@ const updateMarks = view => {
});
}
});
+
allBlockNodes.map(node => {
if (node.node.attrs.track && node.node.attrs.track.length > 0) {
finalNodes.push(node);
diff --git a/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/addMarkStep.js b/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/addMarkStep.js
index 77e3081a7..6c2629ca0 100644
--- a/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/addMarkStep.js
+++ b/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/addMarkStep.js
@@ -14,7 +14,10 @@ const addMarkStep = (state, tr, step, newTr, map, doc, user, date, group) => {
step.mark
);
}
- if (!node.marks.find(mark => mark.type === step.mark.type)) {
+ if (
+ !["comment"].includes(step.mark.type.name) &&
+ !node.marks.find(mark => mark.type === step.mark.type)
+ ) {
const formatChangeMark = node.marks.find(
mark => mark.type.name === "format_change"
);
--
GitLab