@manuscripts/track-changes-plugin 1.10.3-LEAN-4373.1 → 1.10.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.
Files changed (9) hide show
  1. package/dist/cjs/change-steps/processChangeSteps.js +15 -1
  2. package/dist/cjs/changes/applyChanges.js +0 -4
  3. package/dist/cjs/mutate/mergeTrackedMarks.js +1 -2
  4. package/dist/cjs/steps/trackReplaceStep.js +1 -0
  5. package/dist/es/change-steps/processChangeSteps.js +15 -1
  6. package/dist/es/changes/applyChanges.js +0 -4
  7. package/dist/es/mutate/mergeTrackedMarks.js +1 -2
  8. package/dist/es/steps/trackReplaceStep.js +1 -0
  9. package/package.json +1 -1
package/dist/cjs/change-steps/processChangeSteps.js CHANGED
@@ -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
- if (isInserted && deletesCounter > 1) {
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());
package/dist/cjs/changes/applyChanges.js CHANGED
@@ -49,10 +49,6 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
49
49
  else if (ChangeSet_1.ChangeSet.isNodeChange(change) && noChangeNeeded) {
50
50
  const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: null });
51
51
  tr.setNodeMarkup(from, undefined, attrs, node.marks);
52
- if (node.isAtom) {
53
- tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_insert);
54
- tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_delete);
55
- }
56
52
  (0, updateChangeAttrs_1.updateChangeChildrenAttributes)(change.children, tr, deleteMap);
57
53
  }
58
54
  else if (ChangeSet_1.ChangeSet.isNodeChange(change)) {
package/dist/cjs/mutate/mergeTrackedMarks.js CHANGED
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.mergeTrackedMarks = void 0;
4
4
  const nodeHelpers_1 = require("../compute/nodeHelpers");
5
- const uuidv4_1 = require("../utils/uuidv4");
6
5
  function mergeTrackedMarks(pos, doc, newTr, schema) {
7
6
  const resolved = doc.resolve(pos);
8
7
  const { nodeAfter, nodeBefore } = resolved;
@@ -21,6 +20,6 @@ function mergeTrackedMarks(pos, doc, newTr, schema) {
21
20
  const dataTracked = Object.assign(Object.assign({}, ancestorAttrs), { updatedAt: Date.now() });
22
21
  const fromStartOfMark = pos - nodeBefore.nodeSize;
23
22
  const toEndOfMark = pos + nodeAfter.nodeSize;
24
- newTr.addMark(fromStartOfMark, toEndOfMark, leftMark.type.create(Object.assign(Object.assign({}, leftMark.attrs), { dataTracked: Object.assign(Object.assign({}, dataTracked), { id: (0, uuidv4_1.uuidv4)() }) })));
23
+ newTr.addMark(fromStartOfMark, toEndOfMark, leftMark.type.create(Object.assign(Object.assign({}, leftMark.attrs), { dataTracked })));
25
24
  }
26
25
  exports.mergeTrackedMarks = mergeTrackedMarks;
package/dist/cjs/steps/trackReplaceStep.js CHANGED
@@ -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);
package/dist/es/change-steps/processChangeSteps.js CHANGED
@@ -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
- if (isInserted && deletesCounter > 1) {
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());
package/dist/es/changes/applyChanges.js CHANGED
@@ -45,10 +45,6 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, del
45
45
  else if (ChangeSet.isNodeChange(change) && noChangeNeeded) {
46
46
  const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: null });
47
47
  tr.setNodeMarkup(from, undefined, attrs, node.marks);
48
- if (node.isAtom) {
49
- tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_insert);
50
- tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_delete);
51
- }
52
48
  updateChangeChildrenAttributes(change.children, tr, deleteMap);
53
49
  }
54
50
  else if (ChangeSet.isNodeChange(change)) {
package/dist/es/mutate/mergeTrackedMarks.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import { shouldMergeTrackedAttributes } from '../compute/nodeHelpers';
2
- import { uuidv4 } from '../utils/uuidv4';
3
2
  export function mergeTrackedMarks(pos, doc, newTr, schema) {
4
3
  const resolved = doc.resolve(pos);
5
4
  const { nodeAfter, nodeBefore } = resolved;
@@ -18,5 +17,5 @@ export function mergeTrackedMarks(pos, doc, newTr, schema) {
18
17
  const dataTracked = Object.assign(Object.assign({}, ancestorAttrs), { updatedAt: Date.now() });
19
18
  const fromStartOfMark = pos - nodeBefore.nodeSize;
20
19
  const toEndOfMark = pos + nodeAfter.nodeSize;
21
- newTr.addMark(fromStartOfMark, toEndOfMark, leftMark.type.create(Object.assign(Object.assign({}, leftMark.attrs), { dataTracked: Object.assign(Object.assign({}, dataTracked), { id: uuidv4() }) })));
20
+ newTr.addMark(fromStartOfMark, toEndOfMark, leftMark.type.create(Object.assign(Object.assign({}, leftMark.attrs), { dataTracked })));
22
21
  }
package/dist/es/steps/trackReplaceStep.js CHANGED
@@ -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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manuscripts/track-changes-plugin",
3
- "version": "1.10.3-LEAN-4373.1",
3
+ "version": "1.10.3",
4
4
  "author": "Atypon Systems LLC",
5
5
  "license": "Apache-2.0",
6
6
  "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",