From 93513230dee8c40810008431158db3e62006c5c9 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Wed, 14 Feb 2024 16:42:22 +0200
Subject: [PATCH] pass viewId
---
.../src/utilities/track-changes/helpers/markDeletion.js | 3 +++
.../src/utilities/track-changes/helpers/replaceStep.js | 4 +++-
.../src/CommentsService/components/ConnectedTrackChange.js | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js b/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js
index d525de58a..ccbae044b 100644
--- a/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js
+++ b/wax-prosemirror-core/src/utilities/track-changes/helpers/markDeletion.js
@@ -99,6 +99,7 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => {
node.type.name === 'figure'
) {
const track = node.attrs.track.slice();
+ console.log('viewId', viewId);
track.push({
type: 'deletion',
user: user.userId,
@@ -108,6 +109,7 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => {
group,
viewid: viewId,
});
+ console.log('track', track);
tr.setNodeMarkup(
deletionMap.map(pos),
null,
@@ -115,6 +117,7 @@ const markDeletion = (tr, from, to, user, date, group, viewId) => {
track,
group,
id: uuidv4(),
+ viewid: viewId,
}),
// Object.assign(node.attrs.track, { track }),
node.marks,
diff --git a/wax-prosemirror-core/src/utilities/track-changes/helpers/replaceStep.js b/wax-prosemirror-core/src/utilities/track-changes/helpers/replaceStep.js
index 98fd42047..dd5bc0164 100644
--- a/wax-prosemirror-core/src/utilities/track-changes/helpers/replaceStep.js
+++ b/wax-prosemirror-core/src/utilities/track-changes/helpers/replaceStep.js
@@ -68,7 +68,9 @@ const replaceStep = (
}
}
if (step.from !== step.to) {
- map.appendMap(markDeletion(newTr, step.from, step.to, user, date, group));
+ map.appendMap(
+ markDeletion(newTr, step.from, step.to, user, date, group, viewId),
+ );
}
};
diff --git a/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js b/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js
index c8ffdd923..4faf2eaff 100644
--- a/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js
+++ b/wax-prosemirror-services/src/CommentsService/components/ConnectedTrackChange.js
@@ -58,6 +58,8 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
};
const focusOnBlcock = trackData => {
+ console.log(trackData);
+ console.log(pmViews, viewId);
pmViews[viewId].dispatch(
pmViews[viewId].state.tr.setSelection(
new TextSelection(
--
GitLab