@manuscripts/track-changes-plugin 1.8.5 → 1.8.6-LEAN-4102.1

package/dist/cjs/ChangeSet.js

@@ -38,13 +38,23 @@ class ChangeSet {
     get changeTree() {
         const rootNodes = [];
         let currentNodeChange;
-        this.changes.forEach((c) => {
+        let currentInlineChange;
+        this.changes.forEach((c, index) => {
             if (currentNodeChange &&
                 (c.from >= currentNodeChange.to ||
                     c.dataTracked.statusUpdateAt !== currentNodeChange.dataTracked.statusUpdateAt)) {
-                rootNodes.push(currentNodeChange);
+                rootNodes.push([currentNodeChange]);
                 currentNodeChange = undefined;
             }
+            if (this.canJoinAdjacentInlineChanges(c, index) && !currentNodeChange) {
+                currentInlineChange = currentInlineChange ? [...currentInlineChange, c] : [c];
+                return;
+            }
+            else if (currentInlineChange) {
+                rootNodes.push([...currentInlineChange, c]);
+                currentInlineChange = undefined;
+                return;
+            }
             if (currentNodeChange &&
                 c.from < currentNodeChange.to &&
                 !(__classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isSameNodeChange).call(this, currentNodeChange, c) && __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isNotPendingOrDeleted).call(this, currentNodeChange))) {
@@ -54,7 +64,7 @@ class ChangeSet {
                 const result = this.matchAndAddToRootChange(rootNodes, c);
                 if (result) {
                     const { index, root } = result;
-                    rootNodes[index] = root;
+                    rootNodes[index][0] = root;
                 }
                 else {
                     currentNodeChange = Object.assign(Object.assign({}, c), { children: [] });
@@ -64,20 +74,20 @@ class ChangeSet {
                 const result = this.matchAndAddToRootChange(rootNodes, c);
                 if (result) {
                     const { index, root } = result;
-                    rootNodes[index] = root;
+                    rootNodes[index][0] = root;
                 }
                 else {
-                    rootNodes.push(c);
+                    rootNodes.push([c]);
                 }
             }
         });
         if (currentNodeChange) {
-            rootNodes.push(currentNodeChange);
+            rootNodes.push([currentNodeChange]);
         }
-        return rootNodes;
+        return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== change_1.CHANGE_OPERATION.reference));
     }
     get pending() {
-        return this.changeTree.filter((c) => c.dataTracked.status === change_1.CHANGE_STATUS.pending);
+        return this.changes.filter((c) => c.dataTracked.status === change_1.CHANGE_STATUS.pending);
     }
     get textChanges() {
         return this.changes.filter((c) => c.type === 'text-change');
@@ -120,7 +130,7 @@ class ChangeSet {
     }
     matchAndAddToRootChange(rootNodes, change) {
         for (let i = 0; i < rootNodes.length; i++) {
-            const root = rootNodes[i];
+            const root = rootNodes[i][0];
             if (root.type === 'node-change' &&
                 change.from < root.to &&
                 change.dataTracked.statusUpdateAt === root.dataTracked.statusUpdateAt) {
@@ -129,6 +139,15 @@ class ChangeSet {
             }
         }
     }
+    canJoinAdjacentInlineChanges(change, index) {
+        const nextChange = this.changes.at(index + 1);
+        const isInline = (c) => c.type === 'text-change' || (c.type === 'node-change' && c.node.isInline);
+        return (isInline(change) &&
+            nextChange &&
+            isInline(nextChange) &&
+            change.to === nextChange.from &&
+            change.dataTracked.operation === nextChange.dataTracked.operation);
+    }
     static flattenTreeToIds(changes) {
         return changes.flatMap((c) => (this.isNodeChange(c) ? [c.id, ...c.children.map((c) => c.id)] : c.id));
     }

package/dist/cjs/changes/findChanges.js

@@ -12,11 +12,7 @@ function findChanges(state) {
         for (let i = 0; i < tracked.length; i += 1) {
             const dataTracked = tracked[i];
             const id = dataTracked.id || '';
-            if (current &&
-                current.change.id === id &&
-                current.node.isText &&
-                node.isText &&
-                !(0, nodeHelpers_1.equalMarks)(node, current.node)) {
+            if (current && current.change.id === id) {
                 current.change.to = pos + node.nodeSize;
                 current.node = node;
                 continue;

package/dist/cjs/steps/trackTransaction.js

@@ -8,16 +8,19 @@ const prosemirror_state_1 = require("prosemirror-state");
 const prosemirror_transform_1 = require("prosemirror-transform");
 const diffChangeSteps_1 = require("../change-steps/diffChangeSteps");
 const processChangeSteps_1 = require("../change-steps/processChangeSteps");
+const updateChangeAttrs_1 = require("../changes/updateChangeAttrs");
+const nodeHelpers_1 = require("../compute/nodeHelpers");
 const change_1 = require("../types/change");
 const logger_1 = require("../utils/logger");
 const mapChangeStep_1 = require("../utils/mapChangeStep");
+const uuidv4_1 = require("../utils/uuidv4");
 const trackAttrsChange_1 = __importDefault(require("./trackAttrsChange"));
 const trackReplaceAroundStep_1 = require("./trackReplaceAroundStep");
 const trackReplaceStep_1 = require("./trackReplaceStep");
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
 const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.nodes.highlight_marker;
 function trackTransaction(tr, oldState, newTr, authorID) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const emptyAttrs = {
         authorID,
         reviewedByID: null,
@@ -91,6 +94,12 @@ function trackTransaction(tr, oldState, newTr, authorID) {
             const chnageSteps = (0, trackAttrsChange_1.default)(step, oldState, tr, newTr, emptyAttrs, tr.docs[i]);
             const [mapping, selectionPos] = (0, processChangeSteps_1.processChangeSteps)(chnageSteps, tr.selection.from, newTr, emptyAttrs, oldState.schema);
         }
+        else if (step instanceof prosemirror_transform_1.AddMarkStep) {
+            const dataTracked = (_e = (0, nodeHelpers_1.getNodeTrackedData)(newTr.doc.nodeAt(step.from), oldState.schema)) === null || _e === void 0 ? void 0 : _e.pop();
+            if (dataTracked) {
+                (0, updateChangeAttrs_1.updateChangeAttrs)(newTr, { id: dataTracked.id, from: step.from, to: step.to, type: 'text-change', dataTracked }, Object.assign(Object.assign({}, dataTracked), { id: (0, uuidv4_1.uuidv4)() }), oldState.schema);
+            }
+        }
         tr.getMeta('inputType') && newTr.setMeta('inputType', tr.getMeta('inputType'));
         tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
     }

package/dist/es/ChangeSet.js

@@ -35,13 +35,23 @@ export class ChangeSet {
     get changeTree() {
         const rootNodes = [];
         let currentNodeChange;
-        this.changes.forEach((c) => {
+        let currentInlineChange;
+        this.changes.forEach((c, index) => {
             if (currentNodeChange &&
                 (c.from >= currentNodeChange.to ||
                     c.dataTracked.statusUpdateAt !== currentNodeChange.dataTracked.statusUpdateAt)) {
-                rootNodes.push(currentNodeChange);
+                rootNodes.push([currentNodeChange]);
                 currentNodeChange = undefined;
             }
+            if (this.canJoinAdjacentInlineChanges(c, index) && !currentNodeChange) {
+                currentInlineChange = currentInlineChange ? [...currentInlineChange, c] : [c];
+                return;
+            }
+            else if (currentInlineChange) {
+                rootNodes.push([...currentInlineChange, c]);
+                currentInlineChange = undefined;
+                return;
+            }
             if (currentNodeChange &&
                 c.from < currentNodeChange.to &&
                 !(__classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isSameNodeChange).call(this, currentNodeChange, c) && __classPrivateFieldGet(this, _ChangeSet_instances, "m", _ChangeSet_isNotPendingOrDeleted).call(this, currentNodeChange))) {
@@ -51,7 +61,7 @@ export class ChangeSet {
                 const result = this.matchAndAddToRootChange(rootNodes, c);
                 if (result) {
                     const { index, root } = result;
-                    rootNodes[index] = root;
+                    rootNodes[index][0] = root;
                 }
                 else {
                     currentNodeChange = Object.assign(Object.assign({}, c), { children: [] });
@@ -61,20 +71,20 @@ export class ChangeSet {
                 const result = this.matchAndAddToRootChange(rootNodes, c);
                 if (result) {
                     const { index, root } = result;
-                    rootNodes[index] = root;
+                    rootNodes[index][0] = root;
                 }
                 else {
-                    rootNodes.push(c);
+                    rootNodes.push([c]);
                 }
             }
         });
         if (currentNodeChange) {
-            rootNodes.push(currentNodeChange);
+            rootNodes.push([currentNodeChange]);
         }
-        return rootNodes;
+        return rootNodes.filter((changes) => changes.filter((c) => c.dataTracked.operation !== CHANGE_OPERATION.reference));
     }
     get pending() {
-        return this.changeTree.filter((c) => c.dataTracked.status === CHANGE_STATUS.pending);
+        return this.changes.filter((c) => c.dataTracked.status === CHANGE_STATUS.pending);
     }
     get textChanges() {
         return this.changes.filter((c) => c.type === 'text-change');
@@ -117,7 +127,7 @@ export class ChangeSet {
     }
     matchAndAddToRootChange(rootNodes, change) {
         for (let i = 0; i < rootNodes.length; i++) {
-            const root = rootNodes[i];
+            const root = rootNodes[i][0];
             if (root.type === 'node-change' &&
                 change.from < root.to &&
                 change.dataTracked.statusUpdateAt === root.dataTracked.statusUpdateAt) {
@@ -126,6 +136,15 @@ export class ChangeSet {
             }
         }
     }
+    canJoinAdjacentInlineChanges(change, index) {
+        const nextChange = this.changes.at(index + 1);
+        const isInline = (c) => c.type === 'text-change' || (c.type === 'node-change' && c.node.isInline);
+        return (isInline(change) &&
+            nextChange &&
+            isInline(nextChange) &&
+            change.to === nextChange.from &&
+            change.dataTracked.operation === nextChange.dataTracked.operation);
+    }
     static flattenTreeToIds(changes) {
         return changes.flatMap((c) => (this.isNodeChange(c) ? [c.id, ...c.children.map((c) => c.id)] : c.id));
     }

package/dist/es/changes/findChanges.js

@@ -1,5 +1,5 @@
 import { ChangeSet } from '../ChangeSet';
-import { equalMarks, getNodeTrackedData } from '../compute/nodeHelpers';
+import { getNodeTrackedData } from '../compute/nodeHelpers';
 import { CHANGE_OPERATION, } from '../types/change';
 export function findChanges(state) {
     const changes = [];
@@ -9,11 +9,7 @@ export function findChanges(state) {
         for (let i = 0; i < tracked.length; i += 1) {
             const dataTracked = tracked[i];
             const id = dataTracked.id || '';
-            if (current &&
-                current.change.id === id &&
-                current.node.isText &&
-                node.isText &&
-                !equalMarks(node, current.node)) {
+            if (current && current.change.id === id) {
                 current.change.to = pos + node.nodeSize;
                 current.node = node;
                 continue;

package/dist/es/steps/trackTransaction.js

@@ -1,17 +1,20 @@
 import { NodeSelection as NodeSelectionClass, TextSelection, } from 'prosemirror-state';
-import { AttrStep, ReplaceAroundStep, ReplaceStep, } from 'prosemirror-transform';
+import { AddMarkStep, AttrStep, ReplaceAroundStep, ReplaceStep, } from 'prosemirror-transform';
 import { diffChangeSteps } from '../change-steps/diffChangeSteps';
 import { processChangeSteps } from '../change-steps/processChangeSteps';
+import { updateChangeAttrs } from '../changes/updateChangeAttrs';
+import { getNodeTrackedData } from '../compute/nodeHelpers';
 import { CHANGE_STATUS } from '../types/change';
 import { log } from '../utils/logger';
 import { mapChangeSteps } from '../utils/mapChangeStep';
+import { uuidv4 } from '../utils/uuidv4';
 import trackAttrsChange from './trackAttrsChange';
 import { trackReplaceAroundStep } from './trackReplaceAroundStep';
 import { trackReplaceStep } from './trackReplaceStep';
 const getSelectionStaticConstructor = (sel) => Object.getPrototypeOf(sel).constructor;
 const isHighlightMarkerNode = (node) => node && node.type === node.type.schema.nodes.highlight_marker;
 export function trackTransaction(tr, oldState, newTr, authorID) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const emptyAttrs = {
         authorID,
         reviewedByID: null,
@@ -85,6 +88,12 @@ export function trackTransaction(tr, oldState, newTr, authorID) {
             const chnageSteps = trackAttrsChange(step, oldState, tr, newTr, emptyAttrs, tr.docs[i]);
             const [mapping, selectionPos] = processChangeSteps(chnageSteps, tr.selection.from, newTr, emptyAttrs, oldState.schema);
         }
+        else if (step instanceof AddMarkStep) {
+            const dataTracked = (_e = getNodeTrackedData(newTr.doc.nodeAt(step.from), oldState.schema)) === null || _e === void 0 ? void 0 : _e.pop();
+            if (dataTracked) {
+                updateChangeAttrs(newTr, { id: dataTracked.id, from: step.from, to: step.to, type: 'text-change', dataTracked }, Object.assign(Object.assign({}, dataTracked), { id: uuidv4() }), oldState.schema);
+            }
+        }
         tr.getMeta('inputType') && newTr.setMeta('inputType', tr.getMeta('inputType'));
         tr.getMeta('uiEvent') && newTr.setMeta('uiEvent', tr.getMeta('uiEvent'));
     }

package/dist/types/ChangeSet.d.ts

@@ -1,10 +1,10 @@
-import { IncompleteChange, NodeAttrChange, NodeChange, ReferenceChange, TextChange, TrackedAttrs, TrackedChange } from './types/change';
+import { IncompleteChange, NodeAttrChange, NodeChange, ReferenceChange, RootChanges, TextChange, TrackedAttrs, TrackedChange } from './types/change';
 export declare class ChangeSet {
     #private;
     constructor(changes?: (TrackedChange | IncompleteChange)[]);
     get changes(): TrackedChange[];
     get invalidChanges(): (TrackedChange | IncompleteChange)[];
-    get changeTree(): TrackedChange[];
+    get changeTree(): TrackedChange[][];
     get pending(): TrackedChange[];
     get textChanges(): TrackedChange[];
     get nodeChanges(): TrackedChange[];
@@ -17,10 +17,11 @@ export declare class ChangeSet {
     get(id: string): TrackedChange | IncompleteChange | undefined;
     getIn(ids: string[]): (TrackedChange | IncompleteChange)[];
     getNotIn(ids: string[]): (TrackedChange | IncompleteChange)[];
-    matchAndAddToRootChange(rootNodes: TrackedChange[], change: TrackedChange): {
+    matchAndAddToRootChange(rootNodes: RootChanges, change: TrackedChange): {
         index: number;
         root: NodeChange;
     } | undefined;
+    canJoinAdjacentInlineChanges(change: TrackedChange, index: number): boolean | undefined;
     static flattenTreeToIds(changes: TrackedChange[]): string[];
     static shouldDeleteChange(change: TrackedChange): boolean;
     static isValidDataTracked(dataTracked?: Partial<TrackedAttrs>): boolean;

package/dist/types/types/change.d.ts

@@ -92,5 +92,6 @@ export type PartialChange<T extends TrackedChange> = Omit<T, 'dataTracked'> & {
 export type IncompleteChange = Omit<TrackedChange, 'dataTracked'> & {
     dataTracked: Partial<TrackedAttrs>;
 };
-export type ChangeType = TrackedChange['type'];
+export type RootChanges = TrackedChange[][];
+export type RootChange = TrackedChange[];
 export {};

package/package.json

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