@manuscripts/track-changes-plugin 2.0.5 → 2.0.7

package/dist/cjs/steps/trackTransaction.js

@@ -40,7 +40,7 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     (0, track_utils_1.handleDirectPendingMoveDeletions)(tr, newTr, movingStepsAssociated);
     const cleanSteps = (0, track_utils_1.filterMeaninglessMoveSteps)(tr, movingStepsAssociated);
     for (let i = cleanSteps.length - 1; i >= 0; i--) {
-        const step = tr.steps[i];
+        const step = cleanSteps[i];
         logger_1.log.info('transaction step', step);
         iters += 1;
         const uiEvent = tr.getMeta('uiEvent');

package/dist/cjs/utils/track-utils.js

@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterMeaninglessMoveSteps = exports.handleDirectPendingMoveDeletions = exports.isDirectPendingMoveDeletion = exports.isDeletingPendingMovedNode = exports.HasMoveOperations = exports.trFromHistory = exports.stepIsLift = exports.isLiftStep = exports.isWrapStep = exports.isSplitStep = exports.createNewUpdateAttrs = exports.createNewMoveAttrs = exports.createNewDeleteAttrs = exports.createNewReferenceAttrs = exports.createNewSplitAttrs = exports.createNewWrapAttrs = exports.createNewInsertAttrs = void 0;
+exports.filterMeaninglessMoveSteps = exports.handleDirectPendingMoveDeletions = exports.isDirectPendingMoveDeletion = exports.isDeletingPendingMovedNode = exports.isPendingChange = exports.HasMoveOperations = exports.trFromHistory = exports.stepIsLift = exports.isLiftStep = exports.isWrapStep = exports.isSplitStep = exports.createNewUpdateAttrs = exports.createNewMoveAttrs = exports.createNewDeleteAttrs = exports.createNewReferenceAttrs = exports.createNewSplitAttrs = exports.createNewWrapAttrs = exports.createNewInsertAttrs = void 0;
 const prosemirror_transform_1 = require("prosemirror-transform");
 const change_1 = require("../types/change");
 const uuidv4_1 = require("./uuidv4");
@@ -66,7 +66,8 @@ const isSplitStep = (step, selection, uiEvent) => {
     return (openStart === openEnd &&
         firstChild.type === lastChild.type &&
         firstChild.inlineContent &&
-        lastChild.inlineContent);
+        lastChild.inlineContent &&
+        !(startOffset === parentSize && endOffset === parentSize));
 };
 exports.isSplitStep = isSplitStep;
 const isWrapStep = (step) => step.from === step.gapFrom &&
@@ -146,6 +147,10 @@ const HasMoveOperations = (tr) => {
     return movingAssoc;
 };
 exports.HasMoveOperations = HasMoveOperations;
