diff --git a/wax-prosemirror-services/src/CommentsService/CommentsService.js b/wax-prosemirror-services/src/CommentsService/CommentsService.js index 5bf33affe306bb445fdfb84e96c26d63803e8a5d..8f612c57184ba0d494c12be698c1eb06184ee40f 100644 --- a/wax-prosemirror-services/src/CommentsService/CommentsService.js +++ b/wax-prosemirror-services/src/CommentsService/CommentsService.js @@ -10,6 +10,7 @@ import './comments.css'; const PLUGIN_KEY = 'commentPlugin'; export default class CommentsService extends Service { + allCommentsFromStates = []; boot() { const commentsConfig = this.app.config.get('config.CommentsService'); @@ -22,8 +23,11 @@ export default class CommentsService extends Service { const options = { styles: {}, onSelectionChange: items => { - commentsConfig.getComments(items); - this.app.context.setOption({ comments: items }); + this.allCommentsFromStates = this.allCommentsFromStates.concat([ + ...items, + ]); + commentsConfig.getComments(this.allCommentsFromStates); + this.app.context.setOption({ comments: this.allCommentsFromStates }); }, onAnnotationListChange: () => true, document: '', diff --git a/wax-prosemirror-services/src/CommentsService/components/RightArea.js b/wax-prosemirror-services/src/CommentsService/components/RightArea.js index 59e3b81f11ae0a28966770012c933bcbe8c2a041..57ed063e7dde18855f5983cc4417a4442f9ad863 100644 --- a/wax-prosemirror-services/src/CommentsService/components/RightArea.js +++ b/wax-prosemirror-services/src/CommentsService/components/RightArea.js @@ -12,9 +12,11 @@ export default ({ area, users }) => { pmViews: { main }, app, activeView, - options, + options: { comments }, } = useContext(WaxContext); - console.log(options); + + console.log('sddssd', comments); + const commentPlugin = app.PmPlugins.get('commentPlugin'); const trakChangePlugin = app.PmPlugins.get('trackChangePlugin'); @@ -38,7 +40,7 @@ export default ({ area, users }) => { WaxSurface = main.dom.getBoundingClientRect(); WaxSurfaceMarginTop = window.getComputedStyle(main.dom).marginTop; } - + console.log(marksNodes); each(marksNodes[area], (markNode, pos) => { const id = markNode instanceof Mark ? markNode.attrs.id : markNode.node.attrs.id;