@manuscripts/track-changes-plugin 1.5.2-LEAN-2508 → 1.5.2-LEAN-2529

package/dist/index.cjs

@@ -448,8 +448,7 @@ function deleteNode(node, pos, tr) {
     const resPos = tr.doc.resolve(pos);
     // Block nodes can be deleted by just removing their start token which should then merge the text
     // content to above node's content (if there is one)
-    // this will work just for the node after the first child
-    const canMergeToNodeAbove = resPos.parent !== tr.doc && resPos.nodeBefore && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
+    const canMergeToNodeAbove = (resPos.parent !== tr.doc || resPos.nodeBefore) && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
     if (canMergeToNodeAbove) {
         return tr.replaceWith(pos - 1, pos + 1, prosemirrorModel.Fragment.empty);
     }
@@ -510,9 +509,9 @@ function mergeNode(node, pos, tr) {
     if (prosemirrorTransform.canJoin(tr.doc, pos)) {
         return tr.join(pos);
     }
-    else if (!tr.doc.resolve(pos).nodeBefore) {
-        // for this case will just delete that node in `deleteNode.ts` as the join will not work
-        return undefined;
+    else if (prosemirrorTransform.canJoin(tr.doc, pos + node.nodeSize)) {
+        // TODO should copy the attributes from the merged node below
+        return tr.join(pos + node.nodeSize);
     }
     // TODO is this the same thing as join to above?
     const resPos = tr.doc.resolve(pos);
@@ -1201,6 +1200,7 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
     let selectionPos = 0, changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
+        var _a, _b;
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
         log.info('TR: steps before applying delete', [...newTr.steps]);
@@ -1248,9 +1248,6 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
                 type: 'insert-slice',
                 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),
             });
@@ -1258,7 +1255,10 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         else {
             // Incase only deletion was applied, check whether tracked marks around deleted content can be merged
             // mergeTrackedMarks(adjustedInsertPos, newTr.doc, newTr, oldState.schema)
-            selectionPos = fromA;
+            // When DEL is used, the selection is set to the end of the deleted content
+            // TODO: 'window.event' is deprecated, find a better way to detect the key used for deletion
+            // @ts-ignore
+            selectionPos = ((_a = window.event) === null || _a === void 0 ? void 0 : _a.code) === 'Delete' || ((_b = window.event) === null || _b === void 0 ? void 0 : _b.inputType) === 'deleteContentForward' ? toA : fromA;
         }
     });
     return [changeSteps, selectionPos];

package/dist/index.js

@@ -440,8 +440,7 @@ function deleteNode(node, pos, tr) {
     const resPos = tr.doc.resolve(pos);
     // Block nodes can be deleted by just removing their start token which should then merge the text
     // content to above node's content (if there is one)
-    // this will work just for the node after the first child
-    const canMergeToNodeAbove = resPos.parent !== tr.doc && resPos.nodeBefore && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
+    const canMergeToNodeAbove = (resPos.parent !== tr.doc || resPos.nodeBefore) && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
     if (canMergeToNodeAbove) {
         return tr.replaceWith(pos - 1, pos + 1, Fragment.empty);
     }
@@ -502,9 +501,9 @@ function mergeNode(node, pos, tr) {
     if (canJoin(tr.doc, pos)) {
         return tr.join(pos);
     }
-    else if (!tr.doc.resolve(pos).nodeBefore) {
-        // for this case will just delete that node in `deleteNode.ts` as the join will not work
-        return undefined;
+    else if (canJoin(tr.doc, pos + node.nodeSize)) {
+        // TODO should copy the attributes from the merged node below
+        return tr.join(pos + node.nodeSize);
     }
     // TODO is this the same thing as join to above?
     const resPos = tr.doc.resolve(pos);
@@ -1193,6 +1192,7 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
     let selectionPos = 0, changeSteps = [];
     // Invert the transaction step to prevent it from actually deleting or inserting anything
     step.getMap().forEach((fromA, toA, fromB, toB) => {
+        var _a, _b;
         log.info(`changed ranges: ${fromA} ${toA} ${fromB} ${toB}`);
         const { slice } = step;
         log.info('TR: steps before applying delete', [...newTr.steps]);
@@ -1240,9 +1240,6 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
                 type: 'insert-slice',
                 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),
             });
@@ -1250,7 +1247,10 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
         else {
             // Incase only deletion was applied, check whether tracked marks around deleted content can be merged
             // mergeTrackedMarks(adjustedInsertPos, newTr.doc, newTr, oldState.schema)
-            selectionPos = fromA;
+            // When DEL is used, the selection is set to the end of the deleted content
+            // TODO: 'window.event' is deprecated, find a better way to detect the key used for deletion
+            // @ts-ignore
+            selectionPos = ((_a = window.event) === null || _a === void 0 ? void 0 : _a.code) === 'Delete' || ((_b = window.event) === null || _b === void 0 ? void 0 : _b.inputType) === 'deleteContentForward' ? toA : fromA;
         }
     });
     return [changeSteps, selectionPos];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuscripts/track-changes-plugin",
-  "version": "1.5.2-LEAN-2508",
+  "version": "1.5.2-LEAN-2529",
   "author": "Atypon Systems LLC",
   "license": "Apache-2.0",
   "homepage": "https://github.com/Atypon-OpenSource/manuscripts-quarterback/tree/main/quarterback-packages/track-changes-plugin",
@@ -61,6 +61,7 @@
   "scripts": {
     "build": "rollup -c",
     "watch": "rollup -cw",
+    "dev": "yarn run watch",
     "test": "jest --runInBand",
     "format": "prettier --write \"*.+(js|json|yml|yaml|ts|md|graphql|mdx)\" src/ test/",
     "typecheck": "tsc --project tsconfig.test.json --noEmit",