@atlaskit/editor-plugin-show-diff 15.0.1 → 15.1.2

package/dist/esm/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -170,7 +170,8 @@ var isInsideTable = function isInsideTable(tables, pos) {
   });
 };
 var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(_ref5) {
-  var doc = _ref5.doc,
+  var attributionKey = _ref5.attributionKey,
+    doc = _ref5.doc,
     from = _ref5.from,
     to = _ref5.to,
     colorScheme = _ref5.colorScheme,
@@ -179,11 +180,14 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
     activeIndexPos = _ref5.activeIndexPos,
     _ref5$shouldHideDelet = _ref5.shouldHideDeleted,
     shouldHideDeleted = _ref5$shouldHideDelet === void 0 ? false : _ref5$shouldHideDelet,
+    _ref5$showContributor = _ref5.showContributorTags,
+    showContributorTags = _ref5$showContributor === void 0 ? false : _ref5$showContributor,
     _ref5$showIndicators = _ref5.showIndicators,
     showIndicators = _ref5$showIndicators === void 0 ? false : _ref5$showIndicators,
     diffType = _ref5.diffType,
     _ref5$coarseTableCell = _ref5.coarseTableCellsOnly,
-    coarseTableCellsOnly = _ref5$coarseTableCell === void 0 ? false : _ref5$coarseTableCell;
+    coarseTableCellsOnly = _ref5$coarseTableCell === void 0 ? false : _ref5$coarseTableCell,
+    tagMountContext = _ref5.tagMountContext;
   var decorations = [];
   // Coarse path: inside the large table, only cell/header overlays are kept — the
   // table/row/paragraph decorations there are redundant and cause expensive per-cell
@@ -201,6 +205,7 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
       var nodeEnd = pos + node.nodeSize;
       var isActive = isRangeActive(activeIndexPos, pos, nodeEnd);
       decorations.push.apply(decorations, _toConsumableArray(createBlockChangedDecoration({
+        attributionKey: attributionKey,
         change: {
           from: pos,
           to: nodeEnd,
@@ -210,9 +215,11 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
         isInserted: isInserted,
         isActive: isActive,
         shouldHideDeleted: shouldHideDeleted,
+        showContributorTags: showContributorTags,
         showIndicators: showIndicators,
         doc: doc,
-        diffType: diffType
+        diffType: diffType,
+        tagMountContext: tagMountContext
       })));
     }
   });
@@ -241,30 +248,51 @@ export var isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_r
   // Inline-level (undefined) and sentence-level changes.
   return inlineDeletedDiffPlacement === 'after';
 };
