@atlaskit/editor-plugin-show-diff 8.0.0 → 8.1.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 8.1.1
+
+### Patch Changes
+
+- [`b26874dcf4a79`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b26874dcf4a79) -
+  Show granular inline diffs when the replace step is for a paragraph.
+- Updated dependencies
+
+## 8.1.0
+
+### Minor Changes
+
+- [`c50b6810de5a3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c50b6810de5a3) -
+  Open expand nodes before scrolling to diff changes within them using `toggleExpandRange` from the
+  expand plugin. This is gated behind the `platform_editor_show_diff_open_expands_on_scroll` feature
+  flag.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 8.0.0
 
 ### Patch Changes

package/afm-cc/tsconfig.json

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

package/afm-products/tsconfig.json

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

package/dist/cjs/pm-plugins/calculateDiff/diffBySteps.js

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.diffBySteps = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _prosemirrorChangeset = require("prosemirror-changeset");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _optimizeChanges = require("./optimizeChanges");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -67,6 +69,18 @@ var mergeOverlappingByNewDocRange = function mergeOverlappingByNewDocRange(chang
   merged.push(current);
   return merged;
 };
+var isReplaceStepForTextBlockNode = function isReplaceStepForTextBlockNode(step, before, from, to) {
+  var _replacedSlice$conten, _replacingSlice$conte, _replacedSlice$conten2;
+  if (!(step instanceof _transform.ReplaceStep)) {
+    return false;
+  }
+  if (step.slice.openStart !== 0 || step.slice.openEnd !== 0) {
+    return false;
+  }
+  var replacedSlice = before.slice(from, to);
+  var replacingSlice = step.slice;
+  return Boolean(replacedSlice.openStart === 0 && replacedSlice.openEnd === 0 && replacedSlice.content.childCount === 1 && replacingSlice.content.childCount === 1 && ((_replacedSlice$conten = replacedSlice.content.firstChild) === null || _replacedSlice$conten === void 0 ? void 0 : _replacedSlice$conten.type.name) === ((_replacingSlice$conte = replacingSlice.content.firstChild) === null || _replacingSlice$conte === void 0 ? void 0 : _replacingSlice$conte.type.name) && ((_replacedSlice$conten2 = replacedSlice.content.firstChild) === null || _replacedSlice$conten2 === void 0 ? void 0 : _replacedSlice$conten2.type.isTextblock));
+};
 var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps) {
   var changes = [];
   var currentDoc = originalDoc;
@@ -77,6 +91,7 @@ var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps)
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var step = _step2.value;
+      var before = currentDoc;
       var result = step.apply(currentDoc);
       if (result.failed !== null || !result.doc) {
         continue;
@@ -85,9 +100,12 @@ var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps)
       var rangeStep = step;
       if (typeof rangeStep.from === 'number' && typeof rangeStep.to === 'number') {
         rangedSteps.push({
+          before: before,
+          doc: result.doc,
           from: rangeStep.from,
           to: rangeStep.to,
           mapIndex: successfulStepMaps.length,
+          step: step,
           stepMap: stepMap
         });
       }
@@ -113,6 +131,34 @@ var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps)
     var afterStepToFinal = createMapping(successfulStepMaps.slice(rangedStep.mapIndex + 1));
     var fromB = mapPosition(afterStepToFinal, fromAfterStep);
     var toB = mapPosition(afterStepToFinal, toAfterStep);
+    if (isReplaceStepForTextBlockNode(rangedStep.step, rangedStep.before, rangedStep.from, rangedStep.to)) {
+      var granularStepChanges = _prosemirrorChangeset.ChangeSet.create(rangedStep.before).addSteps(rangedStep.doc, [rangedStep.stepMap], null);
+      var optimizedGranularStepChanges = (0, _optimizeChanges.optimizeChanges)((0, _prosemirrorChangeset.simplifyChanges)(granularStepChanges.changes, granularStepChanges.startDoc));
+      var _iterator3 = _createForOfIteratorHelper(optimizedGranularStepChanges),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var granularChange = _step3.value;
+          var granularFromA = mapPosition(beforeStepToOriginal, granularChange.fromA);
+          var granularToA = mapPosition(beforeStepToOriginal, granularChange.toA);
+          var granularFromB = mapPosition(afterStepToFinal, granularChange.fromB);
+          var granularToB = mapPosition(afterStepToFinal, granularChange.toB);
+          changes.push({
+            fromA: granularFromA,
+            toA: granularToA,
+            fromB: granularFromB,
+            toB: granularToB,
+            deleted: createSpans(Math.max(0, granularToA - granularFromA)),
+            inserted: createSpans(Math.max(0, granularToB - granularFromB))
+          });
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+      continue;
+    }
     changes.push({
       fromA: fromA,
       toA: toA,

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

@@ -161,9 +161,14 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
             var activeIndexChanged = (pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && pluginState.activeIndex !== previousActiveIndex;
             previousActiveIndex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex;
             if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && activeIndexChanged) {
-              var _cancelPendingScrollT;
+              var _cancelPendingScrollT, _api$expand;
               (_cancelPendingScrollT = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT === void 0 || _cancelPendingScrollT();
-              cancelPendingScrollToDecoration = (0, _scrollToActiveDecoration.scrollToActiveDecoration)(view, (0, _getScrollableDecorations.getScrollableDecorations)(pluginState.decorations, view.state.doc), pluginState.activeIndex);
+              var scrollableDecorations = (0, _getScrollableDecorations.getScrollableDecorations)(pluginState.decorations, view.state.doc);
+              var activeDecoration = scrollableDecorations[pluginState.activeIndex];
+              if (activeDecoration && api !== null && api !== void 0 && (_api$expand = api.expand) !== null && _api$expand !== void 0 && (_api$expand = _api$expand.commands) !== null && _api$expand !== void 0 && _api$expand.toggleExpandRange && (0, _platformFeatureFlags.fg)('platform_editor_show_diff_scroll_navigation')) {
+                api === null || api === void 0 || api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
+              }
+              cancelPendingScrollToDecoration = (0, _scrollToActiveDecoration.scrollToActiveDecoration)(view, scrollableDecorations, pluginState.activeIndex);
             }
           }
         },

package/dist/es2019/pm-plugins/calculateDiff/diffBySteps.js

@@ -1,4 +1,6 @@
-import { Mapping } from '@atlaskit/editor-prosemirror/transform';
+import { simplifyChanges, ChangeSet } from 'prosemirror-changeset';
+import { Mapping, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { optimizeChanges } from './optimizeChanges';
 const mapPosition = (mapping, pos) => mapping.map(pos);
 const createMapping = maps => {
   const mapping = new Mapping();
@@ -42,12 +44,25 @@ const mergeOverlappingByNewDocRange = changes => {
   merged.push(current);
   return merged;
 };
+const isReplaceStepForTextBlockNode = (step, before, from, to) => {
+  var _replacedSlice$conten, _replacingSlice$conte, _replacedSlice$conten2;
+  if (!(step instanceof ReplaceStep)) {
+    return false;
+  }
+  if (step.slice.openStart !== 0 || step.slice.openEnd !== 0) {
+    return false;
+  }
+  const replacedSlice = before.slice(from, to);
+  const replacingSlice = step.slice;
+  return Boolean(replacedSlice.openStart === 0 && replacedSlice.openEnd === 0 && replacedSlice.content.childCount === 1 && replacingSlice.content.childCount === 1 && ((_replacedSlice$conten = replacedSlice.content.firstChild) === null || _replacedSlice$conten === void 0 ? void 0 : _replacedSlice$conten.type.name) === ((_replacingSlice$conte = replacingSlice.content.firstChild) === null || _replacingSlice$conte === void 0 ? void 0 : _replacingSlice$conte.type.name) && ((_replacedSlice$conten2 = replacedSlice.content.firstChild) === null || _replacedSlice$conten2 === void 0 ? void 0 : _replacedSlice$conten2.type.isTextblock));
+};
 export const diffBySteps = (originalDoc, steps) => {
   const changes = [];
   let currentDoc = originalDoc;
   const successfulStepMaps = [];
   const rangedSteps = [];
   for (const step of steps) {
+    const before = currentDoc;
     const result = step.apply(currentDoc);
     if (result.failed !== null || !result.doc) {
       continue;
@@ -56,9 +71,12 @@ export const diffBySteps = (originalDoc, steps) => {
     const rangeStep = step;
     if (typeof rangeStep.from === 'number' && typeof rangeStep.to === 'number') {
       rangedSteps.push({
+        before,
+        doc: result.doc,
         from: rangeStep.from,
         to: rangeStep.to,
         mapIndex: successfulStepMaps.length,
+        step,
         stepMap
       });
     }
@@ -78,6 +96,25 @@ export const diffBySteps = (originalDoc, steps) => {
     const afterStepToFinal = createMapping(successfulStepMaps.slice(rangedStep.mapIndex + 1));
     const fromB = mapPosition(afterStepToFinal, fromAfterStep);
     const toB = mapPosition(afterStepToFinal, toAfterStep);
+    if (isReplaceStepForTextBlockNode(rangedStep.step, rangedStep.before, rangedStep.from, rangedStep.to)) {
+      const granularStepChanges = ChangeSet.create(rangedStep.before).addSteps(rangedStep.doc, [rangedStep.stepMap], null);
+      const optimizedGranularStepChanges = optimizeChanges(simplifyChanges(granularStepChanges.changes, granularStepChanges.startDoc));
+      for (const granularChange of optimizedGranularStepChanges) {
+        const granularFromA = mapPosition(beforeStepToOriginal, granularChange.fromA);
+        const granularToA = mapPosition(beforeStepToOriginal, granularChange.toA);
+        const granularFromB = mapPosition(afterStepToFinal, granularChange.fromB);
+        const granularToB = mapPosition(afterStepToFinal, granularChange.toB);
+        changes.push({
+          fromA: granularFromA,
+          toA: granularToA,
+          fromB: granularFromB,
+          toB: granularToB,
+          deleted: createSpans(Math.max(0, granularToA - granularFromA)),
+          inserted: createSpans(Math.max(0, granularToB - granularFromB))
+        });
+      }
+      continue;
+    }
     changes.push({
       fromA,
       toA,

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

@@ -166,9 +166,14 @@ export const createPlugin = (config, getIntl, api) => {
             const activeIndexChanged = (pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && pluginState.activeIndex !== previousActiveIndex;
             previousActiveIndex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex;
             if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && activeIndexChanged) {
-              var _cancelPendingScrollT;
+              var _cancelPendingScrollT, _api$expand, _api$expand$commands;
               (_cancelPendingScrollT = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT === void 0 ? void 0 : _cancelPendingScrollT();
-              cancelPendingScrollToDecoration = scrollToActiveDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc), pluginState.activeIndex);
+              const scrollableDecorations = getScrollableDecorations(pluginState.decorations, view.state.doc);
+              const activeDecoration = scrollableDecorations[pluginState.activeIndex];
+              if (activeDecoration && api !== null && api !== void 0 && (_api$expand = api.expand) !== null && _api$expand !== void 0 && (_api$expand$commands = _api$expand.commands) !== null && _api$expand$commands !== void 0 && _api$expand$commands.toggleExpandRange && fg('platform_editor_show_diff_scroll_navigation')) {
+                api === null || api === void 0 ? void 0 : api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
+              }
+              cancelPendingScrollToDecoration = scrollToActiveDecoration(view, scrollableDecorations, pluginState.activeIndex);
             }
           }
         },

package/dist/esm/pm-plugins/calculateDiff/diffBySteps.js

@@ -5,7 +5,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 { Mapping } from '@atlaskit/editor-prosemirror/transform';
+import { simplifyChanges, ChangeSet } from 'prosemirror-changeset';
+import { Mapping, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { optimizeChanges } from './optimizeChanges';
 var mapPosition = function mapPosition(mapping, pos) {
   return mapping.map(pos);
 };
@@ -60,6 +62,18 @@ var mergeOverlappingByNewDocRange = function mergeOverlappingByNewDocRange(chang
   merged.push(current);
   return merged;
 };
+var isReplaceStepForTextBlockNode = function isReplaceStepForTextBlockNode(step, before, from, to) {
+  var _replacedSlice$conten, _replacingSlice$conte, _replacedSlice$conten2;
+  if (!(step instanceof ReplaceStep)) {
+    return false;
+  }
+  if (step.slice.openStart !== 0 || step.slice.openEnd !== 0) {
+    return false;
+  }
+  var replacedSlice = before.slice(from, to);
+  var replacingSlice = step.slice;
+  return Boolean(replacedSlice.openStart === 0 && replacedSlice.openEnd === 0 && replacedSlice.content.childCount === 1 && replacingSlice.content.childCount === 1 && ((_replacedSlice$conten = replacedSlice.content.firstChild) === null || _replacedSlice$conten === void 0 ? void 0 : _replacedSlice$conten.type.name) === ((_replacingSlice$conte = replacingSlice.content.firstChild) === null || _replacingSlice$conte === void 0 ? void 0 : _replacingSlice$conte.type.name) && ((_replacedSlice$conten2 = replacedSlice.content.firstChild) === null || _replacedSlice$conten2 === void 0 ? void 0 : _replacedSlice$conten2.type.isTextblock));
+};
 export var diffBySteps = function diffBySteps(originalDoc, steps) {
   var changes = [];
   var currentDoc = originalDoc;
@@ -70,6 +84,7 @@ export var diffBySteps = function diffBySteps(originalDoc, steps) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var step = _step2.value;
+      var before = currentDoc;
       var result = step.apply(currentDoc);
       if (result.failed !== null || !result.doc) {
         continue;
@@ -78,9 +93,12 @@ export var diffBySteps = function diffBySteps(originalDoc, steps) {
       var rangeStep = step;
       if (typeof rangeStep.from === 'number' && typeof rangeStep.to === 'number') {
         rangedSteps.push({
+          before: before,
+          doc: result.doc,
           from: rangeStep.from,
           to: rangeStep.to,
           mapIndex: successfulStepMaps.length,
+          step: step,
           stepMap: stepMap
         });
       }
@@ -106,6 +124,34 @@ export var diffBySteps = function diffBySteps(originalDoc, steps) {
     var afterStepToFinal = createMapping(successfulStepMaps.slice(rangedStep.mapIndex + 1));
     var fromB = mapPosition(afterStepToFinal, fromAfterStep);
     var toB = mapPosition(afterStepToFinal, toAfterStep);
+    if (isReplaceStepForTextBlockNode(rangedStep.step, rangedStep.before, rangedStep.from, rangedStep.to)) {
+      var granularStepChanges = ChangeSet.create(rangedStep.before).addSteps(rangedStep.doc, [rangedStep.stepMap], null);
+      var optimizedGranularStepChanges = optimizeChanges(simplifyChanges(granularStepChanges.changes, granularStepChanges.startDoc));
+      var _iterator3 = _createForOfIteratorHelper(optimizedGranularStepChanges),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var granularChange = _step3.value;
+          var granularFromA = mapPosition(beforeStepToOriginal, granularChange.fromA);
+          var granularToA = mapPosition(beforeStepToOriginal, granularChange.toA);
+          var granularFromB = mapPosition(afterStepToFinal, granularChange.fromB);
+          var granularToB = mapPosition(afterStepToFinal, granularChange.toB);
+          changes.push({
+            fromA: granularFromA,
+            toA: granularToA,
+            fromB: granularFromB,
+            toB: granularToB,
+            deleted: createSpans(Math.max(0, granularToA - granularFromA)),
+            inserted: createSpans(Math.max(0, granularToB - granularFromB))
+          });
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+      continue;
+    }
     changes.push({
       fromA: fromA,
       toA: toA,

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

@@ -154,9 +154,14 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
             var activeIndexChanged = (pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && pluginState.activeIndex !== previousActiveIndex;
             previousActiveIndex = pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex;
             if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && activeIndexChanged) {
-              var _cancelPendingScrollT;
+              var _cancelPendingScrollT, _api$expand;
               (_cancelPendingScrollT = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT === void 0 || _cancelPendingScrollT();
-              cancelPendingScrollToDecoration = scrollToActiveDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc), pluginState.activeIndex);
+              var scrollableDecorations = getScrollableDecorations(pluginState.decorations, view.state.doc);
+              var activeDecoration = scrollableDecorations[pluginState.activeIndex];
+              if (activeDecoration && api !== null && api !== void 0 && (_api$expand = api.expand) !== null && _api$expand !== void 0 && (_api$expand = _api$expand.commands) !== null && _api$expand !== void 0 && _api$expand.toggleExpandRange && fg('platform_editor_show_diff_scroll_navigation')) {
+                api === null || api === void 0 || api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
+              }
+              cancelPendingScrollToDecoration = scrollToActiveDecoration(view, scrollableDecorations, pluginState.activeIndex);
             }
           }
         },

package/dist/types/pm-plugins/calculateDiff/diffBySteps.d.ts

@@ -1,4 +1,4 @@
-import type { Change } from 'prosemirror-changeset';
+import { type Change } from 'prosemirror-changeset';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 export declare const diffBySteps: (originalDoc: PMNode, steps: Step[]) => Change[];

package/dist/types/showDiffPluginType.d.ts

@@ -2,6 +2,7 @@ import type { StepJson } from '@atlaskit/editor-common/collab';
 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 { ExpandPlugin } from '@atlaskit/editor-plugin-expand';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 export type ColorScheme = 'standard' | 'traditional';
@@ -37,7 +38,7 @@ export type ShowDiffPlugin = NextEditorPlugin<'showDiff', {
         scrollToPrevious: EditorCommand;
         showDiff: (config: PMDiffParams) => EditorCommand;
     };
-    dependencies: [OptionalPlugin<AnalyticsPlugin>];
+    dependencies: [OptionalPlugin<AnalyticsPlugin>, OptionalPlugin<ExpandPlugin>];
     pluginConfiguration: DiffParams | undefined;
     sharedState: {
         /**

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

@@ -1,4 +1,4 @@
-import type { Change } from 'prosemirror-changeset';
+import { type Change } from 'prosemirror-changeset';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 export declare const diffBySteps: (originalDoc: PMNode, steps: Step[]) => Change[];

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

@@ -2,6 +2,7 @@ import type { StepJson } from '@atlaskit/editor-common/collab';
 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 { ExpandPlugin } from '@atlaskit/editor-plugin-expand';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
 export type ColorScheme = 'standard' | 'traditional';
@@ -38,7 +39,8 @@ export type ShowDiffPlugin = NextEditorPlugin<'showDiff', {
         showDiff: (config: PMDiffParams) => EditorCommand;
     };
     dependencies: [
-        OptionalPlugin<AnalyticsPlugin>
+        OptionalPlugin<AnalyticsPlugin>,
+        OptionalPlugin<ExpandPlugin>
     ];
     pluginConfiguration: DiffParams | undefined;
     sharedState: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "8.0.0",
+	"version": "8.1.1",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,10 +31,11 @@
 		"@atlaskit/adf-schema": "^52.5.0",
 		"@atlaskit/custom-steps": "^0.16.0",
 		"@atlaskit/editor-plugin-analytics": "^10.0.0",
+		"@atlaskit/editor-plugin-expand": "^11.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": "^62.4.0",
+		"@atlaskit/tmp-editor-statsig": "^62.8.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
@@ -56,7 +57,7 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.0.0",
+		"@atlaskit/editor-common": "^114.1.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {