@atlaskit/editor-plugin-show-diff 5.0.6 → 5.0.8

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 5.0.8
+
+### Patch Changes
+
+- [`e7825d1698274`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e7825d1698274) -
+  Improve areNodesEqualIgnoreAttrs by adding option ignoreMarkOrder which ensures the order of the
+  marks does not result in a "false" which can break some cases of diffs.
+- Updated dependencies
+
+## 5.0.7
+
+### Patch Changes
+
+- [`1fd2b267eb592`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1fd2b267eb592) -
+  Cleanup `platform_editor_ai_aifc_patch_ga` flag
+- Updated dependencies
+
 ## 5.0.6
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -21,6 +21,9 @@
 		{
 			"path": "../../adf-schema/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-prosemirror/afm-cc/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -21,6 +21,9 @@
 		{
 			"path": "../../adf-schema/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-prosemirror/afm-jira/tsconfig.json"
 		},

package/afm-products/tsconfig.json

@@ -21,6 +21,9 @@
 		{
 			"path": "../../adf-schema/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-analytics/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../editor-prosemirror/afm-products/tsconfig.json"
 		},

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

@@ -13,6 +13,7 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _createBlockChangedDecoration = require("./decorations/createBlockChangedDecoration");
 var _createInlineChangedDecoration = require("./decorations/createInlineChangedDecoration");
 var _createNodeChangedDecorationWidget = require("./decorations/createNodeChangedDecorationWidget");
@@ -87,7 +88,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref2
     nodeViewSerializer = _ref2.nodeViewSerializer,
     colorScheme = _ref2.colorScheme,
     intl = _ref2.intl,
-    activeIndexPos = _ref2.activeIndexPos;
+    activeIndexPos = _ref2.activeIndexPos,
+    api = _ref2.api;
   var originalDoc = pluginState.originalDoc,
     steps = pluginState.steps;
   if (!originalDoc || !pluginState.isDisplayingChanges) {
@@ -121,6 +123,18 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref2
     _iterator.f();
   }
   if (!(0, _document.areNodesEqualIgnoreAttrs)(steppedDoc, tr.doc)) {
+    if ((0, _expValEquals.expValEquals)('platform_editor_are_nodes_equal_ignore_mark_order', 'isEnabled', true)) {
+      var _api$analytics;
+      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
+        eventType: 'track',
+        action: 'nodesNotEqual',
+        actionSubject: 'showDiff',
+        attributes: {
+          docSizeEqual: steppedDoc.nodeSize === tr.doc.nodeSize,
+          colorScheme: colorScheme
+        }
+      });
+    }
     return _view.DecorationSet.empty;
   }
   var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc).addSteps(steppedDoc, stepMaps, tr.doc);

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.createNodeChangedDecorationWidget = void 0;
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _standard = require("./colorSchemes/standard");
 var _traditional = require("./colorSchemes/traditional");
@@ -75,9 +74,6 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     return;
   }
   if (isTableRowContent) {
-    if (!(0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga')) {
-      return;
-    }
     return (0, _createChangedRowDecorationWidgets.createChangedRowDecorationWidgets)({
       changes: [change],
       originalDoc: doc,

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

@@ -24,7 +24,7 @@ var getScrollableDecorations = exports.getScrollableDecorations = function getSc
     return spec.key === 'diff-inline' || spec.key === 'diff-widget' || spec.key === 'diff-block';
   })) !== null && _set$find !== void 0 ? _set$find : [];
 };
-var createPlugin = exports.createPlugin = function createPlugin(config, getIntl) {
+var createPlugin = exports.createPlugin = function createPlugin(config, getIntl, api) {
   var nodeViewSerializer = new _NodeViewSerializer.NodeViewSerializer({});
   var setNodeViewSerializer = function setNodeViewSerializer(editorView) {
     nodeViewSerializer.init({
@@ -60,7 +60,8 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl)
               nodeViewSerializer: nodeViewSerializer,
               colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
               intl: getIntl(),
-              activeIndexPos: (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? newPluginState.activeIndexPos : undefined
+              activeIndexPos: (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation') ? newPluginState.activeIndexPos : undefined,
+              api: api
             });
             // Update the decorations
             newPluginState.decorations = decorations;
@@ -96,7 +97,8 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl)
                 nodeViewSerializer: nodeViewSerializer,
                 colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
                 intl: getIntl(),
-                activeIndexPos: newPluginState.activeIndexPos
+                activeIndexPos: newPluginState.activeIndexPos,
+                api: api
               });
               newPluginState.decorations = updatedDecorations;
             }

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