-var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7) {
-  var state = _ref7.state,
-    pluginState = _ref7.pluginState,
-    nodeViewSerializer = _ref7.nodeViewSerializer,
-    colorScheme = _ref7.colorScheme,
-    intl = _ref7.intl,
-    activeIndexPos = _ref7.activeIndexPos,
-    api = _ref7.api,
-    _ref7$isInverted = _ref7.isInverted,
-    isInverted = _ref7$isInverted === void 0 ? false : _ref7$isInverted,
-    _ref7$diffType = _ref7.diffType,
-    diffType = _ref7$diffType === void 0 ? getDefaultDiffType() : _ref7$diffType,
-    _ref7$hideDeletedDiff = _ref7.hideDeletedDiffs,
-    hideDeletedDiffs = _ref7$hideDeletedDiff === void 0 ? false : _ref7$hideDeletedDiff,
-    _ref7$hideAddedDiffsU = _ref7.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderlineParam = _ref7$hideAddedDiffsU === void 0 ? false : _ref7$hideAddedDiffsU,
-    _ref7$showIndicators = _ref7.showIndicators,
-    showIndicators = _ref7$showIndicators === void 0 ? false : _ref7$showIndicators,
-    smartThresholds = _ref7.smartThresholds,
-    _ref7$deletedDiffPlac = _ref7.deletedDiffPlacement,
-    deletedDiffPlacement = _ref7$deletedDiffPlac === void 0 ? 'top' : _ref7$deletedDiffPlac,
-    _ref7$inlineDeletedDi = _ref7.inlineDeletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref7$inlineDeletedDi === void 0 ? 'before' : _ref7$inlineDeletedDi,
-    tagMountContext = _ref7.tagMountContext;
+
+/**
+ * Single place `platform_editor_diff_hide_pure_deletions` is read, shared by the widget-anchor
+ * calculation and the decoration push below so the two cannot drift.
+ *
+ * The clean view ("new state") historically only suppressed a deleted side when the same change
+ * also carried an insertion. A PURE deletion — text removed with nothing put in its place — fell
+ * through and leaked struck-through text into a view that is supposed to show none. `smart` never
+ * showed this because it pairs a rewrite into a single change that always carries an insertion;
+ * `inline` emits delete-only changes, so it did.
+ *
+ * With the gate off this returns exactly what both callers computed before it existed.
+ */
+var shouldHideDeletedSide = function shouldHideDeletedSide(_ref7) {
+  var change = _ref7.change,
+    diffType = _ref7.diffType,
+    hideDeletedDiffs = _ref7.hideDeletedDiffs,
+    isInverted = _ref7.isInverted;
+  return isExtendedEnabled(diffType) && !isInverted && !!hideDeletedDiffs && (change.inserted.length > 0 || fg('platform_editor_diff_hide_pure_deletions'));
+};
+var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8) {
+  var state = _ref8.state,
+    pluginState = _ref8.pluginState,
+    nodeViewSerializer = _ref8.nodeViewSerializer,
+    colorScheme = _ref8.colorScheme,
+    intl = _ref8.intl,
+    activeIndexPos = _ref8.activeIndexPos,
+    api = _ref8.api,
+    _ref8$isInverted = _ref8.isInverted,
+    isInverted = _ref8$isInverted === void 0 ? false : _ref8$isInverted,
+    _ref8$diffType = _ref8.diffType,
+    diffType = _ref8$diffType === void 0 ? getDefaultDiffType() : _ref8$diffType,
+    _ref8$hideDeletedDiff = _ref8.hideDeletedDiffs,
+    hideDeletedDiffs = _ref8$hideDeletedDiff === void 0 ? false : _ref8$hideDeletedDiff,
+    _ref8$hideAddedDiffsU = _ref8.hideAddedDiffsUnderline,
+    hideAddedDiffsUnderlineParam = _ref8$hideAddedDiffsU === void 0 ? false : _ref8$hideAddedDiffsU,
+    _ref8$showIndicators = _ref8.showIndicators,
+    showIndicators = _ref8$showIndicators === void 0 ? false : _ref8$showIndicators,
+    smartThresholds = _ref8.smartThresholds,
+    _ref8$deletedDiffPlac = _ref8.deletedDiffPlacement,
+    deletedDiffPlacement = _ref8$deletedDiffPlac === void 0 ? 'top' : _ref8$deletedDiffPlac,
+    _ref8$inlineDeletedDi = _ref8.inlineDeletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref8$inlineDeletedDi === void 0 ? 'before' : _ref8$inlineDeletedDi,
+    reveal = _ref8.reveal,
+    tagMountContext = _ref8.tagMountContext;
   var originalDoc = pluginState.originalDoc,
     steps = pluginState.steps,
     stepAttributions = pluginState.stepAttributions,
@@ -291,12 +319,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   var simplifiedStepAttributions = [];
   if (attributedChangesetEnabled) {
     var simplifiedStepsWithAttribution = simplifyStepsWithAttribution(steps, stepAttributions !== null && stepAttributions !== void 0 ? stepAttributions : [], originalDoc);
-    simplifiedSteps = simplifiedStepsWithAttribution.map(function (_ref8) {
-      var step = _ref8.step;
+    simplifiedSteps = simplifiedStepsWithAttribution.map(function (_ref9) {
+      var step = _ref9.step;
       return step;
     });
-    simplifiedStepAttributions = simplifiedStepsWithAttribution.map(function (_ref9) {
-      var stepAttribution = _ref9.stepAttribution;
+    simplifiedStepAttributions = simplifiedStepsWithAttribution.map(function (_ref0) {
+      var stepAttribution = _ref0.stepAttribution;
       return stepAttribution;
     });
   } else {
@@ -330,11 +358,11 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   } finally {
     _iterator.f();
   }
-  var attrStepContexts = fg('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(function (_ref0) {
-    var afterNode = _ref0.afterNode,
-      beforeNode = _ref0.beforeNode,
-      mapIndex = _ref0.mapIndex,
-      step = _ref0.step;
+  var attrStepContexts = fg('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(function (_ref1) {
+    var afterNode = _ref1.afterNode,
+      beforeNode = _ref1.beforeNode,
+      mapIndex = _ref1.mapIndex,
+      step = _ref1.step;
     var finalPosition = new Mapping(stepMaps.slice(mapIndex + 1)).mapResult(step.pos);
     if (finalPosition.deleted) {
       return [];
@@ -349,8 +377,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
     }), {}, {
       step: step
     })];
-  }) : pendingAttrSteps.map(function (_ref1) {
-    var step = _ref1.step;
+  }) : pendingAttrSteps.map(function (_ref10) {
+    var step = _ref10.step;
     return {
       afterNode: tr.doc.nodeAt(step.pos),
       beforeNode: originalDoc.nodeAt(step.pos),
@@ -487,7 +515,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       // change. Used to decide if indicator anchor positions should be adjusted
       // inward — when the widget is present the anchor must stay at the block
       // boundary to keep the indicator bar continuous with the deleted content.
-      var willRenderDeletedWidget = change.deleted.length > 0 && !isMarkOnly && !(isExtendedEnabled(diffType) && !isInverted && hideDeletedDiffs && change.inserted.length > 0);
+      var willRenderDeletedWidget = change.deleted.length > 0 && !isMarkOnly && !shouldHideDeletedSide({
+        change: change,
+        diffType: diffType,
+        hideDeletedDiffs: hideDeletedDiffs,
+        isInverted: isInverted
+      });
       if (isSmartNodeLevel) {
         // For a large inserted table, skip the O(cells) inline decorations inside the
         // table (the cell overlays added below provide the highlight without the
@@ -521,6 +554,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
               hideAddedDiffsUnderline: hideAddedDiffsUnderline,
               hasDeletedWidget: willRenderDeletedWidget,
               isDeletedWidgetBelow: isDeletedWidgetBelow,
+              reveal: reveal,
               tagMountContext: tagMountContext
             }))));
           }
