track list deletions

wax-prosemirror-services/src/BaseService/RedoService/Redo.js

 import { redo } from 'prosemirror-history';
-import Tools from '../../lib/Tools';
 import { injectable } from 'inversify';
 import { icons } from 'wax-prosemirror-components';
+import Tools from '../../lib/Tools';
 
 export default
 @injectable()
@@ -12,7 +12,7 @@ class Redo extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      redo(state, tr => dispatch(tr.setMeta('inputType', 'historyRedo')));
+      redo(state, tr => dispatch(tr.setMeta('inputType', 'Redo')));
     };
   }
 

wax-prosemirror-services/src/BaseService/UndoService/Undo.js

@@ -12,7 +12,7 @@ class Undo extends Tools {
 
   get run() {
     return (state, dispatch) => {
-      undo(state, tr => dispatch(tr.setMeta('inputType', 'historyUndo')));
+      undo(state, tr => dispatch(tr.setMeta('inputType', 'Undo')));
     };
   }
 

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

@@ -33,10 +33,10 @@ const backSpaceShortCut = (state, dispatch, view) =>
   );
 
 const undoShortCut = (state, dispatch, view) =>
-  undo(state, tr => dispatch(tr.setMeta('inputType', 'historyUndo')), view);
+  undo(state, tr => dispatch(tr.setMeta('inputType', 'Undo')), view);
 
 const redoShortCut = (state, dispatch, view) =>
