From f5bddfba4d7a402304380aeb59aecebfbe0f2279 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Mon, 22 Jun 2020 14:19:00 +0300
Subject: [PATCH] find block level track nodes
---
.../src/components/rightArea/RightArea.js | 6 ++++++
.../track-changes/helpers/markWrapping.js | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/wax-prosemirror-components/src/components/rightArea/RightArea.js b/wax-prosemirror-components/src/components/rightArea/RightArea.js
index 915258848..31eaea800 100644
--- a/wax-prosemirror-components/src/components/rightArea/RightArea.js
+++ b/wax-prosemirror-components/src/components/rightArea/RightArea.js
@@ -136,6 +136,7 @@ const updateMarks = view => {
const allBlockNodes = DocumentHelpers.findBlockNodes(view.state.doc);
const allInlineNodes = DocumentHelpers.findInlineNodes(view.state.doc);
const finalMarks = [];
+ const finalNodes = [];
allInlineNodes.map(node => {
if (node.node.marks.length > 0) {
@@ -151,6 +152,11 @@ const updateMarks = view => {
});
}
});
+ allBlockNodes.map(node => {
+ if (node.node.attrs.track && node.node.attrs.track.length > 0) {
+ finalNodes.push(node);
+ }
+ });
const groupedNodes = {};
uniqBy(finalMarks, "attrs.id").forEach(mark => {
diff --git a/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/markWrapping.js b/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/markWrapping.js
index 08581b9b1..d54fed37a 100644
--- a/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/markWrapping.js
+++ b/wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/markWrapping.js
@@ -38,7 +38,7 @@ const markWrapping = (tr, pos, oldNode, newNode, user, date, group) => {
tr.setNodeMarkup(
pos,
null,
- Object.assign({}, newNode.attrs, { track, group })
+ Object.assign({}, newNode.attrs, { track, group, id: uuidv4() })
);
};
--
GitLab