@manuscripts/track-changes-plugin 1.5.0 → 1.5.2-LEAN-2508

package/dist/index.cjs

@@ -448,7 +448,8 @@ function deleteNode(node, pos, tr) {
     const resPos = tr.doc.resolve(pos);
     // Block nodes can be deleted by just removing their start token which should then merge the text
     // content to above node's content (if there is one)
-    const canMergeToNodeAbove = (resPos.parent !== tr.doc || resPos.nodeBefore) && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
+    // this will work just for the node after the first child
+    const canMergeToNodeAbove = resPos.parent !== tr.doc && resPos.nodeBefore && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
     if (canMergeToNodeAbove) {
         return tr.replaceWith(pos - 1, pos + 1, prosemirrorModel.Fragment.empty);
     }
@@ -509,9 +510,9 @@ function mergeNode(node, pos, tr) {
     if (prosemirrorTransform.canJoin(tr.doc, pos)) {
         return tr.join(pos);
     }
-    else if (prosemirrorTransform.canJoin(tr.doc, pos + node.nodeSize)) {
-        // TODO should copy the attributes from the merged node below
-        return tr.join(pos + node.nodeSize);
+    else if (!tr.doc.resolve(pos).nodeBefore) {
+        // for this case will just delete that node in `deleteNode.ts` as the join will not work
+        return undefined;
     }
     // TODO is this the same thing as join to above?
     const resPos = tr.doc.resolve(pos);
@@ -1213,8 +1214,31 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         changeSteps.push(...deleteSteps);
         log.info('TR: steps after applying delete', [...newTr.steps]);
         log.info('DELETE STEPS: ', changeSteps);
-        const adjustedInsertPos = toA;
-        if (newSliceContent.size > 0) {
+        // console.log('CHANGE STEPS AT THIS POINT:')
+        // console.log(JSON.parse(JSON.stringify(changeSteps)))
+        function sameThingBackSpaced() {
+            /*
+            When deleting text with backspace and getting to the point of when a space and a character before a deleted piece of text is deleted
+            the prosemirror would interpret it as moving the <del> node (this is a tracked deletion) one characted behind.
+            It normally results in [delete, delete, insert] set of ChangSteps where the 1st delete is for the delete done by
+            the backspace key, the second delete and the insert are a misinterpretation of the moved text. So these last 2 steps have to be caught
+            and removed as they are not meaningful.
+            */
+            if (changeSteps.length == 2 && newSliceContent.size > 0) {
+                const correspondingDeletion = changeSteps.find(
+                // @ts-ignore
+                (step) => step.node.text === newSliceContent.content[0].text //  @TODO - get more precise proof of match. E.g.: position approximation
+                );
+                return correspondingDeletion;
+            }
+            return undefined;
+        }
+        const backSpacedText = sameThingBackSpaced();
+        if (backSpacedText) {
+            changeSteps.splice(changeSteps.indexOf(backSpacedText));
+        }
+        const textWasDeleted = !!changeSteps.length;
+        if (!backSpacedText && newSliceContent.size > 0) {
             log.info('newSliceContent', newSliceContent);
             // Since deleteAndMergeSplitBlockNodes modified the slice to not to contain any merged nodes,
             // the sides should be equal. TODO can they be other than 0?
@@ -1222,8 +1246,11 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
             const openEnd = slice.openStart !== slice.openEnd ? 0 : slice.openEnd;
             changeSteps.push({
                 type: 'insert-slice',
-                from: adjustedInsertPos,
-                to: adjustedInsertPos,
+                from: textWasDeleted ? fromB : toA,
+                to: textWasDeleted ? toB - 1 : toA,
+                /* it's not entirely clear why using "fromB" is needed at all but in cases where there areno content deleted before
+                    - it will gointo infinite loop if toB -1 is used
+                */
                 sliceWasSplit,
                 slice: new prosemirrorModel.Slice(setFragmentAsInserted(newSliceContent, createNewInsertAttrs(attrs), oldState.schema), openStart, openEnd),
             });

package/dist/index.js

@@ -440,7 +440,8 @@ function deleteNode(node, pos, tr) {
     const resPos = tr.doc.resolve(pos);
     // Block nodes can be deleted by just removing their start token which should then merge the text
     // content to above node's content (if there is one)
-    const canMergeToNodeAbove = (resPos.parent !== tr.doc || resPos.nodeBefore) && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
+    // this will work just for the node after the first child
+    const canMergeToNodeAbove = resPos.parent !== tr.doc && resPos.nodeBefore && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
     if (canMergeToNodeAbove) {
         return tr.replaceWith(pos - 1, pos + 1, Fragment.empty);
     }
@@ -501,9 +502,9 @@ function mergeNode(node, pos, tr) {
     if (canJoin(tr.doc, pos)) {
         return tr.join(pos);
     }
-    else if (canJoin(tr.doc, pos + node.nodeSize)) {
-        // TODO should copy the attributes from the merged node below
-        return tr.join(pos + node.nodeSize);
+    else if (!tr.doc.resolve(pos).nodeBefore) {
+        // for this case will just delete that node in `deleteNode.ts` as the join will not work
+        return undefined;
     }
     // TODO is this the same thing as join to above?
     const resPos = tr.doc.resolve(pos);
@@ -1205,8 +1206,31 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         changeSteps.push(...deleteSteps);
         log.info('TR: steps after applying delete', [...newTr.steps]);
         log.info('DELETE STEPS: ', changeSteps);
-        const adjustedInsertPos = toA;
-        if (newSliceContent.size > 0) {
+        // console.log('CHANGE STEPS AT THIS POINT:')
+        // console.log(JSON.parse(JSON.stringify(changeSteps)))
+        function sameThingBackSpaced() {
+            /*
+            When deleting text with backspace and getting to the point of when a space and a character before a deleted piece of text is deleted
+            the prosemirror would interpret it as moving the <del> node (this is a tracked deletion) one characted behind.
+            It normally results in [delete, delete, insert] set of ChangSteps where the 1st delete is for the delete done by
+            the backspace key, the second delete and the insert are a misinterpretation of the moved text. So these last 2 steps have to be caught
+            and removed as they are not meaningful.
+            */
+            if (changeSteps.length == 2 && newSliceContent.size > 0) {
+                const correspondingDeletion = changeSteps.find(
+                // @ts-ignore
+                (step) => step.node.text === newSliceContent.content[0].text //  @TODO - get more precise proof of match. E.g.: position approximation
+                );
+                return correspondingDeletion;
+            }
+            return undefined;
+        }
+        const backSpacedText = sameThingBackSpaced();
+        if (backSpacedText) {
+            changeSteps.splice(changeSteps.indexOf(backSpacedText));
+        }
+        const textWasDeleted = !!changeSteps.length;
+        if (!backSpacedText && newSliceContent.size > 0) {
             log.info('newSliceContent', newSliceContent);
             // Since deleteAndMergeSplitBlockNodes modified the slice to not to contain any merged nodes,
             // the sides should be equal. TODO can they be other than 0?
@@ -1214,8 +1238,11 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
             const openEnd = slice.openStart !== slice.openEnd ? 0 : slice.openEnd;
             changeSteps.push({
                 type: 'insert-slice',
-                from: adjustedInsertPos,
-                to: adjustedInsertPos,
+                from: textWasDeleted ? fromB : toA,
+                to: textWasDeleted ? toB - 1 : toA,
+                /* it's not entirely clear why using "fromB" is needed at all but in cases where there areno content deleted before
+                    - it will gointo infinite loop if toB -1 is used
+                */
                 sliceWasSplit,
                 slice: new Slice(setFragmentAsInserted(newSliceContent, createNewInsertAttrs(attrs), oldState.schema), openStart, openEnd),
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.5.0",
+  "version": "1.5.2-LEAN-2508",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",