@manuscripts/track-changes-plugin 1.0.0 → 1.1.0

package/dist/index.cjs

@@ -1195,23 +1195,21 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function trackReplaceStep(step, oldState, newTr, attrs) {
+function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
     let selectionPos = 0, changeSteps = [];
+    // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
-        // Invert the transaction step to prevent it from actually deleting or inserting anything
-        const newStep = step.invert(oldState.doc);
-        const stepResult = newTr.maybeStep(newStep);
-        if (stepResult.failed) {
-            log.error(`invert ReplaceStep failed: "${stepResult.failed}"`, newStep);
-            return;
-        }
         log.info('TR: steps before applying delete', [...newTr.steps]);
         // First apply the deleted range and update the insert slice to not include content that was deleted,
         // eg partial nodes in an open-ended slice
-        const { sliceWasSplit, newSliceContent, steps: deleteSteps, } = deleteAndMergeSplitNodes(fromA, toA, undefined, oldState.doc, newTr, oldState.schema, attrs, slice);
+        if (stepResult.failed) {
+            log.error(`invert ReplaceStep failed: "${stepResult.failed}"`);
+            return;
+        }
+        const { sliceWasSplit, newSliceContent, steps: deleteSteps, } = deleteAndMergeSplitNodes(fromA, toA, undefined, currentStepDoc, newTr, oldState.schema, attrs, slice);
         changeSteps.push(...deleteSteps);
         log.info('TR: steps after applying delete', [...newTr.steps]);
         log.info('DELETE STEPS: ', changeSteps);
@@ -1635,6 +1633,7 @@ const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.n
  * @returns newTr that inverts the initial tr and applies track attributes/marks
  */
 function trackTransaction(tr, oldState, newTr, authorID) {
+    var _a, _b, _c, _d;
     const emptyAttrs = {
         authorID,
         reviewedByID: null,
@@ -1647,33 +1646,35 @@ function trackTransaction(tr, oldState, newTr, authorID) {
     const wasNodeSelection = tr.selection instanceof prosemirrorState.NodeSelection;
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
-    tr.steps.forEach((step) => {
-        var _a, _b, _c, _d;
+    for (let i = tr.steps.length - 1; i >= 0; i--) {
+        const step = tr.steps[i];
         log.info('transaction step', step);
         iters += 1;
         if (iters > 20) {
             console.error('@manuscripts/track-changes-plugin: Possible infinite loop in iterating tr.steps, tracking skipped!\n' +
                 'This is probably an error with the library, please report back to maintainers with a reproduction if possible', newTr);
-            return;
+            continue;
         }
         else if (!(step instanceof prosemirrorTransform.ReplaceStep) && step.constructor.name === 'ReplaceStep') {
             console.error('@manuscripts/track-changes-plugin: Multiple prosemirror-transform packages imported, alias/dedupe them ' +
                 'or instanceof checks fail as well as creating new steps');
-            return;
+            continue;
         }
         else if (step instanceof prosemirrorTransform.ReplaceStep) {
             const { slice } = step;
             if (((_b = (_a = slice === null || slice === void 0 ? void 0 : slice.content) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.length) === 1 &&
                 isHighlightMarkerNode(slice.content.content[0])) {
                 // don't track highlight marker nodes
-                return;
+                continue;
             }
-            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs);
+            const newStep = step.invert(tr.docs[i]);
+            const stepResult = newTr.maybeStep(newStep);
+            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i]);
             if (steps.length === 1) {
                 const step = steps[0]; // eslint-disable-line @typescript-eslint/no-explicit-any
                 if (isHighlightMarkerNode((step === null || step === void 0 ? void 0 : step.node) || ((_d = (_c = step === null || step === void 0 ? void 0 : step.slice) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.content[0]))) {
                     // don't track deleted highlight marker nodes
-                    return;
+                    continue;
                 }
             }
             log.info('CHANGES: ', steps);
@@ -1713,10 +1714,11 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         // after track-changes plugin.
         tr.getMeta('inputType') && newTr.setMeta('inputType', tr.getMeta('inputType'));
         tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
-    });
+    }
     // This is kinda hacky solution at the moment to maintain NodeSelections over transactions
     // These are required by at least cross-references and links to activate their selector pop-ups
     if (wasNodeSelection) {
+        console.log('%c Getting into node select! ', 'background: #222; color: #bada55');
         // And -1 here is necessary to keep the selection pointing at the start of the node
         // (or something, breaks with cross-references otherwise)
         const mappedPos = newTr.mapping.map(tr.selection.from, -1);

package/dist/index.js

@@ -1187,23 +1187,21 @@ function trackReplaceAroundStep(step, oldState, newTr, attrs) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function trackReplaceStep(step, oldState, newTr, attrs) {
+function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepDoc) {
     log.info('###### ReplaceStep ######');
     let selectionPos = 0, changeSteps = [];
+    // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
-        // Invert the transaction step to prevent it from actually deleting or inserting anything
-        const newStep = step.invert(oldState.doc);
-        const stepResult = newTr.maybeStep(newStep);
-        if (stepResult.failed) {
-            log.error(`invert ReplaceStep failed: "${stepResult.failed}"`, newStep);
-            return;
-        }
         log.info('TR: steps before applying delete', [...newTr.steps]);
         // First apply the deleted range and update the insert slice to not include content that was deleted,
         // eg partial nodes in an open-ended slice
-        const { sliceWasSplit, newSliceContent, steps: deleteSteps, } = deleteAndMergeSplitNodes(fromA, toA, undefined, oldState.doc, newTr, oldState.schema, attrs, slice);
+        if (stepResult.failed) {
+            log.error(`invert ReplaceStep failed: "${stepResult.failed}"`);
+            return;
+        }
+        const { sliceWasSplit, newSliceContent, steps: deleteSteps, } = deleteAndMergeSplitNodes(fromA, toA, undefined, currentStepDoc, newTr, oldState.schema, attrs, slice);
         changeSteps.push(...deleteSteps);
         log.info('TR: steps after applying delete', [...newTr.steps]);
         log.info('DELETE STEPS: ', changeSteps);
@@ -1627,6 +1625,7 @@ const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.n
  * @returns newTr that inverts the initial tr and applies track attributes/marks
  */
 function trackTransaction(tr, oldState, newTr, authorID) {
+    var _a, _b, _c, _d;
     const emptyAttrs = {
         authorID,
         reviewedByID: null,
@@ -1639,33 +1638,35 @@ function trackTransaction(tr, oldState, newTr, authorID) {
     const wasNodeSelection = tr.selection instanceof NodeSelection;
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
-    tr.steps.forEach((step) => {
-        var _a, _b, _c, _d;
+    for (let i = tr.steps.length - 1; i >= 0; i--) {
+        const step = tr.steps[i];
         log.info('transaction step', step);
         iters += 1;
         if (iters > 20) {
             console.error('@manuscripts/track-changes-plugin: Possible infinite loop in iterating tr.steps, tracking skipped!\n' +
                 'This is probably an error with the library, please report back to maintainers with a reproduction if possible', newTr);
-            return;
+            continue;
         }
         else if (!(step instanceof ReplaceStep) && step.constructor.name === 'ReplaceStep') {
             console.error('@manuscripts/track-changes-plugin: Multiple prosemirror-transform packages imported, alias/dedupe them ' +
                 'or instanceof checks fail as well as creating new steps');
-            return;
+            continue;
         }
         else if (step instanceof ReplaceStep) {
             const { slice } = step;
             if (((_b = (_a = slice === null || slice === void 0 ? void 0 : slice.content) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.length) === 1 &&
                 isHighlightMarkerNode(slice.content.content[0])) {
                 // don't track highlight marker nodes
-                return;
+                continue;
             }
-            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs);
+            const newStep = step.invert(tr.docs[i]);
+            const stepResult = newTr.maybeStep(newStep);
+            let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i]);
             if (steps.length === 1) {
                 const step = steps[0]; // eslint-disable-line @typescript-eslint/no-explicit-any
                 if (isHighlightMarkerNode((step === null || step === void 0 ? void 0 : step.node) || ((_d = (_c = step === null || step === void 0 ? void 0 : step.slice) === null || _c === void 0 ? void 0 : _c.content) === null || _d === void 0 ? void 0 : _d.content[0]))) {
                     // don't track deleted highlight marker nodes
-                    return;
+                    continue;
                 }
             }
             log.info('CHANGES: ', steps);
@@ -1705,10 +1706,11 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         // after track-changes plugin.
         tr.getMeta('inputType') && newTr.setMeta('inputType', tr.getMeta('inputType'));
         tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
-    });
+    }
     // This is kinda hacky solution at the moment to maintain NodeSelections over transactions
     // These are required by at least cross-references and links to activate their selector pop-ups
     if (wasNodeSelection) {
+        console.log('%c Getting into node select! ', 'background: #222; color: #bada55');
         // And -1 here is necessary to keep the selection pointing at the start of the node
         // (or something, breaks with cross-references otherwise)
         const mappedPos = newTr.mapping.map(tr.selection.from, -1);

package/dist/steps/trackReplaceStep.d.ts

@@ -1,5 +1,21 @@
+/*!
+ * © 2021 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Node as PMNode } from 'prosemirror-model';
 import type { EditorState, Transaction } from 'prosemirror-state';
-import { ReplaceStep } from 'prosemirror-transform';
+import { ReplaceStep, StepResult } from 'prosemirror-transform';
 import { NewEmptyAttrs } from '../types/track';
 import { ChangeStep } from '../types/step';
-export declare function trackReplaceStep(step: ReplaceStep, oldState: EditorState, newTr: Transaction, attrs: NewEmptyAttrs): [ChangeStep[], number];
+export declare function trackReplaceStep(step: ReplaceStep, oldState: EditorState, newTr: Transaction, attrs: NewEmptyAttrs, stepResult: StepResult, currentStepDoc: PMNode): [ChangeStep[], number];

package/package.json

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