@@ -545,10 +579,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
           hasDeletedWidget: willRenderDeletedWidget,
           isDeletedWidgetBelow: isDeletedWidgetBelow,
+          reveal: reveal,
           tagMountContext: tagMountContext
         }))));
       }
       decorations.push.apply(decorations, _toConsumableArray(calculateNodesForBlockDecoration(_objectSpread(_objectSpread({
+        attributionKey: attributionKey,
         doc: tr.doc,
         from: change.fromB,
         to: change.toB,
@@ -556,7 +592,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       }, isExtendedEnabled(diffType) && {
         isInserted: isInserted,
         shouldHideDeleted: shouldHideDeleted,
-        showIndicators: showIndicators
+        showContributorTags: showContributorTags,
+        showIndicators: showIndicators,
+        tagMountContext: tagMountContext
       }), {}, {
         activeIndexPos: activeIndexPos,
         intl: intl,
@@ -565,11 +603,19 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       }))));
     }
     if (change.deleted.length > 0 && !isMarkOnly) {
-      var _shouldHideDeleted = isExtendedEnabled(diffType) ? !isInverted && hideDeletedDiffs && change.inserted.length > 0 : false;
+      var _shouldHideDeleted = shouldHideDeletedSide({
+        change: change,
+        diffType: diffType,
+        hideDeletedDiffs: hideDeletedDiffs,
+        isInverted: isInverted
+      });
       if (!_shouldHideDeleted) {
         decorations.push.apply(decorations, _toConsumableArray(createNodeChangedDecorationWidget(_objectSpread(_objectSpread({
           // The deleted side has no inline decoration, so the widget carries the actor.
           attributionKey: attributionKey,
+          // Extended pipeline only, matching the inline path: the non-extended styles have no
+          // background for the wipe to act on.
+          reveal: isExtendedEnabled(diffType) ? reveal : undefined,
           change: change,
           doc: originalDoc,
           nodeViewSerializer: nodeViewSerializer,
@@ -597,9 +643,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   // smart path. Only add the legacy step-range decoration when no equivalent changeset range was
   // produced; otherwise the same content receives two inline decorations (and two navigation
   // changes), usually one attribution colour and one default purple decoration.
-  getMarkChangeRanges(steps).filter(function (_ref10) {
-    var fromB = _ref10.fromB,
-      toB = _ref10.toB;
+  getMarkChangeRanges(steps).filter(function (_ref11) {
+    var fromB = _ref11.fromB,
+      toB = _ref11.toB;
     return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
@@ -610,7 +656,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       colorScheme: colorScheme,
       diffType: diffType,
       isActive: isActive,
-      isInserted: true
+      isInserted: true,
+      reveal: reveal
     })));
   });
   getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).forEach(function (change) {
@@ -700,44 +747,49 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
 export var calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change. `tagMountContext` is deliberately absent: it is
 // built once per plugin instance, so it can never be the reason a diff needs recalculating.
-function (_ref11, _ref12) {
-  var _ref16;
-  var _ref13 = _slicedToArray(_ref11, 1),
-    _ref13$ = _ref13[0],
-    pluginState = _ref13$.pluginState,
-    state = _ref13$.state,
-    colorScheme = _ref13$.colorScheme,
-    intl = _ref13$.intl,
-    activeIndexPos = _ref13$.activeIndexPos,
-    isInverted = _ref13$.isInverted,
-    diffType = _ref13$.diffType,
-    hideDeletedDiffs = _ref13$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref13$.hideAddedDiffsUnderline,
-    showIndicators = _ref13$.showIndicators,
-    smartThresholds = _ref13$.smartThresholds,
-    deletedDiffPlacement = _ref13$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref13$.inlineDeletedDiffPlacement;
+function (_ref12, _ref13) {
+  var _ref17;
   var _ref14 = _slicedToArray(_ref12, 1),
     _ref14$ = _ref14[0],
-    lastPluginState = _ref14$.pluginState,
-    lastState = _ref14$.state,
-    lastColorScheme = _ref14$.colorScheme,
-    lastIntl = _ref14$.intl,
-    lastActiveIndexPos = _ref14$.activeIndexPos,
-    lastIsInverted = _ref14$.isInverted,
-    lastDiffType = _ref14$.diffType,
-    lastHideDeletedDiffs = _ref14$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref14$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref14$.showIndicators,
-    lastSmartThresholds = _ref14$.smartThresholds,
-    lastDeletedDiffPlacement = _ref14$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref14$.inlineDeletedDiffPlacement;
+    pluginState = _ref14$.pluginState,
+    state = _ref14$.state,
+    colorScheme = _ref14$.colorScheme,
+    intl = _ref14$.intl,
+    activeIndexPos = _ref14$.activeIndexPos,
+    isInverted = _ref14$.isInverted,
+    diffType = _ref14$.diffType,
+    hideDeletedDiffs = _ref14$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref14$.hideAddedDiffsUnderline,
+    showIndicators = _ref14$.showIndicators,
+    smartThresholds = _ref14$.smartThresholds,
+    deletedDiffPlacement = _ref14$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref14$.inlineDeletedDiffPlacement,
+    reveal = _ref14$.reveal;
+  var _ref15 = _slicedToArray(_ref13, 1),
+    _ref15$ = _ref15[0],
+    lastPluginState = _ref15$.pluginState,
+    lastState = _ref15$.state,
+    lastColorScheme = _ref15$.colorScheme,
+    lastIntl = _ref15$.intl,
+    lastActiveIndexPos = _ref15$.activeIndexPos,
+    lastIsInverted = _ref15$.isInverted,
+    lastDiffType = _ref15$.diffType,
+    lastHideDeletedDiffs = _ref15$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref15$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref15$.showIndicators,
+    lastSmartThresholds = _ref15$.smartThresholds,
+    lastDeletedDiffPlacement = _ref15$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref15$.inlineDeletedDiffPlacement,
+    lastReveal = _ref15$.reveal;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if (isExtendedEnabled(diffType)) {
-    var _ref15;
-    return (_ref15 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
+    var _ref16;
+    return (_ref16 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
     // Contributors can arrive after the first calculation; without this, tags never appear.
-    isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref15 !== void 0 ? _ref15 : false;
+    isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement &&
+    // Turning the reveal on or off changes the emitted styles, so a cached result from the
+    // other setting would leave the diff painted in the wrong resting state.
+    isEqual(reveal, lastReveal)) !== null && _ref16 !== void 0 ? _ref16 : false;
   }
-  return (_ref16 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref16 !== void 0 ? _ref16 : false;
+  return (_ref17 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref17 !== void 0 ? _ref17 : false;
 });

package/dist/esm/pm-plugins/decorations/colorSchemes/factory.js

@@ -682,6 +682,36 @@ export function buildInsertedInlineStyle(colors, isActive, hideAddedDiffsUnderli
   return hideAddedDiffsUnderline ? buildInsertStyleExtendedNoUnderline(colors) : buildInsertStyleExtended(colors);
 }
 
+/**
+ * The colours `buildInsertedInlineStyle()` above would paint, for the reveal to animate towards.
+ *
+ * MUST mirror that function: the reveal replaces the flat highlight with a sized gradient, so a
+ * divergence here means the animation settles on a different colour than a static render produces.
+ * `revealStyles.ts` in the test package asserts the two agree across the isActive /
+ * hideAddedDiffsUnderline matrix.
+ *
+ * A transparent border is how "no underline" is expressed: the box still reserves the 2px so the
+ * text does not shift when the underline arrives.
+ */
+export function getInsertedInlineRevealColors(colors, isActive, hideAddedDiffsUnderline) {
+  return {
+    background: isActive ? bgSubtlerPressed(colors.insertActiveColor) : bgSubtlest(colors.insertColor),
+    border: hideAddedDiffsUnderline ? 'transparent' : borderAccent(colors.insertColor)
+  };
+}
+
+/**
+ * The colours `buildDeletedInlineContentStyleExtended()` paints, for the reveal to animate towards.
+ * Deleted content's highlight does not vary with the active state — only its text does, which the
+ * reveal keeps as-is.
+ */
+export function getDeletedInlineRevealColors(colors) {
+  return {
+    background: bgSubtlest(colors.deleteColor),
+    border: borderAccent(colors.deleteColor)
+  };
+}
+
 /** The three visual states deleted inline content can be in. */
 
 /**

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

@@ -3,12 +3,14 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { 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 { 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 } from './createContributorTagWidget';
 import { buildDiffDecorationSpec } from './decorationKeys';
 import { getBlockNodeStyleLegacy, resolveCellOverlayStyleLegacy } from './createBlockChangedDecoration.styles.legacy';
 var displayNoneStyle = convertToInlineCss({
@@ -24,6 +26,29 @@ var UNSTYLED_NODES = ['mediaSingle', 'mediaGroup', 'table',
 'heading', 'hardBreak', 'decisionList', 'taskList', 'bulletList', 'orderedList', 'layoutSection'];
 var CELL_NODES = ['tableCell', 'tableHeader'];
 
+/**
+ * Block nodes that host a contributor tag of their own — those whose whole box reads as one change.
+ * Lists and tables are excluded: they decorate per item and per cell, with no one-tag-per-block
+ * design yet. `blockCard` covers the datasource variant, which is the same node type.
+ */
+var TAGGABLE_BLOCK_NODES = new Set(['blockCard', 'blockquote', 'bodiedExtension', 'codeBlock', 'embedCard', 'expand', 'extension', 'media', 'multiBodiedExtension', 'panel', 'rule']);
+
+/** Panels, rules and media can also sit in a table cell, which is out of scope for block tags. */
+var isInsideTable = function isInsideTable(doc, pos) {
+  return findParentNodeClosestToPos(doc.resolve(pos), function (node) {
+    return node.type.name === 'table';
+  }) !== undefined;
+};
+
+/** Whether this block can host a contributor tag of its own. */
+var canTagBlock = function canTagBlock(_ref) {
+  var diffType = _ref.diffType,
+    doc = _ref.doc,
+    from = _ref.from,
+    name = _ref.name;
+  return doc !== undefined && isExtendedEnabled(diffType) && TAGGABLE_BLOCK_NODES.has(name) && !isInsideTable(doc, from);
+};
+
 /** Positioning context for the cell overlay widget decorations. */
 var cellPositionStyle = convertToInlineCss({
   position: 'relative'
@@ -70,14 +95,14 @@ var getNodeClass = function getNodeClass(name) {
       return undefined;
   }
 };
-var getBlockNodeStyleNext = function getBlockNodeStyleNext(_ref) {
-  var nodeName = _ref.nodeName,
-    colorScheme = _ref.colorScheme,
-    _ref$isInserted = _ref.isInserted,
-    isInserted = _ref$isInserted === void 0 ? true : _ref$isInserted,
-    _ref$isActive = _ref.isActive,
-    isActive = _ref$isActive === void 0 ? false : _ref$isActive,
-    diffType = _ref.diffType;
+var getBlockNodeStyleNext = function getBlockNodeStyleNext(_ref2) {
+  var nodeName = _ref2.nodeName,
+    colorScheme = _ref2.colorScheme,
+    _ref2$isInserted = _ref2.isInserted,
+    isInserted = _ref2$isInserted === void 0 ? true : _ref2$isInserted,
+    _ref2$isActive = _ref2.isActive,
+    isActive = _ref2$isActive === void 0 ? false : _ref2$isActive,
+    diffType = _ref2.diffType;
   if (UNSTYLED_NODES.includes(nodeName)) {
     return undefined;
   }
@@ -139,21 +164,33 @@ var isCellEmpty = function isCellEmpty(cellNode) {
  * @param isActive Whether this node is part of the currently active/focused change
  * @returns Prosemirror node decoration or undefined
  */
-export var createBlockChangedDecoration = function createBlockChangedDecoration(_ref2) {
-  var change = _ref2.change,
-    colorScheme = _ref2.colorScheme,
-    _ref2$isInserted = _ref2.isInserted,
-    isInserted = _ref2$isInserted === void 0 ? true : _ref2$isInserted,
-    _ref2$isActive = _ref2.isActive,
-    isActive = _ref2$isActive === void 0 ? false : _ref2$isActive,
-    _ref2$shouldHideDelet = _ref2.shouldHideDeleted,
-    shouldHideDeleted = _ref2$shouldHideDelet === void 0 ? false : _ref2$shouldHideDelet,
-    _ref2$showIndicators = _ref2.showIndicators,
-    showIndicators = _ref2$showIndicators === void 0 ? false : _ref2$showIndicators,
-    doc = _ref2.doc,
-    diffType = _ref2.diffType;
+export var createBlockChangedDecoration = function createBlockChangedDecoration(_ref3) {
+  var attributionKey = _ref3.attributionKey,
+    change = _ref3.change,
+    colorScheme = _ref3.colorScheme,
+    _ref3$isInserted = _ref3.isInserted,
+    isInserted = _ref3$isInserted === void 0 ? true : _ref3$isInserted,
+    _ref3$isActive = _ref3.isActive,
+    isActive = _ref3$isActive === void 0 ? false : _ref3$isActive,
+    _ref3$shouldHideDelet = _ref3.shouldHideDeleted,
+    shouldHideDeleted = _ref3$shouldHideDelet === void 0 ? false : _ref3$shouldHideDelet,
+    _ref3$showContributor = _ref3.showContributorTags,
+    showContributorTags = _ref3$showContributor === void 0 ? false : _ref3$showContributor,
+    _ref3$showIndicators = _ref3.showIndicators,
+    showIndicators = _ref3$showIndicators === void 0 ? false : _ref3$showIndicators,
+    doc = _ref3.doc,
+    diffType = _ref3.diffType,
+    tagMountContext = _ref3.tagMountContext;
   var decorations = [];
-  var diffId = crypto.randomUUID();
+  // Derived from the node range so it survives a recalculation, as in
+  // `createInlineChangedDecoration`. Changes are disjoint, so no two of them decorate one node.
+  var diffId = showContributorTags ? "block-".concat(change.from, "-").concat(change.to) : crypto.randomUUID();
+  var shouldTagBlock = showContributorTags && canTagBlock({
+    diffType: diffType,
+    doc: doc,
+    from: change.from,
+    name: change.name
+  });
   if (shouldHideDeleted) {
     return [Decoration.node(change.from, change.to, {
       style: displayNoneStyle
@@ -199,19 +236,27 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
   });
   var className = getNodeClass(change.name);
   if (style || className) {
-    decorations.push(Decoration.node(change.from, change.to, {
+    decorations.push(Decoration.node(change.from, change.to, _objectSpread({
       style: style,
       'data-testid': 'show-diff-changed-decoration-node',
       class: className
-    }, buildDiffDecorationSpec({
+    }, shouldTagBlock && {
+      'data-diff-id': diffId
+    }), buildDiffDecorationSpec({
+      attributionKey: shouldTagBlock ? attributionKey : undefined,
+      colorScheme: colorScheme,
       decorationType: 'block',
       diffId: diffId,
       isActive: isActive,
+      isInserted: isInserted,
       nodeName: change.name,
       diffType: diffType
     })));
   }
-  if (decorations.length > 0 && showIndicators && doc && isExtendedEnabled(diffType)) {
+  if (decorations.length === 0) {
+    return decorations;
+  }
+  if (showIndicators && doc && isExtendedEnabled(diffType)) {
     decorations.push.apply(decorations, _toConsumableArray(createBlockIndicatorAnchorWidgets({
       doc: doc,
       from: change.from,
@@ -219,5 +264,22 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
       diffId: diffId
     })));
   }
+
+  // `change.from` is just before the node, so the host sits outside it and the tag renders on the
+  // block's own top-left corner. Resolving inline content instead would put the host inside a
+  // container block's content DOM (panel, expand, blockquote).
+  if (shouldTagBlock && doc) {
+    var tagWidget = createContributorTagWidget({
+      anchorAtRangeStart: true,
+      doc: doc,
+      from: change.from,
+      to: change.to,
+      diffId: diffId,
+      mountContext: tagMountContext
+    });
+    if (tagWidget) {
+      decorations.push(tagWidget);
+    }
+  }
   return decorations;
 };

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

@@ -105,14 +105,34 @@ var resolveInlineContentStart = function resolveInlineContentStart(doc, from, to
 };
 
 /**
- * A widget hosting the contributor tag of one inline diff range, placed on the first character the
- * range highlights.
+ * The position just before the code block enclosing `pos`, or `undefined` when nothing does.
+ *
+ * `.code-block-content-wrapper` hides its block-axis overflow, so a host left inside the code has
+ * its tag clipped away. Hosting it before the block puts the tag on the block's top-left corner,
+ * where a whole-code-block change is tagged too (EDITOR-8766).
+ */
+var resolveCodeBlockStart = function resolveCodeBlockStart(doc, pos) {
+  var $pos = doc.resolve(pos);
+  for (var depth = $pos.depth; depth > 0; depth--) {
+    if ($pos.node(depth).type.name === 'codeBlock') {
+      return $pos.before(depth);
+    }
+  }
+  return undefined;
+};
+
+/**
+ * A widget hosting the contributor tag of one diff range, placed on the first 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`.
  *
  * 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`.
  */
 export var createContributorTagWidget = function createContributorTagWidget(_ref2) {
-  var doc = _ref2.doc,
+  var _ref2$anchorAtRangeSt = _ref2.anchorAtRangeStart,
+    anchorAtRangeStart = _ref2$anchorAtRangeSt === void 0 ? false : _ref2$anchorAtRangeSt,
+    doc = _ref2.doc,
     from = _ref2.from,
     to = _ref2.to,
     diffId = _ref2.diffId,
@@ -124,9 +144,12 @@ export var createContributorTagWidget = function createContributorTagWidget(_ref
   // Reassigned when ProseMirror redraws this decoration, which it may do more than once for the
   // same `Decoration` instance.
   var mount;
+  var anchorPos = anchorAtRangeStart ? from : resolveInlineContentStart(doc, from, to);
+  // A change inside a code block is hoisted out of it; anything else keeps its own anchor.
+  var codeBlockPos = resolveCodeBlockStart(doc, anchorPos);
   return Decoration.widget(
   // Keep the host out of the table row's grid (EDITOR-8442).
-  clampAnchorPosIntoCell(doc, resolveInlineContentStart(doc, from, to), 1), function () {
+  clampAnchorPosIntoCell(doc, codeBlockPos !== null && codeBlockPos !== void 0 ? codeBlockPos : anchorPos, 1), function () {
     var host = buildContributorTagHost(diffId);
     mount = mountContributorTag({
       diffId: diffId,