delete block if empty

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

@@ -85,7 +85,6 @@ export default ({ comment, activeView, user, active }) => {
     }
 
     if (conversation.length === 0 && value === '') {
-      console.log('here?');
       resolveComment();
     }
   };

wax-prosemirror-services/src/TrackChangeService/AcceptTrackChangeService/AcceptTrackChange.js

 import { Mapping, RemoveMarkStep, ReplaceStep } from 'prosemirror-transform';
 import { Slice } from 'prosemirror-model';
-
-import { minBy, maxBy } from 'lodash';
-
 import { injectable } from 'inversify';
+import removeNode from '../track-changes/helpers/removeNode';
 import Tools from '../../lib/Tools';
 
 export default
@@ -18,10 +16,17 @@ class AcceptTrackChange extends Tools {
         tr,
         selection: { from, to },
       } = state;
+
       tr.setMeta('AcceptReject', true);
       const map = new Mapping();
 
       state.doc.nodesBetween(from, to, (node, pos) => {
+        if (
+          node.attrs.track &&
+          node.attrs.track.find(track => track.type === 'deletion')
+        ) {
+          removeNode(tr, node, pos, map, true);
+        }
         if (
           node.marks &&
           node.marks.find(mark => mark.type.name === 'deletion')

wax-prosemirror-services/src/TrackChangeService/track-changes/helpers/markDeletion.js

-import { Selection, TextSelection } from "prosemirror-state";
-import { Slice } from "prosemirror-model";
-import { ReplaceStep, Mapping } from "prosemirror-transform";
+import { Selection, TextSelection } from 'prosemirror-state';
+import { Slice } from 'prosemirror-model';
+import { ReplaceStep, Mapping } from 'prosemirror-transform';
 
 const markDeletion = (tr, from, to, user, date, group) => {
   const deletionMark = tr.doc.type.schema.marks.deletion.create({
     user: user.userId,
-    username: user.username
+    username: user.username,
     // date
   });
-  let firstTableCellChild = false;
+
   const deletionMap = new Mapping();
-  // Add deletion mark to block nodes (figures, text blocks) and find already deleted inline nodes (and leave them alone)
+
   tr.doc.nodesBetween(from, to, (node, pos) => {
-    if (pos < from && node.type.name === "table_cell") {
-      firstTableCellChild = true;
-      return true;
-    } else if ((pos < from && node.isBlock) || firstTableCellChild) {
-      firstTableCellChild = false;
-      return true;
-    } else if (["table_row", "table_cell"].includes(node.type.name)) {
-      return false;
-    } else if (
+    if (node.type.name.includes('table')) {
+      return;
+    }
+    if (
       node.isInline &&
       node.marks.find(
         mark =>
-          mark.type.name === "insertion" && mark.attrs.user === user.userId
+          mark.type.name === 'insertion' && mark.attrs.user === user.userId,
       )
     ) {
       const removeStep = new ReplaceStep(
         deletionMap.map(Math.max(from, pos)),
         deletionMap.map(Math.min(to, pos + node.nodeSize)),
-        Slice.empty
+        Slice.empty,
       );
       if (!tr.maybeStep(removeStep).failed) {
         deletionMap.appendMap(removeStep.getMap());
       }
     } else if (
       node.isInline &&
-      !node.marks.find(mark => mark.type.name === "deletion")
+      !node.marks.find(mark => mark.type.name === 'deletion')
     ) {
       tr.addMark(
         deletionMap.map(Math.max(from, pos)),
         deletionMap.map(Math.min(to, pos + node.nodeSize)),
-        deletionMark
+        deletionMark,
       );
     } else if (
       node.attrs.track &&
-      !node.attrs.track.find(trackAttr => trackAttr.type === "deletion") &&
-      !["bullet_list", "ordered_list"].includes(node.type.name)
+      !node.attrs.track.find(trackAttr => trackAttr.type === 'deletion') &&
+      !['bullet_list', 'ordered_list'].includes(node.type.name)
     ) {
       if (
         node.attrs.track.find(
           trackAttr =>
-            trackAttr.type === "insertion" && trackAttr.user === user.userId
+            trackAttr.type === 'insertion' && trackAttr.user === user.userId,
         )
       ) {
         let removeStep;
@@ -64,14 +59,14 @@ const markDeletion = (tr, from, to, user, date, group) => {
             removeStep = new ReplaceStep(
               deletionMap.map(selectionBefore.$anchor.pos),
               deletionMap.map(to),
-              Slice.empty
+              Slice.empty,
             );
           }
         } else {
           removeStep = new ReplaceStep(
             deletionMap.map(Math.max(from, pos)),
             deletionMap.map(Math.min(to, pos + node.nodeSize)),
-            Slice.empty
+            Slice.empty,
           );
         }
 
@@ -79,19 +74,21 @@ const markDeletion = (tr, from, to, user, date, group) => {
           deletionMap.appendMap(removeStep.getMap());
         }
       } else {
-        const track = node.attrs.track.slice();
-        track.push({
-          type: "deletion",
-          user: user.userId,
-          username: user.username
-          // date
-        });
-        tr.setNodeMarkup(
-          deletionMap.map(pos),
-          null,
-          Object.assign({}, node.attrs, { track }),
-          node.marks
-        );
+        if (node.content.size === 0) {
+          const track = node.attrs.track.slice();
+          track.push({
+            type: 'deletion',
+            user: user.userId,
+            username: user.username,
+            // date
+          });
+          tr.setNodeMarkup(
+            deletionMap.map(pos),
+            null,
+            Object.assign({}, node.attrs, { track }),
+            node.marks,
+          );
+        }
       }
     }
   });

wax-prosemirror-services/src/TrackChangeService/track-changes/trackedTransaction.js

@@ -98,10 +98,10 @@ const trackedTransaction = (tr, state, user) => {
       const caretPos = map.map(tr.selection.from - 2, -1);
       newTr.setSelection(new TextSelection(newTr.doc.resolve(caretPos)));
     } else {
-      const slice = map.slice(newTr.selection.from, newTr.selection.to);
-      map.appendMap(slice);
-      // const caretPos = map.map(tr.selection.from, -1);
-      // newTr.setSelection(new TextSelection(newTr.doc.resolve(caretPos)));
+      const caretPos = map.map(tr.selection.from, -1);
+      newTr.setSelection(new TextSelection(newTr.doc.resolve(caretPos)));
+      // const slice = map.slice(newTr.selection.from, newTr.selection.to);
+      // map.appendMap(slice);
     }
   }
   if (tr.storedMarksSet) {