@manuscripts/track-changes-plugin 1.10.3 → 1.10.4-LEAN-4373.1

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 (5) hide show
  1. package/dist/cjs/changes/applyChanges.js +4 -0
  2. package/dist/cjs/mutate/mergeTrackedMarks.js +8 -1
  3. package/dist/es/changes/applyChanges.js +4 -0
  4. package/dist/es/mutate/mergeTrackedMarks.js +8 -1
  5. package/package.json +1 -1
package/dist/cjs/changes/applyChanges.js CHANGED
@@ -49,6 +49,10 @@ 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
+ }
52
56
  (0, updateChangeAttrs_1.updateChangeChildrenAttributes)(change.children, tr, deleteMap);
53
57
  }
54
58
  else if (ChangeSet_1.ChangeSet.isNodeChange(change)) {
package/dist/cjs/mutate/mergeTrackedMarks.js CHANGED
@@ -2,6 +2,13 @@
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
+ const assignId = (attrs, leftDataTracked, rightDataTracked) => {
7
+ if (attrs.id === leftDataTracked.id || attrs.id === rightDataTracked.id) {
8
+ return Object.assign(Object.assign({}, attrs), { id: (0, uuidv4_1.uuidv4)() });
9
+ }
10
+ return attrs;
11
+ };
5
12
  function mergeTrackedMarks(pos, doc, newTr, schema) {
6
13
  const resolved = doc.resolve(pos);
7
14
  const { nodeAfter, nodeBefore } = resolved;
@@ -20,6 +27,6 @@ function mergeTrackedMarks(pos, doc, newTr, schema) {
20
27
  const dataTracked = Object.assign(Object.assign({}, ancestorAttrs), { updatedAt: Date.now() });
21
28
  const fromStartOfMark = pos - nodeBefore.nodeSize;
22
29
  const toEndOfMark = pos + nodeAfter.nodeSize;
23
- newTr.addMark(fromStartOfMark, toEndOfMark, leftMark.type.create(Object.assign(Object.assign({}, leftMark.attrs), { dataTracked })));
30
+ newTr.addMark(fromStartOfMark, toEndOfMark, leftMark.type.create(Object.assign(Object.assign({}, leftMark.attrs), { dataTracked: assignId(dataTracked, leftDataTracked, rightDataTracked) })));
24
31
  }
25
32
  exports.mergeTrackedMarks = mergeTrackedMarks;
package/dist/es/changes/applyChanges.js CHANGED
@@ -45,6 +45,10 @@ 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
+ }
48
52
  updateChangeChildrenAttributes(change.children, tr, deleteMap);
49
53
  }
50
54
  else if (ChangeSet.isNodeChange(change)) {
package/dist/es/mutate/mergeTrackedMarks.js CHANGED
@@ -1,4 +1,11 @@
1
1
  import { shouldMergeTrackedAttributes } from '../compute/nodeHelpers';
2
+ import { uuidv4 } from '../utils/uuidv4';
3
+ const assignId = (attrs, leftDataTracked, rightDataTracked) => {
4
+ if (attrs.id === leftDataTracked.id || attrs.id === rightDataTracked.id) {
5
+ return Object.assign(Object.assign({}, attrs), { id: uuidv4() });
6
+ }
7
+ return attrs;
8
+ };
2
9
  export function mergeTrackedMarks(pos, doc, newTr, schema) {
3
10
  const resolved = doc.resolve(pos);
4
11
  const { nodeAfter, nodeBefore } = resolved;
@@ -17,5 +24,5 @@ export function mergeTrackedMarks(pos, doc, newTr, schema) {
17
24
  const dataTracked = Object.assign(Object.assign({}, ancestorAttrs), { updatedAt: Date.now() });
18
25
  const fromStartOfMark = pos - nodeBefore.nodeSize;
19
26
  const toEndOfMark = pos + nodeAfter.nodeSize;
20
- newTr.addMark(fromStartOfMark, toEndOfMark, leftMark.type.create(Object.assign(Object.assign({}, leftMark.attrs), { dataTracked })));
27
+ newTr.addMark(fromStartOfMark, toEndOfMark, leftMark.type.create(Object.assign(Object.assign({}, leftMark.attrs), { dataTracked: assignId(dataTracked, leftDataTracked, rightDataTracked) })));
21
28
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@manuscripts/track-changes-plugin",
3
- "version": "1.10.3",
3
+ "version": "1.10.4-LEAN-4373.1",
4
4
  "author": "Atypon Systems LLC",
5
5
  "license": "Apache-2.0",
6
6
  "homepage": "https://github.com/Atypon-OpenSource/manuscripts-track-changes-plugin",