From bfb56f20dabd29151da350e39002689ee24149db Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Fri, 10 Jul 2020 20:18:35 +0300
Subject: [PATCH] enable track changes on notes
---
.../components/notes/NoteEditorContainer.js | 20 +++++++++++++++++++
wax-prosemirror-core/src/WaxView.js | 1 +
.../track-changes/trackedTransaction.js | 2 +-
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
index 9acb8015c..9aee856a0 100644
--- a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
+++ b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
@@ -31,6 +31,26 @@ const NoteStyled = styled.div`
background-color: #ffab20;
}
}
+
+ span.deletion {
+ text-decoration: line-through;
+ color: red;
+ }
+
+ span.insertion {
+ color: blue;
+ }
+
+ .selected-insertion,
+ .selected-deletion,
+ .selected-format-change,
+ .selected-block-change {
+ background-color: #fffacf;
+ }
+
+ .format-change {
+ border-bottom: 2px solid blue;
+ }
`;
const NoteEditorContainer = React.forwardRef((props, ref) => (
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index 0fdb460bf..c6e06b876 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -45,6 +45,7 @@ export default props => {
}
}
);
+
context.updateView(
{
main: view
diff --git a/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js b/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js
index 0cebdfbbd..486081a9d 100644
--- a/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js
+++ b/wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js
@@ -25,7 +25,7 @@ const trackedTransaction = (tr, state, user, group) => {
!tr.steps.length ||
(tr.meta &&
!Object.keys(tr.meta).every(metadata =>
- ["inputType", "uiEvent", "paste"].includes(metadata)
+ ["inputType", "uiEvent", "paste", "fromOutsideView"].includes(metadata)
)) ||
["historyUndo", "historyRedo"].includes(tr.getMeta("inputType"))
) {
--
GitLab