revert comments implementation

wax-prosemirror-components/src/components/comments/Comment.js

@@ -92,16 +92,22 @@ export default ({ comment, activeView, user, active }) => {
 
   const resolveComment = event => {
     if (event) event.stopPropagation();
+    let maxPos = comment.pos;
+    let minPos = comment.pos;
 
-    const actualComment = DocumentHelpers.findMarkPosition(
-      activeView.state,
-      allCommentsWithSameId[0].pos,
-      'comment',
-    );
+    allCommentsWithSameId.forEach(singleComment => {
+      const markPosition = DocumentHelpers.findMarkPosition(
+        state,
+        singleComment.pos,
+        'comment',
+      );
+      if (markPosition.from < minPos) minPos = markPosition.from;
+      if (markPosition.to > maxPos) maxPos = markPosition.to;
+    });
 
-    dispatch(
-      state.tr.removeMark(actualComment.from, actualComment.to, commentMark),
-    );
+    if (allCommentsWithSameId.length > 1)
+      maxPos += last(allCommentsWithSameId).node.nodeSize;
+    dispatch(state.tr.removeMark(minPos, maxPos, commentMark));
     activeView.focus();
   };
 

wax-prosemirror-plugins/src/comments/CommentPlugin.js

@@ -22,13 +22,37 @@ const getComment = state => {
   }
 
   if (commentOnSelection) {
-    const actualComment = DocumentHelpers.findMarkPosition(
-      state,
-      commentOnSelection.from,
-      'comment',
+    const commentNodes = DocumentHelpers.findChildrenByMark(
+      state.doc,
+      commentMark,
+      true,
     );
-    return actualComment;
+
+    const allCommentsWithSameId = [];
+    commentNodes.map(node => {
+      node.node.marks.filter(mark => {
+        if (
+          mark.type.name === 'comment' &&
+          commentOnSelection.attrs.id === mark.attrs.id
+        ) {
+          allCommentsWithSameId.push(node);
+        }
+      });
+    });
+
+    if (allCommentsWithSameId.length > 1) {
+      const minPos = minBy(allCommentsWithSameId, 'pos');
+      const maxPos = maxBy(allCommentsWithSameId, 'pos');
+
+      return {
+        from: minPos.pos,
+        to: maxPos.pos + last(allCommentsWithSameId).node.nodeSize,
+        attrs: commentOnSelection.attrs,
+        contained: commentOnSelection.contained,
+      };
+    }
   }
+  return commentOnSelection;
 };
 
 export default props => {