correct carret position on active

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

@@ -22,7 +22,7 @@ export default ({ comment, activeView, user }) => {
 
   const handleKeyDown = event => {
     if (event.key === 'Enter' || event.which === 13) {
-      saveComment();
+      saveComment(event);
     }
   };
 
@@ -74,7 +74,7 @@ export default ({ comment, activeView, user }) => {
   };
 
   const resolveComment = event => {
-    event.stopPropagation();
+    if (event) event.stopPropagation();
     let maxPos = comment.pos;
     let minPos = comment.pos;
 

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

 import React, { useState, useEffect, useContext } from 'react';
 import { TextSelection } from 'prosemirror-state';
-import { last } from 'lodash';
+import { last, maxBy } from 'lodash';
 
 import { Transition } from 'react-transition-group';
 import styled from 'styled-components';
@@ -59,18 +59,19 @@ export default ({ comment, top, dataBox }) => {
 
   const setCommentActive = () => {
     const viewId = comment.attrs.viewid;
-    let maxPos = comment.pos;
-    const allCommentsWithSameId = DocumentHelpers.findAllMarksWithSameId(view[viewId].state, comment);
 
-    allCommentsWithSameId.forEach(singleComment => {
-      const markPosition = DocumentHelpers.findMarkPosition(view[viewId], singleComment.pos, 'comment');
-      if (markPosition.to > maxPos) maxPos = markPosition.to;
-    });
+    if (active) {
+      view[viewId].focus();
+      return false;
+    }
+
+    const allCommentsWithSameId = DocumentHelpers.findAllMarksWithSameId(view[viewId].state, comment);
 
-    if (!active && allCommentsWithSameId.length > 1) maxPos += last(allCommentsWithSameId).node.nodeSize;
+    const maxPos = maxBy(allCommentsWithSameId, 'pos');
+    maxPos.pos += last(allCommentsWithSameId).node.nodeSize;
 
     view[viewId].dispatch(
-      view[viewId].state.tr.setSelection(new TextSelection(view[viewId].state.tr.doc.resolve(maxPos, maxPos))),
+      view[viewId].state.tr.setSelection(new TextSelection(view[viewId].state.tr.doc.resolve(maxPos.pos, maxPos.pos))),
     );
 
     view[viewId].focus();

wax-prosemirror-utilities/src/document/DocumentHelpers.js

@@ -96,7 +96,6 @@ const findAllMarksWithSameId = (state, mark) => {
   return allMarksWithSameId;
 };
 
-// TODO Also find fragmented marks
 const findMarkPosition = (activeView, initialPos, markType) => {
   const $pos = activeView.state.tr.doc.resolve(initialPos);
   const { parent } = $pos;