@manuscripts/track-changes-plugin 1.10.5-LEAN-4160.2 → 1.10.5-LEAN-4160.4

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.
@@ -30,7 +30,7 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
30
30
  !deleted && logger_1.log.warn('no node found to update for change', change);
31
31
  return;
32
32
  }
33
- if (change.dataTracked.status == change_1.CHANGE_STATUS.rejected) {
33
+ if (change.dataTracked.status === change_1.CHANGE_STATUS.rejected) {
34
34
  if (change.dataTracked.operation === change_1.CHANGE_OPERATION.node_split) {
35
35
  return (0, revertChange_1.revertSplitNodeChange)(tr, change, changeSet);
36
36
  }
@@ -42,6 +42,15 @@ function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, deleteMap
42
42
  return deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
43
43
  }
44
44
  }
45
+ else if (change.dataTracked.status === change_1.CHANGE_STATUS.accepted) {
46
+ if (change.dataTracked.operation === change_1.CHANGE_OPERATION.move) {
47
+ tr.delete(from, from + node.nodeSize);
48
+ deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
49
+ const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) });
50
+ tr.setNodeMarkup(from, undefined, attrs, node.marks);
51
+ return;
52
+ }
53
+ }
45
54
  if (ChangeSet_1.ChangeSet.isTextChange(change) && noChangeNeeded) {
46
55
  tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_insert);
47
56
  tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_delete);
@@ -39,7 +39,7 @@ function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
39
39
  tr.steps.forEach((step) => {
40
40
  var _a;
41
41
  if (step instanceof prosemirror_transform_1.ReplaceStep) {
42
- const doc = tr.docs[tr.steps.indexOf(step)] || tr.docs[0];
42
+ const doc = tr.docs[tr.steps.indexOf(step)];
43
43
  if ((0, track_utils_1.isDeletingPendingMovedNode)(step, doc)) {
44
44
  const node = doc.nodeAt(step.from);
45
45
  (_a = node === null || node === void 0 ? void 0 : node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.forEach((tracked) => {
@@ -100,7 +100,7 @@ const isNodeMoveOperation = (tr) => {
100
100
  const insertedHashes = new Set();
101
101
  for (let i = 0; i < tr.steps.length; i++) {
102
102
  const step = tr.steps[i];
103
- const doc = tr.docs[i] || tr.docs[0];
103
+ const doc = tr.docs[i];
104
104
  const content = step.slice.size === 0 ? doc.slice(step.from, step.to) : step.slice;
105
105
  if (step.from !== step.to && step.slice.size === 0) {
106
106
  if (content.content.firstChild) {
@@ -26,7 +26,7 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, del
26
26
  !deleted && log.warn('no node found to update for change', change);
27
27
  return;
28
28
  }
29
- if (change.dataTracked.status == CHANGE_STATUS.rejected) {
29
+ if (change.dataTracked.status === CHANGE_STATUS.rejected) {
30
30
  if (change.dataTracked.operation === CHANGE_OPERATION.node_split) {
31
31
  return revertSplitNodeChange(tr, change, changeSet);
32
32
  }
@@ -38,6 +38,15 @@ export function applyAcceptedRejectedChanges(tr, schema, changes, changeSet, del
38
38
  return deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
39
39
  }
40
40
  }
41
+ else if (change.dataTracked.status === CHANGE_STATUS.accepted) {
42
+ if (change.dataTracked.operation === CHANGE_OPERATION.move) {
43
+ tr.delete(from, from + node.nodeSize);
44
+ deleteMap.appendMap(tr.steps[tr.steps.length - 1].getMap());
45
+ const attrs = Object.assign(Object.assign({}, node.attrs), { dataTracked: getUpdatedDataTracked(node.attrs.dataTracked, change.id) });
46
+ tr.setNodeMarkup(from, undefined, attrs, node.marks);
47
+ return;
48
+ }
49
+ }
41
50
  if (ChangeSet.isTextChange(change) && noChangeNeeded) {
42
51
  tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_insert);
43
52
  tr.removeMark(from, deleteMap.map(change.to), schema.marks.tracked_delete);
@@ -33,7 +33,7 @@ export function trackTransaction(tr, oldState, newTr, authorID, changeSet) {
33
33
  tr.steps.forEach((step) => {
34
34
  var _a;
35
35
  if (step instanceof ReplaceStep) {
36
- const doc = tr.docs[tr.steps.indexOf(step)] || tr.docs[0];
36
+ const doc = tr.docs[tr.steps.indexOf(step)];
37
37
  if (isDeletingPendingMovedNode(step, doc)) {
38
38
  const node = doc.nodeAt(step.from);
39
39
  (_a = node === null || node === void 0 ? void 0 : node.attrs.dataTracked) === null || _a === void 0 ? void 0 : _a.forEach((tracked) => {
@@ -85,7 +85,7 @@ export const isNodeMoveOperation = (tr) => {
85
85
  const insertedHashes = new Set();
86
86
  for (let i = 0; i < tr.steps.length; i++) {
87
87
  const step = tr.steps[i];
88
- const doc = tr.docs[i] || tr.docs[0];
88
+ const doc = tr.docs[i];
89
89
  const content = step.slice.size === 0 ? doc.slice(step.from, step.to) : step.slice;
90
90
  if (step.from !== step.to && step.slice.size === 0) {
91
91
  if (content.content.firstChild) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manuscripts/track-changes-plugin",
3
- "version": "1.10.5-LEAN-4160.2",
3
+ "version": "1.10.5-LEAN-4160.4",
4
4
  "author": "Atypon Systems LLC",
5
5
  "license": "Apache-2.0",
6
6
  "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",