@manuscripts/track-changes-plugin 1.7.2-LEAN-2832-v2 → 1.7.3
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.
|
@@ -15,10 +15,7 @@ function deleteNode(node, pos, tr) {
|
|
|
15
15
|
return tr.lift(range, targetDepth);
|
|
16
16
|
}
|
|
17
17
|
const resPos = tr.doc.resolve(pos);
|
|
18
|
-
const canMergeToNodeAbove = resPos.parent !== tr.doc &&
|
|
19
|
-
resPos.nodeBefore &&
|
|
20
|
-
node.isBlock &&
|
|
21
|
-
((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
|
|
18
|
+
const canMergeToNodeAbove = resPos.parent !== tr.doc && resPos.nodeBefore && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
|
|
22
19
|
if (canMergeToNodeAbove) {
|
|
23
20
|
return tr.replaceWith(pos - 1, pos + 1, prosemirror_model_1.Fragment.empty);
|
|
24
21
|
}
|
|
@@ -29,19 +26,14 @@ function deleteNode(node, pos, tr) {
|
|
|
29
26
|
exports.deleteNode = deleteNode;
|
|
30
27
|
function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
|
|
31
28
|
const dataTracked = (0, nodeHelpers_1.getBlockInlineTrackedData)(node);
|
|
32
|
-
const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.insert
|
|
33
|
-
d.status === change_1.CHANGE_STATUS.pending);
|
|
29
|
+
const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.insert);
|
|
34
30
|
const deleted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.delete);
|
|
35
31
|
const updated = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === change_1.CHANGE_OPERATION.set_node_attributes);
|
|
36
32
|
if (inserted && inserted.authorID === deleteAttrs.authorID) {
|
|
37
33
|
return deleteNode(node, pos, newTr);
|
|
38
34
|
}
|
|
39
35
|
if (!newTr.doc.nodeAt(pos)) {
|
|
40
|
-
logger_1.log.error(`deleteOrSetNodeDeleted: no node found for deletion`, {
|
|
41
|
-
pos,
|
|
42
|
-
node,
|
|
43
|
-
newTr,
|
|
44
|
-
});
|
|
36
|
+
logger_1.log.error(`deleteOrSetNodeDeleted: no node found for deletion`, { pos, node, newTr });
|
|
45
37
|
return;
|
|
46
38
|
}
|
|
47
39
|
const newDeleted = deleted
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Fragment } from 'prosemirror-model';
|
|
2
2
|
import { liftTarget } from 'prosemirror-transform';
|
|
3
3
|
import { log } from '../utils/logger';
|
|
4
|
-
import { CHANGE_OPERATION
|
|
5
|
-
import { addTrackIdIfDoesntExist, getBlockInlineTrackedData
|
|
4
|
+
import { CHANGE_OPERATION } from '../types/change';
|
|
5
|
+
import { addTrackIdIfDoesntExist, getBlockInlineTrackedData } from '../compute/nodeHelpers';
|
|
6
6
|
export function deleteNode(node, pos, tr) {
|
|
7
7
|
var _a;
|
|
8
8
|
const startPos = tr.doc.resolve(pos + 1);
|
|
@@ -12,10 +12,7 @@ export function deleteNode(node, pos, tr) {
|
|
|
12
12
|
return tr.lift(range, targetDepth);
|
|
13
13
|
}
|
|
14
14
|
const resPos = tr.doc.resolve(pos);
|
|
15
|
-
const canMergeToNodeAbove = resPos.parent !== tr.doc &&
|
|
16
|
-
resPos.nodeBefore &&
|
|
17
|
-
node.isBlock &&
|
|
18
|
-
((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
|
|
15
|
+
const canMergeToNodeAbove = resPos.parent !== tr.doc && resPos.nodeBefore && node.isBlock && ((_a = node.firstChild) === null || _a === void 0 ? void 0 : _a.isText);
|
|
19
16
|
if (canMergeToNodeAbove) {
|
|
20
17
|
return tr.replaceWith(pos - 1, pos + 1, Fragment.empty);
|
|
21
18
|
}
|
|
@@ -25,19 +22,14 @@ export function deleteNode(node, pos, tr) {
|
|
|
25
22
|
}
|
|
26
23
|
export function deleteOrSetNodeDeleted(node, pos, newTr, deleteAttrs) {
|
|
27
24
|
const dataTracked = getBlockInlineTrackedData(node);
|
|
28
|
-
const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.insert
|
|
29
|
-
d.status === CHANGE_STATUS.pending);
|
|
25
|
+
const inserted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.insert);
|
|
30
26
|
const deleted = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.delete);
|
|
31
27
|
const updated = dataTracked === null || dataTracked === void 0 ? void 0 : dataTracked.find((d) => d.operation === CHANGE_OPERATION.set_node_attributes);
|
|
32
28
|
if (inserted && inserted.authorID === deleteAttrs.authorID) {
|
|
33
29
|
return deleteNode(node, pos, newTr);
|
|
34
30
|
}
|
|
35
31
|
if (!newTr.doc.nodeAt(pos)) {
|
|
36
|
-
log.error(`deleteOrSetNodeDeleted: no node found for deletion`, {
|
|
37
|
-
pos,
|
|
38
|
-
node,
|
|
39
|
-
newTr,
|
|
40
|
-
});
|
|
32
|
+
log.error(`deleteOrSetNodeDeleted: no node found for deletion`, { pos, node, newTr });
|
|
41
33
|
return;
|
|
42
34
|
}
|
|
43
35
|
const newDeleted = deleted
|
package/package.json
CHANGED