From 28684a70cbd53a58b0408fe11f29614e7491dc88 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sat, 11 Jul 2020 00:27:13 +0300
Subject: [PATCH] set correct group
---
wax-prosemirror-core/src/WaxView.js | 5 ++---
wax-prosemirror-services/src/NoteService/Editor.js | 2 +-
.../TrackChangeService/track-changes/trackedTransaction.js | 6 ++++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index 8af701fd1..0a146c01b 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -60,13 +60,12 @@ export default props => {
const dispatchTransaction = transaction => {
const { TrackChange } = props;
- const group = "main";
/*when a transaction comes from a view other than
main don't keep updating the view ,as this this
the central point of each transaction
*/
- if (!transaction.getMeta("fromOutsideView")) {
+ if (!transaction.getMeta("outsideView")) {
context.updateView(
{
main: view
@@ -75,7 +74,7 @@ export default props => {
);
}
const tr = TrackChange
- ? trackedTransaction(transaction, view.state, user, group)
+ ? trackedTransaction(transaction, view.state, user)
: transaction;
const state = view.state.apply(tr);
diff --git a/wax-prosemirror-services/src/NoteService/Editor.js b/wax-prosemirror-services/src/NoteService/Editor.js
index 64a714b46..2d3e48f53 100644
--- a/wax-prosemirror-services/src/NoteService/Editor.js
+++ b/wax-prosemirror-services/src/NoteService/Editor.js
@@ -54,7 +54,7 @@ export default ({ node, view }) => {
}
//
if (outerTr.docChanged)
- view.dispatch(outerTr.setMeta("fromOutsideView", true));
+ view.dispatch(outerTr.setMeta("outsideView", "notes"));
}
},
handleDOMEvents: {
diff --git a/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js b/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js
index 486081a9d..7aebb9d46 100644
--- a/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js
+++ b/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js
@@ -20,18 +20,20 @@ import replaceAroundStep from "./helpers/replaceAroundStep";
import addMarkStep from "./helpers/addMarkStep";
import removeMarkStep from "./helpers/removeMarkStep";
-const trackedTransaction = (tr, state, user, group) => {
+const trackedTransaction = (tr, state, user) => {
if (
!tr.steps.length ||
(tr.meta &&
!Object.keys(tr.meta).every(metadata =>
- ["inputType", "uiEvent", "paste", "fromOutsideView"].includes(metadata)
+ ["inputType", "uiEvent", "paste", "outsideView"].includes(metadata)
)) ||
["historyUndo", "historyRedo"].includes(tr.getMeta("inputType"))
) {
return tr;
}
+ const group = tr.getMeta("outsideView") ? tr.getMeta("outsideView") : "main";
+ console.log(group);
const newTr = state.tr;
const map = new Mapping();
const date = Math.floor(Date.now() / 300000);
--
GitLab