@atlaskit/editor-plugin-show-diff 1.0.0 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 2.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.0.1
+
+### Patch Changes
+
+- [`4144b576f0bf8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4144b576f0bf8) -
+  Ignore attribute changes when ensuring the steps match the final document
+- Updated dependencies
+
 ## 1.0.0
 
 ### Patch Changes

package/dist/cjs/pm-plugins/calculateDiffDecorations.js

@@ -0,0 +1,100 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.areNodesEqual = areNodesEqual;
+exports.calculateDiffDecorations = void 0;
+var _prosemirrorChangeset = require("prosemirror-changeset");
+var _view = require("@atlaskit/editor-prosemirror/view");
+var _decorations = require("./decorations");
+var _markDecorations = require("./markDecorations");
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } // eslint-disable-next-line @atlassian/tangerine/import/entry-points
+var calculateDiffDecorations = exports.calculateDiffDecorations = function calculateDiffDecorations(_ref) {
+  var state = _ref.state,
+    pluginState = _ref.pluginState,
+    nodeViewSerializer = _ref.nodeViewSerializer;
+  var originalDoc = pluginState.originalDoc,
+    steps = pluginState.steps;
+  if (!originalDoc || !pluginState.isDisplayingChanges) {
+    return _view.DecorationSet.empty;
+  }
+  var tr = state.tr;
+  var steppedDoc = originalDoc;
+  var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc);
+  var _iterator = _createForOfIteratorHelper(steps),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var step = _step.value;
+      var result = step.apply(steppedDoc);
+      if (result.failed === null && result.doc) {
+        steppedDoc = result.doc;
+        changeset = changeset.addSteps(steppedDoc, [step.getMap()], tr.doc);
+      }
+    }
+    // Rather than using .eq() we use a custom function that only checks for structural
+    // changes and ignores differences in attributes which don't affect decoration positions
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  if (!areNodesEqual(steppedDoc, tr.doc)) {
+    return _view.DecorationSet.empty;
+  }
+  var changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
+  var decorations = [];
+  changes.forEach(function (change) {
+    if (change.inserted.length > 0) {
+      decorations.push((0, _decorations.createInlineChangedDecoration)(change));
+    }
+    if (change.deleted.length > 0) {
+      var decoration = (0, _decorations.createDeletedContentDecoration)({
+        change: change,
+        doc: originalDoc,
+        nodeViewSerializer: nodeViewSerializer
+      });
+      if (decoration) {
+        decorations.push(decoration);
+      }
+    }
+  });
+  (0, _markDecorations.getMarkChangeRanges)(steps).forEach(function (change) {
+    decorations.push((0, _decorations.createInlineChangedDecoration)(change));
+  });
+  return _view.DecorationSet.empty.add(tr.doc, decorations);
+};
+
+/**
+ * Compares two ProseMirror documents for equality, ignoring attributes
+ * which don't affect the document structure.
+ *
+ * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
+ *
+ * @param doc1 PMNode
+ * @param doc2 PMNode
+ * @returns boolean
+ */
+function areNodesEqual(node1, node2) {
+  if (node1.isText) {
+    return node1.eq(node2);
+  }
+  return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node2.marks) && areFragmentsEqual(node1.content, node2.content);
+}
+function areFragmentsEqual(frag1, frag2) {
+  if (frag1.content.length !== frag2.content.length) {
+    return false;
+  }
+  var childrenEqual = true;
+  frag1.content.forEach(function (child, i) {
+    var otherChild = frag2.child(i);
+    if (child === otherChild || otherChild && areNodesEqual(child, otherChild)) {
+      return;
+    }
+    childrenEqual = false;
+  });
+  return childrenEqual;
+}

package/dist/cjs/pm-plugins/main.js

@@ -6,73 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.showDiffPluginKey = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorChangeset = require("prosemirror-changeset");
 var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _decorations = require("./decorations");
-var _markDecorations = require("./markDecorations");
+var _calculateDiffDecorations = require("./calculateDiffDecorations");
 var _NodeViewSerializer = require("./NodeViewSerializer");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } // eslint-disable-next-line @atlassian/tangerine/import/entry-points
-var calculateDecorations = function calculateDecorations(_ref) {
-  var state = _ref.state,
-    pluginState = _ref.pluginState,
-    nodeViewSerializer = _ref.nodeViewSerializer;
-  var originalDoc = pluginState.originalDoc,
-    steps = pluginState.steps;
-  if (!originalDoc || !pluginState.isDisplayingChanges) {
-    return _view.DecorationSet.empty;
-  }
-  var tr = state.tr;
-  var steppedDoc = originalDoc;
-  var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc);
-  var _iterator = _createForOfIteratorHelper(steps),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var step = _step.value;
-      var result = step.apply(steppedDoc);
-      if (result.failed === null && result.doc) {
-        steppedDoc = result.doc;
-        changeset = changeset.addSteps(steppedDoc, [step.getMap()], tr.doc);
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  if (!steppedDoc.eq(tr.doc)) {
-    return _view.DecorationSet.empty;
-  }
-  var changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
-  var decorations = [];
-  changes.forEach(function (change) {
-    if (change.inserted.length > 0) {
-      decorations.push((0, _decorations.createInlineChangedDecoration)(change));
-    }
-    if (change.deleted.length > 0) {
-      var decoration = (0, _decorations.createDeletedContentDecoration)({
-        change: change,
-        doc: originalDoc,
-        nodeViewSerializer: nodeViewSerializer
-      });
-      if (decoration) {
-        decorations.push(decoration);
-      }
-    }
-  });
-  (0, _markDecorations.getMarkChangeRanges)(steps).forEach(function (change) {
-    decorations.push((0, _decorations.createInlineChangedDecoration)(change));
-  });
-  return _view.DecorationSet.empty.add(tr.doc, decorations);
-};
 var showDiffPluginKey = exports.showDiffPluginKey = new _state.PluginKey('showDiffPlugin');
 var createPlugin = exports.createPlugin = function createPlugin(config) {
   var nodeViewSerializer = new _NodeViewSerializer.NodeViewSerializer({});
@@ -103,7 +45,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config) {
               isDisplayingChanges: true
             });
             // Calculate and store decorations in state
-            var decorations = calculateDecorations({
+            var decorations = (0, _calculateDiffDecorations.calculateDiffDecorations)({
               state: newState,
               pluginState: newPluginState,
               nodeViewSerializer: nodeViewSerializer

package/dist/es2019/pm-plugins/calculateDiffDecorations.js

@@ -0,0 +1,87 @@
+// eslint-disable-next-line @atlassian/tangerine/import/entry-points
+import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { createInlineChangedDecoration, createDeletedContentDecoration } from './decorations';
+import { getMarkChangeRanges } from './markDecorations';
+export const calculateDiffDecorations = ({
+  state,
+  pluginState,
+  nodeViewSerializer
+}) => {
+  const {
+    originalDoc,
+    steps
+  } = pluginState;
+  if (!originalDoc || !pluginState.isDisplayingChanges) {
+    return DecorationSet.empty;
+  }
+  const {
+    tr
+  } = state;
+  let steppedDoc = originalDoc;
+  let changeset = ChangeSet.create(originalDoc);
+  for (const step of steps) {
+    const result = step.apply(steppedDoc);
+    if (result.failed === null && result.doc) {
+      steppedDoc = result.doc;
+      changeset = changeset.addSteps(steppedDoc, [step.getMap()], tr.doc);
+    }
+  }
+  // Rather than using .eq() we use a custom function that only checks for structural
+  // changes and ignores differences in attributes which don't affect decoration positions
+  if (!areNodesEqual(steppedDoc, tr.doc)) {
+    return DecorationSet.empty;
+  }
+  const changes = simplifyChanges(changeset.changes, tr.doc);
+  const decorations = [];
+  changes.forEach(change => {
+    if (change.inserted.length > 0) {
+      decorations.push(createInlineChangedDecoration(change));
+    }
+    if (change.deleted.length > 0) {
+      const decoration = createDeletedContentDecoration({
+        change,
+        doc: originalDoc,
+        nodeViewSerializer
+      });
+      if (decoration) {
+        decorations.push(decoration);
+      }
+    }
+  });
+  getMarkChangeRanges(steps).forEach(change => {
+    decorations.push(createInlineChangedDecoration(change));
+  });
+  return DecorationSet.empty.add(tr.doc, decorations);
+};
+
+/**
+ * Compares two ProseMirror documents for equality, ignoring attributes
+ * which don't affect the document structure.
+ *
+ * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
+ *
+ * @param doc1 PMNode
+ * @param doc2 PMNode
+ * @returns boolean
+ */
+export function areNodesEqual(node1, node2) {
+  if (node1.isText) {
+    return node1.eq(node2);
+  }
+  return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node2.marks) && areFragmentsEqual(node1.content, node2.content);
+}
+function areFragmentsEqual(frag1, frag2) {
+  if (frag1.content.length !== frag2.content.length) {
+    return false;
+  }
+  let childrenEqual = true;
+  frag1.content.forEach((child, i) => {
+    const otherChild = frag2.child(i);
+    if (child === otherChild || otherChild && areNodesEqual(child, otherChild)) {
+      return;
+    }
+    childrenEqual = false;
+  });
+  return childrenEqual;
+}

package/dist/es2019/pm-plugins/main.js

@@ -1,62 +1,10 @@
-// eslint-disable-next-line @atlassian/tangerine/import/entry-points
-import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { processRawValue } from '@atlaskit/editor-common/process-raw-value';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { createInlineChangedDecoration, createDeletedContentDecoration } from './decorations';
-import { getMarkChangeRanges } from './markDecorations';
+import { calculateDiffDecorations } from './calculateDiffDecorations';
 import { NodeViewSerializer } from './NodeViewSerializer';
-const calculateDecorations = ({
-  state,
-  pluginState,
-  nodeViewSerializer
-}) => {
-  const {
-    originalDoc,
-    steps
-  } = pluginState;
-  if (!originalDoc || !pluginState.isDisplayingChanges) {
-    return DecorationSet.empty;
-  }
-  const {
-    tr
-  } = state;
-  let steppedDoc = originalDoc;
-  let changeset = ChangeSet.create(originalDoc);
-  for (const step of steps) {
-    const result = step.apply(steppedDoc);
-    if (result.failed === null && result.doc) {
-      steppedDoc = result.doc;
-      changeset = changeset.addSteps(steppedDoc, [step.getMap()], tr.doc);
-    }
-  }
-  if (!steppedDoc.eq(tr.doc)) {
-    return DecorationSet.empty;
-  }
-  const changes = simplifyChanges(changeset.changes, tr.doc);
-  const decorations = [];
-  changes.forEach(change => {
-    if (change.inserted.length > 0) {
-      decorations.push(createInlineChangedDecoration(change));
-    }
-    if (change.deleted.length > 0) {
-      const decoration = createDeletedContentDecoration({
-        change,
-        doc: originalDoc,
-        nodeViewSerializer
-      });
-      if (decoration) {
-        decorations.push(decoration);
-      }
-    }
-  });
-  getMarkChangeRanges(steps).forEach(change => {
-    decorations.push(createInlineChangedDecoration(change));
-  });
-  return DecorationSet.empty.add(tr.doc, decorations);
-};
 export const showDiffPluginKey = new PluginKey('showDiffPlugin');
 export const createPlugin = config => {
   const nodeViewSerializer = new NodeViewSerializer({});
@@ -89,7 +37,7 @@ export const createPlugin = config => {
               isDisplayingChanges: true
             };
             // Calculate and store decorations in state
-            const decorations = calculateDecorations({
+            const decorations = calculateDiffDecorations({
               state: newState,
               pluginState: newPluginState,
               nodeViewSerializer

package/dist/esm/pm-plugins/calculateDiffDecorations.js

@@ -0,0 +1,94 @@
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+// eslint-disable-next-line @atlassian/tangerine/import/entry-points
+import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { createInlineChangedDecoration, createDeletedContentDecoration } from './decorations';
+import { getMarkChangeRanges } from './markDecorations';
+export var calculateDiffDecorations = function calculateDiffDecorations(_ref) {
+  var state = _ref.state,
+    pluginState = _ref.pluginState,
+    nodeViewSerializer = _ref.nodeViewSerializer;
+  var originalDoc = pluginState.originalDoc,
+    steps = pluginState.steps;
+  if (!originalDoc || !pluginState.isDisplayingChanges) {
+    return DecorationSet.empty;
+  }
+  var tr = state.tr;
+  var steppedDoc = originalDoc;
+  var changeset = ChangeSet.create(originalDoc);
+  var _iterator = _createForOfIteratorHelper(steps),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var step = _step.value;
+      var result = step.apply(steppedDoc);
+      if (result.failed === null && result.doc) {
+        steppedDoc = result.doc;
+        changeset = changeset.addSteps(steppedDoc, [step.getMap()], tr.doc);
+      }
+    }
+    // Rather than using .eq() we use a custom function that only checks for structural
+    // changes and ignores differences in attributes which don't affect decoration positions
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  if (!areNodesEqual(steppedDoc, tr.doc)) {
+    return DecorationSet.empty;
+  }
+  var changes = simplifyChanges(changeset.changes, tr.doc);
+  var decorations = [];
+  changes.forEach(function (change) {
+    if (change.inserted.length > 0) {
+      decorations.push(createInlineChangedDecoration(change));
+    }
+    if (change.deleted.length > 0) {
+      var decoration = createDeletedContentDecoration({
+        change: change,
+        doc: originalDoc,
+        nodeViewSerializer: nodeViewSerializer
+      });
+      if (decoration) {
+        decorations.push(decoration);
+      }
+    }
+  });
+  getMarkChangeRanges(steps).forEach(function (change) {
+    decorations.push(createInlineChangedDecoration(change));
+  });
+  return DecorationSet.empty.add(tr.doc, decorations);
+};
+
+/**
+ * Compares two ProseMirror documents for equality, ignoring attributes
+ * which don't affect the document structure.
+ *
+ * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
+ *
+ * @param doc1 PMNode
+ * @param doc2 PMNode
+ * @returns boolean
+ */
+export function areNodesEqual(node1, node2) {
+  if (node1.isText) {
+    return node1.eq(node2);
+  }
+  return node1 === node2 || node1.hasMarkup(node2.type, node1.attrs, node2.marks) && areFragmentsEqual(node1.content, node2.content);
+}
+function areFragmentsEqual(frag1, frag2) {
+  if (frag1.content.length !== frag2.content.length) {
+    return false;
+  }
+  var childrenEqual = true;
+  frag1.content.forEach(function (child, i) {
+    var otherChild = frag2.child(i);
+    if (child === otherChild || otherChild && areNodesEqual(child, otherChild)) {
+      return;
+    }
+    childrenEqual = false;
+  });
+  return childrenEqual;
+}

package/dist/esm/pm-plugins/main.js

@@ -1,72 +1,13 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-// eslint-disable-next-line @atlassian/tangerine/import/entry-points
-import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { processRawValue } from '@atlaskit/editor-common/process-raw-value';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { createInlineChangedDecoration, createDeletedContentDecoration } from './decorations';
-import { getMarkChangeRanges } from './markDecorations';
+import { calculateDiffDecorations } from './calculateDiffDecorations';
 import { NodeViewSerializer } from './NodeViewSerializer';
-var calculateDecorations = function calculateDecorations(_ref) {
-  var state = _ref.state,
-    pluginState = _ref.pluginState,
-    nodeViewSerializer = _ref.nodeViewSerializer;
-  var originalDoc = pluginState.originalDoc,
-    steps = pluginState.steps;
-  if (!originalDoc || !pluginState.isDisplayingChanges) {
-    return DecorationSet.empty;
-  }
-  var tr = state.tr;
-  var steppedDoc = originalDoc;
-  var changeset = ChangeSet.create(originalDoc);
-  var _iterator = _createForOfIteratorHelper(steps),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var step = _step.value;
-      var result = step.apply(steppedDoc);
-      if (result.failed === null && result.doc) {
-        steppedDoc = result.doc;
-        changeset = changeset.addSteps(steppedDoc, [step.getMap()], tr.doc);
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  if (!steppedDoc.eq(tr.doc)) {
-    return DecorationSet.empty;
-  }
-  var changes = simplifyChanges(changeset.changes, tr.doc);
-  var decorations = [];
-  changes.forEach(function (change) {
-    if (change.inserted.length > 0) {
-      decorations.push(createInlineChangedDecoration(change));
-    }
-    if (change.deleted.length > 0) {
-      var decoration = createDeletedContentDecoration({
-        change: change,
-        doc: originalDoc,
-        nodeViewSerializer: nodeViewSerializer
-      });
-      if (decoration) {
-        decorations.push(decoration);
-      }
-    }
-  });
-  getMarkChangeRanges(steps).forEach(function (change) {
-    decorations.push(createInlineChangedDecoration(change));
-  });
-  return DecorationSet.empty.add(tr.doc, decorations);
-};
 export var showDiffPluginKey = new PluginKey('showDiffPlugin');
 export var createPlugin = function createPlugin(config) {
   var nodeViewSerializer = new NodeViewSerializer({});
@@ -97,7 +38,7 @@ export var createPlugin = function createPlugin(config) {
               isDisplayingChanges: true
             });
             // Calculate and store decorations in state
-            var decorations = calculateDecorations({
+            var decorations = calculateDiffDecorations({
               state: newState,
               pluginState: newPluginState,
               nodeViewSerializer: nodeViewSerializer

package/dist/types/pm-plugins/calculateDiffDecorations.d.ts

@@ -0,0 +1,21 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import type { ShowDiffPluginState } from './main';
+import type { NodeViewSerializer } from './NodeViewSerializer';
+export declare const calculateDiffDecorations: ({ state, pluginState, nodeViewSerializer, }: {
+    nodeViewSerializer: NodeViewSerializer;
+    pluginState: Omit<ShowDiffPluginState, "decorations">;
+    state: EditorState;
+}) => DecorationSet;
+/**
+ * Compares two ProseMirror documents for equality, ignoring attributes
+ * which don't affect the document structure.
+ *
+ * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
+ *
+ * @param doc1 PMNode
+ * @param doc2 PMNode
+ * @returns boolean
+ */
+export declare function areNodesEqual(node1: PMNode, node2: PMNode): boolean;

package/dist/types/pm-plugins/main.d.ts

@@ -5,11 +5,10 @@ import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform'
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { type DiffParams } from '../showDiffPluginType';
 export declare const showDiffPluginKey: PluginKey<ShowDiffPluginState>;
-type ShowDiffPluginState = {
+export type ShowDiffPluginState = {
     decorations: DecorationSet;
     isDisplayingChanges: boolean;
     originalDoc: PMNode | undefined;
     steps: ProseMirrorStep[];
 };
 export declare const createPlugin: (config: DiffParams | undefined) => SafePlugin<ShowDiffPluginState>;
-export {};

package/dist/types-ts4.5/pm-plugins/calculateDiffDecorations.d.ts

@@ -0,0 +1,21 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import { type EditorState } from '@atlaskit/editor-prosemirror/state';
+import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import type { ShowDiffPluginState } from './main';
+import type { NodeViewSerializer } from './NodeViewSerializer';
+export declare const calculateDiffDecorations: ({ state, pluginState, nodeViewSerializer, }: {
+    nodeViewSerializer: NodeViewSerializer;
+    pluginState: Omit<ShowDiffPluginState, "decorations">;
+    state: EditorState;
+}) => DecorationSet;
+/**
+ * Compares two ProseMirror documents for equality, ignoring attributes
+ * which don't affect the document structure.
+ *
+ * This is almost a copy of the .eq() PM function - tweaked to ignore attrs
+ *
+ * @param doc1 PMNode
+ * @param doc2 PMNode
+ * @returns boolean
+ */
+export declare function areNodesEqual(node1: PMNode, node2: PMNode): boolean;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -5,11 +5,10 @@ import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform'
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { type DiffParams } from '../showDiffPluginType';
 export declare const showDiffPluginKey: PluginKey<ShowDiffPluginState>;
-type ShowDiffPluginState = {
+export type ShowDiffPluginState = {
     decorations: DecorationSet;
     isDisplayingChanges: boolean;
     originalDoc: PMNode | undefined;
     steps: ProseMirrorStep[];
 };
 export declare const createPlugin: (config: DiffParams | undefined) => SafePlugin<ShowDiffPluginState>;
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "1.0.0",
+	"version": "2.0.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,12 +29,12 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/tokens": "^6.1.0",
+		"@atlaskit/tokens": "^6.3.0",
 		"@babel/runtime": "^7.0.0",
 		"prosemirror-changeset": "^2.2.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^108.0.0",
+		"@atlaskit/editor-common": "^109.0.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {