@atlaskit/editor-plugin-show-diff 16.1.1 → 17.0.0

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

@@ -73,6 +73,7 @@ exports.getDeletedHighlightHoverColor = getDeletedHighlightHoverColor;
 exports.getDeletedInlineRevealColors = getDeletedInlineRevealColors;
 exports.getInsertedInlineRevealColors = getInsertedInlineRevealColors;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _agentBrandColorSchemes = require("@atlaskit/agent-color/agent-brand-color-schemes");
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _getStandardDeletedTextDecorationStyle = require("./getStandardDeletedTextDecorationStyle");
 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; }
@@ -191,40 +192,48 @@ var textAccentMap = {
   gray: "var(--ds-text-accent-gray, #505258)",
   lime: "var(--ds-text-accent-lime, #4C6B1F)"
 };
+var getBrand = function getBrand(color) {
+  return Object.prototype.hasOwnProperty.call(_agentBrandColorSchemes.agentBrandColorSchemes, color) ? _agentBrandColorSchemes.agentBrandColorSchemes[color] : undefined;
+};
 function bgSubtlest(color) {
-  return bgSubtlestMap[color];
+  var _getBrand$background, _getBrand;
+  return (_getBrand$background = (_getBrand = getBrand(color)) === null || _getBrand === void 0 ? void 0 : _getBrand.background) !== null && _getBrand$background !== void 0 ? _getBrand$background : bgSubtlestMap[color];
 }
 function bgSubtlestPressed(color) {
-  return bgSubtlestPressedMap[color];
+  var _getBrand$background2, _getBrand2;
+  return (_getBrand$background2 = (_getBrand2 = getBrand(color)) === null || _getBrand2 === void 0 ? void 0 : _getBrand2.background) !== null && _getBrand$background2 !== void 0 ? _getBrand$background2 : bgSubtlestPressedMap[color];
 }
 function bgSubtler(color) {
-  return bgSubtlerMap[color];
+  var _getBrand$border, _getBrand3;
+  return (_getBrand$border = (_getBrand3 = getBrand(color)) === null || _getBrand3 === void 0 ? void 0 : _getBrand3.border) !== null && _getBrand$border !== void 0 ? _getBrand$border : bgSubtlerMap[color];
 }
 function bgBolder(color) {
-  return bgBolderMap[color];
+  var _getBrand$bold, _getBrand4;
+  return (_getBrand$bold = (_getBrand4 = getBrand(color)) === null || _getBrand4 === void 0 ? void 0 : _getBrand4.bold) !== null && _getBrand$bold !== void 0 ? _getBrand$bold : bgBolderMap[color];
 }
 function bgSubtlerPressed(color) {
-  return bgSubtlerPressedMap[color];
+  var _getBrand$background3, _getBrand5;
+  return (_getBrand$background3 = (_getBrand5 = getBrand(color)) === null || _getBrand5 === void 0 ? void 0 : _getBrand5.background) !== null && _getBrand$background3 !== void 0 ? _getBrand$background3 : bgSubtlerPressedMap[color];
 }
 function borderAccent(color) {
-  return borderAccentMap[color];
+  var _getBrand$border2, _getBrand6;
+  return (_getBrand$border2 = (_getBrand6 = getBrand(color)) === null || _getBrand6 === void 0 ? void 0 : _getBrand6.border) !== null && _getBrand$border2 !== void 0 ? _getBrand$border2 : borderAccentMap[color];
 }
 function textAccent(color) {
-  return textAccentMap[color];
+  var _getBrand$accentText, _getBrand7;
+  return (_getBrand$accentText = (_getBrand7 = getBrand(color)) === null || _getBrand7 === void 0 ? void 0 : _getBrand7.accentText) !== null && _getBrand$accentText !== void 0 ? _getBrand$accentText : textAccentMap[color];
+}
+function deletedBackground(color) {
+  var _getBrand$emphasisBac, _getBrand8;
+  return (_getBrand$emphasisBac = (_getBrand8 = getBrand(color)) === null || _getBrand8 === void 0 ? void 0 : _getBrand8.emphasisBackground) !== null && _getBrand$emphasisBac !== void 0 ? _getBrand$emphasisBac : bgSubtlest(color);
 }
 
