@atlaskit/editor-plugin-show-diff 17.1.5 → 17.1.7

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

@@ -6,10 +6,10 @@ import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { countEmptyTextBlockOnlySlice } from '../utils/emptyTextBlocks';
 import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
-import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
+import { clampAnchorPosIntoCell, createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { createChangedRowDecorationWidgets } from './createChangedRowDecorationWidgets';
-import { createContributorTagHost, unmountContributorTag } from './createContributorTagWidget';
-import { AnchorTypeKey, buildDiffDecorationSpec, buildAnchorDecorationKey, scrollMarginTopValue } from './decorationKeys';
+import { createContributorTagHost, resolveHoistedCodeBlockAnchor, unmountContributorTag } from './createContributorTagWidget';
+import { AnchorTypeKey, buildContributorTagDecorationSpec, buildDiffDecorationSpec, buildAnchorDecorationKey, scrollMarginTopValue } from './decorationKeys';
 import { absorbFirstChildMarginReset } from './utils/absorbFirstChildMarginReset';
 import { createDeletedLineBreakDecoration } from './utils/createDeletedLineBreakWidget';
 import { createMarginAbsorber } from './utils/createMarginAbsorber';
@@ -34,6 +34,7 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
     nodeViewSerializer = _ref.nodeViewSerializer,
     colorScheme = _ref.colorScheme,
     isInserted = _ref.isInserted,
+    leftAnchorId = _ref.leftAnchorId,
     diffType = _ref.diffType;
   // Collect the inner content position of each cell in the new document within
   // the change range. Whole-cell replacement preserves cell count/order, so the
@@ -90,6 +91,7 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
       colorScheme: colorScheme,
       decorationType: 'widget',
       diffId: crypto.randomUUID(),
+      leftAnchorId: leftAnchorId,
       isInserted: isInserted,
       diffType: diffType
     }, isExtendedEnabled(diffType) && {
@@ -115,6 +117,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     activeIndexPos = _ref2.activeIndexPos,
     _ref2$isInserted = _ref2.isInserted,
     isInserted = _ref2$isInserted === void 0 ? false : _ref2$isInserted,
+    leftAnchorId = _ref2.leftAnchorId,
     _ref2$showContributor = _ref2.showContributorTags,
     showContributorTags = _ref2$showContributor === void 0 ? false : _ref2$showContributor,
     _ref2$showIndicators = _ref2.showIndicators,
@@ -178,6 +181,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,
       isInserted: isInserted,
+      leftAnchorId: leftAnchorId,
       diffType: diffType
     });
   }
@@ -194,6 +198,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       colorScheme: colorScheme,
       isActive: isActive,
       isInserted: isInserted,
+      leftAnchorId: leftAnchorId,
       diffType: diffType,
       intl: intl,
       // Needed for the row's own indicator anchor; this path returns before the
@@ -407,7 +412,13 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       }
     }
   });
-  var contributorTagAnchorName;
+
+  // A change inside a code block hoists its tag out of the block (EDITOR-9045).
+  var hoistedCodeBlockAnchor = canTagWidget ? resolveHoistedCodeBlockAnchor(newDoc, safeInsertPos, diffId) : undefined;
+  if (hoistedCodeBlockAnchor) {
+    decorations.push(hoistedCodeBlockAnchor.marker);
+  }
+  var contributorTagAnchorName = hoistedCodeBlockAnchor === null || hoistedCodeBlockAnchor === void 0 ? void 0 : hoistedCodeBlockAnchor.anchorName;
   if (!isInserted && deletedColumns !== null && deletedColumns !== void 0 && deletedColumns.length) {
     var table = dom.querySelector('table');
     var firstRow = table === null || table === void 0 ? void 0 : table.rows[0];
@@ -467,6 +478,13 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     dom.style.setProperty('anchor-name', "--".concat(buildAnchorDecorationKey({
       diffId: diffId
     })));
+    // The tag built below only anchors via `anchor()` if `contributorTagAnchorName` is set; without
+    // it the tag falls back to a non-anchored position (EDITOR-9045).
+    if (fg('confluence_ncs_step_diffing_version_history')) {
+      contributorTagAnchorName !== null && contributorTagAnchorName !== void 0 ? contributorTagAnchorName : contributorTagAnchorName = buildAnchorDecorationKey({
+        diffId: diffId
+      });
+    }
   }
 
   // Taken down in the widget's `destroy` below: `dom` is rebuilt on every recalculation, so the tag
