@atlaskit/editor-plugin-show-diff 11.0.4 → 11.0.6

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 11.0.6
+
+### Patch Changes
+
+- [`d1b5e85073e48`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d1b5e85073e48) -
+  [ED-7926] Fix block controls hover jitter when viewing an AI Suggested Edits diff.
+
+  While a diff is on screen the block controls UI is hidden, but the hover handlers kept running:
+  `handleMouseOver` dispatched `showDragHandleAt` (flip-flopping the active node between
+  neighbouring blocks) and the right-side hover-side tracker kept dispatching
+  `setHoverSide`/`mouseEnter`, both causing visible jitter. Block controls now suppress both hover
+  paths (and hide the drag handle) while a diff is displayed, detected via the show-diff plugin's
+  `isDisplayingChanges` shared state (plus the `reviewing` user intent for AI suggestions with no
+  diff decorations), gated behind `platform_editor_diff_plugin_extended`.
+
+  To let block controls read that state without forming a circular project reference
+  (`block-controls -> show-diff -> expand -> block-controls`), the `toggleExpandRange` command and
+  `TOGGLE_EXPAND_RANGE_META_KEY` were moved from `@atlaskit/editor-plugin-expand` into
+  `@atlaskit/editor-common` (re-exported from expand for backwards compatibility).
+  `@atlaskit/editor-plugin-show-diff` no longer depends on `@atlaskit/editor-plugin-expand`, and
+  `@atlaskit/editor-plugin-block-controls` now takes an optional dependency on
+  `@atlaskit/editor-plugin-show-diff`.
+
+- Updated dependencies
+
+## 11.0.5
+
+### Patch Changes
+
+- [`67209770a447f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/67209770a447f) -
+  [ED-8371] Fix `scrollToDiff` not always scrolling to the first diff decoration. When
+  `scrollIntoView` was requested on an extended diff (e.g. AI Suggested Edits),
+  `scrollToFirstDecoration` selected its target using `DecorationSet.find()`, which returns
+  decorations in the set's internal order rather than document position and applies no scrollability
+  filtering. As a result it could scroll to a later decoration (for example a `removeNode` deletion)
+  instead of the topmost one. It now scrolls to the first entry of `getScrollableDecorations` — the
+  same filtered, position-sorted list used by the active-index navigation path — so "first" reliably
+  means the topmost scrollable diff in the document.
+- Updated dependencies
+
 ## 11.0.4
 
 ### Patch Changes

package/afm-cc/tsconfig.json

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

package/afm-products/tsconfig.json

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

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.showDiffPluginKey = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _expand = require("@atlaskit/editor-common/expand");
 var _processRawValue = require("@atlaskit/editor-common/process-raw-value");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
@@ -179,11 +180,13 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
           }
           var pluginState = showDiffPluginKey.getState(view.state);
 
-          // Scroll to the first decoration when scrollIntoView was requested
+          // Scroll to the first decoration when scrollIntoView was requested.
+          // Use the same filtered/position-sorted list as the active-index path
+          // so "first" reliably means the topmost scrollable diff in the document.
           if (pluginState !== null && pluginState !== void 0 && pluginState.scrollIntoView && (0, _isExtendedEnabled.isExtendedEnabled)(pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType)) {
             var _cancelPendingScrollT;
             (_cancelPendingScrollT = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT === void 0 || _cancelPendingScrollT();
-            cancelPendingScrollToDecoration = (0, _scrollToDiff.scrollToFirstDecoration)(view, pluginState.decorations);
+            cancelPendingScrollToDecoration = (0, _scrollToDiff.scrollToFirstDecoration)(view, (0, _getScrollableDecorations.getScrollableDecorations)(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType));
 
             // Reset the flag so we don't scroll again on subsequent updates
             view.dispatch(view.state.tr.setMeta(showDiffPluginKey, {
@@ -195,12 +198,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 _cancelPendingScrollT2, _api$expand;
+            var _cancelPendingScrollT2;
             (_cancelPendingScrollT2 = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT2 === void 0 || _cancelPendingScrollT2();
             var scrollableDecorations = (0, _getScrollableDecorations.getScrollableDecorations)(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType);
             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) {
-              api === null || api === void 0 || api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
+            if (activeDecoration) {
+              // EDITOR-7926: use editor-common's command instead of the expand plugin API to
+              // avoid a circular dependency; expand picks up the meta if loaded (no-op if not).
+              api === null || api === void 0 || api.core.actions.execute((0, _expand.toggleExpandRange)(activeDecoration.from, activeDecoration.to, true));
             }
             cancelPendingScrollToDecoration = (0, _scrollToDiff.scrollToActiveDecoration)(view, scrollableDecorations, pluginState.activeIndex);
           }

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

@@ -44,38 +44,17 @@ function scrollToSelection(node) {
  * Unlike `scrollToActiveDecoration`, this does not require an active index —
  * it simply scrolls to bring the first decoration into view.
  *
+ * The caller must pass the list of scrollable decorations as produced by
+ * `getScrollableDecorations`, which is filtered (non-scrollable decorations
+ * removed) and sorted by document position. This guarantees "first" means the
+ * topmost scrollable diff in the document rather than an arbitrary decoration
+ * from the raw `DecorationSet` ordering. This is delegated to
+ * `scrollToActiveDecoration` at index 0 so both scroll paths behave identically.
+ *
  * @returns A function that cancels the scheduled `requestAnimationFrame` if it has not run yet.
  */
-var scrollToFirstDecoration = exports.scrollToFirstDecoration = function scrollToFirstDecoration(view, set) {
-  var decoration = set.find(undefined, undefined, _decorationKeys.isDiffDecorationSpec).find(_decorationKeys.isDiffDecoration);
-  if (!decoration) {
-    return function () {};
-  }
-  var rafId = requestAnimationFrame(function () {
-    var _decoration$type;
-    rafId = null;
-    // @ts-expect-error - decoration.type is not typed public API
-    if (decoration.spec.decorationType === 'widget' && decoration !== null && decoration !== void 0 && (_decoration$type = decoration.type) !== null && _decoration$type !== void 0 && _decoration$type.toDOM) {
-      // @ts-expect-error - decoration.type is not typed public API
-      var widgetDom = decoration.type.toDOM;
-      // Always scroll to the top of this decoration even if it's in view already
-      scrollToSelection(widgetDom);
-    } else {
-      var _view$domAtPos;
-      var targetNode = view.nodeDOM(decoration === null || decoration === void 0 ? void 0 : decoration.from);
-      var node = targetNode instanceof Element ? targetNode : (_view$domAtPos = view.domAtPos(decoration === null || decoration === void 0 ? void 0 : decoration.from)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
-      if (node instanceof HTMLElement) {
-        // Always scroll to the top of this decoration even if it's in view already
-        scrollToSelection(node);
-      }
-    }
-  });
-  return function () {
-    if (rafId !== null) {
-      cancelAnimationFrame(rafId);
-      rafId = null;
-    }
-  };
+var scrollToFirstDecoration = exports.scrollToFirstDecoration = function scrollToFirstDecoration(view, scrollableDecorations) {
+  return scrollToActiveDecoration(view, scrollableDecorations, 0);
 };
 
 /**
@@ -91,14 +70,14 @@ var scrollToActiveDecoration = exports.scrollToActiveDecoration = function scrol
   var rafId = requestAnimationFrame(function () {
     rafId = null;
     if ((0, _decorationKeys.isDiffDecoration)(decoration) && decoration.spec.decorationType === 'widget') {
-      var _decoration$type2;
+      var _decoration$type;
       // @ts-expect-error - decoration.type is not typed public API
-      var widgetDom = decoration === null || decoration === void 0 || (_decoration$type2 = decoration.type) === null || _decoration$type2 === void 0 ? void 0 : _decoration$type2.toDOM;
+      var widgetDom = decoration === null || decoration === void 0 || (_decoration$type = decoration.type) === null || _decoration$type === void 0 ? void 0 : _decoration$type.toDOM;
       scrollToSelection(widgetDom);
     } else {
-      var _view$domAtPos2;
+      var _view$domAtPos;
       var targetNode = view.nodeDOM(decoration === null || decoration === void 0 ? void 0 : decoration.from);
-      var node = targetNode instanceof Element ? targetNode : (_view$domAtPos2 = view.domAtPos(decoration === null || decoration === void 0 ? void 0 : decoration.from)) === null || _view$domAtPos2 === void 0 ? void 0 : _view$domAtPos2.node;
+      var node = targetNode instanceof Element ? targetNode : (_view$domAtPos = view.domAtPos(decoration === null || decoration === void 0 ? void 0 : decoration.from)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
       scrollToSelection(node);
     }
   });

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

@@ -1,3 +1,4 @@
+import { toggleExpandRange } from '@atlaskit/editor-common/expand';
 import { processRawValue } from '@atlaskit/editor-common/process-raw-value';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
@@ -186,11 +187,13 @@ export const createPlugin = (config, getIntl, api) => {
           }
           const pluginState = showDiffPluginKey.getState(view.state);
 
-          // Scroll to the first decoration when scrollIntoView was requested
+          // Scroll to the first decoration when scrollIntoView was requested.
+          // Use the same filtered/position-sorted list as the active-index path
+          // so "first" reliably means the topmost scrollable diff in the document.
           if (pluginState !== null && pluginState !== void 0 && pluginState.scrollIntoView && isExtendedEnabled(pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType)) {
             var _cancelPendingScrollT;
             (_cancelPendingScrollT = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT === void 0 ? void 0 : _cancelPendingScrollT();
-            cancelPendingScrollToDecoration = scrollToFirstDecoration(view, pluginState.decorations);
+            cancelPendingScrollToDecoration = scrollToFirstDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType));
 
             // Reset the flag so we don't scroll again on subsequent updates
             view.dispatch(view.state.tr.setMeta(showDiffPluginKey, {
@@ -202,12 +205,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 _cancelPendingScrollT2, _api$expand, _api$expand$commands;
+            var _cancelPendingScrollT2;
             (_cancelPendingScrollT2 = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT2 === void 0 ? void 0 : _cancelPendingScrollT2();
             const scrollableDecorations = getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType);
             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) {
-              api === null || api === void 0 ? void 0 : api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
+            if (activeDecoration) {
+              // EDITOR-7926: use editor-common's command instead of the expand plugin API to
+              // avoid a circular dependency; expand picks up the meta if loaded (no-op if not).
+              api === null || api === void 0 ? void 0 : api.core.actions.execute(toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
             }
             cancelPendingScrollToDecoration = scrollToActiveDecoration(view, scrollableDecorations, pluginState.activeIndex);
           }

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

@@ -1,4 +1,4 @@
-import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
+import { isDiffDecoration } from './decorations/decorationKeys';
 
 /**
  * Extra space above the scrolled-to element so it does not sit flush under the
@@ -39,39 +39,16 @@ function scrollToSelection(node) {
  * Unlike `scrollToActiveDecoration`, this does not require an active index —
  * it simply scrolls to bring the first decoration into view.
  *
+ * The caller must pass the list of scrollable decorations as produced by
+ * `getScrollableDecorations`, which is filtered (non-scrollable decorations
+ * removed) and sorted by document position. This guarantees "first" means the
+ * topmost scrollable diff in the document rather than an arbitrary decoration
+ * from the raw `DecorationSet` ordering. This is delegated to
+ * `scrollToActiveDecoration` at index 0 so both scroll paths behave identically.
+ *
  * @returns A function that cancels the scheduled `requestAnimationFrame` if it has not run yet.
  */
-export const scrollToFirstDecoration = (view, set) => {
-  const decoration = set.find(undefined, undefined, isDiffDecorationSpec).find(isDiffDecoration);
-  if (!decoration) {
-    return () => {};
-  }
-  let rafId = requestAnimationFrame(() => {
-    var _decoration$type;
-    rafId = null;
-    // @ts-expect-error - decoration.type is not typed public API
-    if (decoration.spec.decorationType === 'widget' && decoration !== null && decoration !== void 0 && (_decoration$type = decoration.type) !== null && _decoration$type !== void 0 && _decoration$type.toDOM) {
-      // @ts-expect-error - decoration.type is not typed public API
-      const widgetDom = decoration.type.toDOM;
-      // Always scroll to the top of this decoration even if it's in view already
-      scrollToSelection(widgetDom);
-    } else {
-      var _view$domAtPos;
-      const targetNode = view.nodeDOM(decoration === null || decoration === void 0 ? void 0 : decoration.from);
-      const node = targetNode instanceof Element ? targetNode : (_view$domAtPos = view.domAtPos(decoration === null || decoration === void 0 ? void 0 : decoration.from)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
-      if (node instanceof HTMLElement) {
-        // Always scroll to the top of this decoration even if it's in view already
-        scrollToSelection(node);
-      }
-    }
-  });
-  return () => {
-    if (rafId !== null) {
-      cancelAnimationFrame(rafId);
-      rafId = null;
-    }
-  };
-};
+export const scrollToFirstDecoration = (view, scrollableDecorations) => scrollToActiveDecoration(view, scrollableDecorations, 0);
 
 /**
  * Schedules scrolling to the decoration at the given index after the next frame.
@@ -86,14 +63,14 @@ export const scrollToActiveDecoration = (view, decorations, activeIndex) => {
   let rafId = requestAnimationFrame(() => {
     rafId = null;
     if (isDiffDecoration(decoration) && decoration.spec.decorationType === 'widget') {
-      var _decoration$type2;
+      var _decoration$type;
       // @ts-expect-error - decoration.type is not typed public API
-      const widgetDom = decoration === null || decoration === void 0 ? void 0 : (_decoration$type2 = decoration.type) === null || _decoration$type2 === void 0 ? void 0 : _decoration$type2.toDOM;
+      const widgetDom = decoration === null || decoration === void 0 ? void 0 : (_decoration$type = decoration.type) === null || _decoration$type === void 0 ? void 0 : _decoration$type.toDOM;
       scrollToSelection(widgetDom);
     } else {
-      var _view$domAtPos2;
+      var _view$domAtPos;
       const targetNode = view.nodeDOM(decoration === null || decoration === void 0 ? void 0 : decoration.from);
-      const node = targetNode instanceof Element ? targetNode : (_view$domAtPos2 = view.domAtPos(decoration === null || decoration === void 0 ? void 0 : decoration.from)) === null || _view$domAtPos2 === void 0 ? void 0 : _view$domAtPos2.node;
+      const node = targetNode instanceof Element ? targetNode : (_view$domAtPos = view.domAtPos(decoration === null || decoration === void 0 ? void 0 : decoration.from)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
       scrollToSelection(node);
     }
   });

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

@@ -1,6 +1,7 @@
 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 { toggleExpandRange } from '@atlaskit/editor-common/expand';
 import { processRawValue } from '@atlaskit/editor-common/process-raw-value';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
@@ -172,11 +173,13 @@ export var createPlugin = function createPlugin(config, getIntl, api) {
           }
           var pluginState = showDiffPluginKey.getState(view.state);
 
-          // Scroll to the first decoration when scrollIntoView was requested
+          // Scroll to the first decoration when scrollIntoView was requested.
+          // Use the same filtered/position-sorted list as the active-index path
+          // so "first" reliably means the topmost scrollable diff in the document.
           if (pluginState !== null && pluginState !== void 0 && pluginState.scrollIntoView && isExtendedEnabled(pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType)) {
             var _cancelPendingScrollT;
             (_cancelPendingScrollT = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT === void 0 || _cancelPendingScrollT();
-            cancelPendingScrollToDecoration = scrollToFirstDecoration(view, pluginState.decorations);
+            cancelPendingScrollToDecoration = scrollToFirstDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType));
 
             // Reset the flag so we don't scroll again on subsequent updates
             view.dispatch(view.state.tr.setMeta(showDiffPluginKey, {
@@ -188,12 +191,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 _cancelPendingScrollT2, _api$expand;
+            var _cancelPendingScrollT2;
             (_cancelPendingScrollT2 = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT2 === void 0 || _cancelPendingScrollT2();
             var scrollableDecorations = getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType);
             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) {
-              api === null || api === void 0 || api.core.actions.execute(api.expand.commands.toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
+            if (activeDecoration) {
+              // EDITOR-7926: use editor-common's command instead of the expand plugin API to
+              // avoid a circular dependency; expand picks up the meta if loaded (no-op if not).
+              api === null || api === void 0 || api.core.actions.execute(toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
             }
             cancelPendingScrollToDecoration = scrollToActiveDecoration(view, scrollableDecorations, pluginState.activeIndex);
           }

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

@@ -1,4 +1,4 @@
-import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
+import { isDiffDecoration } from './decorations/decorationKeys';
 
 /**
  * Extra space above the scrolled-to element so it does not sit flush under the
@@ -39,38 +39,17 @@ function scrollToSelection(node) {
  * Unlike `scrollToActiveDecoration`, this does not require an active index —
  * it simply scrolls to bring the first decoration into view.
  *
+ * The caller must pass the list of scrollable decorations as produced by
+ * `getScrollableDecorations`, which is filtered (non-scrollable decorations
+ * removed) and sorted by document position. This guarantees "first" means the
+ * topmost scrollable diff in the document rather than an arbitrary decoration
+ * from the raw `DecorationSet` ordering. This is delegated to
+ * `scrollToActiveDecoration` at index 0 so both scroll paths behave identically.
+ *
  * @returns A function that cancels the scheduled `requestAnimationFrame` if it has not run yet.
  */
-export var scrollToFirstDecoration = function scrollToFirstDecoration(view, set) {
-  var decoration = set.find(undefined, undefined, isDiffDecorationSpec).find(isDiffDecoration);
-  if (!decoration) {
-    return function () {};
-  }
-  var rafId = requestAnimationFrame(function () {
-    var _decoration$type;
-    rafId = null;
-    // @ts-expect-error - decoration.type is not typed public API
-    if (decoration.spec.decorationType === 'widget' && decoration !== null && decoration !== void 0 && (_decoration$type = decoration.type) !== null && _decoration$type !== void 0 && _decoration$type.toDOM) {
-      // @ts-expect-error - decoration.type is not typed public API
-      var widgetDom = decoration.type.toDOM;
-      // Always scroll to the top of this decoration even if it's in view already
-      scrollToSelection(widgetDom);
-    } else {
-      var _view$domAtPos;
-      var targetNode = view.nodeDOM(decoration === null || decoration === void 0 ? void 0 : decoration.from);
-      var node = targetNode instanceof Element ? targetNode : (_view$domAtPos = view.domAtPos(decoration === null || decoration === void 0 ? void 0 : decoration.from)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
-      if (node instanceof HTMLElement) {
-        // Always scroll to the top of this decoration even if it's in view already
-        scrollToSelection(node);
-      }
-    }
-  });
-  return function () {
-    if (rafId !== null) {
-      cancelAnimationFrame(rafId);
-      rafId = null;
-    }
-  };
+export var scrollToFirstDecoration = function scrollToFirstDecoration(view, scrollableDecorations) {
+  return scrollToActiveDecoration(view, scrollableDecorations, 0);
 };
 
 /**
@@ -86,14 +65,14 @@ export var scrollToActiveDecoration = function scrollToActiveDecoration(view, de
   var rafId = requestAnimationFrame(function () {
     rafId = null;
     if (isDiffDecoration(decoration) && decoration.spec.decorationType === 'widget') {
-      var _decoration$type2;
+      var _decoration$type;
       // @ts-expect-error - decoration.type is not typed public API
-      var widgetDom = decoration === null || decoration === void 0 || (_decoration$type2 = decoration.type) === null || _decoration$type2 === void 0 ? void 0 : _decoration$type2.toDOM;
+      var widgetDom = decoration === null || decoration === void 0 || (_decoration$type = decoration.type) === null || _decoration$type === void 0 ? void 0 : _decoration$type.toDOM;
       scrollToSelection(widgetDom);
     } else {
-      var _view$domAtPos2;
+      var _view$domAtPos;
       var targetNode = view.nodeDOM(decoration === null || decoration === void 0 ? void 0 : decoration.from);
-      var node = targetNode instanceof Element ? targetNode : (_view$domAtPos2 = view.domAtPos(decoration === null || decoration === void 0 ? void 0 : decoration.from)) === null || _view$domAtPos2 === void 0 ? void 0 : _view$domAtPos2.node;
+      var node = targetNode instanceof Element ? targetNode : (_view$domAtPos = view.domAtPos(decoration === null || decoration === void 0 ? void 0 : decoration.from)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
       scrollToSelection(node);
     }
   });

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

@@ -1,12 +1,19 @@
-import type { EditorView, Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import type { EditorView, Decoration } from '@atlaskit/editor-prosemirror/view';
 /**
  * Schedules scrolling to the first diff decoration after the next frame.
  * Unlike `scrollToActiveDecoration`, this does not require an active index —
  * it simply scrolls to bring the first decoration into view.
  *
+ * The caller must pass the list of scrollable decorations as produced by
+ * `getScrollableDecorations`, which is filtered (non-scrollable decorations
+ * removed) and sorted by document position. This guarantees "first" means the
+ * topmost scrollable diff in the document rather than an arbitrary decoration
+ * from the raw `DecorationSet` ordering. This is delegated to
+ * `scrollToActiveDecoration` at index 0 so both scroll paths behave identically.
+ *
  * @returns A function that cancels the scheduled `requestAnimationFrame` if it has not run yet.
  */
-export declare const scrollToFirstDecoration: (view: EditorView, set: DecorationSet) => (() => void);
+export declare const scrollToFirstDecoration: (view: EditorView, scrollableDecorations: Decoration[]) => (() => void);
 /**
  * Schedules scrolling to the decoration at the given index after the next frame.
  *

package/dist/types/showDiffPluginType.d.ts

@@ -2,7 +2,6 @@ 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 { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform';
@@ -93,11 +92,7 @@ export type ShowDiffPlugin = NextEditorPlugin<'showDiff', {
         scrollToPrevious: EditorCommand;
         showDiff: (config: PMDiffParams) => EditorCommand;
     };
-    dependencies: [
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<ExpandPlugin>,
-        OptionalPlugin<UserIntentPlugin>
-    ];
+    dependencies: [OptionalPlugin<AnalyticsPlugin>, OptionalPlugin<UserIntentPlugin>];
     pluginConfiguration: DiffParams | undefined;
     sharedState: {
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "11.0.4",
+	"version": "11.0.6",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -23,7 +23,6 @@
 		"@atlaskit/adf-schema": "^56.6.0",
 		"@atlaskit/custom-steps": "^1.0.0",
 		"@atlaskit/editor-plugin-analytics": "^13.0.0",
-		"@atlaskit/editor-plugin-expand": "^14.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^11.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-tables": "^3.0.0",
@@ -54,7 +53,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^117.4.0",
+		"@atlaskit/editor-common": "^117.6.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"techstack": {