diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js index 8af701fd1670a4ca46567875e86b0a6e841d5ee6..0a146c01b2f28289c1753c8c38bb3280669f04c8 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 64a714b469f0f7d576fa57b072dfbb10d4021913..2d3e48f53f0f1b1eead57502a0b63eb1e5b0ba09 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 486081a9d4b64288658ee9e8829fc8cb8bb223d5..7aebb9d462c6053821bdab4991feb005e7b70c98 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);