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

package/dist/index.cjs

@@ -1213,17 +1213,49 @@ 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 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) {
             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: 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),
             });
@@ -1388,7 +1420,8 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
                 return;
             }
             mergeTrackedMarks(mapping.map(c.from), newTr.doc, newTr, schema);
-            mergeTrackedMarks(mapping.map(c.to), newTr.doc, newTr, schema);
+            const to = mapping.map(c.to) + c.slice.size;
+            mergeTrackedMarks(mapping.map(c.to) + (to < newTr.doc.nodeSize ? c.slice.size : 0), newTr.doc, newTr, schema);
             selectionPos = mapping.map(c.to) + c.slice.size;
         }
         else if (c.type === 'update-node-attrs') {
@@ -1828,7 +1861,11 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
                 const skipMetaUsed = skipTrsWithMetas.some((m) => tr.getMeta(m) || (wasAppended === null || wasAppended === void 0 ? void 0 : wasAppended.getMeta(m)));
                 const skipTrackUsed = getAction(tr, TrackChangesAction.skipTrack) ||
                     (wasAppended && getAction(wasAppended, TrackChangesAction.skipTrack));
-                if (tr.docChanged && !skipMetaUsed && !skipTrackUsed && !tr.getMeta('history$')) {
+                if (tr.docChanged &&
+                    !skipMetaUsed &&
+                    !skipTrackUsed &&
+                    !tr.getMeta('history$') &&
+                    !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
                     createdTr = trackTransaction(tr, oldState, createdTr, userID);
                 }
                 docChanged = docChanged || tr.docChanged;

package/dist/index.js

@@ -1205,17 +1205,49 @@ 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 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) {
             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: 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),
             });
@@ -1380,7 +1412,8 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema) {
                 return;
             }
             mergeTrackedMarks(mapping.map(c.from), newTr.doc, newTr, schema);
-            mergeTrackedMarks(mapping.map(c.to), newTr.doc, newTr, schema);
+            const to = mapping.map(c.to) + c.slice.size;
+            mergeTrackedMarks(mapping.map(c.to) + (to < newTr.doc.nodeSize ? c.slice.size : 0), newTr.doc, newTr, schema);
             selectionPos = mapping.map(c.to) + c.slice.size;
         }
         else if (c.type === 'update-node-attrs') {
@@ -1820,7 +1853,11 @@ const trackChangesPlugin = (opts = { userID: 'anonymous:Anonymous' }) => {
                 const skipMetaUsed = skipTrsWithMetas.some((m) => tr.getMeta(m) || (wasAppended === null || wasAppended === void 0 ? void 0 : wasAppended.getMeta(m)));
                 const skipTrackUsed = getAction(tr, TrackChangesAction.skipTrack) ||
                     (wasAppended && getAction(wasAppended, TrackChangesAction.skipTrack));
-                if (tr.docChanged && !skipMetaUsed && !skipTrackUsed && !tr.getMeta('history$')) {
+                if (tr.docChanged &&
+                    !skipMetaUsed &&
+                    !skipTrackUsed &&
+                    !tr.getMeta('history$') &&
+                    !(wasAppended && tr.getMeta('origin') === 'paragraphs')) {
                     createdTr = trackTransaction(tr, oldState, createdTr, userID);
                 }
                 docChanged = docChanged || tr.docChanged;

package/package.json

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