@manuscripts/track-changes-plugin 1.5.1-LEAN-2431 → 1.5.2-LEAN-2529

package/dist/index.cjs

@@ -1200,6 +1200,7 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
     let selectionPos = 0, changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
+        var _a, _b;
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
         log.info('TR: steps before applying delete', [...newTr.steps]);
@@ -1217,14 +1218,13 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         // 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
+            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 1st delete is for the delete done by
+            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) {
-                // 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
@@ -1240,22 +1240,14 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         const textWasDeleted = !!changeSteps.length;
         if (!backSpacedText && 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
-                */
                 sliceWasSplit,
                 slice: new prosemirrorModel.Slice(setFragmentAsInserted(newSliceContent, createNewInsertAttrs(attrs), oldState.schema), openStart, openEnd),
             });
@@ -1263,7 +1255,10 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         else {
             // Incase only deletion was applied, check whether tracked marks around deleted content can be merged
             // mergeTrackedMarks(adjustedInsertPos, newTr.doc, newTr, oldState.schema)
-            selectionPos = fromA;
+            // When DEL is used, the selection is set to the end of the deleted content
+            // TODO: 'window.event' is deprecated, find a better way to detect the key used for deletion
+            // @ts-ignore
+            selectionPos = ((_a = window.event) === null || _a === void 0 ? void 0 : _a.code) === 'Delete' || ((_b = window.event) === null || _b === void 0 ? void 0 : _b.inputType) === 'deleteContentForward' ? toA : fromA;
         }
     });
     return [changeSteps, selectionPos];

package/dist/index.js

@@ -1192,6 +1192,7 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
     let selectionPos = 0, changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
+        var _a, _b;
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
         log.info('TR: steps before applying delete', [...newTr.steps]);
@@ -1209,14 +1210,13 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         // 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
+            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 1st delete is for the delete done by
+            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) {
-                // 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
@@ -1232,22 +1232,14 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         const textWasDeleted = !!changeSteps.length;
         if (!backSpacedText && 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
-                */
                 sliceWasSplit,
                 slice: new Slice(setFragmentAsInserted(newSliceContent, createNewInsertAttrs(attrs), oldState.schema), openStart, openEnd),
             });
@@ -1255,7 +1247,10 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         else {
             // Incase only deletion was applied, check whether tracked marks around deleted content can be merged
             // mergeTrackedMarks(adjustedInsertPos, newTr.doc, newTr, oldState.schema)
-            selectionPos = fromA;
+            // When DEL is used, the selection is set to the end of the deleted content
+            // TODO: 'window.event' is deprecated, find a better way to detect the key used for deletion
+            // @ts-ignore
+            selectionPos = ((_a = window.event) === null || _a === void 0 ? void 0 : _a.code) === 'Delete' || ((_b = window.event) === null || _b === void 0 ? void 0 : _b.inputType) === 'deleteContentForward' ? toA : fromA;
         }
     });
     return [changeSteps, selectionPos];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.5.1-LEAN-2431",
+  "version": "1.5.2-LEAN-2529",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",
@@ -61,6 +61,7 @@
   "scripts": {
     "build": "rollup -c",
     "watch": "rollup -cw",
+    "dev": "yarn run watch",
     "test": "jest --runInBand",
     "format": "prettier --write \"*.+(js|json|yml|yaml|ts|md|graphql|mdx)\" src/ test/",
     "typecheck": "tsc --project tsconfig.test.json --noEmit",