From 16ac404d6b92152c7e0f816b94076642462db80e Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Wed, 16 Sep 2020 20:11:23 +0300 Subject: [PATCH] highlight all type of changes --- .../src/layouts/EditorElements.js | 2 +- .../src/trackChanges/TrackChangePlugin.js | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/wax-prosemirror-layouts/src/layouts/EditorElements.js b/wax-prosemirror-layouts/src/layouts/EditorElements.js index 24c5a1ea5..81693009c 100644 --- a/wax-prosemirror-layouts/src/layouts/EditorElements.js +++ b/wax-prosemirror-layouts/src/layouts/EditorElements.js @@ -196,7 +196,7 @@ export default css` .selected-deletion, .selected-format-change, .selected-block-change { - background-color: #fffacf; + background-color: #eefbfb; } .format-change { diff --git a/wax-prosemirror-plugins/src/trackChanges/TrackChangePlugin.js b/wax-prosemirror-plugins/src/trackChanges/TrackChangePlugin.js index 367873aaa..5ebf2892b 100644 --- a/wax-prosemirror-plugins/src/trackChanges/TrackChangePlugin.js +++ b/wax-prosemirror-plugins/src/trackChanges/TrackChangePlugin.js @@ -25,12 +25,12 @@ export default options => { } = state; let { decos } = this.getState(oldState); - + decos = DecorationSet.empty; if (tr.selectionSet) { const { insertion, deletion, formatChange } = findSelectedChanges( state, ); - decos = DecorationSet.empty; + const decoType = tr.selection.node ? Decoration.node : Decoration.inline; @@ -40,13 +40,14 @@ export default options => { node.attrs.track && node.attrs.track.find(track => track.type === 'block_change') ) { - const blockChangeTrack = node.attrs.track.find( - track => track.type === 'block_change', - ); - console.log(state.selection, blockChangeTrack, node); + let nodeSize = pos; + node.descendants((childNode, childPos) => { + nodeSize += childNode.nodeSize; + }); + decos = decos.add(tr.doc, [ - decoType(1, 100, { - class: 'selected-block_change', + decoType(pos, nodeSize, { + class: 'selected-block-change', }), ]); } -- GitLab