@atlaskit/editor-plugin-show-diff 5.0.7 → 5.0.9

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 5.0.9
+
+### Patch Changes
+
+- [`db37927f35395`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/db37927f35395) -
+  Cleanup platform_editor_ai_aifc_patch_ga_blockers flag.
+
+## 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

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/utils/wrapBlockNodeView.js

@@ -1,19 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.wrapBlockNodeView = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _messages = require("@atlaskit/editor-common/messages");
-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");
-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 lozengeStyle = (0, _lazyNodeView.convertToInlineCss)({
   display: 'inline-flex',
   boxSizing: 'border-box',
@@ -44,13 +39,13 @@ var getDeletedStyleNode = function getDeletedStyleNode(nodeName, colorScheme) {
   var isTraditional = colorScheme === 'traditional';
   switch (nodeName) {
     case 'blockquote':
-      return (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers') ? isTraditional ? _traditional.deletedTraditionalStyleQuoteNode : _standard.deletedStyleQuoteNodeWithLozenge : _standard.deletedStyleQuoteNode;
+      return isTraditional ? _traditional.deletedTraditionalStyleQuoteNode : _standard.deletedStyleQuoteNodeWithLozenge;
     case 'expand':
     case 'decisionList':
-      return isTraditional && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers') ? _traditional.deletedTraditionalBlockOutline : _standard.deletedBlockOutline;
+      return isTraditional ? _traditional.deletedTraditionalBlockOutline : _standard.deletedBlockOutline;
     case 'panel':
     case 'codeBlock':
-      return isTraditional && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers') ? _traditional.deletedTraditionalBlockOutlineRounded : _standard.deletedBlockOutlineRounded;
+      return isTraditional ? _traditional.deletedTraditionalBlockOutlineRounded : _standard.deletedBlockOutlineRounded;
     default:
       return undefined;
   }
@@ -65,7 +60,7 @@ var shouldShowRemovedLozenge = function shouldShowRemovedLozenge(nodeName) {
       return true;
     case 'embedCard':
     case 'blockquote':
-      return (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers');
+      return true;
     default:
       return false;
   }
@@ -76,7 +71,7 @@ var shouldAddShowDiffDeletedNodeClass = function shouldAddShowDiffDeletedNodeCla
     case 'embedCard':
       return true;
     case 'blockquote':
-      return (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers');
+      return true;
     default:
       return false;
   }
@@ -87,31 +82,22 @@ var shouldAddShowDiffDeletedNodeClass = function shouldAddShowDiffDeletedNodeCla
  * to preserve natural block-level margins
  */
 var shouldApplyStylesDirectly = function shouldApplyStylesDirectly(nodeName) {
-  return nodeName === 'heading' || nodeName === 'blockquote' && !(0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers');
+  return nodeName === 'heading';
 };
 
 /**
  * Creates a "Removed" lozenge to be displayed at the top right corner of deleted block nodes
  */
-var createRemovedLozenge = function createRemovedLozenge(intl, nodeName) {
+var createRemovedLozenge = function createRemovedLozenge(intl) {
   var container = document.createElement('span');
-  var borderTopRightRadius;
-  if (['expand', 'decisionList'].includes(nodeName || '')) {
-    borderTopRightRadius = "var(--ds-radius-small, 4px)";
-  } else if (['panel', 'codeBlock', 'mediaSingle'].includes(nodeName || '')) {
-    borderTopRightRadius = "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)");
-  }
-  var containerStyle = (0, _lazyNodeView.convertToInlineCss)(_objectSpread({
+  var containerStyle = (0, _lazyNodeView.convertToInlineCss)({
     position: 'absolute',
-    top: (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers') ? "var(--ds-space-075, 6px)" : "var(--ds-space-0, 0px)",
-    right: (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers') ? "var(--ds-space-075, 6px)" : "var(--ds-space-0, 0px)",
+    top: "var(--ds-space-075, 6px)",
+    right: "var(--ds-space-075, 6px)",
     zIndex: 2,
     pointerEvents: 'none',
     display: 'flex'
-  }, !(0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers') ? {
-    overflow: 'hidden',
-    borderTopRightRadius: borderTopRightRadius
-  } : {}));
+  });
   container.setAttribute('style', containerStyle);
   container.setAttribute('data-testid', 'show-diff-removed-lozenge');
 
@@ -231,7 +217,7 @@ var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref4)
 
   // Add deleted node class if needed
   if (shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
-    var showDiffDeletedNodeClass = colorScheme === 'traditional' && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers') ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
+    var showDiffDeletedNodeClass = colorScheme === 'traditional' ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
     nodeView.classList.add(showDiffDeletedNodeClass);
   }
   dom.append(nodeView);
@@ -256,7 +242,7 @@ var wrapBlockNode = function wrapBlockNode(_ref5) {
       targetNode: targetNode,
       lozenge: lozenge,
       colorScheme: colorScheme
-    }) && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers')) {
+    })) {
       return;
     }
     if (handleMediaSingleWithLozenge({
@@ -277,7 +263,7 @@ var wrapBlockNode = function wrapBlockNode(_ref5) {
   });
   blockWrapper.append(contentWrapper);
   if (nodeView instanceof HTMLElement && shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
-    var showDiffDeletedNodeClass = colorScheme === 'traditional' && (0, _platformFeatureFlags.fg)('platform_editor_ai_aifc_patch_ga_blockers') ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
+    var showDiffDeletedNodeClass = colorScheme === 'traditional' ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
     nodeView.classList.add(showDiffDeletedNodeClass);
   }
   dom.append(blockWrapper);

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/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/utils/wrapBlockNodeView.js

@@ -1,9 +1,8 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { trackChangesMessages } from '@atlaskit/editor-common/messages';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { deletedStyleQuoteNode, deletedStyleQuoteNodeWithLozenge, deletedBlockOutline, deletedBlockOutlineRounded, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleNewActive } from '../colorSchemes/standard';
-import { deletedTraditionalStyleQuoteNode, deletedTraditionalBlockOutline, deletedTraditionalBlockOutlineRounded, deletedTraditionalContentStyle } from '../colorSchemes/traditional';
+import { deletedBlockOutline, deletedBlockOutlineRounded, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleNewActive, deletedStyleQuoteNodeWithLozenge } from '../colorSchemes/standard';
+import { deletedTraditionalBlockOutline, deletedTraditionalBlockOutlineRounded, deletedTraditionalContentStyle, deletedTraditionalStyleQuoteNode } from '../colorSchemes/traditional';
 const lozengeStyle = convertToInlineCss({
   display: 'inline-flex',
   boxSizing: 'border-box',
@@ -33,13 +32,13 @@ const getDeletedStyleNode = (nodeName, colorScheme) => {
   const isTraditional = colorScheme === 'traditional';
   switch (nodeName) {
     case 'blockquote':
-      return fg('platform_editor_ai_aifc_patch_ga_blockers') ? isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNodeWithLozenge : deletedStyleQuoteNode;
+      return isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNodeWithLozenge;
     case 'expand':
     case 'decisionList':
-      return isTraditional && fg('platform_editor_ai_aifc_patch_ga_blockers') ? deletedTraditionalBlockOutline : deletedBlockOutline;
+      return isTraditional ? deletedTraditionalBlockOutline : deletedBlockOutline;
     case 'panel':
     case 'codeBlock':
-      return isTraditional && fg('platform_editor_ai_aifc_patch_ga_blockers') ? deletedTraditionalBlockOutlineRounded : deletedBlockOutlineRounded;
+      return isTraditional ? deletedTraditionalBlockOutlineRounded : deletedBlockOutlineRounded;
     default:
       return undefined;
   }
@@ -54,7 +53,7 @@ const shouldShowRemovedLozenge = nodeName => {
       return true;
     case 'embedCard':
     case 'blockquote':
-      return fg('platform_editor_ai_aifc_patch_ga_blockers');
+      return true;
     default:
       return false;
   }
@@ -65,7 +64,7 @@ const shouldAddShowDiffDeletedNodeClass = nodeName => {
     case 'embedCard':
       return true;
     case 'blockquote':
-      return fg('platform_editor_ai_aifc_patch_ga_blockers');
+      return true;
     default:
       return false;
   }
@@ -76,31 +75,21 @@ const shouldAddShowDiffDeletedNodeClass = nodeName => {
  * to preserve natural block-level margins
  */
 const shouldApplyStylesDirectly = nodeName => {
-  return nodeName === 'heading' || nodeName === 'blockquote' && !fg('platform_editor_ai_aifc_patch_ga_blockers');
+  return nodeName === 'heading';
 };
 
 /**
  * Creates a "Removed" lozenge to be displayed at the top right corner of deleted block nodes
  */
-const createRemovedLozenge = (intl, nodeName) => {
+const createRemovedLozenge = intl => {
   const container = document.createElement('span');
-  let borderTopRightRadius;
-  if (['expand', 'decisionList'].includes(nodeName || '')) {
-    borderTopRightRadius = "var(--ds-radius-small, 4px)";
-  } else if (['panel', 'codeBlock', 'mediaSingle'].includes(nodeName || '')) {
-    borderTopRightRadius = `calc(${"var(--ds-radius-xsmall, 2px)"} + 1px)`;
-  }
   const containerStyle = convertToInlineCss({
     position: 'absolute',
-    top: fg('platform_editor_ai_aifc_patch_ga_blockers') ? "var(--ds-space-075, 6px)" : "var(--ds-space-0, 0px)",
-    right: fg('platform_editor_ai_aifc_patch_ga_blockers') ? "var(--ds-space-075, 6px)" : "var(--ds-space-0, 0px)",
+    top: "var(--ds-space-075, 6px)",
+    right: "var(--ds-space-075, 6px)",
     zIndex: 2,
     pointerEvents: 'none',
-    display: 'flex',
-    ...(!fg('platform_editor_ai_aifc_patch_ga_blockers') ? {
-      overflow: 'hidden',
-      borderTopRightRadius
-    } : {})
+    display: 'flex'
   });
   container.setAttribute('style', containerStyle);
   container.setAttribute('data-testid', 'show-diff-removed-lozenge');
@@ -225,7 +214,7 @@ const handleMediaSingleWithLozenge = ({
 
   // Add deleted node class if needed
   if (shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
-    const showDiffDeletedNodeClass = colorScheme === 'traditional' && fg('platform_editor_ai_aifc_patch_ga_blockers') ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
+    const showDiffDeletedNodeClass = colorScheme === 'traditional' ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
     nodeView.classList.add(showDiffDeletedNodeClass);
   }
   dom.append(nodeView);
@@ -251,7 +240,7 @@ const wrapBlockNode = ({
       targetNode,
       lozenge,
       colorScheme
-    }) && fg('platform_editor_ai_aifc_patch_ga_blockers')) {
+    })) {
       return;
     }
     if (handleMediaSingleWithLozenge({
@@ -272,7 +261,7 @@ const wrapBlockNode = ({
   });
   blockWrapper.append(contentWrapper);
   if (nodeView instanceof HTMLElement && shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
-    const showDiffDeletedNodeClass = colorScheme === 'traditional' && fg('platform_editor_ai_aifc_patch_ga_blockers') ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
+    const showDiffDeletedNodeClass = colorScheme === 'traditional' ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
     nodeView.classList.add(showDiffDeletedNodeClass);
   }
   dom.append(blockWrapper);

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/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/utils/wrapBlockNodeView.js

@@ -1,12 +1,8 @@
-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; }
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { trackChangesMessages } from '@atlaskit/editor-common/messages';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { deletedStyleQuoteNode, deletedStyleQuoteNodeWithLozenge, deletedBlockOutline, deletedBlockOutlineRounded, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleNewActive } from '../colorSchemes/standard';
-import { deletedTraditionalStyleQuoteNode, deletedTraditionalBlockOutline, deletedTraditionalBlockOutlineRounded, deletedTraditionalContentStyle } from '../colorSchemes/traditional';
+import { deletedBlockOutline, deletedBlockOutlineRounded, deletedContentStyle, deletedContentStyleActive, deletedContentStyleNew, deletedContentStyleNewActive, deletedStyleQuoteNodeWithLozenge } from '../colorSchemes/standard';
+import { deletedTraditionalBlockOutline, deletedTraditionalBlockOutlineRounded, deletedTraditionalContentStyle, deletedTraditionalStyleQuoteNode } from '../colorSchemes/traditional';
 var lozengeStyle = convertToInlineCss({
   display: 'inline-flex',
   boxSizing: 'border-box',
@@ -37,13 +33,13 @@ var getDeletedStyleNode = function getDeletedStyleNode(nodeName, colorScheme) {
   var isTraditional = colorScheme === 'traditional';
   switch (nodeName) {
     case 'blockquote':
-      return fg('platform_editor_ai_aifc_patch_ga_blockers') ? isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNodeWithLozenge : deletedStyleQuoteNode;
+      return isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNodeWithLozenge;
     case 'expand':
     case 'decisionList':
-      return isTraditional && fg('platform_editor_ai_aifc_patch_ga_blockers') ? deletedTraditionalBlockOutline : deletedBlockOutline;
+      return isTraditional ? deletedTraditionalBlockOutline : deletedBlockOutline;
     case 'panel':
     case 'codeBlock':
-      return isTraditional && fg('platform_editor_ai_aifc_patch_ga_blockers') ? deletedTraditionalBlockOutlineRounded : deletedBlockOutlineRounded;
+      return isTraditional ? deletedTraditionalBlockOutlineRounded : deletedBlockOutlineRounded;
     default:
       return undefined;
   }
@@ -58,7 +54,7 @@ var shouldShowRemovedLozenge = function shouldShowRemovedLozenge(nodeName) {
       return true;
     case 'embedCard':
     case 'blockquote':
-      return fg('platform_editor_ai_aifc_patch_ga_blockers');
+      return true;
     default:
       return false;
   }
@@ -69,7 +65,7 @@ var shouldAddShowDiffDeletedNodeClass = function shouldAddShowDiffDeletedNodeCla
     case 'embedCard':
       return true;
     case 'blockquote':
-      return fg('platform_editor_ai_aifc_patch_ga_blockers');
+      return true;
     default:
       return false;
   }
@@ -80,31 +76,22 @@ var shouldAddShowDiffDeletedNodeClass = function shouldAddShowDiffDeletedNodeCla
  * to preserve natural block-level margins
  */
 var shouldApplyStylesDirectly = function shouldApplyStylesDirectly(nodeName) {
-  return nodeName === 'heading' || nodeName === 'blockquote' && !fg('platform_editor_ai_aifc_patch_ga_blockers');
+  return nodeName === 'heading';
 };
 
 /**
  * Creates a "Removed" lozenge to be displayed at the top right corner of deleted block nodes
  */
-var createRemovedLozenge = function createRemovedLozenge(intl, nodeName) {
+var createRemovedLozenge = function createRemovedLozenge(intl) {
   var container = document.createElement('span');
-  var borderTopRightRadius;
-  if (['expand', 'decisionList'].includes(nodeName || '')) {
-    borderTopRightRadius = "var(--ds-radius-small, 4px)";
-  } else if (['panel', 'codeBlock', 'mediaSingle'].includes(nodeName || '')) {
-    borderTopRightRadius = "calc(".concat("var(--ds-radius-xsmall, 2px)", " + 1px)");
-  }
-  var containerStyle = convertToInlineCss(_objectSpread({
+  var containerStyle = convertToInlineCss({
     position: 'absolute',
-    top: fg('platform_editor_ai_aifc_patch_ga_blockers') ? "var(--ds-space-075, 6px)" : "var(--ds-space-0, 0px)",
-    right: fg('platform_editor_ai_aifc_patch_ga_blockers') ? "var(--ds-space-075, 6px)" : "var(--ds-space-0, 0px)",
+    top: "var(--ds-space-075, 6px)",
+    right: "var(--ds-space-075, 6px)",
     zIndex: 2,
     pointerEvents: 'none',
     display: 'flex'
-  }, !fg('platform_editor_ai_aifc_patch_ga_blockers') ? {
-    overflow: 'hidden',
-    borderTopRightRadius: borderTopRightRadius
-  } : {}));
+  });
   container.setAttribute('style', containerStyle);
   container.setAttribute('data-testid', 'show-diff-removed-lozenge');
 
@@ -224,7 +211,7 @@ var handleMediaSingleWithLozenge = function handleMediaSingleWithLozenge(_ref4)
 
   // Add deleted node class if needed
   if (shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
-    var showDiffDeletedNodeClass = colorScheme === 'traditional' && fg('platform_editor_ai_aifc_patch_ga_blockers') ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
+    var showDiffDeletedNodeClass = colorScheme === 'traditional' ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
     nodeView.classList.add(showDiffDeletedNodeClass);
   }
   dom.append(nodeView);
@@ -249,7 +236,7 @@ var wrapBlockNode = function wrapBlockNode(_ref5) {
       targetNode: targetNode,
       lozenge: lozenge,
       colorScheme: colorScheme
-    }) && fg('platform_editor_ai_aifc_patch_ga_blockers')) {
+    })) {
       return;
     }
     if (handleMediaSingleWithLozenge({
@@ -270,7 +257,7 @@ var wrapBlockNode = function wrapBlockNode(_ref5) {
   });
   blockWrapper.append(contentWrapper);
   if (nodeView instanceof HTMLElement && shouldAddShowDiffDeletedNodeClass(targetNode.type.name)) {
-    var showDiffDeletedNodeClass = colorScheme === 'traditional' && fg('platform_editor_ai_aifc_patch_ga_blockers') ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
+    var showDiffDeletedNodeClass = colorScheme === 'traditional' ? 'show-diff-deleted-node-traditional' : 'show-diff-deleted-node';
     nodeView.classList.add(showDiffDeletedNodeClass);
   }
   dom.append(blockWrapper);

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/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/index.d.ts

@@ -1,2 +1,2 @@
 export { showDiffPlugin } from './showDiffPlugin';
-export type { ShowDiffPlugin, DiffParams, PMDiffParams } from './showDiffPluginType';
+export type { DiffParams, PMDiffParams, ShowDiffPlugin } from './showDiffPluginType';

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/index.d.ts

@@ -1,2 +1,2 @@
 export { showDiffPlugin } from './showDiffPlugin';
-export type { ShowDiffPlugin, DiffParams, PMDiffParams } from './showDiffPluginType';
+export type { DiffParams, PMDiffParams, ShowDiffPlugin } from './showDiffPluginType';

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.7",
+	"version": "5.0.9",
 	"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.5.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.32.0",
+		"@atlaskit/editor-common": "^111.33.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {
@@ -82,9 +86,6 @@
 	"platform-feature-flags": {
 		"platform_editor_show_diff_scroll_navigation": {
 			"type": "boolean"
-		},
-		"platform_editor_ai_aifc_patch_ga_blockers": {
-			"type": "boolean"
 		}
 	}
 }