@atlaskit/editor-plugin-show-diff 14.3.2 → 14.4.2

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 14.4.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.4.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.4.0
+
+### Minor Changes
+
+- [`844f6fce7d9c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/844f6fce7d9c4) -
+  Render the diff contributor tag from its own widget decoration instead of positioning an overlay
+  with CSS anchor positioning, and declare react-dom as a peer dependency for the portal into that
+  widget. Behind the confluence_ncs_step_diffing_version_history gate.
+- [`844f6fce7d9c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/844f6fce7d9c4) -
+  [ux] Attributed diff changes now render a contributor tag naming who made the change, tinted to
+  match the change's attribution colour, behind the `confluence_ncs_step_diffing_version_history`
+  gate. Adds an optional `contributorProfiles` list to the attributed `showDiff` params, from which
+  the plugin resolves the contributors it credits.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.3.2
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -20,6 +20,9 @@
 		{
 			"path": "../../adf-schema/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/avatar/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../custom-steps/afm-cc/tsconfig.json"
 		},
@@ -38,18 +41,33 @@
 		{
 			"path": "../../editor-tables/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/icon-lab/afm-cc/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/logo/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../../platform/feature-experiments/afm-cc/tsconfig.json"
 		},
 		{
 			"path": "../../../platform/feature-flags/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/primitives/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../tmp-editor-statsig/afm-cc/tsconfig.json"
 		},
 		{
 			"path": "../../../design-system/tokens/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/tooltip/afm-cc/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/visually-hidden/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-common/afm-cc/tsconfig.json"
 		}

package/afm-products/tsconfig.json

@@ -20,6 +20,9 @@
 		{
 			"path": "../../adf-schema/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/avatar/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../custom-steps/afm-products/tsconfig.json"
 		},
@@ -38,18 +41,33 @@
 		{
 			"path": "../../editor-tables/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/icon-lab/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/logo/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../../platform/feature-experiments/afm-products/tsconfig.json"
 		},
 		{
 			"path": "../../../platform/feature-flags/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/primitives/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../tmp-editor-statsig/afm-products/tsconfig.json"
 		},
 		{
 			"path": "../../../design-system/tokens/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../../design-system/tooltip/afm-products/tsconfig.json"
+		},
+		{
+			"path": "../../../design-system/visually-hidden/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../editor-common/afm-products/tsconfig.json"
 		}

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

