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

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

@@ -17,7 +17,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';
 /**
@@ -98,20 +99,40 @@ var extractChangedRows = function extractChangedRows(_ref) {
     }
   });
 
-  // 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.
+  var equivalentRowDeletionCounts = [];
   return changedRows.filter(function (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) {
       var counterpart = tableNew.node.maybeChild(changedRow.rowIndex);
       return !counterpart || !areNodesEqualIgnoreAttrs(counterpart, changedRow.rowNode);
     }
-    return !tableNew.node.children.some(function (newRow) {
-      return areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode);
+    var deletionCount = equivalentRowDeletionCounts.find(function (_ref2) {
+      var rowNode = _ref2.rowNode;
+      return areNodesEqualIgnoreAttrs(rowNode, changedRow.rowNode);
     });
+    if (!deletionCount) {
+      var oldRowCount = tableOld.node.children.filter(function (oldRow) {
+        return areNodesEqualIgnoreAttrs(oldRow, changedRow.rowNode);
+      }).length;
+      var newRowCount = tableNew.node.children.filter(function (newRow) {
+        return 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;
   });
 };
 
@@ -156,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;
@@ -194,11 +218,11 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
 /**
  * Expands a diff to include whole changed rows when table rows are affected
  */
-var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
-  var changes = _ref2.changes,
-    originalDoc = _ref2.originalDoc,
-    newDoc = _ref2.newDoc,
-    diffType = _ref2.diffType;
+var expandDiffForChangedRows = function expandDiffForChangedRows(_ref3) {
+  var changes = _ref3.changes,
+    originalDoc = _ref3.originalDoc,
+    newDoc = _ref3.newDoc,
+    diffType = _ref3.diffType;
   var rowInfo = [];
   var _iterator = _createForOfIteratorHelper(changes),
     _step;
@@ -227,17 +251,22 @@ var expandDiffForChangedRows = function expandDiffForChangedRows(_ref2) {
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-export var createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref3) {
-  var changes = _ref3.changes,
-    originalDoc = _ref3.originalDoc,
-    newDoc = _ref3.newDoc,
-    nodeViewSerializer = _ref3.nodeViewSerializer,
-    colorScheme = _ref3.colorScheme,
-    _ref3$isInserted = _ref3.isInserted,
-    isInserted = _ref3$isInserted === void 0 ? false : _ref3$isInserted,
-    diffType = _ref3.diffType,
-    _ref3$showIndicators = _ref3.showIndicators,
-    showIndicators = _ref3$showIndicators === void 0 ? false : _ref3$showIndicators;
+export var createChangedRowDecorationWidgets = function createChangedRowDecorationWidgets(_ref4) {
+  var attributionKey = _ref4.attributionKey,
+    changes = _ref4.changes,
+    originalDoc = _ref4.originalDoc,
+    newDoc = _ref4.newDoc,
+    nodeViewSerializer = _ref4.nodeViewSerializer,
+    colorScheme = _ref4.colorScheme,
+    isActive = _ref4.isActive,
+    _ref4$isInserted = _ref4.isInserted,
+    isInserted = _ref4$isInserted === void 0 ? false : _ref4$isInserted,
+    diffType = _ref4.diffType,
+    _ref4$showIndicators = _ref4.showIndicators,
+    showIndicators = _ref4$showIndicators === void 0 ? false : _ref4$showIndicators,
+    _ref4$showContributor = _ref4.showContributorTags,
+    showContributorTags = _ref4$showContributor === void 0 ? false : _ref4$showContributor,
+    tagMountContext = _ref4.tagMountContext;
   // First, expand the changes to include complete deleted rows
   var changedRows = expandDiffForChangedRows({
     changes: changes.filter(function (change) {
@@ -254,8 +283,12 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     var safeInsertPos = findSafeInsertPos(newDoc, changedRow.fromB - 1,
     // -1 to find the first safe position from the table
     originalDoc.slice(changedRow.fromA, changedRow.toA));
-    var diffId = crypto.randomUUID();
+
+    // Stable while contributor tags are enabled so a decoration recalculation preserves the tag's
+    // identity and controller state.
+    var diffId = showContributorTags ? "widget-row-".concat(changedRow.fromA, "-").concat(changedRow.toA) : crypto.randomUUID();
     var decorations = [];
+    var 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
@@ -263,9 +296,9 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     // 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', "--".concat(buildAnchorDecorationKey({
+      rowAnchorNames.push(buildAnchorDecorationKey({
         diffId: 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.
@@ -278,14 +311,47 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
         decorations.push(leftAnchor);
       }
     }
-    decorations.push(Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, buildDiffDecorationSpec({
+    var tagAnchorName = showContributorTags && isContributorTagWidgetEnabled() ? buildAnchorDecorationKey({
+      diffId: diffId,
+      anchorType: AnchorTypeKey.tag
+    }) : undefined;
+    var tagWidget = tagAnchorName ? createContributorTagWidget({
+      anchorAtRangeStart: true,
+      anchorName: tagAnchorName,
+      diffId: 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(function (anchorName) {
+        return "--".concat(anchorName);
+      }).join(', '));
+    }
+    if (tagWidget) {
+      // Lets the contributor tag reveal when any part of the deleted row is hovered.
+      rowDOM.setAttribute('data-diff-id', diffId);
+    }
+    var rowWidget = Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, buildDiffDecorationSpec({
+      attributionKey: tagWidget ? attributionKey : undefined,
       colorScheme: colorScheme,
       decorationType: 'widget',
       diffId: diffId,
-      isActive: false,
+      isActive: isActive,
       isInserted: isInserted,
       diffType: diffType
-    }))));
+    })));
+    decorations.push(rowWidget);
+    if (tagWidget) {
+      decorations.push(tagWidget);
+    }
     return decorations;
   });
 };

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

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
+import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles/constants';
 export var CONTRIBUTOR_TAG_TESTID = 'diff-contributor-tag';
 export var CONTRIBUTOR_TAG_NAME_TESTID = 'diff-contributor-tag-name';
 
@@ -13,15 +14,15 @@ export var 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 var CONTRIBUTOR_TAG_Z_INDEX = 2;
+export var 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/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/createChangedRowDecorationWidgets.d.ts

@@ -4,18 +4,23 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { DiffType } from '../../showDiffPluginType';
 import type { NodeViewSerializer } from '../NodeViewSerializer';
 import type { ColorScheme } from './colorSchemes/types';
+import { type ContributorTagMountContext } from './createContributorTagWidget';
 type SimpleChange = Pick<Change, 'fromA' | 'toA' | 'fromB' | 'deleted'>;
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-export declare const createChangedRowDecorationWidgets: ({ changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isInserted, diffType, showIndicators, }: {
+export declare const createChangedRowDecorationWidgets: ({ attributionKey, changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isActive, isInserted, diffType, showIndicators, showContributorTags, tagMountContext, }: {
+    attributionKey?: string;
     changes: SimpleChange[];
     colorScheme?: ColorScheme;
     diffType?: DiffType;
+    isActive?: boolean;
     isInserted?: boolean;
     newDoc: PMNode;
     nodeViewSerializer: NodeViewSerializer;
     originalDoc: PMNode;
+    showContributorTags?: boolean;
     showIndicators?: boolean;
+    tagMountContext?: ContributorTagMountContext;
 }) => Decoration[];
 export {};

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/dist/types/ui/ContributorTag/buildContributorTagDom.d.ts

@@ -9,15 +9,15 @@ export declare 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 declare const CONTRIBUTOR_TAG_Z_INDEX = 2;
+export declare const CONTRIBUTOR_TAG_Z_INDEX: number;
 /**
  * The plugin's whole side of the tag's motion: the fade and the hidden state are
  * `contributorTagStyles` in both EditorContentContainer stylesheets, keyed on this literal and the

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "16.0.14",
+	"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",
@@ -32,7 +33,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^196.0.0",
+		"@atlaskit/tmp-editor-statsig": "^197.0.0",
 		"@atlaskit/tokens": "^17.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -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"

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

@@ -1,55 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.areDocsEqualByBlockStructureAndText = areDocsEqualByBlockStructureAndText;
-var _transform = require("@atlaskit/editor-prosemirror/transform");
-/**
- * Returns a copy of the document with all marks removed from all text.
- * This normalises mark fragmentation — e.g. annotation marks reordering can split
- * a single text run into many text nodes, making structural comparison unreliable.
- * After stripping, ProseMirror will merge adjacent text nodes so childCounts are stable.
- */
-function stripMarks(doc) {
-  var tr = new _transform.Transform(doc);
-  tr.removeMark(0, doc.content.size);
-  return tr.doc;
-}
-
-/**
- * Returns true if both (mark-stripped) nodes have the same block tree structure (node type and child count at every level)
- */
-function isBlockStructureEqual(node1, node2) {
-  if (node1.type !== node2.type || node1.childCount !== node2.childCount) {
-    return false;
-  }
-  for (var i = 0; i < node1.childCount; i++) {
-    if (!isBlockStructureEqual(node1.child(i), node2.child(i))) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/**
- * Looser equality for "safe diff" cases: same full text content and same block structure
- * (e.g. text moved across text-node boundaries). Used when strict areNodesEqualIgnoreAttrs fails.
- * This is safe because we ensure decorations get applied to valid positions.
- *
- * Marks are intentionally ignored — two documents that differ only in mark application
- * (e.g. bold/italic boundaries or annotation mark ordering) are considered equal here.
- * Both documents are mark-stripped before comparison so that mark-driven text fragmentation
- * does not produce false inequalities.
- */
-function areDocsEqualByBlockStructureAndText(doc1, doc2) {
-  if (doc1.textContent !== doc2.textContent) {
-    return false;
-  }
-  // Strip marks before comparing so that mark-driven text fragmentation
-  // (e.g. annotation mark reordering producing different childCounts) does not
-  // cause false inequalities.
-  var stripped1 = stripMarks(doc1);
-  var stripped2 = stripMarks(doc2);
-  return doc1.nodeSize === doc2.nodeSize && isBlockStructureEqual(stripped1, stripped2);
-}