@@ -7,7 +7,6 @@ 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; }
@@ -33,7 +32,7 @@ function mergeReplaceSteps(step1, step2) {
 
 // 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;
+  var stepsToFilter = removeUnusedSteps(steps, originalDoc);
   return stepsToFilter
   // Remove steps that don't affect document structure or content
   .filter(function (step) {
@@ -41,9 +40,9 @@ function simplifySteps(steps, originalDoc) {
   })
   // Merge consecutive steps where possible
   .reduce(function (acc, step) {
-    var _lastStep$merge, _lastStep$merge2, _lastStep$merge3;
+    var _lastStep$merge, _lastStep$merge2;
     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);
+    var merged = (_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);
     if (merged) {
       acc[acc.length - 1] = merged;
     } else {

package/dist/cjs/showDiffPlugin.js

@@ -11,7 +11,7 @@ var _main = require("./pm-plugins/main");
 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; }
 var showDiffPlugin = exports.showDiffPlugin = function showDiffPlugin(_ref) {
-  var _api = _ref.api,
+  var api = _ref.api,
     config = _ref.config;
   return {
     name: 'showDiff',
@@ -49,7 +49,7 @@ var showDiffPlugin = exports.showDiffPlugin = function showDiffPlugin(_ref) {
         name: 'showDiffPlugin',
         plugin: function plugin(_ref6) {
           var getIntl = _ref6.getIntl;
-          return (0, _main.createPlugin)(config, getIntl);
+          return (0, _main.createPlugin)(config, getIntl, api);
         }
       }];
     },

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

@@ -4,6 +4,7 @@ import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { createBlockChangedDecoration } from './decorations/createBlockChangedDecoration';
 import { createInlineChangedDecoration } from './decorations/createInlineChangedDecoration';
 import { createNodeChangedDecorationWidget } from './decorations/createNodeChangedDecorationWidget';
@@ -78,7 +79,8 @@ const calculateDiffDecorationsInner = ({
   nodeViewSerializer,
   colorScheme,
   intl,
-  activeIndexPos
+  activeIndexPos,
+  api
 }) => {
   const {
     originalDoc,
@@ -108,6 +110,18 @@ const calculateDiffDecorationsInner = ({
   // 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 (!areNodesEqualIgnoreAttrs(steppedDoc, tr.doc)) {
+    if (expValEquals('platform_editor_are_nodes_equal_ignore_mark_order', 'isEnabled', true)) {
+      var _api$analytics;
+      api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.fireAnalyticsEvent({
+        eventType: 'track',
+        action: 'nodesNotEqual',
+        actionSubject: 'showDiff',
+        attributes: {
+          docSizeEqual: steppedDoc.nodeSize === tr.doc.nodeSize,
+          colorScheme
+        }
+      });
+    }
     return DecorationSet.empty;
   }
   const changeset = ChangeSet.create(originalDoc).addSteps(steppedDoc, stepMaps, tr.doc);

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

@@ -1,6 +1,5 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleNewActive, deletedContentStyleUnbounded } from './colorSchemes/standard';
 import { deletedTraditionalContentStyle, deletedTraditionalContentStyleUnbounded } from './colorSchemes/traditional';
@@ -57,9 +56,6 @@ export const createNodeChangedDecorationWidget = ({
     return;
   }
   if (isTableRowContent) {
-    if (!fg('platform_editor_ai_aifc_patch_ga')) {
-      return;
-    }
     return createChangedRowDecorationWidgets({
       changes: [change],
       originalDoc: doc,

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

@@ -12,7 +12,7 @@ export const getScrollableDecorations = set => {
   var _set$find;
   return (_set$find = set === null || set === void 0 ? void 0 : set.find(undefined, undefined, spec => spec.key === 'diff-inline' || spec.key === 'diff-widget' || spec.key === 'diff-block')) !== null && _set$find !== void 0 ? _set$find : [];
 };
-export const createPlugin = (config, getIntl) => {
+export const createPlugin = (config, getIntl, api) => {
   const nodeViewSerializer = new NodeViewSerializer({});
   const setNodeViewSerializer = editorView => {
     nodeViewSerializer.init({
@@ -50,7 +50,8 @@ export const createPlugin = (config, getIntl) => {
               nodeViewSerializer,
               colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
               intl: getIntl(),
-              activeIndexPos: fg('platform_editor_show_diff_scroll_navigation') ? newPluginState.activeIndexPos : undefined
+              activeIndexPos: fg('platform_editor_show_diff_scroll_navigation') ? newPluginState.activeIndexPos : undefined,
+              api
             });
             // Update the decorations
             newPluginState.decorations = decorations;
@@ -89,7 +90,8 @@ export const createPlugin = (config, getIntl) => {
                 nodeViewSerializer,
                 colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
                 intl: getIntl(),
-                activeIndexPos: newPluginState.activeIndexPos
+                activeIndexPos: newPluginState.activeIndexPos,
+                api
               });
               newPluginState.decorations = updatedDecorations;
             }

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

@@ -1,7 +1,6 @@
 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.
@@ -25,15 +24,15 @@ function mergeReplaceSteps(step1, step2) {
 
 // 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;
+  const stepsToFilter = removeUnusedSteps(steps, originalDoc);
   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;
+    var _lastStep$merge, _lastStep$merge2;
     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);
+    const merged = (_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);
     if (merged) {
       acc[acc.length - 1] = merged;
     } else {

package/dist/es2019/showDiffPlugin.js

@@ -1,7 +1,7 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { createPlugin, showDiffPluginKey, getScrollableDecorations } from './pm-plugins/main';
 export const showDiffPlugin = ({
-  api: _api,
+  api,
   config
 }) => ({
   name: 'showDiff',
@@ -42,7 +42,7 @@ export const showDiffPlugin = ({
       name: 'showDiffPlugin',
       plugin: ({
         getIntl
-      }) => createPlugin(config, getIntl)
+      }) => createPlugin(config, getIntl, api)
     }];
   },
   getSharedState: editorState => {

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

@@ -12,6 +12,7 @@ import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { createBlockChangedDecoration } from './decorations/createBlockChangedDecoration';
 import { createInlineChangedDecoration } from './decorations/createInlineChangedDecoration';
 import { createNodeChangedDecorationWidget } from './decorations/createNodeChangedDecorationWidget';
@@ -81,7 +82,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref2
     nodeViewSerializer = _ref2.nodeViewSerializer,
     colorScheme = _ref2.colorScheme,
     intl = _ref2.intl,
-    activeIndexPos = _ref2.activeIndexPos;
+    activeIndexPos = _ref2.activeIndexPos,
+    api = _ref2.api;
   var originalDoc = pluginState.originalDoc,
     steps = pluginState.steps;
   if (!originalDoc || !pluginState.isDisplayingChanges) {
@@ -115,6 +117,18 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref2
     _iterator.f();
   }
   if (!areNodesEqualIgnoreAttrs(steppedDoc, tr.doc)) {
+    if (expValEquals('platform_editor_are_nodes_equal_ignore_mark_order', 'isEnabled', true)) {
+      var _api$analytics;
+      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.fireAnalyticsEvent({
+        eventType: 'track',
+        action: 'nodesNotEqual',
+        actionSubject: 'showDiff',
+        attributes: {
+          docSizeEqual: steppedDoc.nodeSize === tr.doc.nodeSize,
+          colorScheme: colorScheme
+        }
+      });
+    }
     return DecorationSet.empty;
   }
   var changeset = ChangeSet.create(originalDoc).addSteps(steppedDoc, stepMaps, tr.doc);

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

@@ -1,6 +1,5 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleNewActive, deletedContentStyleUnbounded } from './colorSchemes/standard';
 import { deletedTraditionalContentStyle, deletedTraditionalContentStyleUnbounded } from './colorSchemes/traditional';
@@ -69,9 +68,6 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     return;
   }
   if (isTableRowContent) {
-    if (!fg('platform_editor_ai_aifc_patch_ga')) {
-      return;
-    }
     return createChangedRowDecorationWidgets({
       changes: [change],
       originalDoc: doc,

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

@@ -17,7 +17,7 @@ export var getScrollableDecorations = function getScrollableDecorations(set) {
     return spec.key === 'diff-inline' || spec.key === 'diff-widget' || spec.key === 'diff-block';
   })) !== null && _set$find !== void 0 ? _set$find : [];
 };
-export var createPlugin = function createPlugin(config, getIntl) {
+export var createPlugin = function createPlugin(config, getIntl, api) {
   var nodeViewSerializer = new NodeViewSerializer({});
   var setNodeViewSerializer = function setNodeViewSerializer(editorView) {
     nodeViewSerializer.init({
@@ -53,7 +53,8 @@ export var createPlugin = function createPlugin(config, getIntl) {
               nodeViewSerializer: nodeViewSerializer,
               colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
               intl: getIntl(),
-              activeIndexPos: fg('platform_editor_show_diff_scroll_navigation') ? newPluginState.activeIndexPos : undefined
+              activeIndexPos: fg('platform_editor_show_diff_scroll_navigation') ? newPluginState.activeIndexPos : undefined,
+              api: api
             });
             // Update the decorations
             newPluginState.decorations = decorations;
@@ -89,7 +90,8 @@ export var createPlugin = function createPlugin(config, getIntl) {
                 nodeViewSerializer: nodeViewSerializer,
                 colorScheme: config === null || config === void 0 ? void 0 : config.colorScheme,
                 intl: getIntl(),
-                activeIndexPos: newPluginState.activeIndexPos
+                activeIndexPos: newPluginState.activeIndexPos,
+                api: api
               });
               newPluginState.decorations = updatedDecorations;
             }

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

@@ -4,7 +4,6 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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.
@@ -28,7 +27,7 @@ function mergeReplaceSteps(step1, step2) {
 
 // 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;
+  var stepsToFilter = removeUnusedSteps(steps, originalDoc);
   return stepsToFilter
   // Remove steps that don't affect document structure or content
   .filter(function (step) {
@@ -36,9 +35,9 @@ export function simplifySteps(steps, originalDoc) {
   })
   // Merge consecutive steps where possible
   .reduce(function (acc, step) {
-    var _lastStep$merge, _lastStep$merge2, _lastStep$merge3;
+    var _lastStep$merge, _lastStep$merge2;
     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);
+    var merged = (_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);
     if (merged) {
       acc[acc.length - 1] = merged;
     } else {

package/dist/esm/showDiffPlugin.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { fg } from '@atlaskit/platform-feature-flags';
 import { createPlugin, showDiffPluginKey, getScrollableDecorations } from './pm-plugins/main';
 export var showDiffPlugin = function showDiffPlugin(_ref) {
-  var _api = _ref.api,
+  var api = _ref.api,
     config = _ref.config;
   return {
     name: 'showDiff',
@@ -42,7 +42,7 @@ export var showDiffPlugin = function showDiffPlugin(_ref) {
         name: 'showDiffPlugin',
         plugin: function plugin(_ref6) {
           var getIntl = _ref6.getIntl;
-          return createPlugin(config, getIntl);
+          return createPlugin(config, getIntl, api);
         }
       }];
     },

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

@@ -1,14 +1,16 @@
 import type { IntlShape } from 'react-intl-next';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { ColorScheme } from '../showDiffPluginType';
+import type { ColorScheme, ShowDiffPlugin } from '../showDiffPluginType';
 import type { ShowDiffPluginState } from './main';
 import type { NodeViewSerializer } from './NodeViewSerializer';
-export declare const calculateDiffDecorations: import("memoize-one").MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, }: {
+export declare const calculateDiffDecorations: import("memoize-one").MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, api, }: {
     activeIndexPos?: {
         from: number;
         to: number;
     };
+    api: ExtractInjectionAPI<ShowDiffPlugin> | undefined;
     colorScheme?: ColorScheme;
     intl: IntlShape;
     nodeViewSerializer: NodeViewSerializer;

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

@@ -1,11 +1,12 @@
 import type { IntlShape } from 'react-intl-next';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import type { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { type DiffParams } from '../showDiffPluginType';
+import { type DiffParams, type ShowDiffPlugin } from '../showDiffPluginType';
 export declare const showDiffPluginKey: PluginKey<ShowDiffPluginState>;
 export type ShowDiffPluginState = {
     activeIndex?: number;
@@ -19,4 +20,4 @@ export type ShowDiffPluginState = {
     steps: ProseMirrorStep[];
 };
 export declare const getScrollableDecorations: (set: DecorationSet | undefined) => Decoration[];
-export declare const createPlugin: (config: DiffParams | undefined, getIntl: () => IntlShape) => SafePlugin<ShowDiffPluginState>;
+export declare const createPlugin: (config: DiffParams | undefined, getIntl: () => IntlShape, api: ExtractInjectionAPI<ShowDiffPlugin> | undefined) => SafePlugin<ShowDiffPluginState>;

package/dist/types/showDiffPluginType.d.ts

@@ -1,6 +1,7 @@
 import type { StepJson } from '@atlaskit/editor-common/collab';
-import type { NextEditorPlugin, EditorCommand } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, EditorCommand, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 export type ColorScheme = 'standard' | 'traditional';
@@ -32,6 +33,7 @@ export type ShowDiffPlugin = NextEditorPlugin<'showDiff', {
         scrollToPrevious: EditorCommand;
         showDiff: (config: PMDiffParams) => EditorCommand;
     };
+    dependencies: [OptionalPlugin<AnalyticsPlugin>];
     pluginConfiguration: DiffParams | undefined;
     sharedState: {
         /**

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

@@ -1,14 +1,16 @@
 import type { IntlShape } from 'react-intl-next';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { type EditorState } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { ColorScheme } from '../showDiffPluginType';
+import type { ColorScheme, ShowDiffPlugin } from '../showDiffPluginType';
 import type { ShowDiffPluginState } from './main';
 import type { NodeViewSerializer } from './NodeViewSerializer';
-export declare const calculateDiffDecorations: import("memoize-one").MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, }: {
+export declare const calculateDiffDecorations: import("memoize-one").MemoizedFn<({ state, pluginState, nodeViewSerializer, colorScheme, intl, activeIndexPos, api, }: {
     activeIndexPos?: {
         from: number;
         to: number;
     };
+    api: ExtractInjectionAPI<ShowDiffPlugin> | undefined;
     colorScheme?: ColorScheme;
     intl: IntlShape;
     nodeViewSerializer: NodeViewSerializer;

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

@@ -1,11 +1,12 @@
 import type { IntlShape } from 'react-intl-next';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
 import type { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { type DiffParams } from '../showDiffPluginType';
+import { type DiffParams, type ShowDiffPlugin } from '../showDiffPluginType';
 export declare const showDiffPluginKey: PluginKey<ShowDiffPluginState>;
 export type ShowDiffPluginState = {
     activeIndex?: number;
@@ -19,4 +20,4 @@ export type ShowDiffPluginState = {
     steps: ProseMirrorStep[];
 };
 export declare const getScrollableDecorations: (set: DecorationSet | undefined) => Decoration[];
-export declare const createPlugin: (config: DiffParams | undefined, getIntl: () => IntlShape) => SafePlugin<ShowDiffPluginState>;
+export declare const createPlugin: (config: DiffParams | undefined, getIntl: () => IntlShape, api: ExtractInjectionAPI<ShowDiffPlugin> | undefined) => SafePlugin<ShowDiffPluginState>;

package/dist/types-ts4.5/showDiffPluginType.d.ts

@@ -1,6 +1,7 @@
 import type { StepJson } from '@atlaskit/editor-common/collab';
-import type { NextEditorPlugin, EditorCommand } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, EditorCommand, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 export type ColorScheme = 'standard' | 'traditional';
@@ -32,6 +33,9 @@ export type ShowDiffPlugin = NextEditorPlugin<'showDiff', {
         scrollToPrevious: EditorCommand;
         showDiff: (config: PMDiffParams) => EditorCommand;
     };
+    dependencies: [
+        OptionalPlugin<AnalyticsPlugin>
+    ];
     pluginConfiguration: DiffParams | undefined;
     sharedState: {
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "5.0.6",
+	"version": "5.0.8",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,18 +29,22 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^52.2.0",
+		"@atlaskit/editor-plugin-analytics": "^7.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^35.4.0",
-		"@atlaskit/tokens": "^11.0.0",
+		"@atlaskit/tmp-editor-statsig": "^35.6.0",
+		"@atlaskit/tokens": "^11.1.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"memoize-one": "^6.0.0",
 		"prosemirror-changeset": "^2.3.1"
 	},
+	"devDependencies": {
+		"@atlassian/content-reconciliation": "^0.1.3506"
+	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.31.0",
+		"@atlaskit/editor-common": "^111.33.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {
@@ -80,9 +84,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_ai_aifc_patch_ga": {
-			"type": "boolean"
-		},
 		"platform_editor_show_diff_scroll_navigation": {
 			"type": "boolean"
 		},