expand comment

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

@@ -40,10 +40,18 @@ const getComment = state => {
       });
     });
 
-    if (allCommentsWithSameId.length > 1) {
-      const minPos = minBy(allCommentsWithSameId, 'pos');
-      const maxPos = maxBy(allCommentsWithSameId, 'pos');
+    const minPos = minBy(allCommentsWithSameId, 'pos');
+    const maxPos = maxBy(allCommentsWithSameId, 'pos');
 
+    if (
+      state.selection.from ===
+      maxPos.pos + last(allCommentsWithSameId).node.nodeSize
+    ) {
+      state.schema.marks.comment.spec.inclusive = false;
+    } else {
+      state.schema.marks.comment.spec.inclusive = true;
+    }
+    if (allCommentsWithSameId.length > 1) {
       return {
         from: minPos.pos,
         to: maxPos.pos + last(allCommentsWithSameId).node.nodeSize,

wax-prosemirror-services/src/InlineAnnotations/EmphasisService/Emphasis.js

@@ -13,6 +13,7 @@ class Emphasis extends Tools {
 
   get run() {
     return (state, dispatch) => {
+      console.log('run');
       toggleMark(state.config.schema.marks.em)(state, dispatch);
     };
   }

wax-prosemirror-services/src/ShortCutsService/ShortCuts.js

@@ -60,15 +60,6 @@ class ShortCuts {
   }
 
   pressEnter(state, dispatch) {
-    const commentMark = state.schema.marks.comment;
-    const commentOnSelection = DocumentHelpers.findFragmentedMark(
-      state,
-      commentMark,
-    );
-    if (commentOnSelection) {
-      state.schema.marks.comment.spec.inclusive = true;
-    }
-
     // LISTS
     if (splitListItem(this.schema.nodes.list_item)(state)) {
       splitListItem(this.schema.nodes.list_item)(state, dispatch);