@manuscripts/track-changes-plugin 1.10.2 → 1.10.3-LEAN-4401.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -49,18 +49,32 @@ function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema, delete
|
|
|
49
49
|
let selectionPos = startPos;
|
|
50
50
|
let deletesCounter = 0;
|
|
51
51
|
let isInserted = false;
|
|
52
|
+
let prevDeletedNode;
|
|
52
53
|
changes.forEach((c) => {
|
|
53
54
|
let step = newTr.steps[newTr.steps.length - 1];
|
|
54
55
|
switch (c.type) {
|
|
55
56
|
case 'delete-node':
|
|
56
57
|
deletesCounter++;
|
|
58
|
+
const prevDeletedNodeInserted = isInserted;
|
|
57
59
|
const trackedData = (0, nodeHelpers_1.getBlockInlineTrackedData)(c.node);
|
|
58
60
|
const inserted = trackedData === null || trackedData === void 0 ? void 0 : trackedData.find((d) => d.operation === change_1.CHANGE_OPERATION.insert);
|
|
59
61
|
isInserted = !!inserted || (!trackedData && isInserted);
|
|
60
|
-
|
|
62
|
+
let childOfDeleted = false;
|
|
63
|
+
if (prevDeletedNode) {
|
|
64
|
+
prevDeletedNode.descendants((node) => {
|
|
65
|
+
if (childOfDeleted) {
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
if (node == c.node) {
|
|
69
|
+
childOfDeleted = true;
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
if ((isInserted && deletesCounter > 1) || (childOfDeleted && prevDeletedNodeInserted)) {
|
|
61
74
|
return false;
|
|
62
75
|
}
|
|
63
76
|
(0, deleteNode_1.deleteOrSetNodeDeleted)(c.node, mapping.map(c.pos), newTr, deleteAttrs);
|
|
77
|
+
prevDeletedNode = c.node;
|
|
64
78
|
const newestStep = newTr.steps[newTr.steps.length - 1];
|
|
65
79
|
if (isInserted) {
|
|
66
80
|
deletedNodeMapping.appendMap(newestStep.getMap());
|
|
@@ -56,6 +56,7 @@ function trackReplaceStep(step, oldState, newTr, attrs, stepResult, currentStepD
|
|
|
56
56
|
}
|
|
57
57
|
const backSpacedText = sameThingBackSpaced();
|
|
58
58
|
if (backSpacedText) {
|
|
59
|
+
console.log('Detected backspacing');
|
|
59
60
|
changeSteps.splice(changeSteps.indexOf(backSpacedText));
|
|
60
61
|
}
|
|
61
62
|
const textWasDeleted = !!changeSteps.length && !(fromA === fromB);
|
|
@@ -23,18 +23,32 @@ export function processChangeSteps(changes, startPos, newTr, emptyAttrs, schema,
|
|
|
23
23
|
let selectionPos = startPos;
|
|
24
24
|
let deletesCounter = 0;
|
|
25
25
|
let isInserted = false;
|
|
26
|
+
let prevDeletedNode;
|
|
26
27
|
changes.forEach((c) => {
|
|
27
28
|
let step = newTr.steps[newTr.steps.length - 1];
|
|
28
29
|
switch (c.type) {
|
|
29
30
|
case 'delete-node':
|
|
30
31
|
deletesCounter++;
|
|
32
|
+
const prevDeletedNodeInserted = isInserted;
|
|
31
33
|
const trackedData = getBlockInlineTrackedData(c.node);
|
|
32
34
|
const inserted = trackedData === null || trackedData === void 0 ? void 0 : trackedData.find((d) => d.operation === CHANGE_OPERATION.insert);
|
|
33
35
|
isInserted = !!inserted || (!trackedData && isInserted);
|
|
34
|
-
|
|
36
|
+
let childOfDeleted = false;
|
|
37
|
+
if (prevDeletedNode) {
|
|
38
|
+
prevDeletedNode.descendants((node) => {
|
|
39
|
+
if (childOfDeleted) {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
if (node == c.node) {
|
|
43
|
+
childOfDeleted = true;
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
if ((isInserted && deletesCounter > 1) || (childOfDeleted && prevDeletedNodeInserted)) {
|
|
35
48
|
return false;
|
|
36
49
|
}
|
|
37
50
|
deleteOrSetNodeDeleted(c.node, mapping.map(c.pos), newTr, deleteAttrs);
|
|
51
|
+
prevDeletedNode = c.node;
|
|
38
52
|
const newestStep = newTr.steps[newTr.steps.length - 1];
|
|
39
53
|
if (isInserted) {
|
|
40
54
|
deletedNodeMapping.appendMap(newestStep.getMap());
|
|
@@ -30,6 +30,7 @@ export function trackReplaceStep(step, oldState, newTr, attrs, stepResult, curre
|
|
|
30
30
|
}
|
|
31
31
|
const backSpacedText = sameThingBackSpaced();
|
|
32
32
|
if (backSpacedText) {
|
|
33
|
+
console.log('Detected backspacing');
|
|
33
34
|
changeSteps.splice(changeSteps.indexOf(backSpacedText));
|
|
34
35
|
}
|
|
35
36
|
const textWasDeleted = !!changeSteps.length && !(fromA === fromB);
|
package/package.json
CHANGED