@manuscripts/track-changes-plugin 1.7.10 → 1.7.11

package/dist/cjs/steps/trackTransaction.js

@@ -7,6 +7,7 @@ const diffChangeSteps_1 = require("../change-steps/diffChangeSteps");
 const processChangeSteps_1 = require("../change-steps/processChangeSteps");
 const change_1 = require("../types/change");
 const logger_1 = require("../utils/logger");
+const mapChangeStep_1 = require("../utils/mapChangeStep");
 const trackReplaceAroundStep_1 = require("./trackReplaceAroundStep");
 const trackReplaceStep_1 = require("./trackReplaceStep");
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
@@ -22,6 +23,7 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         status: change_1.CHANGE_STATUS.pending,
     };
     const wasNodeSelection = tr.selection instanceof prosemirror_state_1.NodeSelection;
+    const setsNewSelection = tr.selectionSet;
     let iters = 0;
     logger_1.log.info('ORIGINAL transaction', tr);
     for (let i = tr.steps.length - 1; i >= 0; i--) {
@@ -43,7 +45,9 @@ function trackTransaction(tr, oldState, newTr, authorID) {
             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])) {
                 continue;
             }
-            const newStep = step.invert(tr.docs[i]);
+            const invertedStep = step.invert(tr.docs[i]);
+            const thisStepMapping = tr.mapping.slice(i + 1);
+            const newStep = new prosemirror_transform_1.ReplaceStep(thisStepMapping.map(invertedStep.from), thisStepMapping.map(invertedStep.to), invertedStep.slice);
             const stepResult = newTr.maybeStep(newStep);
             let [steps, startPos] = (0, trackReplaceStep_1.trackReplaceStep)(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i]);
             if (steps.length === 1) {
@@ -52,13 +56,15 @@ function trackTransaction(tr, oldState, newTr, authorID) {
                     continue;
                 }
             }
+            startPos = thisStepMapping.map(startPos);
+            steps = (0, mapChangeStep_1.mapChangeSteps)(steps, thisStepMapping);
             logger_1.log.info('CHANGES: ', steps);
             const deleted = steps.filter((s) => s.type !== 'insert-slice');
             const inserted = steps.filter((s) => s.type === 'insert-slice');
             steps = (0, diffChangeSteps_1.diffChangeSteps)(deleted, inserted);
             logger_1.log.info('DIFFED STEPS: ', steps);
             const [mapping, selectionPos] = (0, processChangeSteps_1.processChangeSteps)(steps, startPos || tr.selection.head, newTr, emptyAttrs, oldState.schema);
