@atlaskit/editor-plugin-show-diff 3.2.4 → 3.2.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 3.2.6
+
+### Patch Changes
+
+- [`05ee61c6ace09`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/05ee61c6ace09) -
+  Improve performance of show diff by increasing merge of steps
+- Updated dependencies
+
+## 3.2.5
+
+### Patch Changes
+
+- [`a05464ea42678`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a05464ea42678) -
+  EDITOR-2791 bump adf-schema
+- [`657693883946f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/657693883946f) -
+  Fix diffs for extension nodes
+- Updated dependencies
+
 ## 3.2.4
 
 ### Patch Changes

package/afm-jira/tsconfig.json

@@ -2,7 +2,7 @@
 	"extends": "../../../../tsconfig.entry-points.jira.json",
 	"compilerOptions": {
 		"target": "es5",
-		"outDir": "../../../../../tsDist/@atlaskit__editor-plugin-show-diff/app",
+		"outDir": "../../../../../jira/tsDist/@atlaskit__editor-plugin-show-diff/app",
 		"rootDir": "../",
 		"composite": true
 	},

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

@@ -11,12 +11,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
-var _steps = require("@atlaskit/adf-schema/steps");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _attributeDecorations = require("./attributeDecorations");
 var _decorations = require("./decorations");
 var _markDecorations = require("./markDecorations");
+var _simplifyChanges = require("./simplifyChanges");
 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; }
@@ -69,27 +69,6 @@ function optimizeChanges(changes) {
   optimized.push(current);
   return optimized;
 }
-
-// Simplifies the steps to improve performance and reduce fragmentation in diffs
-function simplifySteps(steps) {
-  return steps
-  // Remove steps that don't affect document structure or content
-  .filter(function (step) {
-    return !(step instanceof _steps.AnalyticsStep);
-  })
-  // Merge consecutive steps where possible
-  .reduce(function (acc, step) {
-    var _lastStep$merge;
-    var lastStep = acc[acc.length - 1];
-    var merged = lastStep === null || lastStep === void 0 || (_lastStep$merge = lastStep.merge) === null || _lastStep$merge === void 0 ? void 0 : _lastStep$merge.call(lastStep, step);
-    if (merged) {
-      acc[acc.length - 1] = merged;
-    } else {
-      acc.push(step);
-    }
-    return acc;
-  }, []);
-}
 var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref) {
   var state = _ref.state,
     pluginState = _ref.pluginState,
@@ -97,8 +76,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
     colourScheme = _ref.colourScheme,
     intl = _ref.intl;
   var originalDoc = pluginState.originalDoc,
-    rawSteps = pluginState.steps;
-  var steps = simplifySteps(rawSteps);
+    steps = pluginState.steps;
   if (!originalDoc || !pluginState.isDisplayingChanges) {
     return _view.DecorationSet.empty;
   }
@@ -106,7 +84,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
   var steppedDoc = originalDoc;
   var attrSteps = [];
   var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc);
-  var _iterator = _createForOfIteratorHelper(steps),
+  var simplifiedSteps = (0, _simplifyChanges.simplifySteps)(steps, originalDoc);
+  var _iterator = _createForOfIteratorHelper(simplifiedSteps),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {

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

@@ -49,10 +49,6 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
     case 'tableHeader':
       return undefined;
     // Handle table separately to avoid border issues
-    case 'embedCard':
-      return (0, _lazyNodeView.convertToInlineCss)({
-        '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #AF59E1)"
-      });
     case 'paragraph':
     case 'heading':
     case 'hardBreak':
@@ -64,6 +60,8 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
     case 'bulletList':
     case 'orderedList':
       return undefined;
+    case 'extension':
+    case 'embedCard':
     case 'listItem':
       return (0, _lazyNodeView.convertToInlineCss)({
         '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #AF59E1)"
@@ -143,6 +141,14 @@ var getDeletedContentStyleUnbounded = exports.getDeletedContentStyleUnbounded =
 var getDeletedContentStyle = exports.getDeletedContentStyle = function getDeletedContentStyle(colourScheme) {
   return colourScheme === 'traditional' ? deletedTraditionalContentStyle : deletedContentStyle;
 };
+var getNodeClass = function getNodeClass(name) {
+  switch (name) {
+    case 'extension':
+      return 'show-diff-changed-decoration-node';
+    default:
+      return undefined;
+  }
+};
 
 /**
  * Inline decoration used for insertions as the content already exists in the document
@@ -153,7 +159,8 @@ var getDeletedContentStyle = exports.getDeletedContentStyle = function getDelete
 var createBlockChangedDecoration = exports.createBlockChangedDecoration = function createBlockChangedDecoration(change, colourScheme) {
   return _view.Decoration.node(change.from, change.to, {
     style: getEditorStyleNode(change.name, colourScheme),
-    'data-testid': 'show-diff-changed-decoration-node'
+    'data-testid': 'show-diff-changed-decoration-node',
+    class: getNodeClass(change.name)
   }, {});
 };
 var createDeletedContentDecoration = exports.createDeletedContentDecoration = function createDeletedContentDecoration(_ref) {

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

@@ -0,0 +1,77 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.simplifySteps = simplifySteps;
+var _steps = require("@atlaskit/adf-schema/steps");
+var _document = require("@atlaskit/editor-common/utils/document");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+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; }
+/**
+ * Attempts to merge two consecutive ReplaceStep operations.
+ * This merges steps where:
+ * - Both steps replace content at the same starting position
+ * - The second step's range encompasses the first step's range
+ * - The second step has content to insert
+ * Returns null if steps cannot be merged.
+ */
+function mergeReplaceSteps(step1, step2) {
+  if (!(step1 instanceof _transform.ReplaceStep) || !(step2 instanceof _transform.ReplaceStep)) {
+    return null;
+  }
+  if (step1.from === step2.from && step2.to >= step1.to && step2.slice.size >= step1.slice.size) {
+    return new _transform.ReplaceStep(step1.from, step1.to, step2.slice);
+  }
+  return null;
+}
+
+// Simplifies the steps to improve performance and reduce fragmentation in diffs
+function simplifySteps(steps, originalDoc) {
+  var stepsToFilter = (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga') ? removeUnusedSteps(steps, originalDoc) : steps;
+  return stepsToFilter
+  // Remove steps that don't affect document structure or content
+  .filter(function (step) {
+    return !(step instanceof _steps.AnalyticsStep);
+  })
+  // Merge consecutive steps where possible
+  .reduce(function (acc, step) {
+    var _lastStep$merge, _lastStep$merge2, _lastStep$merge3;
+    var lastStep = acc[acc.length - 1];
+    var merged = (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga') ? (_lastStep$merge = lastStep === null || lastStep === void 0 || (_lastStep$merge2 = lastStep.merge) === null || _lastStep$merge2 === void 0 ? void 0 : _lastStep$merge2.call(lastStep, step)) !== null && _lastStep$merge !== void 0 ? _lastStep$merge : mergeReplaceSteps(lastStep, step) : lastStep === null || lastStep === void 0 || (_lastStep$merge3 = lastStep.merge) === null || _lastStep$merge3 === void 0 ? void 0 : _lastStep$merge3.call(lastStep, step);
+    if (merged) {
+      acc[acc.length - 1] = merged;
+    } else {
+      acc.push(step);
+    }
+    return acc;
+  }, []);
+}
+
+/**
+ * Does a first pass to remove steps that don't impact the document
+ */
+function removeUnusedSteps(steps, originalDoc) {
+  var finalSteps = [];
+  var firstPassDoc = originalDoc;
+  var _iterator = _createForOfIteratorHelper(steps),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var step = _step.value;
+      var result = step.apply(firstPassDoc);
+      if (result.failed === null && result.doc && !(0, _document.areNodesEqualIgnoreAttrs)(firstPassDoc, result.doc, ['localId'])) {
+        finalSteps.push(step);
+        firstPassDoc = result.doc;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return finalSteps;
+}

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

@@ -2,12 +2,12 @@
 import isEqual from 'lodash/isEqual';
 import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
-import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { getAttrChangeRanges, stepIsValidAttrChange } from './attributeDecorations';
 import { createInlineChangedDecoration, createDeletedContentDecoration, createBlockChangedDecoration } from './decorations';
 import { getMarkChangeRanges } from './markDecorations';
+import { simplifySteps } from './simplifyChanges';
 const calculateNodesForBlockDecoration = (doc, from, to, colourScheme) => {
   const decorations = [];
   // Iterate over the document nodes within the range
@@ -59,25 +59,6 @@ function optimizeChanges(changes) {
   optimized.push(current);
   return optimized;
 }
-
-// Simplifies the steps to improve performance and reduce fragmentation in diffs
-function simplifySteps(steps) {
-  return steps
-  // Remove steps that don't affect document structure or content
-  .filter(step => !(step instanceof AnalyticsStep))
-  // Merge consecutive steps where possible
-  .reduce((acc, step) => {
-    var _lastStep$merge;
-    const lastStep = acc[acc.length - 1];
-    const merged = lastStep === null || lastStep === void 0 ? void 0 : (_lastStep$merge = lastStep.merge) === null || _lastStep$merge === void 0 ? void 0 : _lastStep$merge.call(lastStep, step);
-    if (merged) {
-      acc[acc.length - 1] = merged;
-    } else {
-      acc.push(step);
-    }
-    return acc;
-  }, []);
-}
 const calculateDiffDecorationsInner = ({
   state,
   pluginState,
@@ -87,9 +68,8 @@ const calculateDiffDecorationsInner = ({
 }) => {
   const {
     originalDoc,
-    steps: rawSteps
+    steps
   } = pluginState;
-  const steps = simplifySteps(rawSteps);
   if (!originalDoc || !pluginState.isDisplayingChanges) {
     return DecorationSet.empty;
   }
@@ -99,7 +79,8 @@ const calculateDiffDecorationsInner = ({
   let steppedDoc = originalDoc;
   const attrSteps = [];
   let changeset = ChangeSet.create(originalDoc);
-  for (const step of steps) {
+  const simplifiedSteps = simplifySteps(steps, originalDoc);
+  for (const step of simplifiedSteps) {
     const result = step.apply(steppedDoc);
     if (result.failed === null && result.doc) {
       if (stepIsValidAttrChange(step, steppedDoc, result.doc)) {

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

@@ -41,10 +41,6 @@ const getEditorStyleNode = (nodeName, colourScheme) => {
     case 'tableHeader':
       return undefined;
     // Handle table separately to avoid border issues
-    case 'embedCard':
-      return convertToInlineCss({
-        '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #AF59E1)"
-      });
     case 'paragraph':
     case 'heading':
     case 'hardBreak':
@@ -56,6 +52,8 @@ const getEditorStyleNode = (nodeName, colourScheme) => {
     case 'bulletList':
     case 'orderedList':
       return undefined;
+    case 'extension':
+    case 'embedCard':
     case 'listItem':
       return convertToInlineCss({
         '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #AF59E1)"
@@ -131,6 +129,14 @@ const deletedTraditionalContentStyleUnbounded = convertToInlineCss({
 });
 export const getDeletedContentStyleUnbounded = colourScheme => colourScheme === 'traditional' ? deletedTraditionalContentStyleUnbounded : deletedContentStyleUnbounded;
 export const getDeletedContentStyle = colourScheme => colourScheme === 'traditional' ? deletedTraditionalContentStyle : deletedContentStyle;
+const getNodeClass = name => {
+  switch (name) {
+    case 'extension':
+      return 'show-diff-changed-decoration-node';
+    default:
+      return undefined;
+  }
+};
 
 /**
  * Inline decoration used for insertions as the content already exists in the document
@@ -140,7 +146,8 @@ export const getDeletedContentStyle = colourScheme => colourScheme === 'traditio
  */
 export const createBlockChangedDecoration = (change, colourScheme) => Decoration.node(change.from, change.to, {
   style: getEditorStyleNode(change.name, colourScheme),
-  'data-testid': 'show-diff-changed-decoration-node'
+  'data-testid': 'show-diff-changed-decoration-node',
+  class: getNodeClass(change.name)
 }, {});
 export const createDeletedContentDecoration = ({
   change,

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

@@ -0,0 +1,58 @@
+import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
+import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { fg } from '@atlaskit/platform-feature-flags';
+
+/**
+ * Attempts to merge two consecutive ReplaceStep operations.
+ * This merges steps where:
+ * - Both steps replace content at the same starting position
+ * - The second step's range encompasses the first step's range
+ * - The second step has content to insert
+ * Returns null if steps cannot be merged.
+ */
+function mergeReplaceSteps(step1, step2) {
+  if (!(step1 instanceof ReplaceStep) || !(step2 instanceof ReplaceStep)) {
+    return null;
+  }
+  if (step1.from === step2.from && step2.to >= step1.to && step2.slice.size >= step1.slice.size) {
+    return new ReplaceStep(step1.from, step1.to, step2.slice);
+  }
+  return null;
+}
+
+// Simplifies the steps to improve performance and reduce fragmentation in diffs
+export function simplifySteps(steps, originalDoc) {
+  const stepsToFilter = fg('platform_editor_ai_aifc_patch_ga') ? removeUnusedSteps(steps, originalDoc) : steps;
+  return stepsToFilter
+  // Remove steps that don't affect document structure or content
+  .filter(step => !(step instanceof AnalyticsStep))
+  // Merge consecutive steps where possible
+  .reduce((acc, step) => {
+    var _lastStep$merge, _lastStep$merge2, _lastStep$merge3;
+    const lastStep = acc[acc.length - 1];
+    const merged = fg('platform_editor_ai_aifc_patch_ga') ? (_lastStep$merge = lastStep === null || lastStep === void 0 ? void 0 : (_lastStep$merge2 = lastStep.merge) === null || _lastStep$merge2 === void 0 ? void 0 : _lastStep$merge2.call(lastStep, step)) !== null && _lastStep$merge !== void 0 ? _lastStep$merge : mergeReplaceSteps(lastStep, step) : lastStep === null || lastStep === void 0 ? void 0 : (_lastStep$merge3 = lastStep.merge) === null || _lastStep$merge3 === void 0 ? void 0 : _lastStep$merge3.call(lastStep, step);
+    if (merged) {
+      acc[acc.length - 1] = merged;
+    } else {
+      acc.push(step);
+    }
+    return acc;
+  }, []);
+}
+
+/**
+ * Does a first pass to remove steps that don't impact the document
+ */
+function removeUnusedSteps(steps, originalDoc) {
+  const finalSteps = [];
+  let firstPassDoc = originalDoc;
+  for (const step of steps) {
+    const result = step.apply(firstPassDoc);
+    if (result.failed === null && result.doc && !areNodesEqualIgnoreAttrs(firstPassDoc, result.doc, ['localId'])) {
+      finalSteps.push(step);
+      firstPassDoc = result.doc;
+    }
+  }
+  return finalSteps;
+}

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

@@ -10,12 +10,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import isEqual from 'lodash/isEqual';
 import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
-import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { getAttrChangeRanges, stepIsValidAttrChange } from './attributeDecorations';
 import { createInlineChangedDecoration, createDeletedContentDecoration, createBlockChangedDecoration } from './decorations';
 import { getMarkChangeRanges } from './markDecorations';
+import { simplifySteps } from './simplifyChanges';
 var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(doc, from, to, colourScheme) {
   var decorations = [];
   // Iterate over the document nodes within the range
@@ -63,27 +63,6 @@ function optimizeChanges(changes) {
   optimized.push(current);
   return optimized;
 }
-
-// Simplifies the steps to improve performance and reduce fragmentation in diffs
-function simplifySteps(steps) {
-  return steps
-  // Remove steps that don't affect document structure or content
-  .filter(function (step) {
-    return !(step instanceof AnalyticsStep);
-  })
-  // Merge consecutive steps where possible
-  .reduce(function (acc, step) {
-    var _lastStep$merge;
-    var lastStep = acc[acc.length - 1];
-    var merged = lastStep === null || lastStep === void 0 || (_lastStep$merge = lastStep.merge) === null || _lastStep$merge === void 0 ? void 0 : _lastStep$merge.call(lastStep, step);
-    if (merged) {
-      acc[acc.length - 1] = merged;
-    } else {
-      acc.push(step);
-    }
-    return acc;
-  }, []);
-}
 var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref) {
   var state = _ref.state,
     pluginState = _ref.pluginState,
@@ -91,8 +70,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
     colourScheme = _ref.colourScheme,
     intl = _ref.intl;
   var originalDoc = pluginState.originalDoc,
-    rawSteps = pluginState.steps;
-  var steps = simplifySteps(rawSteps);
+    steps = pluginState.steps;
   if (!originalDoc || !pluginState.isDisplayingChanges) {
     return DecorationSet.empty;
   }
@@ -100,7 +78,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref)
   var steppedDoc = originalDoc;
   var attrSteps = [];
   var changeset = ChangeSet.create(originalDoc);
-  var _iterator = _createForOfIteratorHelper(steps),
+  var simplifiedSteps = simplifySteps(steps, originalDoc);
+  var _iterator = _createForOfIteratorHelper(simplifiedSteps),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {

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

@@ -43,10 +43,6 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
     case 'tableHeader':
       return undefined;
     // Handle table separately to avoid border issues
-    case 'embedCard':
-      return convertToInlineCss({
-        '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #AF59E1)"
-      });
     case 'paragraph':
     case 'heading':
     case 'hardBreak':
@@ -58,6 +54,8 @@ var getEditorStyleNode = function getEditorStyleNode(nodeName, colourScheme) {
     case 'bulletList':
     case 'orderedList':
       return undefined;
+    case 'extension':
+    case 'embedCard':
     case 'listItem':
       return convertToInlineCss({
         '--diff-decoration-marker-color': colourScheme === 'traditional' ? "var(--ds-border-accent-green, #22A06B)" : "var(--ds-border-accent-purple, #AF59E1)"
@@ -137,6 +135,14 @@ export var getDeletedContentStyleUnbounded = function getDeletedContentStyleUnbo
 export var getDeletedContentStyle = function getDeletedContentStyle(colourScheme) {
   return colourScheme === 'traditional' ? deletedTraditionalContentStyle : deletedContentStyle;
 };
+var getNodeClass = function getNodeClass(name) {
+  switch (name) {
+    case 'extension':
+      return 'show-diff-changed-decoration-node';
+    default:
+      return undefined;
+  }
+};
 
 /**
  * Inline decoration used for insertions as the content already exists in the document
@@ -147,7 +153,8 @@ export var getDeletedContentStyle = function getDeletedContentStyle(colourScheme
 export var createBlockChangedDecoration = function createBlockChangedDecoration(change, colourScheme) {
   return Decoration.node(change.from, change.to, {
     style: getEditorStyleNode(change.name, colourScheme),
-    'data-testid': 'show-diff-changed-decoration-node'
+    'data-testid': 'show-diff-changed-decoration-node',
+    class: getNodeClass(change.name)
   }, {});
 };
 export var createDeletedContentDecoration = function createDeletedContentDecoration(_ref) {

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

@@ -0,0 +1,72 @@
+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; }
+import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
+import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
+import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { fg } from '@atlaskit/platform-feature-flags';
+
+/**
+ * Attempts to merge two consecutive ReplaceStep operations.
+ * This merges steps where:
+ * - Both steps replace content at the same starting position
+ * - The second step's range encompasses the first step's range
+ * - The second step has content to insert
+ * Returns null if steps cannot be merged.
+ */
+function mergeReplaceSteps(step1, step2) {
+  if (!(step1 instanceof ReplaceStep) || !(step2 instanceof ReplaceStep)) {
+    return null;
+  }
+  if (step1.from === step2.from && step2.to >= step1.to && step2.slice.size >= step1.slice.size) {
+    return new ReplaceStep(step1.from, step1.to, step2.slice);
+  }
+  return null;
+}
+
+// Simplifies the steps to improve performance and reduce fragmentation in diffs
+export function simplifySteps(steps, originalDoc) {
+  var stepsToFilter = fg('platform_editor_ai_aifc_patch_ga') ? removeUnusedSteps(steps, originalDoc) : steps;
+  return stepsToFilter
+  // Remove steps that don't affect document structure or content
+  .filter(function (step) {
+    return !(step instanceof AnalyticsStep);
+  })
+  // Merge consecutive steps where possible
+  .reduce(function (acc, step) {
+    var _lastStep$merge, _lastStep$merge2, _lastStep$merge3;
+    var lastStep = acc[acc.length - 1];
+    var merged = fg('platform_editor_ai_aifc_patch_ga') ? (_lastStep$merge = lastStep === null || lastStep === void 0 || (_lastStep$merge2 = lastStep.merge) === null || _lastStep$merge2 === void 0 ? void 0 : _lastStep$merge2.call(lastStep, step)) !== null && _lastStep$merge !== void 0 ? _lastStep$merge : mergeReplaceSteps(lastStep, step) : lastStep === null || lastStep === void 0 || (_lastStep$merge3 = lastStep.merge) === null || _lastStep$merge3 === void 0 ? void 0 : _lastStep$merge3.call(lastStep, step);
+    if (merged) {
+      acc[acc.length - 1] = merged;
+    } else {
+      acc.push(step);
+    }
+    return acc;
+  }, []);
+}
+
+/**
+ * Does a first pass to remove steps that don't impact the document
+ */
+function removeUnusedSteps(steps, originalDoc) {
+  var finalSteps = [];
+  var firstPassDoc = originalDoc;
+  var _iterator = _createForOfIteratorHelper(steps),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var step = _step.value;
+      var result = step.apply(firstPassDoc);
+      if (result.failed === null && result.doc && !areNodesEqualIgnoreAttrs(firstPassDoc, result.doc, ['localId'])) {
+        finalSteps.push(step);
+        firstPassDoc = result.doc;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return finalSteps;
+}

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

@@ -0,0 +1,3 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
+export declare function simplifySteps(steps: ProseMirrorStep[], originalDoc: PMNode): ProseMirrorStep[];

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

@@ -0,0 +1,3 @@
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
+export declare function simplifySteps(steps: ProseMirrorStep[], originalDoc: PMNode): ProseMirrorStep[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "3.2.4",
+	"version": "3.2.6",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,18 +28,18 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.3.2",
+		"@atlaskit/adf-schema": "^51.4.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tokens": "^8.0.0",
+		"@atlaskit/tokens": "^8.1.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"memoize-one": "^6.0.0",
 		"prosemirror-changeset": "^2.2.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.27.0",
+		"@atlaskit/editor-common": "^110.33.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {