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

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

@@ -10,7 +10,8 @@ import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDel
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { resolveCellOverlayStyleLegacy, resolveDeletedRowStyleLegacy } from './createChangedRowDecorationWidgets.styles.legacy';
-import { buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
+import { createContributorTagWidget, isContributorTagWidgetEnabled } from './createContributorTagWidget';
+import { AnchorTypeKey, buildAnchorDecorationKey, buildDiffDecorationSpec, scrollMarginTopValue } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
 import { applyCellEdgeAttrs, getRowCellEdgeAttrs, getTableTopAndBottomCellEdgeAttrs } from './utils/tableCellEdgeAttrs';
 /**
@@ -86,18 +87,35 @@ const extractChangedRows = ({
     }
   });
 
-  // Filter changes that never truly got deleted
+  // Filter changes that never truly got deleted. Compare the number of equivalent rows rather
+  // than only checking whether one still exists: deleting two of three identical empty rows should
+  // retain two changed rows even though the third remains in the new table.
+  const equivalentRowDeletionCounts = [];
   return changedRows.filter(changedRow => {
     // A replacement leaves every sibling row in place, so asking "does this row still exist
     // ANYWHERE in the new table?" can drop a genuinely rewritten row that happens to match a
-    // sibling. Compare it against the row at the same index instead. Deletions must keep the
-    // whole-table `some()`: their indices shift, so an index comparison would let every
-    // surviving row through and draw a widget for each one.
+    // sibling. Compare it against the row at the same index instead.
     if (handleRowReplacement) {
       const counterpart = tableNew.node.maybeChild(changedRow.rowIndex);
       return !counterpart || !areNodesEqualIgnoreAttrs(counterpart, changedRow.rowNode);
     }
-    return !tableNew.node.children.some(newRow => areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode));
+    let deletionCount = equivalentRowDeletionCounts.find(({
+      rowNode
+    }) => areNodesEqualIgnoreAttrs(rowNode, changedRow.rowNode));
+    if (!deletionCount) {
+      const oldRowCount = tableOld.node.children.filter(oldRow => areNodesEqualIgnoreAttrs(oldRow, changedRow.rowNode)).length;
+      const newRowCount = tableNew.node.children.filter(newRow => areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode)).length;
+      deletionCount = {
+        remaining: Math.max(0, oldRowCount - newRowCount),
+        rowNode: changedRow.rowNode
+      };
+      equivalentRowDeletionCounts.push(deletionCount);
+    }
+    if (deletionCount.remaining === 0) {
+      return false;
+    }
+    deletionCount.remaining--;
+    return true;
   });
 };
 
@@ -142,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;
@@ -206,14 +227,18 @@ const expandDiffForChangedRows = ({
  * Main function to handle deleted rows - computes diff and creates decorations
  */
 export const createChangedRowDecorationWidgets = ({
+  attributionKey,
   changes,
   originalDoc,
   newDoc,
   nodeViewSerializer,
   colorScheme,
+  isActive,
   isInserted = false,
   diffType,
-  showIndicators = false
+  showIndicators = false,
+  showContributorTags = false,
+  tagMountContext
 }) => {
   // First, expand the changes to include complete deleted rows
   const changedRows = expandDiffForChangedRows({
@@ -229,8 +254,12 @@ export const createChangedRowDecorationWidgets = ({
     const safeInsertPos = findSafeInsertPos(newDoc, changedRow.fromB - 1,
     // -1 to find the first safe position from the table
     originalDoc.slice(changedRow.fromA, changedRow.toA));
-    const diffId = crypto.randomUUID();
+
+    // Stable while contributor tags are enabled so a decoration recalculation preserves the tag's
+    // identity and controller state.
+    const diffId = showContributorTags ? `widget-row-${changedRow.fromA}-${changedRow.toA}` : crypto.randomUUID();
     const decorations = [];
+    const rowAnchorNames = [];
 
     // `IndicatorBarContentComponent` renders a bar for every widget descriptor and anchors its
     // top and bottom to `anchor-<diffId>`. Without an element carrying that anchor name the bar
@@ -238,9 +267,9 @@ export const createChangedRowDecorationWidgets = ({
     // bar covers only the row being changed. `createNodeChangedDecorationWidget` sets the same
     // property on its own widget DOM for non-table content; this path returns before reaching it.
     if (showIndicators && isExtendedEnabled(diffType) && fg('platform_editor_ai_show_diff_patch_1')) {
-      rowDOM.style.setProperty('anchor-name', `--${buildAnchorDecorationKey({
+      rowAnchorNames.push(buildAnchorDecorationKey({
         diffId
-      })}`);
+      }));
 
       // A table's content can extend past the doc margin, so the bar also needs a left anchor
       // measured against the table itself or it is clipped once the table is resized.
@@ -253,16 +282,47 @@ export const createChangedRowDecorationWidgets = ({
         decorations.push(leftAnchor);
       }
     }
-    decorations.push(Decoration.widget(safeInsertPos, rowDOM, {
+    const tagAnchorName = showContributorTags && isContributorTagWidgetEnabled() ? buildAnchorDecorationKey({
+      diffId,
+      anchorType: AnchorTypeKey.tag
+    }) : undefined;
+    const tagWidget = tagAnchorName ? createContributorTagWidget({
+      anchorAtRangeStart: true,
+      anchorName: tagAnchorName,
+      diffId,
+      doc: newDoc,
+      from: safeInsertPos,
+      mountContext: tagMountContext,
+      to: safeInsertPos
+    }) : undefined;
+    if (tagAnchorName) {
+      // The tag host is a separate, table-safe widget. CSS anchor positioning aligns it to this
+      // synthetic row without placing non-cell DOM inside the `<tr>` or inheriting its deletion
+      // opacity and strikethrough.
+      rowAnchorNames.push(tagAnchorName);
+    }
+    if (rowAnchorNames.length > 0) {
+      rowDOM.style.setProperty('anchor-name', rowAnchorNames.map(anchorName => `--${anchorName}`).join(', '));
+    }
+    if (tagWidget) {
+      // Lets the contributor tag reveal when any part of the deleted row is hovered.
+      rowDOM.setAttribute('data-diff-id', diffId);
+    }
+    const rowWidget = Decoration.widget(safeInsertPos, rowDOM, {
       ...buildDiffDecorationSpec({
+        attributionKey: tagWidget ? attributionKey : undefined,
         colorScheme,
         decorationType: 'widget',
         diffId,
-        isActive: false,
+        isActive,
         isInserted,
         diffType
       })
-    }));
+    });
+    decorations.push(rowWidget);
+    if (tagWidget) {
+      decorations.push(tagWidget);
+    }
     return decorations;
   });
 };

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.
@@ -150,16 +153,20 @@ export const createNodeChangedDecorationWidget = ({
   }
   if (isTableRowContent) {
     return createChangedRowDecorationWidgets({
+      attributionKey,
       changes: [change],
       originalDoc: doc,
       newDoc,
       nodeViewSerializer,
       colorScheme,
+      isActive,
       isInserted,
       diffType,
       // Needed for the row's own indicator anchor; this path returns before the
       // `anchor-name` assignment further down.
-      showIndicators
+      showIndicators,
+      showContributorTags,
+      tagMountContext
     });
   }
   const serializer = nodeViewSerializer;
@@ -330,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.
@@ -416,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/ContributorTag/buildContributorTagDom.js

@@ -1,4 +1,5 @@
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
+import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles/constants';
 export const CONTRIBUTOR_TAG_TESTID = 'diff-contributor-tag';
 export const CONTRIBUTOR_TAG_NAME_TESTID = 'diff-contributor-tag-name';
 
@@ -12,15 +13,15 @@ export const MAX_TAG_WIDTH = '200px';
 /**
  * The tag sits on the line above the change, so it has to paint over that line to be readable —
  * including any diff highlight already on it, which would otherwise slice straight through the tag.
- * Hence one level above `akEditorUnitZIndex`, where the highlights sit; exported because the
- * change's own highlight is stacked one level below it — see `stackBelowContributorTagStyle` in
- * `createInlineChangedDecoration`.
+ * It also has to paint above table interaction overlays and sticky-capable header rows, which use
+ * `akEditorSmallZIndex`. The change's own highlight is stacked one level below it — see
+ * `stackBelowContributorTagStyle` in `createInlineChangedDecoration`.
  *
  * Painting above its own highlight is only safe because the tag can never reach it: `bottom: 100%`
  * puts the root's bottom edge exactly on the highlight's top edge, and the root's `overflow: clip`
  * keeps every pixel the tag paints inside it.
  */
-export const CONTRIBUTOR_TAG_Z_INDEX = 2;
+export const CONTRIBUTOR_TAG_Z_INDEX = akEditorSmallZIndex + 1;
 
 /**
  * The plugin's whole side of the tag's motion: the fade and the hidden state are

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/calculateDiff/calculateDiffDecorations.js

@@ -9,13 +9,13 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import isEqual from 'lodash/isEqual';
 import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
+import { areDocsEqualByBlockStructureAndText } from '@atlaskit/editor-common/utils/areDocsEqualByBlockStructureAndText';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { Mapping } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-import { areDocsEqualByBlockStructureAndText } from '../areDocsEqualByBlockStructureAndText';
 import { createDocMarginAnchorWidget } from '../decorations/createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
 import { createInlineChangedDecoration } from '../decorations/createInlineChangedDecoration';

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({