-            if (!wasNodeSelection) {
+            if (!wasNodeSelection && !setsNewSelection) {
                 const sel = getSelectionStaticConstructor(tr.selection);
                 const near = sel.near(newTr.doc.resolve(selectionPos), -1);
                 newTr.setSelection(near);
@@ -76,6 +82,10 @@ function trackTransaction(tr, oldState, newTr, authorID) {
         tr.getMeta('inputType') && newTr.setMeta('inputType', tr.getMeta('inputType'));
         tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
     }
+    if (setsNewSelection && tr.selection instanceof prosemirror_state_1.TextSelection) {
+        const newPos = newTr.doc.resolve(tr.selection.from);
+        newTr.setSelection(new prosemirror_state_1.TextSelection(newPos));
+    }
     if (wasNodeSelection) {
         console.log('%c Getting into node select! ', 'background: #222; color: #bada55');
         const mappedPos = newTr.mapping.map(tr.selection.from, -1);

package/dist/cjs/utils/mapChangeStep.js

@@ -0,0 +1,39 @@
+"use strict";
+/*!
+ * © 2023 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapChangeSteps = void 0;
+function mapChangeSteps(steps, mapping) {
+    steps.forEach((step) => {
+        if ('from' in step) {
+            step.from = mapping.map(step.from);
+        }
+        if ('to' in step) {
+            step.to = mapping.map(step.to);
+        }
+        if ('pos' in step) {
+            step.pos = mapping.map(step.pos);
+        }
+        if ('nodeEnd' in step) {
+            step.nodeEnd = mapping.map(step.nodeEnd);
+        }
+        if ('mergePos' in step) {
+            step.mergePos = mapping.map(step.mergePos);
+        }
+    });
+    return steps;
+}
+exports.mapChangeSteps = mapChangeSteps;

package/dist/es/steps/trackTransaction.js

@@ -1,9 +1,10 @@
-import { NodeSelection as NodeSelectionClass } from 'prosemirror-state';
+import { NodeSelection as NodeSelectionClass, TextSelection, } from 'prosemirror-state';
 import { ReplaceAroundStep, ReplaceStep } from 'prosemirror-transform';
 import { diffChangeSteps } from '../change-steps/diffChangeSteps';
 import { processChangeSteps } from '../change-steps/processChangeSteps';
 import { CHANGE_STATUS } from '../types/change';
 import { log } from '../utils/logger';
+import { mapChangeSteps } from '../utils/mapChangeStep';
 import { trackReplaceAroundStep } from './trackReplaceAroundStep';
 import { trackReplaceStep } from './trackReplaceStep';
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
@@ -19,6 +20,7 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
         status: CHANGE_STATUS.pending,
     };
     const wasNodeSelection = tr.selection instanceof NodeSelectionClass;
+    const setsNewSelection = tr.selectionSet;
     let iters = 0;
     log.info('ORIGINAL transaction', tr);
     for (let i = tr.steps.length - 1; i >= 0; i--) {
@@ -40,7 +42,9 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
             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])) {
                 continue;
             }
-            const newStep = step.invert(tr.docs[i]);
+            const invertedStep = step.invert(tr.docs[i]);
+            const thisStepMapping = tr.mapping.slice(i + 1);
+            const newStep = new ReplaceStep(thisStepMapping.map(invertedStep.from), thisStepMapping.map(invertedStep.to), invertedStep.slice);
             const stepResult = newTr.maybeStep(newStep);
             let [steps, startPos] = trackReplaceStep(step, oldState, newTr, emptyAttrs, stepResult, tr.docs[i]);
             if (steps.length === 1) {
@@ -49,13 +53,15 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
                     continue;
                 }
             }
+            startPos = thisStepMapping.map(startPos);
+            steps = mapChangeSteps(steps, thisStepMapping);
             log.info('CHANGES: ', steps);
             const deleted = steps.filter((s) => s.type !== 'insert-slice');
             const inserted = steps.filter((s) => s.type === 'insert-slice');
             steps = diffChangeSteps(deleted, inserted);
             log.info('DIFFED STEPS: ', steps);
             const [mapping, selectionPos] = processChangeSteps(steps, startPos || tr.selection.head, newTr, emptyAttrs, oldState.schema);
-            if (!wasNodeSelection) {
+            if (!wasNodeSelection && !setsNewSelection) {
                 const sel = getSelectionStaticConstructor(tr.selection);
                 const near = sel.near(newTr.doc.resolve(selectionPos), -1);
                 newTr.setSelection(near);
@@ -73,6 +79,10 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
         tr.getMeta('inputType') && newTr.setMeta('inputType', tr.getMeta('inputType'));
         tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
     }
+    if (setsNewSelection && tr.selection instanceof TextSelection) {
+        const newPos = newTr.doc.resolve(tr.selection.from);
+        newTr.setSelection(new TextSelection(newPos));
+    }
     if (wasNodeSelection) {
         console.log('%c Getting into node select! ', 'background: #222; color: #bada55');
         const mappedPos = newTr.mapping.map(tr.selection.from, -1);

package/dist/es/utils/mapChangeStep.js

@@ -0,0 +1,35 @@
+/*!
+ * © 2023 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.
+ */
+export function mapChangeSteps(steps, mapping) {
+    steps.forEach((step) => {
+        if ('from' in step) {
+            step.from = mapping.map(step.from);
+        }
+        if ('to' in step) {
+            step.to = mapping.map(step.to);
+        }
+        if ('pos' in step) {
+            step.pos = mapping.map(step.pos);
+        }
+        if ('nodeEnd' in step) {
+            step.nodeEnd = mapping.map(step.nodeEnd);
+        }
+        if ('mergePos' in step) {
+            step.mergePos = mapping.map(step.mergePos);
+        }
+    });
+    return steps;
+}

package/dist/types/steps/trackTransaction.d.ts

@@ -1,2 +1,2 @@
-import type { EditorState, Transaction } from 'prosemirror-state';
+import { EditorState, Transaction } from 'prosemirror-state';
 export declare function trackTransaction(tr: Transaction, oldState: EditorState, newTr: Transaction, authorID: string): Transaction;

package/dist/types/utils/mapChangeStep.d.ts

@@ -0,0 +1,18 @@
+/*!
+ * © 2023 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 { Mapping } from 'prosemirror-transform';
+import { ChangeStep } from '../types/step';
+export declare function mapChangeSteps(steps: ChangeStep[], mapping: Mapping): ChangeStep[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.7.10",
+  "version": "1.7.11",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",