diff --git a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js index 9acb8015c9b1340c4ddd630a51e2f4c52d58c893..9aee856a0018f196896ff03d37c48417e977270d 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 0fdb460bf5bb900e1f015a3afa1756cb2a2aa4c2..c6e06b876633e92afb3d775a07996ec74a671848 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 0cebdfbbde3d8dcf1a52c7fa5c171b827c99dfa2..486081a9d4b64288658ee9e8829fc8cb8bb223d5 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")) ) {