-/**
- * Presentation tokens for a contributor tag in one diff colour.
- *
- * A `bolder` fill rather than the `subtlest` tint the highlight uses: the tag is a label on the
- * change, and at tag size a tint reads as a second, weaker highlight sitting above the real one.
- * `inverse` is the only text tone that reads on a bolder fill, and it needs no per-colour map —
- * which is also why the tag carries no border: the fill alone bounds it.
- */
+/** Contributor tags use a bold fill with a contrasting foreground, including branded schemes. */
 function getAccentTokens(color) {
+  var _getBrand$boldText, _getBrand9;
   return {
     background: bgBolder(color),
-    text: "var(--ds-text-inverse, #FFFFFF)"
+    text: (_getBrand$boldText = (_getBrand9 = getBrand(color)) === null || _getBrand9 === void 0 ? void 0 : _getBrand9.boldText) !== null && _getBrand$boldText !== void 0 ? _getBrand$boldText : "var(--ds-text-inverse, #FFFFFF)"
   };
 }
 
@@ -246,18 +255,23 @@ function deletedCellOutline(colors) {
 // --- Inserted content styles ---
 
 function insertedInlineBorderColor(colors) {
-  return colors.insertedInlineBorderTone === 'backgroundHovered' ? bgSubtlestHoveredMap[colors.insertColor] : borderAccent(colors.insertColor);
+  var _getBrand$border3, _getBrand0;
+  return colors.insertedInlineBorderTone === 'backgroundHovered' ? (_getBrand$border3 = (_getBrand0 = getBrand(colors.insertColor)) === null || _getBrand0 === void 0 ? void 0 : _getBrand0.border) !== null && _getBrand$border3 !== void 0 ? _getBrand$border3 : bgSubtlestHoveredMap[colors.insertColor] : borderAccent(colors.insertColor);
 }
 
 /** Inline inserted content — default state. */
 function buildInsertStyle(colors) {
-  return (0, _lazyNodeView.convertToInlineCss)({
-    background: bgSubtlest(colors.insertColor),
+  var brand = getBrand(colors.insertColor);
+  return (0, _lazyNodeView.convertToInlineCss)(_objectSpread(_objectSpread({
+    background: bgSubtlest(colors.insertColor)
+  }, brand ? {
+    color: brand.text
+  } : {}), {}, {
     textDecoration: 'underline',
     textDecorationStyle: colors.insertUnderlineStyle,
     textDecorationThickness: "var(--ds-space-025, 2px)",
     textDecorationColor: borderAccent(colors.insertColor)
-  });
+  }));
 }
 
 /** Inline insert style for content within a block node (no background, underline only). */
@@ -272,11 +286,15 @@ function buildInsertStyleInBlock(colors) {
 
 /** Extended insert style — background + border-bottom underline. */
 function buildInsertStyleExtended(colors) {
-  return (0, _lazyNodeView.convertToInlineCss)({
-    background: bgSubtlest(colors.insertColor),
+  var brand = getBrand(colors.insertColor);
+  return (0, _lazyNodeView.convertToInlineCss)(_objectSpread(_objectSpread({
+    background: bgSubtlest(colors.insertColor)
+  }, brand ? {
+    color: brand.text
+  } : {}), {}, {
     borderBottom: "2px solid ".concat(insertedInlineBorderColor(colors)),
     padding: "1px 0 2px"
-  });
+  }));
 }
 
 /** Extended insert style for content within a block node (border-bottom only, no background). */
@@ -289,27 +307,39 @@ function buildInsertStyleInBlockExtended(colors) {
 
 /** Active state of the extended insert style. */
 function buildInsertStyleExtendedActive(colors) {
-  return (0, _lazyNodeView.convertToInlineCss)({
-    background: bgSubtlerPressed(colors.insertActiveColor),
+  var brand = getBrand(colors.insertColor);
+  return (0, _lazyNodeView.convertToInlineCss)(_objectSpread(_objectSpread({
+    background: bgSubtlerPressed(colors.insertActiveColor)
+  }, brand ? {
+    color: brand.text
+  } : {}), {}, {
     borderBottom: "2px solid ".concat(borderAccent(colors.insertColor)),
     padding: "1px 0 2px"
-  });
+  }));
 }
 
 /** Extended insert style without underline — background + padding only. */
 function buildInsertStyleExtendedNoUnderline(colors) {
-  return (0, _lazyNodeView.convertToInlineCss)({
-    background: bgSubtlest(colors.insertColor),
+  var brand = getBrand(colors.insertColor);
+  return (0, _lazyNodeView.convertToInlineCss)(_objectSpread(_objectSpread({
+    background: bgSubtlest(colors.insertColor)
+  }, brand ? {
+    color: brand.text
+  } : {}), {}, {
     padding: "1px 0 2px"
-  });
+  }));
 }
 
 /** Active state of the no-underline extended insert style. */
 function buildInsertStyleExtendedNoUnderlineActive(colors) {
-  return (0, _lazyNodeView.convertToInlineCss)({
-    background: bgSubtlerPressed(colors.insertActiveColor),
+  var brand = getBrand(colors.insertColor);
+  return (0, _lazyNodeView.convertToInlineCss)(_objectSpread(_objectSpread({
+    background: bgSubtlerPressed(colors.insertActiveColor)
+  }, brand ? {
+    color: brand.text
+  } : {}), {}, {
     padding: "1px 0 2px"
-  });
+  }));
 }
 
 /** No-underline extended insert style for block content (padding only). */
@@ -321,13 +351,17 @@ function buildInsertStyleInBlockExtendedNoUnderline(_colors) {
 
 /** Inline inserted content — active/focused state. */
 function buildInsertStyleActive(colors) {
-  return (0, _lazyNodeView.convertToInlineCss)({
-    background: bgSubtlerPressed(colors.insertActiveColor),
+  var brand = getBrand(colors.insertColor);
+  return (0, _lazyNodeView.convertToInlineCss)(_objectSpread(_objectSpread({
+    background: bgSubtlerPressed(colors.insertActiveColor)
+  }, brand ? {
+    color: brand.text
+  } : {}), {}, {
     textDecoration: 'underline',
     textDecorationStyle: colors.insertUnderlineStyle,
     textDecorationThickness: "var(--ds-space-025, 2px)",
     textDecorationColor: textAccent(colors.insertActiveColor)
-  });
+  }));
 }
 
 // --- Deleted inline content styles ---
@@ -685,7 +719,7 @@ function buildDeletedInlineContentStyleExtended(colors) {
   // Under 'underline' emphasis the highlight stays on its resting tint — the same one hover paints —
   // so only the border carries the emphasis.
   var isUnderlineEmphasis = isActive && usesUnderlineEmphasis(colors);
-  var backgroundColor = isActive && !isUnderlineEmphasis && colors.deletedInlineBorderTone === 'background' ? bgSubtlerPressed(colors.deleteActiveColor) : bgSubtlest(colors.deleteColor);
+  var backgroundColor = isActive && !isUnderlineEmphasis && colors.deletedInlineBorderTone === 'background' ? bgSubtlerPressed(colors.deleteActiveColor) : deletedBackground(colors.deleteColor);
   var borderColor = isUnderlineEmphasis ? borderAccent(colors.deleteActiveColor) : colors.deletedInlineBorderTone === 'background' ? backgroundColor : borderAccent(colors.deleteColor);
   return (0, _lazyNodeView.convertToInlineCss)({
     backgroundColor: backgroundColor,
@@ -895,7 +929,7 @@ function getDeletedInlineRevealColors(colors) {
  * paints at rest, so hovering restores the appearance rather than introducing a third one.
  */
 function getDeletedHighlightHoverColor(colors) {
-  return bgSubtlest(colors.deleteColor);
+  return deletedBackground(colors.deleteColor);
 }
 
 /**

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.traditionalScheme = exports.standardScheme = exports.getLegacyColorScheme = exports.colorSchemeRegistry = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _agentBrandColorSchemes = require("@atlaskit/agent-color/agent-brand-color-schemes");
 var _types = require("./types");
 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; }
@@ -84,9 +85,12 @@ var createAttributionScheme = function createAttributionScheme(color) {
 var attributionColorSchemes = Object.fromEntries(_types.PARTICIPANT_COLOR_SCHEMES.map(function (color) {
   return [color, createAttributionScheme(color)];
 }));
+var brandSchemes = Object.fromEntries(Object.keys(_agentBrandColorSchemes.agentBrandColorSchemes).map(function (scheme) {
+  return [scheme, createAttributionScheme(scheme)];
+}));
 
 /** Maps public schemes and attribution-only participant slots to their data objects. */
-var colorSchemeRegistry = exports.colorSchemeRegistry = _objectSpread(_objectSpread({}, attributionColorSchemes), {}, {
+var colorSchemeRegistry = exports.colorSchemeRegistry = _objectSpread(_objectSpread(_objectSpread({}, attributionColorSchemes), brandSchemes), {}, {
   traditional: traditionalScheme,
   standard: standardScheme
 });

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

@@ -11,8 +11,6 @@ var PARTICIPANT_COLOR_SCHEMES = exports.PARTICIPANT_COLOR_SCHEMES = ['red', 'blu
 
 /** ADS accent hues used by the public and participant colour schemes. */
 
-/** A public scheme or an attribution participant slot resolved internally for one change. */
-
 /**
  * A show-diff colour scheme. Colour fields are ADS hues that `factory.ts` expands into token paths;
  * the rest encode structural differences no colour can express. Ring widths, padding, radius and

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

@@ -13,6 +13,7 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _isExtendedEnabled = require("../isExtendedEnabled");
+var _taggableBlockNodes = require("../utils/taggableBlockNodes");
 var _factory = require("./colorSchemes/factory");
 var _schemes = require("./colorSchemes/schemes");
 var _createAnchorDecorationWidgets = require("./createAnchorDecorationWidgets");
@@ -34,13 +35,6 @@ 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 (0, _utils.findParentNodeClosestToPos)(doc.resolve(pos), function (node) {
@@ -48,13 +42,23 @@ var isInsideTable = function isInsideTable(doc, pos) {
   }) !== undefined;
 };
 
-/** Whether this block can host a contributor tag of its own. */
+/**
+ * Whether this block can host a contributor tag of its own.
+ *
+ * The node type is resolved from the document rather than matched on `change.name`, so a schema
+ * variant is recognised as the type it varies — see `isTaggableBlockNode`. `from` is the node's own
+ * position, so `nodeAt` returns exactly the node being decorated.
+ */
 var canTagBlock = function canTagBlock(_ref) {
+  var _doc$nodeAt;
   var diffType = _ref.diffType,
     doc = _ref.doc,
-    from = _ref.from,
-    name = _ref.name;
-  return doc !== undefined && (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && TAGGABLE_BLOCK_NODES.has(name) && !isInsideTable(doc, from);
+    from = _ref.from;
+  if (doc === undefined || !(0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+    return false;
+  }
+  var nodeType = (_doc$nodeAt = doc.nodeAt(from)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type;
+  return nodeType !== undefined && (0, _taggableBlockNodes.isTaggableBlockNode)(nodeType) && !isInsideTable(doc, from);
 };
 
 /** Positioning context for the cell overlay widget decorations. */
@@ -196,8 +200,7 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
   var shouldTagBlock = showContributorTags && canTagBlock({
     diffType: diffType,
     doc: doc,
-    from: change.from,
-    name: change.name
+    from: change.from
   });
   // Named so this block's own tag can position against it; see `createContributorTagWidget`.
   var tagAnchorName = shouldTagBlock && (0, _createContributorTagWidget.isContributorTagWidgetEnabled)() ? (0, _decorationKeys.buildAnchorDecorationKey)({
@@ -241,7 +244,9 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
       key: 'cell-overlay-decoration'
     }));
   }
-  // isInserted is only read under the extended experience, so pass it unconditionally.
+  // isInserted is only read under the extended experience, so pass it unconditionally. `change.name`
+  // verbatim: base-name resolution stays in `canTagBlock`, which needs tags on, so a schema
+  // variant's legacy style is untouched — see `resolveBaseNodeName`.
   var nodeStyle = getBlockNodeStyle({
     nodeName: change.name,
     colorScheme: colorScheme,
@@ -272,6 +277,8 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
     })));
   }
   if (decorations.length === 0) {
+    // An unstyled node type (paragraph, heading, list, layout, …) emits no decoration at all, so
+    // there is nothing for a tag to hang off even when the node type would otherwise be taggable.
     return decorations;
   }
   if (showIndicators && doc && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {

package/dist/cjs/pm-plugins/decorations/extractContributorTags.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.extractContributorTags = void 0;
-var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _fg = require("@atlaskit/platform-feature-flags/fg");
@@ -57,6 +57,14 @@ var isSameBlockChange = function isSameBlockChange(inner, block) {
   return inner.spec.attributionKey === block.spec.attributionKey && (block.from <= inner.from && inner.to <= block.to || inner.from <= block.from && block.to <= inner.to);
 };
 
+/**
+ * Whether `outer` is the box `inner` sits in, for one contributor. Nested blocks they inserted read
+ * as one change, so only the outermost keeps a tag (EDITOR-8932).
+ */
+var containsBlock = function containsBlock(outer, inner) {
+  return outer.spec.attributionKey === inner.spec.attributionKey && outer.from <= inner.from && inner.to <= outer.to && outer.to - outer.from > inner.to - inner.from;
+};
+
 /**
  * Which of two changes in the same range leads, and so is the one a tag captions. Position first,
  * then `side`, since deleted content shares its `from` with the content that replaced it and paints
@@ -77,6 +85,19 @@ var containedBy = function containedBy(targets, _ref2) {
   }).sort(byLeadingPosition);
 };
 
+/**
+ * The stop a target is stepped to by: the narrowest one that wholly covers it. A stop's range is
+ * the union of the decorations grouped into it, so one inserted run's inline highlight stretches
+ * its stop over every block the run spans — including blocks that are a stop of their own. Picking
+ * the narrowest keeps each of those blocks in the stop that actually reaches it, rather than
+ * letting the widest stop claim them all and fold away every tag but the first (EDITOR-8932).
+ */
+var owningStop = function owningStop(target, stops) {
+  return stops.reduce(function (narrowest, stop) {
+    return stop.from <= target.decoration.from && target.decoration.to <= stop.to && (narrowest === undefined || stop.to - stop.from < narrowest.to - narrowest.from) ? stop : narrowest;
+  }, undefined);
+};
+
 /**
  * The one tag a navigation step reveals. `spec.isActive` is no use here: it covers everything the
  * group's union range touches, so several tags revealed over each other (EDITOR-8971). Hence
@@ -145,6 +166,10 @@ var extractContributorTags = exports.extractContributorTags = function extractCo
   });
   var linkedDiffIds = new Map();
   var folded = new Set();
+
+  /**
+   * A folded target keeps no tag of its own — it becomes a hover target of the host instead.
+   */
   var fold = function fold(host, target) {
     var _linkedDiffIds$get, _linkedDiffIds$get2;
     folded.add(target);
@@ -202,58 +227,113 @@ var extractContributorTags = exports.extractContributorTags = function extractCo
     if (_ret === 0) continue;
   }
 
+  // A nested block folds into the outermost one of the same contributor, so nesting adds no tags.
+  if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+    var blocksByContributor = new Map();
+    var _iterator2 = _createForOfIteratorHelper(blockTargets),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _target$decoration$sp, _blocksByContributor$;
+        var target = _step2.value;
+        var key = (_target$decoration$sp = target.decoration.spec.attributionKey) !== null && _target$decoration$sp !== void 0 ? _target$decoration$sp : '';
+        blocksByContributor.set(key, [].concat((0, _toConsumableArray2.default)((_blocksByContributor$ = blocksByContributor.get(key)) !== null && _blocksByContributor$ !== void 0 ? _blocksByContributor$ : []), [target]));
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    var _iterator3 = _createForOfIteratorHelper(blocksByContributor.values()),
+      _step3;
+    try {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var contributorBlocks = _step3.value;
+        // Block ranges nest rather than partially overlap, so ascending `from` then descending `to`
+        // reaches every block after the ones containing it. A stack of the blocks still open at
+        // this position then yields each block's container in one pass, rather than rescanning
+        // every block for the widest that contains it.
+        var nested = (0, _toConsumableArray2.default)(contributorBlocks).sort(function (left, right) {
+          return left.decoration.from - right.decoration.from || right.decoration.to - left.decoration.to;
+        });
+        var open = [];
+        var _iterator4 = _createForOfIteratorHelper(nested),
+          _step4;
+        try {
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            var _target = _step4.value;
+            while (open.length > 0 && !containsBlock(open[open.length - 1].decoration, _target.decoration)) {
+              open.pop();
+            }
+            // Outermost first, so the bottom of the stack is the block the tag survives on.
+            if (open.length > 0) {
+              fold(open[0], _target);
+            }
+            open.push(_target);
+          }
+        } catch (err) {
+          _iterator4.e(err);
+        } finally {
+          _iterator4.f();
+        }
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+  }
+
   // One tag per contributor per navigation stop. The folds above only catch a replacement's two
   // halves and a block's own highlights; two of one contributor's changes that merely touch are a
   // single stop (`groupTouchingDecorations`) yet kept a tag each, so the stop's trailing tag was
   // drawn but could never be stepped to (EDITOR-8971). It folds into the leading tag of its
   // contributor, staying a hover target. Contributors are kept apart: a stop spanning two of them
   // still captions each, rather than crediting one for the other's change.
-  var _iterator2 = _createForOfIteratorHelper(stops !== null && stops !== void 0 ? stops : []),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var stop = _step2.value;
-      var byContributor = new Map();
-      var _iterator3 = _createForOfIteratorHelper(containedBy(targets.filter(function (target) {
-          return !folded.has(target);
-        }), stop)),
-        _step3;
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var _target$decoration$sp, _byContributor$get;
-          var target = _step3.value;
-          var key = (_target$decoration$sp = target.decoration.spec.attributionKey) !== null && _target$decoration$sp !== void 0 ? _target$decoration$sp : '';
-          byContributor.set(key, [].concat((0, _toConsumableArray2.default)((_byContributor$get = byContributor.get(key)) !== null && _byContributor$get !== void 0 ? _byContributor$get : []), [target]));
+  // Each target is counted against one stop only — see `owningStop`.
+  if (stops !== null && stops !== void 0 && stops.length) {
+    var byStopAndContributor = new Map();
+    var _iterator5 = _createForOfIteratorHelper(targets.filter(function (target) {
+        return !folded.has(target);
+      })),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var _target2$decoration$s, _byStopAndContributor;
+        var _target2 = _step5.value;
+        var stop = owningStop(_target2, stops);
+        if (stop === undefined) {
+          continue;
         }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
+        var _key = "".concat(stop.from, "-").concat(stop.to, "|").concat((_target2$decoration$s = _target2.decoration.spec.attributionKey) !== null && _target2$decoration$s !== void 0 ? _target2$decoration$s : '');
+        byStopAndContributor.set(_key, [].concat((0, _toConsumableArray2.default)((_byStopAndContributor = byStopAndContributor.get(_key)) !== null && _byStopAndContributor !== void 0 ? _byStopAndContributor : []), [_target2]));
       }
-      var _iterator4 = _createForOfIteratorHelper(byContributor.values()),
-        _step4;
-      try {
-        var _loop2 = function _loop2() {
-          var _step4$value = (0, _toArray2.default)(_step4.value),
-            leader = _step4$value[0],
-            trailing = _arrayLikeToArray(_step4$value).slice(1);
-          trailing.forEach(function (target) {
-            return fold(leader, target);
-          });
-        };
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          _loop2();
-        }
-      } catch (err) {
-        _iterator4.e(err);
-      } finally {
-        _iterator4.f();
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
+    }
+    var _iterator6 = _createForOfIteratorHelper(byStopAndContributor.values()),
+      _step6;
+    try {
+      var _loop2 = function _loop2() {
+        var members = _step6.value;
+        var _sort = (0, _toConsumableArray2.default)(members).sort(byLeadingPosition),
+          _sort2 = (0, _toArray2.default)(_sort),
+          leader = _sort2[0],
+          trailing = _arrayLikeToArray(_sort2).slice(1);
+        trailing.forEach(function (target) {
+          return fold(leader, target);
+        });
+      };
+      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+        _loop2();
       }
+    } catch (err) {
+      _iterator6.e(err);
+    } finally {
+      _iterator6.f();
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
   }
   var surviving = targets.filter(function (target) {
     return !folded.has(target);

package/dist/cjs/pm-plugins/decorations/revealStyles.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.resolveRevealStyle = exports.buildWipeableBackground = exports.applyRevealToElement = exports.REVEAL_BORDER_VAR = exports.REVEAL_BG_VAR = exports.REVEAL_ATTR = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _agentBrandColorSchemes = require("@atlaskit/agent-color/agent-brand-color-schemes");
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _factory = require("./colorSchemes/factory");
@@ -115,6 +116,7 @@ var resolveRevealStyle = exports.resolveRevealStyle = function resolveRevealStyl
     return undefined;
   }
   var colors = getColorScheme(colorScheme);
+  var brand = isInserted && Object.prototype.hasOwnProperty.call(_agentBrandColorSchemes.agentBrandColorSchemes, colors.insertColor) ? _agentBrandColorSchemes.agentBrandColorSchemes[colors.insertColor] : undefined;
   var _resolveRevealColors = resolveRevealColors(colors, {
       hideAddedDiffsUnderline: hideAddedDiffsUnderline,
       isActive: isActive,
@@ -124,7 +126,9 @@ var resolveRevealStyle = exports.resolveRevealStyle = function resolveRevealStyl
     border = _resolveRevealColors.border;
   return {
     role: isInserted ? 'added' : 'deleted',
-    style: (isInserted || !includeDeletedTextStyle ? '' : deletedTextOnlyStyle(colors, isActive)) + revealBaseStyle + buildWipeableBackground(background) + buildRevealVariables({
+    style: (brand ? (0, _lazyNodeView.convertToInlineCss)({
+      color: brand.text
+    }) : '') + (isInserted || !includeDeletedTextStyle ? '' : deletedTextOnlyStyle(colors, isActive)) + revealBaseStyle + buildWipeableBackground(background) + buildRevealVariables({
       background: background,
       border: border
     })