@manuscripts/track-changes-plugin 1.4.1-LEAN-2431 → 1.5.0

package/dist/index.cjs

@@ -1213,49 +1213,17 @@ 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);
-        // 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 the space 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 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) {
-                // or jus thangeSteps.length == 2
-                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) {
+        const adjustedInsertPos = toA;
+        if (newSliceContent.size > 0) {
             log.info('newSliceContent', newSliceContent);
-            //
-            // console.log('Sliced Content:')
-            // console.log(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?
-            // the sides should be equal. TODO can they be other than 0?
-            //
             const openStart = slice.openStart !== slice.openEnd ? 0 : slice.openStart;
             const openEnd = slice.openStart !== slice.openEnd ? 0 : slice.openEnd;
             changeSteps.push({
                 type: 'insert-slice',
-                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
-                */
+                from: adjustedInsertPos,
+                to: adjustedInsertPos,
                 sliceWasSplit,
                 slice: new prosemirrorModel.Slice(setFragmentAsInserted(newSliceContent, createNewInsertAttrs(attrs), oldState.schema), openStart, openEnd),
             });

package/dist/index.js

@@ -1205,49 +1205,17 @@ 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);
-        // 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 the space 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 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) {
-                // or jus thangeSteps.length == 2
-                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) {
+        const adjustedInsertPos = toA;
+        if (newSliceContent.size > 0) {
             log.info('newSliceContent', newSliceContent);
-            //
-            // console.log('Sliced Content:')
-            // console.log(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?
-            // the sides should be equal. TODO can they be other than 0?
-            //
             const openStart = slice.openStart !== slice.openEnd ? 0 : slice.openStart;
             const openEnd = slice.openStart !== slice.openEnd ? 0 : slice.openEnd;
             changeSteps.push({
                 type: 'insert-slice',
-                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
-                */
+                from: adjustedInsertPos,
+                to: adjustedInsertPos,
                 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.4.1-LEAN-2431",
+  "version": "1.5.0",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",
@@ -25,8 +25,8 @@
   },
   "devDependencies": {
     "@manuscripts/data": "^1.0.2",
-    "@manuscripts/json-schema": "^2.0.1",
-    "@manuscripts/transform": "^1.2.3",
+    "@manuscripts/json-schema": "^2.0.2",
+    "@manuscripts/transform": "^1.2.5",
     "@rollup/plugin-commonjs": "^22.0.2",
     "@types/debug": "^4.1.7",
     "@types/jest": "27.5.1",