@@ -24,6 +24,7 @@ var _createInlineChangedDecoration = require("../decorations/createInlineChanged
 var _createNodeChangedDecorationWidget = require("../decorations/createNodeChangedDecorationWidget");
 var _attributions = require("../decorations/colorSchemes/attributions");
 var _decorationKeys = require("../decorations/decorationKeys");
+var _extractContributorTags = require("../decorations/extractContributorTags");
 var _getAttrChangeRanges = require("../decorations/utils/getAttrChangeRanges");
 var _getMarkChangeRanges = require("../decorations/utils/getMarkChangeRanges");
 var _isExtendedEnabled = require("../isExtendedEnabled");
@@ -82,19 +83,12 @@ var getAttributedChanges = function getAttributedChanges(_ref2) {
     originalDoc = _ref2.originalDoc,
     steppedDoc = _ref2.steppedDoc,
     diffType = _ref2.diffType,
-    tr = _ref2.tr,
-    intl = _ref2.intl,
-    smartThresholds = _ref2.smartThresholds;
+    tr = _ref2.tr;
+  // `smart` is deliberately absent here, even though `getChanges` applies it: the classifier drops
+  // the step attribution and promotes ranges to sentence/paragraph/node granularity, so a promoted
+  // range covers several actors' steps and the latest-writer rule credits all of it to one of them.
+  // The attributed changeset keeps step granularity instead.
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    if (diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff')) {
-      return (0, _classifySmartChanges.classifySmartChanges)({
-        changes: (0, _simplifyChangesWithAttribution.simplifyChangesWithAttribution)(attributedChanges, tr.doc),
-        originalDoc: originalDoc,
-        newDoc: tr.doc,
-        locale: intl.locale,
-        thresholds: smartThresholds
-      });
-    }
     if (diffType === 'step') {
       return attributedChanges;
     }
@@ -277,13 +271,16 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
     _ref7$deletedDiffPlac = _ref7.deletedDiffPlacement,
     deletedDiffPlacement = _ref7$deletedDiffPlac === void 0 ? 'top' : _ref7$deletedDiffPlac,
     _ref7$inlineDeletedDi = _ref7.inlineDeletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref7$inlineDeletedDi === void 0 ? 'before' : _ref7$inlineDeletedDi;
+    inlineDeletedDiffPlacement = _ref7$inlineDeletedDi === void 0 ? 'before' : _ref7$inlineDeletedDi,
+    tagMountContext = _ref7.tagMountContext;
   var originalDoc = pluginState.originalDoc,
     steps = pluginState.steps,
     stepAttributions = pluginState.stepAttributions,
+    contributors = pluginState.contributors,
     isDisplayingChanges = pluginState.isDisplayingChanges;
   if (!originalDoc || !isDisplayingChanges) {
     return {
+      contributorTags: [],
       decorations: _view.DecorationSet.empty,
       diffDescriptors: []
     };
@@ -295,9 +292,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   var tr = state.tr;
   var steppedDoc = originalDoc;
   var attributionColoringEnabled = (0, _attributions.isAttributionColoringEnabled)(stepAttributions);
+  var showContributorTags = (0, _attributions.isContributorTagsEnabled)(stepAttributions, contributors);
+  // Tags need the attributed changeset even on diffs with too few actors to be worth colouring.
+  var attributedChangesetEnabled = attributionColoringEnabled || showContributorTags;
   var simplifiedSteps;
   var simplifiedStepAttributions = [];
-  if (attributionColoringEnabled) {
+  if (attributedChangesetEnabled) {
     var simplifiedStepsWithAttribution = (0, _simplifySteps.simplifyStepsWithAttribution)(steps, stepAttributions !== null && stepAttributions !== void 0 ? stepAttributions : [], originalDoc);
     simplifiedSteps = simplifiedStepsWithAttribution.map(function (_ref8) {
       var step = _ref8.step;
@@ -385,6 +385,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
     });
     if (!recoveredViaContentEquality) {
       return {
+        contributorTags: [],
         decorations: _view.DecorationSet.empty,
         diffDescriptors: []
       };
@@ -397,7 +398,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   var changes;
   var attributedChanges = [];
   var attributionColors;
-  if (attributionColoringEnabled) {
+  if (attributedChangesetEnabled) {
     var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc, function (left, right) {
       return (0, _attributions.getAttributionKey)(left) === (0, _attributions.getAttributionKey)(right) ? left.stepIndex > right.stepIndex ? left : right :
       // `prosemirror-changeset` uses null as its incompatible-data sentinel even
@@ -409,17 +410,22 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       });
     }));
     attributedChanges = (0, _diffBySteps.diffBySteps)(originalDoc, simplifiedSteps, simplifiedStepAttributions);
-    changes = getAttributedChanges({
+    // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
+    // `collapseOverlappingChanges`.
+    var uncollapsedChanges = getAttributedChanges({
       changeset: changeset,
       originalDoc: originalDoc,
       steppedDoc: steppedDoc,
       diffType: diffType,
       tr: tr,
-      attributedChanges: attributedChanges,
-      intl: intl,
-      smartThresholds: smartThresholds
+      attributedChanges: attributedChanges
     });
-    attributionColors = (0, _attributions.createAttributionColorMap)(simplifiedStepAttributions);
+    changes = (0, _simplifyChangesWithAttribution.collapseOverlappingChanges)(uncollapsedChanges);
+
+    // Still colours-only: a tags-only diff keeps the plain colour scheme.
+    if (attributionColoringEnabled) {
+      attributionColors = (0, _attributions.createAttributionColorMap)(simplifiedStepAttributions);
+    }
   } else {
     var _changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
     changes = getChanges({
@@ -446,6 +452,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   var isInserted = !isInverted;
   var createDecorationsForChange = function createDecorationsForChange(change) {
     var changeColorScheme = attributionColors ? (0, _attributions.getColorSchemeForChange)(change, attributedChanges, attributionColors, colorScheme) : colorScheme;
+    var attributionKey = showContributorTags ? (0, _attributions.getAttributionKeyForChange)(change, attributedChanges) : undefined;
     var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
 
     // The deleted side of a mark-only change is a byte-identical copy of the new text, so it is
@@ -505,6 +512,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
               continue;
             }
             decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)(_objectSpread({
+              attributionKey: attributionKey,
               change: {
                 fromB: from,
                 toB: to
@@ -516,10 +524,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
             }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
               isInserted: isInserted,
               shouldHideDeleted: shouldHideDeleted,
+              showContributorTags: showContributorTags,
               showIndicators: showIndicators,
               hideAddedDiffsUnderline: hideAddedDiffsUnderline,
               hasDeletedWidget: willRenderDeletedWidget,
-              isDeletedWidgetBelow: isDeletedWidgetBelow
+              isDeletedWidgetBelow: isDeletedWidgetBelow,
+              tagMountContext: tagMountContext
             }))));
           }
         } catch (err) {
@@ -529,6 +539,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
         }
       } else {
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)(_objectSpread({
+          attributionKey: attributionKey,
           change: change,
           doc: tr.doc,
           colorScheme: changeColorScheme,
@@ -537,10 +548,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
         }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
           isInserted: isInserted,
           shouldHideDeleted: shouldHideDeleted,
+          showContributorTags: showContributorTags,
           showIndicators: showIndicators,
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
           hasDeletedWidget: willRenderDeletedWidget,
-          isDeletedWidgetBelow: isDeletedWidgetBelow
+          isDeletedWidgetBelow: isDeletedWidgetBelow,
+          tagMountContext: tagMountContext
         }))));
       }
       decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration(_objectSpread(_objectSpread({
@@ -563,13 +576,17 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       var _shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? !isInverted && hideDeletedDiffs && change.inserted.length > 0 : false;
       if (!_shouldHideDeleted) {
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)(_objectSpread(_objectSpread({
+          // The deleted side has no inline decoration, so the widget carries the actor.
+          attributionKey: attributionKey,
           change: change,
           doc: originalDoc,
           nodeViewSerializer: nodeViewSerializer,
           colorScheme: changeColorScheme,
           newDoc: tr.doc,
           intl: intl,
-          activeIndexPos: activeIndexPos
+          activeIndexPos: activeIndexPos,
+          showContributorTags: showContributorTags,
+          tagMountContext: tagMountContext
         }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
           isInserted: !isInserted,
           diffType: diffType,
@@ -688,12 +705,14 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   });
   var decorationSet = _view.DecorationSet.empty.add(tr.doc, decorations);
   return {
+    contributorTags: showContributorTags ? (0, _extractContributorTags.extractContributorTags)(decorationSet, contributors) : [],
     decorations: decorationSet,
     diffDescriptors: (0, _decorationKeys.extractDiffDescriptors)(decorationSet)
   };
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
-// Cache results unless relevant inputs change
+// 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 = (0, _slicedToArray2.default)(_ref11, 1),
@@ -729,7 +748,9 @@ function (_ref11, _ref12) {
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
     var _ref15;
-    return (_ref15 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref15 !== void 0 ? _ref15 : false;
+    return (_ref15 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
+    // Contributors can arrive after the first calculation; without this, tags never appear.
+    (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref15 !== void 0 ? _ref15 : false;
   }
-  return (_ref16 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref16 !== void 0 ? _ref16 : false;
+  return (_ref16 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref16 !== void 0 ? _ref16 : false;
 });

package/dist/cjs/pm-plugins/calculateDiff/simplifyChangesWithAttribution.js

@@ -4,17 +4,17 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.simplifyChangesWithAttribution = void 0;
+exports.simplifyChangesWithAttribution = exports.collapseOverlappingChanges = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
 var _attributions = require("../decorations/colorSchemes/attributions");
 var _optimizeChanges = require("./optimizeChanges");
+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) { (0, _defineProperty2.default)(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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-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) { (0, _defineProperty2.default)(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; }
 var getAttributionIdentity = function getAttributionIdentity(change) {
   var identities = new Set();
   for (var _i = 0, _arr = [].concat((0, _toConsumableArray2.default)(change.deleted), (0, _toConsumableArray2.default)(change.inserted)); _i < _arr.length; _i++) {
@@ -32,6 +32,58 @@ var getAttributionIdentity = function getAttributionIdentity(change) {
     mergeable: true
   };
 };
+var byNewDocRange = function byNewDocRange(left, right) {
+  return left.fromB - right.fromB || left.toB - right.toB;
+};
+
+/**
+ * Collapses changes whose new-document ranges strictly overlap. Attribution runs are simplified
+ * independently, so runs either side of an unattributed step can come back covering the same
+ * characters — which stacks two inline decorations and renders one contributor tag per copy.
+ *
+ * Merging keeps every span from both sides, so the latest-writer rule still decides whose tag is
+ * shown. Ranges that merely touch are left alone, so an unattributed edit next to an attributed one
+ * is not credited to it.
+ */
+var collapseOverlappingChanges = exports.collapseOverlappingChanges = function collapseOverlappingChanges(changes) {
+  if (changes.length <= 1) {
+    return changes;
+  }
+
+  // A zero-length new-document range paints no inline decoration, so it is kept aside rather than
+  // folded into a neighbouring insertion.
+  var emptyRanges = changes.filter(function (change) {
+    return change.toB <= change.fromB;
+  });
+  var collapsed = [];
+  var _iterator = _createForOfIteratorHelper(changes.filter(function (change) {
+      return change.toB > change.fromB;
+    }).sort(byNewDocRange)),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var change = _step.value;
+      var current = collapsed[collapsed.length - 1];
+      if (current && change.fromB < current.toB) {
+        collapsed[collapsed.length - 1] = {
+          fromA: Math.min(current.fromA, change.fromA),
+          toA: Math.max(current.toA, change.toA),
+          fromB: Math.min(current.fromB, change.fromB),
+          toB: Math.max(current.toB, change.toB),
+          deleted: [].concat((0, _toConsumableArray2.default)(current.deleted), (0, _toConsumableArray2.default)(change.deleted)),
+          inserted: [].concat((0, _toConsumableArray2.default)(current.inserted), (0, _toConsumableArray2.default)(change.inserted))
+        };
+      } else {
+        collapsed.push(_objectSpread({}, change));
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return [].concat(collapsed, (0, _toConsumableArray2.default)(emptyRanges)).sort(byNewDocRange);
+};
 
 /**
  * Simplifies and optimizes consecutive changes without crossing an attribution boundary.
@@ -62,12 +114,12 @@ var simplifyChangesWithAttribution = exports.simplifyChangesWithAttribution = fu
     run = [];
     runIdentity = undefined;
   };
-  var _iterator = _createForOfIteratorHelper(changes),
-    _step;
+  var _iterator2 = _createForOfIteratorHelper(changes),
+    _step2;
   try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _runIdentity;
-      var change = _step.value;
+      var change = _step2.value;
       var identity = getAttributionIdentity(change);
       var canJoinRun = ((_runIdentity = runIdentity) === null || _runIdentity === void 0 ? void 0 : _runIdentity.mergeable) === true && identity.mergeable && runIdentity.key === identity.key;
       if (run.length > 0 && !canJoinRun) {
@@ -80,9 +132,9 @@ var simplifyChangesWithAttribution = exports.simplifyChangesWithAttribution = fu
       }
     }
   } catch (err) {
-    _iterator.e(err);
+    _iterator2.e(err);
   } finally {
-    _iterator.f();
+    _iterator2.f();
   }
   flush();
   return result;

package/dist/cjs/pm-plugins/decorations/colorSchemes/attributions.js

@@ -4,16 +4,25 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isAttributionColoringEnabled = exports.getColorSchemeForChange = exports.getAttributionKey = exports.createAttributionColorMap = exports.areAttributionColorGatesEnabled = void 0;
+exports.resolveContributors = exports.isContributorTagsEnabled = exports.isAttributionColoringEnabled = exports.getColorSchemeForChange = exports.getAttributionKeyForChange = exports.getAttributionKey = exports.createAttributionColorMap = exports.areAttributionColorGatesEnabled = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _utils = require("@atlaskit/editor-shared-styles/utils");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _types = require("./types");
+var _excluded = ["attribution", "connectedTo"];
+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) { (0, _defineProperty2.default)(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; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+/** A contributor with both of its identities collapsed to internal attribution keys. */
+
+/** Contributors addressed by attribution key. The key format is internal. */
+
 /**
  * Normalise the attribution identity once so a valid lookup key always has a valid participant
  * colour seed. `userId` is primary; `agentId`, or `agentType` as its fallback, separates shared
@@ -48,6 +57,40 @@ var getAttributionKey = exports.getAttributionKey = function getAttributionKey(a
   var _getAttributionIdenti;
   return (_getAttributionIdenti = getAttributionIdentity(attribution)) === null || _getAttributionIdenti === void 0 ? void 0 : _getAttributionIdenti.key;
 };
+
+/**
+ * Public contributor list to internal key-addressed record. A contributor whose attribution carries
+ * no identity is dropped, since it could never match a step. Later entries win.
+ */
+var resolveContributors = exports.resolveContributors = function resolveContributors(contributors) {
+  if (!(contributors !== null && contributors !== void 0 && contributors.length)) {
+    return undefined;
+  }
+  var resolved = {};
+  var _iterator = _createForOfIteratorHelper(contributors),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _ref = _step.value;
+      var attribution = _ref.attribution,
+        connectedTo = _ref.connectedTo,
+        tagContributor = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+      var key = getAttributionKey(attribution);
+      if (!key) {
+        continue;
+      }
+      var connectedToKey = connectedTo ? getAttributionKey(connectedTo) : undefined;
+      resolved[key] = _objectSpread(_objectSpread({}, tagContributor), connectedToKey ? {
+        connectedToKey: connectedToKey
+      } : {});
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return Object.keys(resolved).length > 0 ? resolved : undefined;
+};
 var areAttributionColorGatesEnabled = exports.areAttributionColorGatesEnabled = function areAttributionColorGatesEnabled() {
   return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor');
 };
@@ -60,13 +103,23 @@ var isAttributionColoringEnabled = exports.isAttributionColoringEnabled = functi
   }));
   return attributionKeys.size > 1;
 };
+
+/**
+ * Shares the colours' gates, but with a lower bar: colouring needs two actors to tell apart, whereas
+ * a tag only has to name one.
+ */
+var isContributorTagsEnabled = exports.isContributorTagsEnabled = function isContributorTagsEnabled(stepAttributions, contributors) {
+  return areAttributionColorGatesEnabled() && Boolean(stepAttributions === null || stepAttributions === void 0 ? void 0 : stepAttributions.some(function (attribution) {
+    return getAttributionKey(attribution) !== undefined;
+  })) && contributors !== undefined && Object.keys(contributors).length > 0;
+};
 var createAttributionColorMap = exports.createAttributionColorMap = function createAttributionColorMap(stepAttributions) {
   var colors = new Map();
-  var _iterator = _createForOfIteratorHelper(stepAttributions),
-    _step;
+  var _iterator2 = _createForOfIteratorHelper(stepAttributions),
+    _step2;
   try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var attribution = _step.value;
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var attribution = _step2.value;
       var identity = getAttributionIdentity(attribution);
       if (!identity || colors.has(identity.key)) {
         continue;
@@ -79,9 +132,9 @@ var createAttributionColorMap = exports.createAttributionColorMap = function cre
       }
     }
   } catch (err) {
-    _iterator.e(err);
+    _iterator2.e(err);
   } finally {
-    _iterator.f();
+    _iterator2.f();
   }
   return colors;
 };
@@ -105,19 +158,23 @@ var changesOverlap = function changesOverlap(change, attributedChange) {
   var deletedOverlap = change.deleted.length > 0 && attributedChange.deleted.length > 0 && rangesOverlap(change.fromA, change.toA, attributedChange.fromA, attributedChange.toA);
   return insertedOverlap || deletedOverlap;
 };
-var getParticipantColorSchemeForChanges = function getParticipantColorSchemeForChanges(changes, attributionColors) {
-  var key = getAttributionKey(getLatestAttribution(changes));
-  return key ? attributionColors.get(key) : undefined;
+var getAttributionKeyForChanges = function getAttributionKeyForChanges(changes) {
+  return getAttributionKey(getLatestAttribution(changes));
+};
+
+/**
+ * The attribution key owning a change. Inline and step changes retain direct attribution spans, so
+ * resolve those first. Grouped and smart-classified changes can lose that data; for those, fall
+ * back to the latest overlapping attributed step.
+ */
+var getAttributionKeyForChange = exports.getAttributionKeyForChange = function getAttributionKeyForChange(change, attributedChanges) {
+  var _getAttributionKeyFor;
+  return (_getAttributionKeyFor = getAttributionKeyForChanges([change])) !== null && _getAttributionKeyFor !== void 0 ? _getAttributionKeyFor : getAttributionKeyForChanges(attributedChanges.filter(function (attributedChange) {
+    return changesOverlap(change, attributedChange);
+  }));
 };
 var getColorSchemeForChange = exports.getColorSchemeForChange = function getColorSchemeForChange(change, attributedChanges, attributionColors, fallback) {
-  var _ref, _getParticipantColorS;
-  return (// Inline and step changes retain their own attribution spans. Resolve those first so a broader
-    // change is not recoloured by a later contributor whose nested range happens to overlap it.
-    (_ref = (_getParticipantColorS = getParticipantColorSchemeForChanges([change], attributionColors)) !== null && _getParticipantColorS !== void 0 ? _getParticipantColorS :
-    // Grouping and smart classification can produce changes without direct attribution data. For
-    // those transformed changes, retain the overlap-based lookup as a fallback.
-    getParticipantColorSchemeForChanges(attributedChanges.filter(function (attributedChange) {
-      return changesOverlap(change, attributedChange);
-    }), attributionColors)) !== null && _ref !== void 0 ? _ref : fallback
-  );
+  var _attributionColors$ge;
+  var key = getAttributionKeyForChange(change, attributedChanges);
+  return key ? (_attributionColors$ge = attributionColors.get(key)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : fallback : fallback;
 };

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

@@ -65,6 +65,7 @@ exports.buildInsertStyleRuleNodeActive = buildInsertStyleRuleNodeActive;
 exports.buildInsertStyleRuleNodeNew = buildInsertStyleRuleNodeNew;
 exports.buildInsertedBlockNodeStyle = buildInsertedBlockNodeStyle;
 exports.buildInsertedInlineStyle = buildInsertedInlineStyle;
+exports.getAccentTokens = getAccentTokens;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _constants = require("@atlaskit/editor-shared-styles/constants");
@@ -213,6 +214,15 @@ function textAccent(color) {
   return isParticipantColorScheme(color) ? participantColorTokenSets[color].textAccent : textAccentMap[color];
 }
 
+/** Presentation tokens for one diff colour, shared by highlights and contributor tags. */
+function getAccentTokens(color) {
+  return {
+    background: bgSubtlest(color),
+    border: borderAccent(color),
+    text: textAccent(color)
+  };
+}
+
 /** Ring colour for an active (scroll-target) deleted block outline. */
 function deletedBlockOutlineActiveRing(colors) {
   return colors.deletedBlockOutlineActiveEmphasis === 'border' ? borderAccent(colors.deleteActiveColor) : bgSubtlerPressed(colors.deleteActiveColor);

package/dist/cjs/pm-plugins/decorations/colorSchemes/types.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PARTICIPANT_COLOR_SCHEMES = void 0;
+/** Schemes consumers may explicitly request through the show-diff API. */
+
 /** Attribution-only participant slots selected by the plugin, never by consumers. */
 var PARTICIPANT_COLOR_SCHEMES = exports.PARTICIPANT_COLOR_SCHEMES = ['red-bolder', 'blue-bolder', 'green-bolder', 'yellow-bolder', 'purple-bolder', 'magenta-bolder', 'teal-bolder', 'orange-bolder', 'lime-bolder', 'gray-bolder', 'blue-subtle', 'red-subtle', 'orange-subtle', 'yellow-subtle', 'green-subtle', 'teal-subtle', 'purple-subtle', 'magenta-subtle'];