@@ -475,24 +493,56 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   if (canTagWidget) {
     // Lets the contributor tag find the deleted content on hover.
     dom.setAttribute('data-diff-id', diffId);
-
-    // Hosted at the start of the deleted run rather than on `dom` itself: `dom` is inline, so once
-    // the deleted content wraps its box is the union of its line fragments.
-    var tagHost = createContributorTagHost({
-      anchorName: contributorTagAnchorName,
-      diffId: diffId,
-      mountContext: tagMountContext
-    });
-    if (tagHost) {
-      dom.prepend(tagHost.host);
-      tagMount = tagHost.mount;
+    if (hoistedCodeBlockAnchor) {
+      // Own widget just before the code block, anchored to the marker above, not `dom` (EDITOR-9045).
+      var hoistedTagMount;
+      decorations.push(Decoration.widget(clampAnchorPosIntoCell(newDoc, hoistedCodeBlockAnchor.codeBlockStart, 1), function () {
+        var _tagHost$host;
+        var tagHost = createContributorTagHost({
+          anchorName: contributorTagAnchorName,
+          diffId: diffId,
+          mountContext: tagMountContext
+        });
+        hoistedTagMount = tagHost === null || tagHost === void 0 ? void 0 : tagHost.mount;
+        return (_tagHost$host = tagHost === null || tagHost === void 0 ? void 0 : tagHost.host) !== null && _tagHost$host !== void 0 ? _tagHost$host : document.createElement('span');
+      }, _objectSpread(_objectSpread({}, buildContributorTagDecorationSpec(diffId)), {}, {
+        side: 1,
+        marks: [],
+        ignoreSelection: true,
+        stopEvent: function stopEvent() {
+          return true;
+        },
+        destroy: function destroy() {
+          unmountContributorTag(hoistedTagMount);
+          hoistedTagMount = undefined;
+        }
+      })));
+    } else {
+      // Hosted at the start of the deleted run rather than on `dom` itself: `dom` is inline, so once
+      // the deleted content wraps its box is the union of its line fragments.
+      var tagHost = createContributorTagHost({
+        anchorName: contributorTagAnchorName,
+        diffId: diffId,
+        mountContext: tagMountContext
+      });
+      if (tagHost) {
+        dom.prepend(tagHost.host);
+        tagMount = tagHost.mount;
+      }
     }
   }
   if (showIndicators && isExtendedEnabled(diffType)) {
     var leftAnchor = createLeftAnchorWidget({
       doc: newDoc,
       from: safeInsertPos,
-      diffId: diffId
+      diffId: diffId,
+      leftAnchorId: leftAnchorId,
+      measureElement: fg('platform_editor_ai_show_diff_patch_2') ? dom : undefined,
+      sliceOverride: fg('platform_editor_ai_show_diff_patch_2') ? slice : undefined,
+      underlyingRange: fg('platform_editor_ai_show_diff_patch_2') ? {
+        from: change.fromB,
+        to: change.toB
+      } : undefined
     });
     if (leftAnchor) {
       decorations.push(leftAnchor);
@@ -503,6 +553,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     colorScheme: colorScheme,
     decorationType: 'widget',
     diffId: diffId,
+    leftAnchorId: leftAnchorId,
     isActive: isActive,
     isInserted: isInserted,
     diffType: diffType

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

@@ -75,10 +75,11 @@ export var buildDiffDecorationSpec = function buildDiffDecorationSpec(_ref3) {
     diffId = _ref3.diffId,
     isActive = _ref3.isActive,
     isInserted = _ref3.isInserted,
+    leftAnchorId = _ref3.leftAnchorId,
     nodeName = _ref3.nodeName,
     side = _ref3.side,
     diffType = _ref3.diffType;
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
     decorationFamily: DecorationFamily.diff,
     decorationType: decorationType,
     diffId: diffId,
@@ -94,6 +95,8 @@ export var buildDiffDecorationSpec = function buildDiffDecorationSpec(_ref3) {
     isActive: isActive
   } : {}), isInserted !== undefined ? {
     isInserted: isInserted
+  } : {}), leftAnchorId ? {
+    leftAnchorId: leftAnchorId
   } : {}), colorScheme ? {
     colorScheme: colorScheme
   } : {}), nodeName ? {
@@ -150,11 +153,13 @@ export var isDiffDecoration = function isDiffDecoration(decoration) {
 export var extractDiffDescriptors = function extractDiffDescriptors(decorations) {
   return decorations.find(undefined, undefined, isDiffDecorationSpec).filter(isDiffDecoration).map(function (_ref5) {
     var spec = _ref5.spec;
-    return _objectSpread(_objectSpread(_objectSpread({}, spec.colorScheme ? {
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, spec.colorScheme ? {
       colorScheme: spec.colorScheme
     } : {}), {}, {
       id: spec.diffId
-    }, spec.isInserted !== undefined ? {
+    }, spec.leftAnchorId ? {
+      leftAnchorId: spec.leftAnchorId
+    } : {}), spec.isInserted !== undefined ? {
       isInserted: spec.isInserted
     } : {}), {}, {
       type: spec.decorationType

package/dist/esm/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.js

@@ -48,10 +48,15 @@ var getChangedContentStyleNext = function getChangedContentStyleNext(colorScheme
   if (isExtendedEnabled(diffType) && isInserted) {
     return buildInsertedInlineStyle(colors, isActive, hideAddedDiffsUnderline);
   }
-  if (isActive) {
-    return buildDeletedInlineContentStyle(colors, 'active');
+  var base = buildDeletedInlineContentStyle(colors, isActive ? 'active' : expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'new' : 'default');
+
+  // Text-like blocks (heading, lists, blockquote) render their deleted content through this
+  // getter rather than `getDeletedContentStyle`, so without this they never receive the
+  // glyphTint background + underline that plain deleted text already gets.
+  if (fg('confluence_ncs_step_diffing_version_history') && colors.deletedInlineTreatment === 'glyphTint' && isExtendedEnabled(diffType)) {
+    return base + buildDeletedInlineContentStyleExtended(colors, isActive);
   }
-  return buildDeletedInlineContentStyle(colors, expValEquals('platform_editor_enghealth_a11y_jan_fixes', 'isEnabled', true) ? 'new' : 'default');
+  return base;
 };
 var getChangedNodeStyleNext = function getChangedNodeStyleNext(nodeName, colorScheme) {
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;

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

@@ -5,6 +5,8 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { buildAnchorDecorationKey, AnchorTypeKey } from '../../pm-plugins/decorations/decorationKeys';
 import { IndicatorBar } from './IndicatorBar';
 var renderIndicatorBar = function renderIndicatorBar(descriptor) {
+  var _descriptor$leftAncho;
+  var leftAnchorId = (_descriptor$leftAncho = descriptor.leftAnchorId) !== null && _descriptor$leftAncho !== void 0 ? _descriptor$leftAncho : descriptor.id;
   switch (descriptor.type) {
     case 'inline':
       {
@@ -21,7 +23,7 @@ var renderIndicatorBar = function renderIndicatorBar(descriptor) {
             anchorType: AnchorTypeKey.to
           }),
           anchorLeft: buildAnchorDecorationKey({
-            diffId: descriptor.id,
+            diffId: leftAnchorId,
             anchorType: AnchorTypeKey.left
           })
         });
@@ -41,7 +43,7 @@ var renderIndicatorBar = function renderIndicatorBar(descriptor) {
           anchorTop: blockAnchor,
           anchorBottom: blockAnchor,
           anchorLeft: buildAnchorDecorationKey({
-            diffId: descriptor.id,
+            diffId: leftAnchorId,
             anchorType: AnchorTypeKey.left
           })
         });
@@ -59,7 +61,7 @@ var renderIndicatorBar = function renderIndicatorBar(descriptor) {
             diffId: descriptor.id
           }),
           anchorLeft: buildAnchorDecorationKey({
-            diffId: descriptor.id,
+            diffId: leftAnchorId,
             anchorType: AnchorTypeKey.left
           }),
           anchorLeftFallback: buildAnchorDecorationKey({

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

@@ -1,4 +1,4 @@
-import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 /**
  * Create a widget that marks the start of the doc margin.
@@ -16,10 +16,18 @@ export declare const createDocMarginAnchorWidget: () => Decoration;
  * doc margin so the `IndicatorBar` can align its left edge against it via CSS
  * anchor positioning. Shared by inline and node (widget) diff decorations.
  */
-export declare const createLeftAnchorWidget: ({ doc, from, diffId, }: {
+export declare const createLeftAnchorWidget: ({ doc, from, to, diffId, leftAnchorId, measureElement, sliceOverride, underlyingRange, }: {
     diffId: string;
     doc: PMNode;
     from: number;
+    leftAnchorId?: string;
+    measureElement?: HTMLElement;
+    sliceOverride?: Slice;
+    to?: number;
+    underlyingRange?: {
+        from: number;
+        to: number;
+    };
 }) => Decoration | undefined;
 /**
  * Creates invisible anchor widgets for a single block-changed diff so that the
@@ -32,10 +40,11 @@ export declare const createLeftAnchorWidget: ({ doc, from, diffId, }: {
  *   layout, expand) so the bar aligns within the container boundary.
  *
  */
-export declare const createBlockIndicatorAnchorWidgets: ({ doc, from, to, diffId, }: {
+export declare const createBlockIndicatorAnchorWidgets: ({ doc, from, to, diffId, leftAnchorId, }: {
     diffId: string;
     doc: PMNode;
     from: number;
+    leftAnchorId?: string;
     to: number;
 }) => Decoration[];
 /**
@@ -56,9 +65,10 @@ export declare const createAnchorNameSpan: (anchorKey: string) => HTMLSpanElemen
  * Invisible `from`/`to` (and optional `left`) anchor widgets for one inline diff
  * range, so the `IndicatorBar` can align itself via CSS anchor positioning.
  */
-export declare const createInlineIndicatorAnchorWidgets: ({ doc, from, to, diffId, }: {
+export declare const createInlineIndicatorAnchorWidgets: ({ doc, from, to, diffId, leftAnchorId, }: {
     diffId: string;
     doc: PMNode;
     from: number;
+    leftAnchorId?: string;
     to: number;
 }) => Decoration[];

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

@@ -11,7 +11,7 @@ import { type ContributorTagMountContext } from './createContributorTagWidget';
  * @param isActive Whether this node is part of the currently active/focused change
  * @returns Prosemirror node decoration or undefined
  */
-export declare const createBlockChangedDecoration: ({ attributionKey, change, colorScheme, isInserted, isActive, shouldHideDeleted, showContributorTags, showIndicators, doc, diffType, tagMountContext, }: {
+export declare const createBlockChangedDecoration: ({ attributionKey, change, colorScheme, isInserted, isActive, leftAnchorId, shouldHideDeleted, showContributorTags, showIndicators, doc, diffType, tagMountContext, }: {
     attributionKey?: string;
     change: {
         from: number;
@@ -23,6 +23,7 @@ export declare const createBlockChangedDecoration: ({ attributionKey, change, co
     doc?: PMNode;
     isActive?: boolean;
     isInserted?: boolean;
+    leftAnchorId?: string;
     shouldHideDeleted?: boolean;
     showContributorTags?: boolean;
     showIndicators?: boolean;

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

@@ -10,7 +10,7 @@ type SimpleChange = Pick<Change, 'fromA' | 'toA' | 'fromB' | 'deleted'>;
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-export declare const createChangedRowDecorationWidgets: ({ attributionKey, changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isActive, isInserted, diffType, intl, showIndicators, showContributorTags, tagMountContext, }: {
+export declare const createChangedRowDecorationWidgets: ({ attributionKey, changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isActive, isInserted, leftAnchorId, diffType, intl, showIndicators, showContributorTags, tagMountContext, }: {
     attributionKey?: string;
     changes: SimpleChange[];
     colorScheme?: ColorScheme;
@@ -18,6 +18,7 @@ export declare const createChangedRowDecorationWidgets: ({ attributionKey, chang
     intl?: IntlShape;
     isActive?: boolean;
     isInserted?: boolean;
+    leftAnchorId?: string;
     newDoc: PMNode;
     nodeViewSerializer: NodeViewSerializer;
     originalDoc: PMNode;

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

@@ -48,9 +48,27 @@ export declare const createContributorTagHost: ({ anchorName, diffId, mountConte
     mount: ContributorTagMount | undefined;
 } | undefined;
 /**
- * A widget hosting the contributor tag of one diff range, placed on the first visible character the
- * range highlights — or, with `anchorAtRangeStart`, at `from` itself. Either way a host that would
- * land inside a code block is hoisted out in front of it; see `resolveCodeBlockStart`.
+ * Position just before the code block enclosing `pos`, or `undefined` if there is none.
+ *
+ * Code blocks clip/scroll their own content, so a tag hosted inside one gets clipped away. Hoisting
+ * it before the block avoids that (EDITOR-9045, EDITOR-8766).
+ */
+export declare const resolveCodeBlockStart: (doc: PMNode, pos: number) => number | undefined;
+/**
+ * If `pos` is inside a code block: a marker decoration to anchor the hoisted tag against, plus the
+ * position just before the block to host that tag at (EDITOR-9045).
+ */
+export declare const resolveHoistedCodeBlockAnchor: (doc: PMNode, pos: number, diffId: string) => {
+    anchorName: string;
+    codeBlockStart: number;
+    marker: Decoration;
+} | undefined;
+/**
+ * The contributor tag widget for one diff range, placed on the first visible character the range
+ * highlights — or, with `anchorAtRangeStart`, at `from` itself. A host inside a code block is
+ * hoisted in front of it instead, anchored via `resolveHoistedCodeBlockAnchor` (EDITOR-9045).
+ *
+ * Returns one decoration normally, two (marker + tag) when hoisted out of a code block.
  *
  * The tag is mounted in `toDOM` and taken down in `destroy`, so it lives exactly as long as the host
  * element ProseMirror drew it into — see `mountContributorTag`.
@@ -63,8 +81,8 @@ export declare const createContributorTagWidget: ({ anchorAtRangeStart, anchorNa
     anchorAtRangeStart?: boolean;
     /**
      * The `anchor-name` the block's own decoration carries, so the tag positions against that box
-     * rather than against its host — the block's margin and padding are then the browser's to
-     * resolve, and the tag sits on the same corner for every node type (EDITOR-8933).
+     * rather than against its host (EDITOR-8933). Ignored inside a code block, which anchors to its
+     * own marker instead.
      */
     anchorName?: string;
     diffId: string;
@@ -72,4 +90,4 @@ export declare const createContributorTagWidget: ({ anchorAtRangeStart, anchorNa
     from: number;
     mountContext?: ContributorTagMountContext;
     to: number;
-}) => Decoration | undefined;
+}) => Decoration[] | undefined;

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

@@ -14,7 +14,7 @@ export declare const getAtomicInlineChangedAttrs: (inlineNodeName: InlineAttrCha
  * @param change Changeset "change" containing information about the change content + range
  * @returns Prosemirror inline decoration
  */
-export declare const createInlineChangedDecoration: ({ attributionKey, change, colorScheme, isActive, isInserted, isAtomicInlineNode, shouldHideDeleted, showContributorTags, showIndicators, doc, diffType, hideAddedDiffsUnderline, inlineNodeName, hasDeletedWidget, isDeletedWidgetBelow, reveal, tagMountContext, }: {
+export declare const createInlineChangedDecoration: ({ attributionKey, change, colorScheme, isActive, isInserted, leftAnchorId, isAtomicInlineNode, shouldHideDeleted, showContributorTags, showIndicators, doc, diffType, hideAddedDiffsUnderline, inlineNodeName, hasDeletedWidget, isDeletedWidgetBelow, reveal, tagMountContext, }: {
     attributionKey?: string;
     change: {
         fromB: number;
@@ -30,6 +30,7 @@ export declare const createInlineChangedDecoration: ({ attributionKey, change, c
     isAtomicInlineNode?: boolean;
     isDeletedWidgetBelow?: boolean;
     isInserted?: boolean;
+    leftAnchorId?: string;
     reveal?: RevealOptions;
     shouldHideDeleted?: boolean;
     showContributorTags?: boolean;

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

@@ -10,7 +10,7 @@ import { type ContributorTagMountContext } from './createContributorTagWidget';
  * This function is used to create a decoration widget to show content
  * that is not in the current document.
  */
-export declare const createNodeChangedDecorationWidget: ({ attributionKey, change, doc, nodeViewSerializer, colorScheme, newDoc, intl, activeIndexPos, isInserted, showContributorTags, showIndicators, placeBelow, diffType, hideAddedDiffsUnderline, reveal, tagMountContext, deletedColumns, }: {
+export declare const createNodeChangedDecorationWidget: ({ attributionKey, change, doc, nodeViewSerializer, colorScheme, newDoc, intl, activeIndexPos, isInserted, leftAnchorId, showContributorTags, showIndicators, placeBelow, diffType, hideAddedDiffsUnderline, reveal, tagMountContext, deletedColumns, }: {
     activeIndexPos?: {
         from: number;
         to: number;
@@ -24,6 +24,7 @@ export declare const createNodeChangedDecorationWidget: ({ attributionKey, chang
     hideAddedDiffsUnderline?: boolean;
     intl: IntlShape;
     isInserted?: boolean;
+    leftAnchorId?: string;
     newDoc: PMNode;
     nodeViewSerializer: NodeViewSerializer;
     placeBelow?: boolean;

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

@@ -40,6 +40,7 @@ export type DiffDecorationSpec = BaseDecorationSpec<typeof DecorationFamily.diff
      * the inserted one.
      */
     isInserted?: boolean;
+    leftAnchorId?: string;
     nodeName?: string;
     /**
      * The decoration to scroll to, when it is not the one carrying this spec: the member of a merged
@@ -99,7 +100,7 @@ export declare const buildDiffDecorationKey: ({ decorationKeyPrefix, isActive, d
     diffType?: DiffType;
     isActive?: boolean;
 }) => string;
-export declare const buildDiffDecorationSpec: ({ attributionKey, colorScheme, decorationType, diffId, isActive, isInserted, nodeName, side, diffType, }: {
+export declare const buildDiffDecorationSpec: ({ attributionKey, colorScheme, decorationType, diffId, isActive, isInserted, leftAnchorId, nodeName, side, diffType, }: {
     attributionKey?: string;
     colorScheme?: ColorScheme;
     decorationType: DiffDescriptor['type'];
@@ -107,6 +108,7 @@ export declare const buildDiffDecorationSpec: ({ attributionKey, colorScheme, de
     diffType?: DiffType;
     isActive?: boolean;
     isInserted?: boolean;
+    leftAnchorId?: string;
     nodeName?: string;
     side?: number;
 }) => DiffDecorationSpec;

package/dist/types/showDiffPluginType.d.ts

@@ -120,6 +120,7 @@ export type DiffDescriptor = {
     colorScheme?: ColorScheme;
     id: string;
     isInserted?: boolean;
+    leftAnchorId?: string;
     type: 'inline' | 'block' | 'widget';
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "17.1.5",
+	"version": "17.1.7",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -71,7 +71,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.5.0",
+		"@atlaskit/editor-common": "^123.7.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"