-  redo(state, tr => dispatch(tr.setMeta('inputType', 'historyRedo')), view);
+  redo(state, tr => dispatch(tr.setMeta('inputType', 'Redo')), view);
 
 @injectable()
 class ShortCuts {

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

@@ -25,14 +25,12 @@ class AcceptTrackChange extends Tools {
           node.attrs.track &&
           node.attrs.track.find(track => track.type === 'deletion')
         ) {
-          console.log('here?');
           removeNode(tr, node, pos, map);
         }
         if (
           node.marks &&
           node.marks.find(mark => mark.type.name === 'deletion')
         ) {
-          console.log('or here?', node);
           const deletionStep = new ReplaceStep(
             map.map(Math.max(pos, from)),
             map.map(Math.min(pos + node.nodeSize, to)),

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

-import markDeletion from "./markDeletion";
-import markInsertion from "./markInsertion";
-import markWrapping from "./markWrapping";
+import markDeletion from './markDeletion';
+import markInsertion from './markInsertion';
+import markWrapping from './markWrapping';
 
 const replaceAroundStep = (
   state,
@@ -11,7 +11,7 @@ const replaceAroundStep = (
   doc,
   user,
   date,
-  group
+  group,
 ) => {
   if (step.from === step.gapFrom && step.to === step.gapTo) {
     // wrapped in something
@@ -23,7 +23,7 @@ const replaceAroundStep = (
     // unwrapped from something
     map.appendMap(step.invert(doc).getMap());
     map.appendMap(
-      markDeletion(newTr, step.from, step.gapFrom, user, date, group)
+      markDeletion(newTr, step.from, step.gapFrom, user, date, group),
     );
   } else if (
     step.slice.size === 2 &&
@@ -41,30 +41,30 @@ const replaceAroundStep = (
         step.slice.content.firstChild,
         user,
         date,
-        group
+        group,
       );
     }
   } else {
-    console.log("to fix");
-    // newTr.step(step);
-    // const ranges = [
-    //   {
-    //     from: step.getMap().map(step.from, -1),
-    //     to: step.getMap().map(step.gapFrom)
-    //   },
-    //   {
-    //     from: step.getMap().map(step.gapTo, -1),
-    //     to: step.getMap().map(step.to)
-    //   }
-    // ];
-    // ranges.forEach(range =>
-    //   doc.nodesBetween(range.from, range.to, (node, pos) => {
-    //     if (pos < range.from) {
-    //       return true;
-    //     }
-    //     markInsertion(newTr, range.from, range.to, user, date);
-    //   })
-    // );
+    console.log('to fix');
+    newTr.step(step);
+    const ranges = [
+      {
+        from: step.getMap().map(step.from, -1),
+        to: step.getMap().map(step.gapFrom),
+      },
+      {
+        from: step.getMap().map(step.gapTo, -1),
+        to: step.getMap().map(step.to),
+      },
+    ];
+    ranges.forEach(range =>
+      doc.nodesBetween(range.from, range.to, (node, pos) => {
+        if (pos < range.from) {
+          return true;
+        }
+        markInsertion(newTr, range.from, range.to, user, date);
+      }),
+    );
   }
 };
 

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

 import { ReplaceStep } from 'prosemirror-transform';
-import { CellSelection } from 'prosemirror-tables';
 import { DocumentHelpers } from 'wax-prosemirror-utilities';
 
 import markDeletion from './markDeletion';
 import markInsertion from './markInsertion';
 
 const replaceStep = (state, tr, step, newTr, map, doc, user, date, group) => {
-  const cellDeleteTr =
-    ['backwardsDelete', 'deleteContentForward'].includes(
-      tr.getMeta('inputType'),
-    ) && state.selection instanceof CellSelection;
-
-  // if deletion mark move to the end of deletion
   const deletionMarkSchema = state.schema.marks.deletion;
   const deletionMark = DocumentHelpers.findMark(
     state,
@@ -20,14 +13,12 @@ const replaceStep = (state, tr, step, newTr, map, doc, user, date, group) => {
   );
   const positionTo = deletionMark ? deletionMark.to : step.to;
 
-  const newStep = !cellDeleteTr
-    ? new ReplaceStep(
-        positionTo, // We insert all the same steps, but with "from"/"to" both set to "to" in order not to delete content. Mapped as needed.
-        positionTo,
-        step.slice,
-        step.structure,
-      )
-    : false;
+  const newStep = new ReplaceStep(
+    positionTo, // We insert all the same steps, but with "from"/"to" both set to "to" in order not to delete content. Mapped as needed.
+    positionTo,
+    step.slice,
+    step.structure,
+  );
 
   // We didn't apply the original step in its original place. We adjust the map accordingly.
   map.appendMap(step.invert(doc).getMap());

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

@@ -25,17 +25,18 @@ const trackedTransaction = (tr, state, user) => {
     }
   }
   // images
-  // if (tr.meta.inputType === 'backwardsDelete' && !tr.steps.lenght) return tr;
+  if (tr.meta.inputType === 'backwardsDelete' && !tr.steps.lenght) {
+    const $pos = state.selection.$anchor;
+    if ($pos.depth === 1) return tr;
+  }
 
   if (
     !tr.steps.length ||
     (tr.meta &&
-      !Object.keys(tr.meta).every(metadata =>
-        ['inputType', 'uiEvent', 'paste', 'outsideView'].includes(metadata),
+      !Object.keys(tr.meta).every(meta =>
+        ['inputType', 'uiEvent', 'paste'].includes(meta),
       )) ||
-    ['historyUndo', 'historyRedo', 'AcceptReject'].includes(
-      tr.getMeta('inputType'),
-    )
+    ['AcceptReject', 'Undo', 'Redo'].includes(tr.getMeta('inputType'))
   ) {
     return tr;
   }
@@ -48,9 +49,7 @@ const trackedTransaction = (tr, state, user) => {
   tr.steps.forEach(originalStep => {
     const step = originalStep.map(map);
     const { doc } = newTr;
-    if (!step) {
-      return;
-    }
+    if (!step) return;
 
     switch (step.constructor) {
       case ReplaceStep:
@@ -101,8 +100,21 @@ const trackedTransaction = (tr, state, user) => {
     const caretPos = map.map(tr.selection.from - 2, -1);
     newTr.setSelection(new TextSelection(newTr.doc.resolve(caretPos)));
   } else {
-    if (state.selection.from === state.selection.to) {
-      console.log('to fix for lists');
+    if (
+      state.selection.from === state.selection.to &&
+      tr.selection.$head.depth > 1
+    ) {
+      tr.steps.forEach(originalStep => {
+        const step = originalStep.map(map);
+        step.from += 1;
+        step.to += 1;
+        const { doc } = newTr;
+
+        replaceStep(state, tr, step, newTr, map, doc, user, date, group);
+      });
+      const caretPos = map.map(tr.selection.from - 1, -1);
+      newTr.setSelection(new TextSelection(newTr.doc.resolve(caretPos)));
+    } else if (state.selection.from === state.selection.to) {
       const caretPos = map.map(tr.selection.from, -1);
       newTr.setSelection(new TextSelection(newTr.doc.resolve(caretPos)));
     }