+const isPendingChange = (trackedAttrs, operation) => {
+    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === operation));
+};
+exports.isPendingChange = isPendingChange;
 const isDeletingPendingMovedNode = (step, doc) => {
     if (!step.slice || step.from === step.to || step.slice.content.size > 0) {
         return undefined;
@@ -173,8 +178,7 @@ const isDirectPendingMoveDeletion = (step, doc, movingSteps) => {
     if (!node) {
         return false;
     }
-    const trackedAttrs = node.attrs.dataTracked;
-    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === change_1.CHANGE_OPERATION.move && t.status === change_1.CHANGE_STATUS.pending));
+    return (0, exports.isPendingChange)(node.attrs.dataTracked, change_1.CHANGE_OPERATION.move);
 };
 exports.isDirectPendingMoveDeletion = isDirectPendingMoveDeletion;
 const handleDirectPendingMoveDeletions = (tr, newTr, movingSteps) => {
@@ -192,18 +196,33 @@ const handleDirectPendingMoveDeletions = (tr, newTr, movingSteps) => {
 };
 exports.handleDirectPendingMoveDeletions = handleDirectPendingMoveDeletions;
 const filterMeaninglessMoveSteps = (tr, movingSteps) => {
+    var _a;
     const cleanSteps = [];
     for (let i = 0; i < tr.steps.length; i++) {
         const step = tr.steps[i];
         const moveID = movingSteps.get(step);
-        const prevMoveID = (0, exports.isDeletingPendingMovedNode)(step, tr.docs[i]);
-        if (moveID && prevMoveID) {
-            movingSteps.forEach((replaceStepMoveID, replaceStep) => {
-                if (replaceStep !== step && moveID === replaceStepMoveID) {
-                    movingSteps.set(replaceStep, prevMoveID);
+        if (moveID) {
+            const prevMoveID = (0, exports.isDeletingPendingMovedNode)(step, tr.docs[i]);
+            if (prevMoveID) {
+                movingSteps.forEach((replaceStepMoveID, replaceStep) => {
+                    if (replaceStep !== step && moveID === replaceStepMoveID) {
+                        movingSteps.set(replaceStep, prevMoveID);
+                    }
+                });
+                continue;
+            }
+            if (step instanceof prosemirror_transform_1.ReplaceStep) {
+                const { slice } = step;
+                if ((_a = slice === null || slice === void 0 ? void 0 : slice.content) === null || _a === void 0 ? void 0 : _a.firstChild) {
+                    const insertedNode = slice.content.firstChild;
+                    if (insertedNode.attrs.dataTracked) {
+                        const isPendingInsert = (0, exports.isPendingChange)(insertedNode.attrs.dataTracked, change_1.CHANGE_OPERATION.insert);
+                        if (isPendingInsert) {
+                            continue;
+                        }
+                    }
                 }
-            });
-            continue;
+            }
         }
         cleanSteps.push(step);
     }

package/dist/es/steps/trackTransaction.js

@@ -34,7 +34,7 @@ export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
     handleDirectPendingMoveDeletions(tr, newTr, movingStepsAssociated);
     const cleanSteps = filterMeaninglessMoveSteps(tr, movingStepsAssociated);
     for (let i = cleanSteps.length - 1; i >= 0; i--) {
-        const step = tr.steps[i];
+        const step = cleanSteps[i];
         log.info('transaction step', step);
         iters += 1;
         const uiEvent = tr.getMeta('uiEvent');

package/dist/es/utils/track-utils.js

@@ -56,7 +56,8 @@ export const isSplitStep = (step, selection, uiEvent) => {
     return (openStart === openEnd &&
         firstChild.type === lastChild.type &&
         firstChild.inlineContent &&
-        lastChild.inlineContent);
+        lastChild.inlineContent &&
+        !(startOffset === parentSize && endOffset === parentSize));
 };
 export const isWrapStep = (step) => step.from === step.gapFrom &&
     step.to === step.gapTo &&
@@ -130,6 +131,9 @@ export const HasMoveOperations = (tr) => {
     }
     return movingAssoc;
 };
+export const isPendingChange = (trackedAttrs, operation) => {
+    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === operation));
+};
 export const isDeletingPendingMovedNode = (step, doc) => {
     if (!step.slice || step.from === step.to || step.slice.content.size > 0) {
         return undefined;
@@ -156,8 +160,7 @@ export const isDirectPendingMoveDeletion = (step, doc, movingSteps) => {
     if (!node) {
         return false;
     }
-    const trackedAttrs = node.attrs.dataTracked;
-    return !!(trackedAttrs === null || trackedAttrs === void 0 ? void 0 : trackedAttrs.some((t) => t.operation === CHANGE_OPERATION.move && t.status === CHANGE_STATUS.pending));
+    return isPendingChange(node.attrs.dataTracked, CHANGE_OPERATION.move);
 };
 export const handleDirectPendingMoveDeletions = (tr, newTr, movingSteps) => {
     tr.steps.forEach((step) => {
@@ -173,18 +176,33 @@ export const handleDirectPendingMoveDeletions = (tr, newTr, movingSteps) => {
     });
 };
 export const filterMeaninglessMoveSteps = (tr, movingSteps) => {
+    var _a;
     const cleanSteps = [];
     for (let i = 0; i < tr.steps.length; i++) {
         const step = tr.steps[i];
         const moveID = movingSteps.get(step);
-        const prevMoveID = isDeletingPendingMovedNode(step, tr.docs[i]);
-        if (moveID && prevMoveID) {
-            movingSteps.forEach((replaceStepMoveID, replaceStep) => {
-                if (replaceStep !== step && moveID === replaceStepMoveID) {
-                    movingSteps.set(replaceStep, prevMoveID);
+        if (moveID) {
+            const prevMoveID = isDeletingPendingMovedNode(step, tr.docs[i]);
+            if (prevMoveID) {
+                movingSteps.forEach((replaceStepMoveID, replaceStep) => {
+                    if (replaceStep !== step && moveID === replaceStepMoveID) {
+                        movingSteps.set(replaceStep, prevMoveID);
+                    }
+                });
+                continue;
+            }
+            if (step instanceof ReplaceStep) {
+                const { slice } = step;
+                if ((_a = slice === null || slice === void 0 ? void 0 : slice.content) === null || _a === void 0 ? void 0 : _a.firstChild) {
+                    const insertedNode = slice.content.firstChild;
+                    if (insertedNode.attrs.dataTracked) {
+                        const isPendingInsert = isPendingChange(insertedNode.attrs.dataTracked, CHANGE_OPERATION.insert);
+                        if (isPendingInsert) {
+                            continue;
+                        }
+                    }
                 }
-            });
-            continue;
+            }
         }
         cleanSteps.push(step);
     }

package/dist/types/utils/track-utils.d.ts

@@ -1,6 +1,7 @@
 import { Node as PMNode, Slice } from 'prosemirror-model';
 import { Selection, Transaction } from 'prosemirror-state';
 import { ReplaceAroundStep, ReplaceStep, Step } from 'prosemirror-transform';
+import { CHANGE_OPERATION, TrackedAttrs } from '../types/change';
 import { NewDeleteAttrs, NewEmptyAttrs, NewInsertAttrs, NewReferenceAttrs, NewSplitNodeAttrs, NewUpdateAttrs } from '../types/track';
 export declare function createNewInsertAttrs(attrs: NewEmptyAttrs): NewInsertAttrs;
 export declare function createNewWrapAttrs(attrs: NewEmptyAttrs): NewInsertAttrs;
@@ -20,6 +21,7 @@ export declare function stepIsLift(gap: {
 }, node: PMNode, to: number): boolean;
 export declare const trFromHistory: (tr: Transaction) => string | undefined;
 export declare const HasMoveOperations: (tr: Transaction) => Map<ReplaceStep, string>;
+export declare const isPendingChange: (trackedAttrs: TrackedAttrs[] | undefined, operation: CHANGE_OPERATION) => boolean;
 export declare const isDeletingPendingMovedNode: (step: ReplaceStep, doc: PMNode) => string | undefined;
 export declare const isDirectPendingMoveDeletion: (step: ReplaceStep, doc: PMNode, movingSteps: Map<ReplaceStep, string>) => boolean;
 export declare const handleDirectPendingMoveDeletions: (tr: Transaction, newTr: Transaction, movingSteps: Map<ReplaceStep, string>) => void;

package/package.json

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