@manuscripts/track-changes-plugin 1.8.2-LEAN-4097.0 → 1.8.2-LEAN-3588.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.
@@ -29,17 +29,23 @@ exports.revertSplitNodeChange = revertSplitNodeChange;
29
29
  function revertWrapNodeChange(tr, change) {
30
30
  const from = tr.mapping.map(change.from);
31
31
  const to = tr.mapping.map(change.to);
32
- tr.doc.nodesBetween(from, to, (node, pos) => {
33
- const $fromPos = tr.doc.resolve(pos);
34
- const $toPos = tr.doc.resolve(pos + node.nodeSize - 1);
35
- const nodeRange = $fromPos.blockRange($toPos);
36
- if (!nodeRange) {
37
- return;
38
- }
39
- const targetLiftDepth = (0, prosemirror_transform_1.liftTarget)(nodeRange);
40
- if (targetLiftDepth || targetLiftDepth === 0) {
41
- tr.lift(nodeRange, targetLiftDepth);
42
- }
43
- });
32
+ const node = tr.doc.nodeAt(from);
33
+ if (node === null || node === void 0 ? void 0 : node.isInline) {
34
+ tr.replaceWith(from, to, node.content);
35
+ }
36
+ else {
37
+ tr.doc.nodesBetween(from, to, (node, pos) => {
38
+ const $fromPos = tr.doc.resolve(pos);
39
+ const $toPos = tr.doc.resolve(pos + node.nodeSize - 1);
40
+ const nodeRange = $fromPos.blockRange($toPos);
41
+ if (!nodeRange) {
42
+ return;
43
+ }
44
+ const targetLiftDepth = (0, prosemirror_transform_1.liftTarget)(nodeRange);
45
+ if (targetLiftDepth || targetLiftDepth === 0) {
46
+ tr.lift(nodeRange, targetLiftDepth);
47
+ }
48
+ });
49
+ }
44
50
  }
45
51
  exports.revertWrapNodeChange = revertWrapNodeChange;
@@ -55,8 +55,8 @@ function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema, trackA
55
55
  const mergeContent = mergingStartSide
56
56
  ? firstMergedNode === null || firstMergedNode === void 0 ? void 0 : firstMergedNode.mergedNodeContent
57
57
  : lastMergedNode === null || lastMergedNode === void 0 ? void 0 : lastMergedNode.mergedNodeContent;
58
- const mergeStartNode = endTokenDeleted && openStart > 0 && depth === openStart && mergeContent && mergeContent.size;
59
- const mergeEndNode = startTokenDeleted && openEnd > 0 && depth === openEnd && mergeContent && mergeContent.size;
58
+ const mergeStartNode = endTokenDeleted && openStart > 0 && depth === openStart && mergeContent !== undefined;
59
+ const mergeEndNode = startTokenDeleted && openEnd > 0 && depth === openEnd && mergeContent !== undefined;
60
60
  if (mergeStartNode || mergeEndNode) {
61
61
  steps.push({
62
62
  type: 'merge-fragment',
@@ -25,16 +25,22 @@ export function revertSplitNodeChange(tr, change, changeSet) {
25
25
  export function revertWrapNodeChange(tr, change) {
26
26
  const from = tr.mapping.map(change.from);
27
27
  const to = tr.mapping.map(change.to);
28
- tr.doc.nodesBetween(from, to, (node, pos) => {
29
- const $fromPos = tr.doc.resolve(pos);
30
- const $toPos = tr.doc.resolve(pos + node.nodeSize - 1);
31
- const nodeRange = $fromPos.blockRange($toPos);
32
- if (!nodeRange) {
33
- return;
34
- }
35
- const targetLiftDepth = liftTarget(nodeRange);
36
- if (targetLiftDepth || targetLiftDepth === 0) {
37
- tr.lift(nodeRange, targetLiftDepth);
38
- }
39
- });
28
+ const node = tr.doc.nodeAt(from);
29
+ if (node === null || node === void 0 ? void 0 : node.isInline) {
30
+ tr.replaceWith(from, to, node.content);
31
+ }
32
+ else {
33
+ tr.doc.nodesBetween(from, to, (node, pos) => {
34
+ const $fromPos = tr.doc.resolve(pos);
35
+ const $toPos = tr.doc.resolve(pos + node.nodeSize - 1);
36
+ const nodeRange = $fromPos.blockRange($toPos);
37
+ if (!nodeRange) {
38
+ return;
39
+ }
40
+ const targetLiftDepth = liftTarget(nodeRange);
41
+ if (targetLiftDepth || targetLiftDepth === 0) {
42
+ tr.lift(nodeRange, targetLiftDepth);
43
+ }
44
+ });
45
+ }
40
46
  }
@@ -29,8 +29,8 @@ export function deleteAndMergeSplitNodes(from, to, gap, startDoc, newTr, schema,
29
29
  const mergeContent = mergingStartSide
30
30
  ? firstMergedNode === null || firstMergedNode === void 0 ? void 0 : firstMergedNode.mergedNodeContent
31
31
  : lastMergedNode === null || lastMergedNode === void 0 ? void 0 : lastMergedNode.mergedNodeContent;
32
- const mergeStartNode = endTokenDeleted && openStart > 0 && depth === openStart && mergeContent && mergeContent.size;
33
- const mergeEndNode = startTokenDeleted && openEnd > 0 && depth === openEnd && mergeContent && mergeContent.size;
32
+ const mergeStartNode = endTokenDeleted && openStart > 0 && depth === openStart && mergeContent !== undefined;
33
+ const mergeEndNode = startTokenDeleted && openEnd > 0 && depth === openEnd && mergeContent !== undefined;
34
34
  if (mergeStartNode || mergeEndNode) {
35
35
  steps.push({
36
36
  type: 'merge-fragment',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manuscripts/track-changes-plugin",
3
- "version": "1.8.2-LEAN-4097.0",
3
+ "version": "1.8.2-LEAN-3588.0",
4
4
  "author": "Atypon Systems LLC",
5
5
  "license": "Apache-2.0",
6
6
  "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",