@atlaskit/editor-plugin-show-diff 16.0.16 → 16.0.17

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 16.0.17
+
+### Patch Changes
+
+- [`bac902441a512`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bac902441a512) -
+  Keep layout column diff indicators aligned with their content instead of appearing beside the
+  comments footer, behind `platform_editor_ai_show_diff_patch_1`.
+- [`20d41af8d6f4c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/20d41af8d6f4c) -
+  EDITOR-9000 Fixes scroll to suggestion when it is in table with sticky header
+- Updated dependencies
+
 ## 16.0.16
 
 ### Patch Changes

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

@@ -220,6 +220,7 @@ var createLeftAnchorWidget = exports.createLeftAnchorWidget = function createLef
  *
  */
 var createBlockIndicatorAnchorWidgets = exports.createBlockIndicatorAnchorWidgets = function createBlockIndicatorAnchorWidgets(_ref2) {
+  var _ref3, _parentTable$pos;
   var doc = _ref2.doc,
     from = _ref2.from,
     to = _ref2.to,
@@ -259,9 +260,14 @@ var createBlockIndicatorAnchorWidgets = exports.createBlockIndicatorAnchorWidget
   var parentCellOrRow = (0, _utils.findParentNodeClosestToPos)($from, function (ancestor) {
     return ['tableCell', 'tableHeader', 'tableRow'].includes(ancestor.type.name);
   });
-
-  // Render outside the table when inside one; otherwise keep the original pos.
-  var widgetPos = parentTable ? parentTable.pos : from;
+  var parentLayout = (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? (0, _utils.findParentNodeClosestToPos)($from, function (ancestor) {
+    return ancestor.type.name === 'layoutSection';
+  }) : undefined;
+  // Layouts flatten direct widget children with display: contents. Such a wrapper has no
+  // bounding box or positioning context, so measuring its top produces an offset from the
+  // viewport origin and displaces the indicator into content below the editor. Keep the
+  // wrapper outside the layout, just as we do for tables, but still measure the target node.
+  var widgetPos = (_ref3 = (_parentTable$pos = parentTable === null || parentTable === void 0 ? void 0 : parentTable.pos) !== null && _parentTable$pos !== void 0 ? _parentTable$pos : parentLayout === null || parentLayout === void 0 ? void 0 : parentLayout.pos) !== null && _ref3 !== void 0 ? _ref3 : from;
   // Measure the actual cell/row DOM when inside one; otherwise measure the
   // widget's own position.
   var measurePos = parentCellOrRow ? parentCellOrRow.pos : from;
@@ -360,11 +366,11 @@ var createAnchorNameSpan = exports.createAnchorNameSpan = function createAnchorN
   span.style.setProperty('anchor-name', "--".concat(anchorKey));
   return span;
 };
-var createAnchorSpanWidget = function createAnchorSpanWidget(_ref3) {
-  var pos = _ref3.pos,
-    diffId = _ref3.diffId,
-    anchorType = _ref3.anchorType,
-    side = _ref3.side;
+var createAnchorSpanWidget = function createAnchorSpanWidget(_ref4) {
+  var pos = _ref4.pos,
+    diffId = _ref4.diffId,
+    anchorType = _ref4.anchorType,
+    side = _ref4.side;
   return _view.Decoration.widget(pos, function () {
     return createAnchorNameSpan((0, _decorationKeys.buildAnchorDecorationKey)({
       diffId: diffId,
@@ -381,11 +387,11 @@ var createAnchorSpanWidget = function createAnchorSpanWidget(_ref3) {
  * Invisible `from`/`to` (and optional `left`) anchor widgets for one inline diff
  * range, so the `IndicatorBar` can align itself via CSS anchor positioning.
  */
-var createInlineIndicatorAnchorWidgets = exports.createInlineIndicatorAnchorWidgets = function createInlineIndicatorAnchorWidgets(_ref4) {
-  var doc = _ref4.doc,
-    from = _ref4.from,
-    to = _ref4.to,
-    diffId = _ref4.diffId;
+var createInlineIndicatorAnchorWidgets = exports.createInlineIndicatorAnchorWidgets = function createInlineIndicatorAnchorWidgets(_ref5) {
+  var doc = _ref5.doc,
+    from = _ref5.from,
+    to = _ref5.to,
+    diffId = _ref5.diffId;
   var leftAnchor = createLeftAnchorWidget({
     doc: doc,
     from: from,

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

@@ -11,6 +11,7 @@ var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _isExtendedEnabled = require("../isExtendedEnabled");
 var _factory = require("./colorSchemes/factory");
 var _schemes = require("./colorSchemes/schemes");
@@ -250,7 +251,7 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
   });
   var style = tagAnchorName ? [nodeStyle, (0, _lazyNodeView.convertToInlineCss)({
     anchorName: "--".concat(tagAnchorName)
-  })].filter(Boolean).join(' ') : nodeStyle;
+  }), (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? _decorationKeys.scrollMarginTopStyle : undefined].filter(Boolean).join(' ') : nodeStyle;
   var className = getNodeClass(change.name);
   if (style || className) {
     decorations.push(_view.Decoration.node(change.from, change.to, _objectSpread({

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

@@ -184,6 +184,9 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
   // is ADDED content, so it must not claim the "deleted" testid — page models match that as
   // removed content (same reasoning as `createTableCellContentWidgets`).
   tr.setAttribute('data-testid', (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isInserted && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? 'show-diff-changed-row' : 'show-diff-deleted-row');
+  if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+    tr.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
+  }
 
   // Serialize each cell in the row
   var cellIndex = 0;

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

@@ -10,6 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _buildContributorTagDom = require("../../ui/ContributorTag/buildContributorTagDom");
 var _isExtendedEnabled = require("../isExtendedEnabled");
 var _isEmptyParagraphSlice = require("../utils/isEmptyParagraphSlice");
@@ -215,7 +216,7 @@ var createInlineChangedDecoration = exports.createInlineChangedDecoration = func
     diffId: diffId,
     mountContext: tagMountContext
   }) : undefined;
-  var inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined].filter(Boolean).join('');
+  var inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined, (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? _decorationKeys.scrollMarginTopStyle : undefined].filter(Boolean).join('');
   var decorations = [_view.Decoration.inline(change.fromB, change.toB, _objectSpread(_objectSpread(_objectSpread({
     style: inlineStyle
   }, atomicInlineAttrs && {

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

@@ -80,6 +80,9 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
     // This helper only runs for added content, so use the "changed" testid — not
     // "deleted", which page models match as removed content.
     dom.setAttribute('data-testid', 'show-diff-changed-decoration');
+    if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+      dom.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
+    }
 
     // Skip findSafeInsertPos: it walks forward to a schema-valid cell-insert point
     // and pushes the widget into the next cell. `targetPos` is the correct spot.
@@ -356,6 +359,9 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     }
   });
   dom.setAttribute('data-testid', 'show-diff-deleted-decoration');
+  if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+    dom.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
+  }
 
   // Needed even when the indicator bar is off, because a contributor tag also anchors against the
   // widget.
@@ -435,6 +441,9 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       defaultSpacer.dataset.testid = 'show-diff-default-margin-spacer';
       defaultSpacer.style.display = 'block';
       defaultSpacer.style.marginTop = "var(--ds-space-100, 8px)";
+      if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+        defaultSpacer.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
+      }
       decorations.push(_view.Decoration.widget(safeInsertPos, defaultSpacer, _objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
         colorScheme: colorScheme,
         decorationType: 'widget',

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

@@ -4,9 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildAnchorDecorationKey = exports.DiffDecorationKey = exports.DecorationFamily = exports.AnchorTypeKey = exports.AnchorDocMarginKey = void 0;
+exports.buildAnchorDecorationKey = exports.SCROLL_TARGET_MARGIN_CSS_PROPERTY = exports.DiffDecorationKey = exports.DecorationFamily = exports.AnchorTypeKey = exports.AnchorDocMarginKey = void 0;
 exports.buildAnchorDecorationSpec = buildAnchorDecorationSpec;
-exports.isDiffDecorationSpec = exports.isDiffDecoration = exports.isAnchorDecorationSpec = exports.extractDiffDescriptors = exports.buildDiffDecorationSpec = exports.buildDiffDecorationKey = exports.buildContributorTagDecorationSpec = void 0;
+exports.scrollMarginTopValue = exports.scrollMarginTopStyle = exports.isDiffDecorationSpec = exports.isDiffDecoration = exports.isAnchorDecorationSpec = exports.extractDiffDescriptors = exports.buildDiffDecorationSpec = exports.buildDiffDecorationKey = exports.buildContributorTagDecorationSpec = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isExtendedEnabled = require("../isExtendedEnabled");
@@ -21,6 +21,16 @@ var DecorationFamily = exports.DecorationFamily = {
   anchor: 'anchor',
   contributorTag: 'contributor-tag'
 };
+
+/**
+ * Navigation measures the target table header and writes this variable on the
+ * editor root immediately before scrolling. Diff decorations inherit it, so
+ * native scrolling leaves room for the header without DOM mutation on the
+ * ProseMirror-rendered suggestion.
+ */
+var SCROLL_TARGET_MARGIN_CSS_PROPERTY = exports.SCROLL_TARGET_MARGIN_CSS_PROPERTY = '--ak-editor-diff-additional-margin';
+var scrollMarginTopValue = exports.scrollMarginTopValue = "calc(".concat("var(--ds-space-400, 32px)", " + var(", SCROLL_TARGET_MARGIN_CSS_PROPERTY, ", 0px))");
+var scrollMarginTopStyle = exports.scrollMarginTopStyle = "scroll-margin-top: ".concat(scrollMarginTopValue, ";");
 var AnchorTypeKey = exports.AnchorTypeKey = {
   from: 'from',
   to: 'to',

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

@@ -258,7 +258,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
           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.scrollToDecoration)(view, (0, _getScrollableDecorations.getScrollableDecorations)(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType));
+            cancelPendingScrollToDecoration = (0, _scrollToDiff.scrollToDecoration)(view, (0, _getScrollableDecorations.getScrollableDecorations)(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType), undefined, api);
 
             // Reset the flag so we don't scroll again on subsequent updates
             view.dispatch(view.state.tr.setMeta(showDiffPluginKey, {
@@ -279,7 +279,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
               // 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.scrollToDecoration)(view, scrollableDecorations, pluginState.activeIndex);
+            cancelPendingScrollToDecoration = (0, _scrollToDiff.scrollToDecoration)(view, scrollableDecorations, pluginState.activeIndex, api);
 
             // Stepping only scrolls — no focus moves and no content changes — so without this a
             // screen-reader user gets silence. Announced through the live region rather than by

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

@@ -4,6 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.scrollToDecoration = void 0;
+var _styles = require("@atlaskit/editor-common/styles");
+var _getStickyHeaderHeight = require("@atlaskit/editor-common/table/get-sticky-header-height");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _decorationKeys = require("./decorations/decorationKeys");
 /**
  * Extra space above the scrolled-to element so it does not sit flush under the
@@ -15,6 +18,12 @@ var _decorationKeys = require("./decorations/decorationKeys");
  * outer scroll or mis-identifies the active scroll container.
  */
 var SCROLL_TOP_MARGIN_PX = 100;
+function updateScrollTargetMargin(view, targetPos, api) {
+  var _api$limitedMode;
+  var isLimitedModeEnabled = Boolean(api === null || api === void 0 || (_api$limitedMode = api.limitedMode) === null || _api$limitedMode === void 0 || (_api$limitedMode = _api$limitedMode.sharedState.currentState()) === null || _api$limitedMode === void 0 ? void 0 : _api$limitedMode.enabled);
+  var tableHeaderHeight = isLimitedModeEnabled ? undefined : (0, _getStickyHeaderHeight.getStickyHeaderHeight)(view, targetPos);
+  view.dom.style.setProperty(_decorationKeys.SCROLL_TARGET_MARGIN_CSS_PROPERTY, "".concat(tableHeaderHeight ? tableHeaderHeight + _styles.tableMarginTop : 0, "px"));
+}
 
 /**
  * Returns the resolved HTMLElement for a given DOM node, walking up to the
@@ -25,6 +34,13 @@ function scrollToSelection(node) {
   if (!(element instanceof HTMLElement)) {
     return;
   }
+  if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+    element.scrollIntoView({
+      behavior: 'smooth',
+      block: 'start'
+    });
+    return;
+  }
 
   // scroll-margin is included in scroll-into-view math; it does not change layout.
   var previousScrollMarginTop = element.style.scrollMarginTop;
@@ -47,6 +63,7 @@ function scrollToSelection(node) {
  */
 var scrollToDecoration = exports.scrollToDecoration = function scrollToDecoration(view, decorations) {
   var activeIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var api = arguments.length > 3 ? arguments[3] : undefined;
   var decoration = decorations[activeIndex];
   if (!decoration) {
     return function () {};
@@ -58,6 +75,9 @@ var scrollToDecoration = exports.scrollToDecoration = function scrollToDecoratio
   var target = (0, _decorationKeys.isDiffDecoration)(decoration) && decoration.spec.scrollTarget || decoration;
   var rafId = requestAnimationFrame(function () {
     rafId = null;
+    if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+      updateScrollTargetMargin(view, target.from, api);
+    }
     if ((0, _decorationKeys.isDiffDecoration)(target) && target.spec.decorationType === 'widget') {
       var _target$type;
       // @ts-expect-error - decoration.type is not typed public API

package/dist/cjs/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.2 */
 "use strict";
 
 var _typeof = require("@babel/runtime/helpers/typeof");

package/dist/cjs/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

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

@@ -220,6 +220,7 @@ export const createBlockIndicatorAnchorWidgets = ({
   to,
   diffId
 }) => {
+  var _ref, _parentTable$pos;
   const leftAnchor = createLeftAnchorWidget({
     doc,
     from,
@@ -251,9 +252,12 @@ export const createBlockIndicatorAnchorWidgets = ({
   const $from = doc.resolve(from);
   const parentTable = findParentNodeClosestToPos($from, ancestor => ancestor.type.name === 'table');
   const parentCellOrRow = findParentNodeClosestToPos($from, ancestor => ['tableCell', 'tableHeader', 'tableRow'].includes(ancestor.type.name));
-
-  // Render outside the table when inside one; otherwise keep the original pos.
-  const widgetPos = parentTable ? parentTable.pos : from;
+  const parentLayout = fg('platform_editor_ai_show_diff_patch_1') ? findParentNodeClosestToPos($from, ancestor => ancestor.type.name === 'layoutSection') : undefined;
+  // Layouts flatten direct widget children with display: contents. Such a wrapper has no
+  // bounding box or positioning context, so measuring its top produces an offset from the
+  // viewport origin and displaces the indicator into content below the editor. Keep the
+  // wrapper outside the layout, just as we do for tables, but still measure the target node.
+  const widgetPos = (_ref = (_parentTable$pos = parentTable === null || parentTable === void 0 ? void 0 : parentTable.pos) !== null && _parentTable$pos !== void 0 ? _parentTable$pos : parentLayout === null || parentLayout === void 0 ? void 0 : parentLayout.pos) !== null && _ref !== void 0 ? _ref : from;
   // Measure the actual cell/row DOM when inside one; otherwise measure the
   // widget's own position.
   const measurePos = parentCellOrRow ? parentCellOrRow.pos : from;

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

@@ -2,12 +2,13 @@ import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedBlockNodeStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildInsertedBlockNodeStyle } from './colorSchemes/factory';
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createBlockIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
-import { AnchorTypeKey, buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
+import { AnchorTypeKey, buildDiffDecorationSpec, buildAnchorDecorationKey, scrollMarginTopStyle } from './decorationKeys';
 import { getBlockNodeStyleLegacy, resolveCellOverlayStyleLegacy } from './createBlockChangedDecoration.styles.legacy';
 const displayNoneStyle = convertToInlineCss({
   display: 'none'
@@ -230,11 +231,11 @@ export const createBlockChangedDecoration = ({
   });
   const style = tagAnchorName ? [nodeStyle, convertToInlineCss({
     anchorName: `--${tagAnchorName}`
-  })].filter(Boolean).join(' ') : nodeStyle;
+  }), fg('platform_editor_ai_show_diff_patch_1') ? scrollMarginTopStyle : undefined].filter(Boolean).join(' ') : nodeStyle;
   const className = getNodeClass(change.name);
   if (style || className) {
     decorations.push(Decoration.node(change.from, change.to, {
-      style: style,
+      style,
       'data-testid': 'show-diff-changed-decoration-node',
       class: className,
       // Lets the contributor tag find the block it captions on hover.

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

@@ -11,7 +11,7 @@ import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/scheme
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { resolveCellOverlayStyleLegacy, resolveDeletedRowStyleLegacy } from './createChangedRowDecorationWidgets.styles.legacy';
 import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
-import { AnchorTypeKey, buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
+import { AnchorTypeKey, buildAnchorDecorationKey, buildDiffDecorationSpec, scrollMarginTopValue } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
 import { applyCellEdgeAttrs, getRowCellEdgeAttrs, getTableTopAndBottomCellEdgeAttrs } from './utils/tableCellEdgeAttrs';
 /**
@@ -160,6 +160,9 @@ const createChangedRowDOM = (rowNode, cellEdgeAttrs, nodeViewSerializer, colorSc
   // is ADDED content, so it must not claim the "deleted" testid — page models match that as
   // removed content (same reasoning as `createTableCellContentWidgets`).
   tr.setAttribute('data-testid', isExtendedEnabled(diffType) && isInserted && fg('platform_editor_ai_show_diff_patch_1') ? 'show-diff-changed-row' : 'show-diff-deleted-row');
+  if (fg('platform_editor_ai_show_diff_patch_1')) {
+    tr.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+  }
 
   // Serialize each cell in the row
   let cellIndex = 0;

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

@@ -1,6 +1,7 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { CONTRIBUTOR_TAG_Z_INDEX } from '../../ui/ContributorTag/buildContributorTagDom';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
@@ -9,7 +10,7 @@ import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/scheme
 import { createInlineIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
 import { getAtomicInlineNodeClassNameLegacy, resolveInlineChangedStyleLegacy } from './createInlineChangedDecoration.styles.legacy';
-import { buildDiffDecorationSpec } from './decorationKeys';
+import { buildDiffDecorationSpec, scrollMarginTopStyle } from './decorationKeys';
 import { REVEAL_ATTR, resolveRevealStyle } from './revealStyles';
 const displayNoneStyle = convertToInlineCss({
   display: 'none'
@@ -190,7 +191,7 @@ export const createInlineChangedDecoration = ({
     diffId,
     mountContext: tagMountContext
   }) : undefined;
-  const inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined].filter(Boolean).join('');
+  const inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined, fg('platform_editor_ai_show_diff_patch_1') ? scrollMarginTopStyle : undefined].filter(Boolean).join('');
   const decorations = [Decoration.inline(change.fromB, change.toB, {
     style: inlineStyle,
     ...(atomicInlineAttrs && {

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

@@ -5,7 +5,7 @@ import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { createChangedRowDecorationWidgets } from './createChangedRowDecorationWidgets';
 import { createContributorTagHost, unmountContributorTag } from './createContributorTagWidget';
-import { buildDiffDecorationSpec, buildAnchorDecorationKey } from './decorationKeys';
+import { buildDiffDecorationSpec, buildAnchorDecorationKey, scrollMarginTopValue } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
 import { wrapBlockNodeView, injectInnerWrapper, createContentWrapper } from './utils/wrapBlockNodeView';
 const isHeadingLevel = level => typeof level === 'number' && level >= 1 && level <= 6;
@@ -69,6 +69,9 @@ const createTableCellContentWidgets = ({
     // This helper only runs for added content, so use the "changed" testid — not
     // "deleted", which page models match as removed content.
     dom.setAttribute('data-testid', 'show-diff-changed-decoration');
+    if (fg('platform_editor_ai_show_diff_patch_1')) {
+      dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+    }
 
     // Skip findSafeInsertPos: it walks forward to a schema-valid cell-insert point
     // and pushes the widget into the next cell. `targetPos` is the correct spot.
@@ -334,6 +337,9 @@ export const createNodeChangedDecorationWidget = ({
     }
   });
   dom.setAttribute('data-testid', 'show-diff-deleted-decoration');
+  if (fg('platform_editor_ai_show_diff_patch_1')) {
+    dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+  }
 
   // Needed even when the indicator bar is off, because a contributor tag also anchors against the
   // widget.
@@ -420,6 +426,9 @@ export const createNodeChangedDecorationWidget = ({
       defaultSpacer.dataset.testid = 'show-diff-default-margin-spacer';
       defaultSpacer.style.display = 'block';
       defaultSpacer.style.marginTop = "var(--ds-space-100, 8px)";
+      if (fg('platform_editor_ai_show_diff_patch_1')) {
+        defaultSpacer.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+      }
       decorations.push(Decoration.widget(safeInsertPos, defaultSpacer, {
         ...buildDiffDecorationSpec({
           colorScheme,

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

@@ -8,6 +8,16 @@ export const DecorationFamily = {
   anchor: 'anchor',
   contributorTag: 'contributor-tag'
 };
+
+/**
+ * Navigation measures the target table header and writes this variable on the
+ * editor root immediately before scrolling. Diff decorations inherit it, so
+ * native scrolling leaves room for the header without DOM mutation on the
+ * ProseMirror-rendered suggestion.
+ */
+export const SCROLL_TARGET_MARGIN_CSS_PROPERTY = '--ak-editor-diff-additional-margin';
+export const scrollMarginTopValue = `calc(${"var(--ds-space-400, 32px)"} + var(${SCROLL_TARGET_MARGIN_CSS_PROPERTY}, 0px))`;
+export const scrollMarginTopStyle = `scroll-margin-top: ${scrollMarginTopValue};`;
 export const AnchorTypeKey = {
   from: 'from',
   to: 'to',

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

@@ -264,7 +264,7 @@ export const createPlugin = (config, getIntl, api, onEditorView) => {
           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 = scrollToDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType));
+            cancelPendingScrollToDecoration = scrollToDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType), undefined, api);
 
             // Reset the flag so we don't scroll again on subsequent updates
             view.dispatch(view.state.tr.setMeta(showDiffPluginKey, {
@@ -285,7 +285,7 @@ export const createPlugin = (config, getIntl, api, onEditorView) => {
               // 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 = scrollToDecoration(view, scrollableDecorations, pluginState.activeIndex);
+            cancelPendingScrollToDecoration = scrollToDecoration(view, scrollableDecorations, pluginState.activeIndex, api);
 
             // Stepping only scrolls — no focus moves and no content changes — so without this a
             // screen-reader user gets silence. Announced through the live region rather than by

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

@@ -1,5 +1,7 @@
-import { isDiffDecoration } from './decorations/decorationKeys';
-
+import { tableMarginTop } from '@atlaskit/editor-common/styles';
+import { getStickyHeaderHeight } from '@atlaskit/editor-common/table/get-sticky-header-height';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isDiffDecoration, SCROLL_TARGET_MARGIN_CSS_PROPERTY } from './decorations/decorationKeys';
 /**
  * Extra space above the scrolled-to element so it does not sit flush under the
  * viewport edge (helps with sticky table headers, toolbars, etc.).
@@ -10,6 +12,12 @@ import { isDiffDecoration } from './decorations/decorationKeys';
  * outer scroll or mis-identifies the active scroll container.
  */
 const SCROLL_TOP_MARGIN_PX = 100;
+function updateScrollTargetMargin(view, targetPos, api) {
+  var _api$limitedMode, _api$limitedMode$shar;
+  const isLimitedModeEnabled = Boolean(api === null || api === void 0 ? void 0 : (_api$limitedMode = api.limitedMode) === null || _api$limitedMode === void 0 ? void 0 : (_api$limitedMode$shar = _api$limitedMode.sharedState.currentState()) === null || _api$limitedMode$shar === void 0 ? void 0 : _api$limitedMode$shar.enabled);
+  const tableHeaderHeight = isLimitedModeEnabled ? undefined : getStickyHeaderHeight(view, targetPos);
+  view.dom.style.setProperty(SCROLL_TARGET_MARGIN_CSS_PROPERTY, `${tableHeaderHeight ? tableHeaderHeight + tableMarginTop : 0}px`);
+}
 
 /**
  * Returns the resolved HTMLElement for a given DOM node, walking up to the
@@ -20,6 +28,13 @@ function scrollToSelection(node) {
   if (!(element instanceof HTMLElement)) {
     return;
   }
+  if (fg('platform_editor_ai_show_diff_patch_1')) {
+    element.scrollIntoView({
+      behavior: 'smooth',
+      block: 'start'
+    });
+    return;
+  }
 
   // scroll-margin is included in scroll-into-view math; it does not change layout.
   const previousScrollMarginTop = element.style.scrollMarginTop;
@@ -40,7 +55,7 @@ function scrollToSelection(node) {
  *
  * @returns A function that cancels the scheduled `requestAnimationFrame` if it has not run yet.
  */
-export const scrollToDecoration = (view, decorations, activeIndex = 0) => {
+export const scrollToDecoration = (view, decorations, activeIndex = 0, api) => {
   const decoration = decorations[activeIndex];
   if (!decoration) {
     return () => {};
@@ -52,6 +67,9 @@ export const scrollToDecoration = (view, decorations, activeIndex = 0) => {
   const target = isDiffDecoration(decoration) && decoration.spec.scrollTarget || decoration;
   let rafId = requestAnimationFrame(() => {
     rafId = null;
+    if (fg('platform_editor_ai_show_diff_patch_1')) {
+      updateScrollTargetMargin(view, target.from, api);
+    }
     if (isDiffDecoration(target) && target.spec.decorationType === 'widget') {
       var _target$type;
       // @ts-expect-error - decoration.type is not typed public API

package/dist/es2019/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.2 */
 import "./IndicatorBar.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";

package/dist/es2019/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';

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

@@ -214,6 +214,7 @@ export var createLeftAnchorWidget = function createLeftAnchorWidget(_ref) {
  *
  */
 export var createBlockIndicatorAnchorWidgets = function createBlockIndicatorAnchorWidgets(_ref2) {
+  var _ref3, _parentTable$pos;
   var doc = _ref2.doc,
     from = _ref2.from,
     to = _ref2.to,
@@ -253,9 +254,14 @@ export var createBlockIndicatorAnchorWidgets = function createBlockIndicatorAnch
   var parentCellOrRow = findParentNodeClosestToPos($from, function (ancestor) {
     return ['tableCell', 'tableHeader', 'tableRow'].includes(ancestor.type.name);
   });
-
-  // Render outside the table when inside one; otherwise keep the original pos.
-  var widgetPos = parentTable ? parentTable.pos : from;
+  var parentLayout = fg('platform_editor_ai_show_diff_patch_1') ? findParentNodeClosestToPos($from, function (ancestor) {
+    return ancestor.type.name === 'layoutSection';
+  }) : undefined;
+  // Layouts flatten direct widget children with display: contents. Such a wrapper has no
+  // bounding box or positioning context, so measuring its top produces an offset from the
+  // viewport origin and displaces the indicator into content below the editor. Keep the
+  // wrapper outside the layout, just as we do for tables, but still measure the target node.
+  var widgetPos = (_ref3 = (_parentTable$pos = parentTable === null || parentTable === void 0 ? void 0 : parentTable.pos) !== null && _parentTable$pos !== void 0 ? _parentTable$pos : parentLayout === null || parentLayout === void 0 ? void 0 : parentLayout.pos) !== null && _ref3 !== void 0 ? _ref3 : from;
   // Measure the actual cell/row DOM when inside one; otherwise measure the
   // widget's own position.
   var measurePos = parentCellOrRow ? parentCellOrRow.pos : from;
@@ -354,11 +360,11 @@ export var createAnchorNameSpan = function createAnchorNameSpan(anchorKey) {
   span.style.setProperty('anchor-name', "--".concat(anchorKey));
   return span;
 };
-var createAnchorSpanWidget = function createAnchorSpanWidget(_ref3) {
-  var pos = _ref3.pos,
-    diffId = _ref3.diffId,
-    anchorType = _ref3.anchorType,
-    side = _ref3.side;
+var createAnchorSpanWidget = function createAnchorSpanWidget(_ref4) {
+  var pos = _ref4.pos,
+    diffId = _ref4.diffId,
+    anchorType = _ref4.anchorType,
+    side = _ref4.side;
   return Decoration.widget(pos, function () {
     return createAnchorNameSpan(buildAnchorDecorationKey({
       diffId: diffId,
@@ -375,11 +381,11 @@ var createAnchorSpanWidget = function createAnchorSpanWidget(_ref3) {
  * Invisible `from`/`to` (and optional `left`) anchor widgets for one inline diff
  * range, so the `IndicatorBar` can align itself via CSS anchor positioning.
  */
-export var createInlineIndicatorAnchorWidgets = function createInlineIndicatorAnchorWidgets(_ref4) {
-  var doc = _ref4.doc,
-    from = _ref4.from,
-    to = _ref4.to,
-    diffId = _ref4.diffId;
+export var createInlineIndicatorAnchorWidgets = function createInlineIndicatorAnchorWidgets(_ref5) {
+  var doc = _ref5.doc,
+    from = _ref5.from,
+    to = _ref5.to,
+    diffId = _ref5.diffId;
   var leftAnchor = createLeftAnchorWidget({
     doc: doc,
     from: from,

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

@@ -6,12 +6,13 @@ import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedBlockNodeStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildInsertedBlockNodeStyle } from './colorSchemes/factory';
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createBlockIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
-import { AnchorTypeKey, buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
+import { AnchorTypeKey, buildDiffDecorationSpec, buildAnchorDecorationKey, scrollMarginTopStyle } from './decorationKeys';
 import { getBlockNodeStyleLegacy, resolveCellOverlayStyleLegacy } from './createBlockChangedDecoration.styles.legacy';
 var displayNoneStyle = convertToInlineCss({
   display: 'none'
@@ -243,7 +244,7 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
   });
   var style = tagAnchorName ? [nodeStyle, convertToInlineCss({
     anchorName: "--".concat(tagAnchorName)
-  })].filter(Boolean).join(' ') : nodeStyle;
+  }), fg('platform_editor_ai_show_diff_patch_1') ? scrollMarginTopStyle : undefined].filter(Boolean).join(' ') : nodeStyle;
   var className = getNodeClass(change.name);
   if (style || className) {
     decorations.push(Decoration.node(change.from, change.to, _objectSpread({

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

@@ -18,7 +18,7 @@ import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/scheme
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { resolveCellOverlayStyleLegacy, resolveDeletedRowStyleLegacy } from './createChangedRowDecorationWidgets.styles.legacy';
 import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
-import { AnchorTypeKey, buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
+import { AnchorTypeKey, buildAnchorDecorationKey, buildDiffDecorationSpec, scrollMarginTopValue } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
 import { applyCellEdgeAttrs, getRowCellEdgeAttrs, getTableTopAndBottomCellEdgeAttrs } from './utils/tableCellEdgeAttrs';
 /**
@@ -177,6 +177,9 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
   // is ADDED content, so it must not claim the "deleted" testid — page models match that as
   // removed content (same reasoning as `createTableCellContentWidgets`).
   tr.setAttribute('data-testid', isExtendedEnabled(diffType) && isInserted && fg('platform_editor_ai_show_diff_patch_1') ? 'show-diff-changed-row' : 'show-diff-deleted-row');
+  if (fg('platform_editor_ai_show_diff_patch_1')) {
+    tr.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+  }
 
   // Serialize each cell in the row
   var cellIndex = 0;

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

@@ -5,6 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { CONTRIBUTOR_TAG_Z_INDEX } from '../../ui/ContributorTag/buildContributorTagDom';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
@@ -13,7 +14,7 @@ import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/scheme
 import { createInlineIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
 import { getAtomicInlineNodeClassNameLegacy, resolveInlineChangedStyleLegacy } from './createInlineChangedDecoration.styles.legacy';
-import { buildDiffDecorationSpec } from './decorationKeys';
+import { buildDiffDecorationSpec, scrollMarginTopStyle } from './decorationKeys';
 import { REVEAL_ATTR, resolveRevealStyle } from './revealStyles';
 var displayNoneStyle = convertToInlineCss({
   display: 'none'
@@ -208,7 +209,7 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
     diffId: diffId,
     mountContext: tagMountContext
   }) : undefined;
-  var inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined].filter(Boolean).join('');
+  var inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined, fg('platform_editor_ai_show_diff_patch_1') ? scrollMarginTopStyle : undefined].filter(Boolean).join('');
   var decorations = [Decoration.inline(change.fromB, change.toB, _objectSpread(_objectSpread(_objectSpread({
     style: inlineStyle
   }, atomicInlineAttrs && {

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

@@ -8,7 +8,7 @@ import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { createChangedRowDecorationWidgets } from './createChangedRowDecorationWidgets';
 import { createContributorTagHost, unmountContributorTag } from './createContributorTagWidget';
-import { buildDiffDecorationSpec, buildAnchorDecorationKey } from './decorationKeys';
+import { buildDiffDecorationSpec, buildAnchorDecorationKey, scrollMarginTopValue } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
 import { wrapBlockNodeView, injectInnerWrapper, createContentWrapper } from './utils/wrapBlockNodeView';
 var isHeadingLevel = function isHeadingLevel(level) {
@@ -73,6 +73,9 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
     // This helper only runs for added content, so use the "changed" testid — not
     // "deleted", which page models match as removed content.
     dom.setAttribute('data-testid', 'show-diff-changed-decoration');
+    if (fg('platform_editor_ai_show_diff_patch_1')) {
+      dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+    }
 
     // Skip findSafeInsertPos: it walks forward to a schema-valid cell-insert point
     // and pushes the widget into the next cell. `targetPos` is the correct spot.
@@ -349,6 +352,9 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     }
   });
   dom.setAttribute('data-testid', 'show-diff-deleted-decoration');
+  if (fg('platform_editor_ai_show_diff_patch_1')) {
+    dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+  }
 
   // Needed even when the indicator bar is off, because a contributor tag also anchors against the
   // widget.
@@ -428,6 +434,9 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       defaultSpacer.dataset.testid = 'show-diff-default-margin-spacer';
       defaultSpacer.style.display = 'block';
       defaultSpacer.style.marginTop = "var(--ds-space-100, 8px)";
+      if (fg('platform_editor_ai_show_diff_patch_1')) {
+        defaultSpacer.style.setProperty('scroll-margin-top', scrollMarginTopValue);
+      }
       decorations.push(Decoration.widget(safeInsertPos, defaultSpacer, _objectSpread({}, buildDiffDecorationSpec({
         colorScheme: colorScheme,
         decorationType: 'widget',

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

@@ -12,6 +12,16 @@ export var DecorationFamily = {
   anchor: 'anchor',
   contributorTag: 'contributor-tag'
 };
+
+/**
+ * Navigation measures the target table header and writes this variable on the
+ * editor root immediately before scrolling. Diff decorations inherit it, so
+ * native scrolling leaves room for the header without DOM mutation on the
+ * ProseMirror-rendered suggestion.
+ */
+export var SCROLL_TARGET_MARGIN_CSS_PROPERTY = '--ak-editor-diff-additional-margin';
+export var scrollMarginTopValue = "calc(".concat("var(--ds-space-400, 32px)", " + var(", SCROLL_TARGET_MARGIN_CSS_PROPERTY, ", 0px))");
+export var scrollMarginTopStyle = "scroll-margin-top: ".concat(scrollMarginTopValue, ";");
 export var AnchorTypeKey = {
   from: 'from',
   to: 'to',

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

@@ -251,7 +251,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
           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 = scrollToDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType));
+            cancelPendingScrollToDecoration = scrollToDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType), undefined, api);
 
             // Reset the flag so we don't scroll again on subsequent updates
             view.dispatch(view.state.tr.setMeta(showDiffPluginKey, {
@@ -272,7 +272,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
               // 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 = scrollToDecoration(view, scrollableDecorations, pluginState.activeIndex);
+            cancelPendingScrollToDecoration = scrollToDecoration(view, scrollableDecorations, pluginState.activeIndex, api);
 
             // Stepping only scrolls — no focus moves and no content changes — so without this a
             // screen-reader user gets silence. Announced through the live region rather than by

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

@@ -1,5 +1,7 @@
-import { isDiffDecoration } from './decorations/decorationKeys';
-
+import { tableMarginTop } from '@atlaskit/editor-common/styles';
+import { getStickyHeaderHeight } from '@atlaskit/editor-common/table/get-sticky-header-height';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isDiffDecoration, SCROLL_TARGET_MARGIN_CSS_PROPERTY } from './decorations/decorationKeys';
 /**
  * Extra space above the scrolled-to element so it does not sit flush under the
  * viewport edge (helps with sticky table headers, toolbars, etc.).
@@ -10,6 +12,12 @@ import { isDiffDecoration } from './decorations/decorationKeys';
  * outer scroll or mis-identifies the active scroll container.
  */
 var SCROLL_TOP_MARGIN_PX = 100;
+function updateScrollTargetMargin(view, targetPos, api) {
+  var _api$limitedMode;
+  var isLimitedModeEnabled = Boolean(api === null || api === void 0 || (_api$limitedMode = api.limitedMode) === null || _api$limitedMode === void 0 || (_api$limitedMode = _api$limitedMode.sharedState.currentState()) === null || _api$limitedMode === void 0 ? void 0 : _api$limitedMode.enabled);
+  var tableHeaderHeight = isLimitedModeEnabled ? undefined : getStickyHeaderHeight(view, targetPos);
+  view.dom.style.setProperty(SCROLL_TARGET_MARGIN_CSS_PROPERTY, "".concat(tableHeaderHeight ? tableHeaderHeight + tableMarginTop : 0, "px"));
+}
 
 /**
  * Returns the resolved HTMLElement for a given DOM node, walking up to the
@@ -20,6 +28,13 @@ function scrollToSelection(node) {
   if (!(element instanceof HTMLElement)) {
     return;
   }
+  if (fg('platform_editor_ai_show_diff_patch_1')) {
+    element.scrollIntoView({
+      behavior: 'smooth',
+      block: 'start'
+    });
+    return;
+  }
 
   // scroll-margin is included in scroll-into-view math; it does not change layout.
   var previousScrollMarginTop = element.style.scrollMarginTop;
@@ -42,6 +57,7 @@ function scrollToSelection(node) {
  */
 export var scrollToDecoration = function scrollToDecoration(view, decorations) {
   var activeIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var api = arguments.length > 3 ? arguments[3] : undefined;
   var decoration = decorations[activeIndex];
   if (!decoration) {
     return function () {};
@@ -53,6 +69,9 @@ export var scrollToDecoration = function scrollToDecoration(view, decorations) {
   var target = isDiffDecoration(decoration) && decoration.spec.scrollTarget || decoration;
   var rafId = requestAnimationFrame(function () {
     rafId = null;
+    if (fg('platform_editor_ai_show_diff_patch_1')) {
+      updateScrollTargetMargin(view, target.from, api);
+    }
     if (isDiffDecoration(target) && target.spec.decorationType === 'widget') {
       var _target$type;
       // @ts-expect-error - decoration.type is not typed public API

package/dist/esm/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.2 */
 import "./IndicatorBar.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";

package/dist/esm/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';

package/dist/types/pm-plugins/decorations/decorationKeys.d.ts

@@ -10,6 +10,15 @@ export declare const DecorationFamily: {
     readonly anchor: 'anchor';
     readonly contributorTag: 'contributor-tag';
 };
+/**
+ * Navigation measures the target table header and writes this variable on the
+ * editor root immediately before scrolling. Diff decorations inherit it, so
+ * native scrolling leaves room for the header without DOM mutation on the
+ * ProseMirror-rendered suggestion.
+ */
+export declare const SCROLL_TARGET_MARGIN_CSS_PROPERTY = "--ak-editor-diff-additional-margin";
+export declare const scrollMarginTopValue: string;
+export declare const scrollMarginTopStyle: string;
 type DecorationFamilyValue = (typeof DecorationFamily)[keyof typeof DecorationFamily];
 type BaseDecorationSpec<TFamily extends DecorationFamilyValue> = {
     decorationFamily: TFamily;

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

@@ -1,8 +1,12 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView, Decoration } from '@atlaskit/editor-prosemirror/view';
+import type { ShowDiffPlugin } from '../showDiffPluginType';
+type PluginInjectionAPI = ExtractInjectionAPI<ShowDiffPlugin>;
 /**
  * Schedules scrolling to the decoration at the given index after the next frame. Defaults to the
  * first decoration when no index is provided.
  *
  * @returns A function that cancels the scheduled `requestAnimationFrame` if it has not run yet.
  */
-export declare const scrollToDecoration: (view: EditorView, decorations: Decoration[], activeIndex?: number) => (() => void);
+export declare const scrollToDecoration: (view: EditorView, decorations: Decoration[], activeIndex?: number, api?: PluginInjectionAPI) => (() => void);
+export {};

package/dist/types/showDiffPluginType.d.ts

@@ -3,6 +3,7 @@ import type { NextEditorPlugin, EditorCommand, OptionalPlugin } from '@atlaskit/
 import type { JSONDocNode } from '@atlaskit/editor-json-transformer/types';
 import type { AccessibilityUtilsPlugin } from '@atlaskit/editor-plugin-accessibility-utils';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { LimitedModePlugin } from '@atlaskit/editor-plugin-limited-mode/limited-mode-plugin-type';
 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-override';
@@ -232,6 +233,7 @@ export type ShowDiffPlugin = NextEditorPlugin<'showDiff', {
     dependencies: [
         OptionalPlugin<AnalyticsPlugin>,
         OptionalPlugin<UserIntentPlugin>,
+        OptionalPlugin<LimitedModePlugin>,
         /** Carries the live-region announcement made when stepping between changes. */
         OptionalPlugin<AccessibilityUtilsPlugin>
     ];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "16.0.16",
+	"version": "16.0.17",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -25,6 +25,7 @@
 		"@atlaskit/custom-steps": "^1.1.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^18.0.0",
 		"@atlaskit/editor-plugin-analytics": "^18.0.0",
+		"@atlaskit/editor-plugin-limited-mode": "^15.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^16.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
@@ -64,7 +65,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^122.8.0",
+		"@atlaskit/editor-common": "^122.9.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"