@atlaskit/editor-plugin-show-diff 16.0.0 → 16.0.2

package/dist/es2019/ui/ContributorTag/contributorTagController.js

@@ -5,22 +5,7 @@ import { getAccentTokens } from '../../pm-plugins/decorations/colorSchemes/facto
 import { colorSchemeRegistry } from '../../pm-plugins/decorations/colorSchemes/schemes';
 import { buildContributorTagDom, CONTRIBUTOR_TAG_REVEALED_ATTRIBUTE, TAG_EXIT_FALLBACK_MS } from './buildContributorTagDom';
 import { contributorAvatarRenderer } from './contributorAvatarRenderer';
-import { contributorTagMessages } from './messages';
-const getContributorName = (contributor, formatMessage) => {
-  var _contributor$name, _contributor$agentKin;
-  const name = (_contributor$name = contributor.name) === null || _contributor$name === void 0 ? void 0 : _contributor$name.trim();
-  if (name) {
-    return name;
-  }
-
-  // `agentKind` defaults to `'external'` per the plugin type contract; an unidentified external
-  // agent falls back to a generic label rather than rendering a nameless tag.
-  if (contributor.kind === 'agent' && ((_contributor$agentKin = contributor.agentKind) !== null && _contributor$agentKin !== void 0 ? _contributor$agentKin : 'external') === 'external') {
-    return formatMessage(contributorTagMessages.externalAgentName);
-  }
-  return '';
-};
-
+import { formatContributorLabel } from './contributorLabel';
 /**
  * Resolves the tag's accent from the same scheme value the highlight was drawn from, so the colour
  * the two carry can never drift — only the tone does, which is `getAccentTokens`'s to pick.
@@ -99,8 +84,8 @@ const fadeTagOut = (tag, release) => {
 
 /** The contributors a tag draws, keyed so a republished model can be recognised as the same pair. */
 const identityOf = model => [model === null || model === void 0 ? void 0 : model.contributor, model === null || model === void 0 ? void 0 : model.connectedContributor].map(contributor => {
-  var _contributor$agentKin2, _contributor$avatarUr;
-  return contributor ? `${contributor.kind}:${(_contributor$agentKin2 = contributor.agentKind) !== null && _contributor$agentKin2 !== void 0 ? _contributor$agentKin2 : ''}:${contributor.name}:${(_contributor$avatarUr = contributor.avatarUrl) !== null && _contributor$avatarUr !== void 0 ? _contributor$avatarUr : ''}` : '';
+  var _contributor$agentKin, _contributor$avatarUr;
+  return contributor ? `${contributor.kind}:${(_contributor$agentKin = contributor.agentKind) !== null && _contributor$agentKin !== void 0 ? _contributor$agentKin : ''}:${contributor.name}:${(_contributor$avatarUr = contributor.avatarUrl) !== null && _contributor$avatarUr !== void 0 ? _contributor$avatarUr : ''}` : '';
 }).join('|');
 
 /**
@@ -322,24 +307,12 @@ export class ContributorTagController {
       return;
     }
     const {
-      formatMessage
-    } = this.options.getIntl();
-    const isPrimaryAgent = model.contributor.kind === 'agent';
-    const primaryName = getContributorName(model.contributor, formatMessage);
-    const secondaryName = model.connectedContributor ? getContributorName(model.connectedContributor, formatMessage) : '';
-    const agentName = isPrimaryAgent ? primaryName : secondaryName;
-    const userName = isPrimaryAgent ? secondaryName : primaryName;
-
-    // A connected pair only ever shows the agent; the pair is spelled out in the label, because the
-    // tag is capped at `MAX_TAG_WIDTH` and two names rarely fit inside it.
-    this.dom.name.textContent = model.connectedContributor ? agentName || primaryName : primaryName;
-    this.fullLabel = model.connectedContributor ? formatMessage(contributorTagMessages.changedByConnected, {
-      agentName,
-      userName
-    }) : formatMessage(contributorTagMessages.changedBy, {
-      name: primaryName
-    });
-    this.dom.srLabel.textContent = this.fullLabel;
+      fullLabel,
+      visibleName
+    } = formatContributorLabel(model, this.options.getIntl().formatMessage);
+    this.dom.name.textContent = visibleName;
+    this.fullLabel = fullLabel;
+    this.dom.srLabel.textContent = fullLabel;
   }
   accentOf(model) {
     var _model$isInserted;
@@ -384,7 +357,7 @@ export class ContributorTagController {
    * shape of `syncVanillaDisabledTooltip` in `mentionNodeView`.
    */
   syncTooltip() {
-    var _this$tooltip2;
+    var _this$tooltip2, _this$dom$tag$querySe;
     const content = this.dom ? this.fullLabel : undefined;
     if (content === this.tooltipContent) {
       return;
@@ -401,9 +374,11 @@ export class ContributorTagController {
     // renaming. Those styles are scoped under `.ProseMirror`, and the tag renders inside it.
     'ak-editor-vanilla-tooltip-default');
     // `VanillaTooltip` sets `aria-describedby` on its trigger, which would announce the label a
-    // second time — the visually hidden child already announces it, after the change as design
-    // requires.
+    // second time — the hidden child already announces it, and names the tag with it.
     this.dom.tag.removeAttribute('aria-describedby');
+    // The popover is a child of the trigger, so its text would be a third copy of the same
+    // sentence. It stays visible for sighted users, who need the part of the name the tag clipped.
+    (_this$dom$tag$querySe = this.dom.tag.querySelector(':scope > [role="tooltip"]')) === null || _this$dom$tag$querySe === void 0 ? void 0 : _this$dom$tag$querySe.setAttribute('aria-hidden', 'true');
   }
 
   /**

package/dist/es2019/ui/ContributorTag/messages.js

@@ -5,6 +5,11 @@ export const contributorTagMessages = defineMessages({
     defaultMessage: 'Changed by {name}',
     description: 'Screen-reader label and tooltip for the tag pinned to a highlighted change in the version-history diff, naming the single person or agent that made the change. The name placeholder is the contributor display name.'
   },
+  changedByAgent: {
+    id: 'editor-plugin-show-diff.ContributorTag.changedByAgent',
+    defaultMessage: 'Changed by {name}, an AI agent',
+    description: 'Screen-reader label and tooltip for the tag pinned to a highlighted change in the version-history diff, when a named AI agent made the change rather than a person. The name placeholder is the agent display name.'
+  },
   changedByConnected: {
     id: 'editor-plugin-show-diff.ContributorTag.changedByConnected',
     defaultMessage: 'Changed by {agentName} with {userName}',

package/dist/es2019/ui/DiffNavigation/announceActiveDiff.js

@@ -0,0 +1,49 @@
+import { isDiffDecoration } from '../../pm-plugins/decorations/decorationKeys';
+import { formatContributorLabel } from '../ContributorTag/contributorLabel';
+import { diffNavigationMessages } from './messages';
+
+/**
+ * The tag that captions the given decoration, if any. `linkedDiffIds` is checked as well as
+ * `diffId`, because a replacement's two decorations share one tag and navigation can land on either.
+ */
+const findTagFor = (decoration, contributorTags) => {
+  if (!(contributorTags !== null && contributorTags !== void 0 && contributorTags.length) || !isDiffDecoration(decoration)) {
+    return undefined;
+  }
+  const {
+    diffId
+  } = decoration.spec;
+  return contributorTags.find(tag => {
+    var _tag$linkedDiffIds;
+    return tag.diffId === diffId || ((_tag$linkedDiffIds = tag.linkedDiffIds) === null || _tag$linkedDiffIds === void 0 ? void 0 : _tag$linkedDiffIds.includes(diffId));
+  });
+};
+
+/**
+ * What a screen reader should say once the reader has stepped onto a change: where they are in the
+ * diff, and — when the plugin can credit the change — who made it. Stepping otherwise only scrolls,
+ * which is silent.
+ *
+ * Returns `undefined` for an index that resolves no change, so the caller says nothing at all
+ * rather than "Change 4 of 3".
+ */
+export const getActiveDiffAnnouncement = ({
+  activeIndex,
+  contributorTags,
+  decorations,
+  intl
+}) => {
+  const activeDecoration = decorations[activeIndex];
+  if (!activeDecoration) {
+    return undefined;
+  }
+  const position = {
+    index: activeIndex + 1,
+    total: decorations.length
+  };
+  const tag = findTagFor(activeDecoration, contributorTags);
+  return tag ? intl.formatMessage(diffNavigationMessages.activeChangeWithContributor, {
+    ...position,
+    contributor: formatContributorLabel(tag, intl.formatMessage).fullLabel
+  }) : intl.formatMessage(diffNavigationMessages.activeChange, position);
+};

package/dist/es2019/ui/DiffNavigation/messages.js

@@ -0,0 +1,13 @@
+import { defineMessages } from 'react-intl';
+export const diffNavigationMessages = defineMessages({
+  activeChange: {
+    id: 'editor-plugin-show-diff.DiffNavigation.activeChange',
+    defaultMessage: 'Change {index} of {total}',
+    description: 'Announced to screen readers when the reader steps to the next or previous change in the version-history diff. The index placeholder is the position of the change stepped to, counting from 1; total is how many changes the diff has.'
+  },
+  activeChangeWithContributor: {
+    id: 'editor-plugin-show-diff.DiffNavigation.activeChangeWithContributor',
+    defaultMessage: 'Change {index} of {total}. {contributor}',
+    description: 'Announced to screen readers when the reader steps to the next or previous change in the version-history diff and that change is credited to someone. The index and total placeholders are as in activeChange. The contributor placeholder is an already-translated sentence (changedBy, changedByAgent or changedByConnected), so it must be kept whole and only repositioned.'
+  }
+});

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

@@ -337,15 +337,18 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   }
   var pendingAttrSteps = [];
   var stepMaps = [];
-  var _iterator = _createForOfIteratorHelper(simplifiedSteps),
+  var _iterator = _createForOfIteratorHelper(simplifiedSteps.entries()),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var step = _step.value;
+      var _step$value = _slicedToArray(_step.value, 2),
+        stepIndex = _step$value[0],
+        step = _step$value[1];
       var result = step.apply(steppedDoc);
       if (result.failed === null && result.doc) {
         if (stepIsValidAttrChange(step, steppedDoc, result.doc)) {
           pendingAttrSteps.push({
+            attributionKey: getAttributionKey(simplifiedStepAttributions[stepIndex]),
             afterNode: result.doc.nodeAt(step.pos),
             beforeNode: steppedDoc.nodeAt(step.pos),
             mapIndex: stepMaps.length,
@@ -365,6 +368,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   }
   var attrStepContexts = fg('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(function (_ref1) {
     var afterNode = _ref1.afterNode,
+      attributionKey = _ref1.attributionKey,
       beforeNode = _ref1.beforeNode,
       mapIndex = _ref1.mapIndex,
       step = _ref1.step;
@@ -374,6 +378,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     }
     var originalPosition = new Mapping(stepMaps.slice(0, mapIndex)).invert().mapResult(step.pos);
     return [_objectSpread(_objectSpread({
+      attributionKey: attributionKey,
       afterNode: afterNode,
       beforeNode: beforeNode,
       finalPos: finalPosition.pos
@@ -383,8 +388,10 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       step: step
     })];
   }) : pendingAttrSteps.map(function (_ref10) {
-    var step = _ref10.step;
+    var attributionKey = _ref10.attributionKey,
+      step = _ref10.step;
     return {
+      attributionKey: attributionKey,
       afterNode: tr.doc.nodeAt(step.pos),
       beforeNode: originalDoc.nodeAt(step.pos),
       finalPos: step.pos,
@@ -649,34 +656,54 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   // 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 (_ref11) {
+  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).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;
     });
   }).forEach(function (change) {
+    var _attributionColors$ge, _attributionColors;
+    var changeColorScheme = change.attributionKey ? (_attributionColors$ge = (_attributionColors = attributionColors) === null || _attributionColors === void 0 ? void 0 : _attributionColors.get(change.attributionKey)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : colorScheme : colorScheme;
+    var attributionKey = showContributorTags ? change.attributionKey : undefined;
     var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
     decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration({
+      attributionKey: attributionKey,
       change: change,
-      colorScheme: colorScheme,
+      colorScheme: changeColorScheme,
+      doc: tr.doc,
       diffType: diffType,
       isActive: isActive,
       isInserted: true,
-      reveal: reveal
+      reveal: reveal,
+      showContributorTags: showContributorTags,
+      tagMountContext: tagMountContext
     })));
   });
-  getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).forEach(function (change) {
+  getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).filter(function (_ref12) {
+    var fromB = _ref12.fromB,
+      toB = _ref12.toB;
+    return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
+      return change.fromB === fromB && change.toB === toB;
+    });
+  }).forEach(function (change) {
+    var _attributionColors$ge2, _attributionColors2;
+    var changeColorScheme = change.attributionKey ? (_attributionColors$ge2 = (_attributionColors2 = attributionColors) === null || _attributionColors2 === void 0 ? void 0 : _attributionColors2.get(change.attributionKey)) !== null && _attributionColors$ge2 !== void 0 ? _attributionColors$ge2 : colorScheme : colorScheme;
+    var attributionKey = showContributorTags ? change.attributionKey : undefined;
     if (change.isInline) {
       // Inline nodes (e.g. date, emoji, mention, status) need an inline decoration rather than a block decoration
       var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
       decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration({
+        attributionKey: attributionKey,
         change: change,
-        colorScheme: colorScheme,
+        colorScheme: changeColorScheme,
+        doc: tr.doc,
         isActive: isActive,
         isInserted: true,
         isAtomicInlineNode: true,
         inlineNodeName: change.inlineNodeName,
+        showContributorTags: showContributorTags,
+        tagMountContext: tagMountContext,
         // Suppress the border-bottom underline for atomic inline nodeviews —
         // it doesn't render on custom nodeview DOM elements and is unnecessary noise.
         hideAddedDiffsUnderline: true,
@@ -694,12 +721,15 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
             deleted: []
           },
           doc: originalDoc,
+          attributionKey: attributionKey,
           nodeViewSerializer: nodeViewSerializer,
-          colorScheme: colorScheme,
+          colorScheme: changeColorScheme,
           newDoc: tr.doc,
           intl: intl,
           activeIndexPos: activeIndexPos,
-          isInserted: false
+          isInserted: false,
+          showContributorTags: showContributorTags,
+          tagMountContext: tagMountContext
         })));
       }
     } else {
@@ -707,11 +737,14 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         doc: tr.doc,
         from: change.fromB,
         to: change.toB,
-        colorScheme: colorScheme,
+        attributionKey: attributionKey,
+        colorScheme: changeColorScheme,
         isInserted: true,
         activeIndexPos: activeIndexPos,
         intl: intl,
-        showIndicators: showIndicators
+        showContributorTags: showContributorTags,
+        showIndicators: showIndicators,
+        tagMountContext: tagMountContext
       })));
       // If the original node position is known (e.g. a panel type change), also render
       // the old block node as a "deleted" widget so the reviewer sees the before/after.
@@ -728,7 +761,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           },
           doc: originalDoc,
           nodeViewSerializer: nodeViewSerializer,
-          colorScheme: colorScheme,
+          attributionKey: attributionKey,
+          colorScheme: changeColorScheme,
           newDoc: tr.doc,
           intl: intl,
           activeIndexPos: activeIndexPos,
@@ -738,7 +772,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
           placeBelow: placeBelow
         }), {}, {
-          showIndicators: showIndicators
+          showIndicators: showIndicators,
+          showContributorTags: showContributorTags,
+          tagMountContext: tagMountContext
         }))));
       }
     }
@@ -753,49 +789,49 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
 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 (_ref12, _ref13) {
-  var _ref17;
-  var _ref14 = _slicedToArray(_ref12, 1),
-    _ref14$ = _ref14[0],
-    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;
+function (_ref13, _ref14) {
+  var _ref18;
   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;
+    pluginState = _ref15$.pluginState,
+    state = _ref15$.state,
+    colorScheme = _ref15$.colorScheme,
+    intl = _ref15$.intl,
+    activeIndexPos = _ref15$.activeIndexPos,
+    isInverted = _ref15$.isInverted,
+    diffType = _ref15$.diffType,
+    hideDeletedDiffs = _ref15$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref15$.hideAddedDiffsUnderline,
+    showIndicators = _ref15$.showIndicators,
+    smartThresholds = _ref15$.smartThresholds,
+    deletedDiffPlacement = _ref15$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref15$.inlineDeletedDiffPlacement,
+    reveal = _ref15$.reveal;
+  var _ref16 = _slicedToArray(_ref14, 1),
+    _ref16$ = _ref16[0],
+    lastPluginState = _ref16$.pluginState,
+    lastState = _ref16$.state,
+    lastColorScheme = _ref16$.colorScheme,
+    lastIntl = _ref16$.intl,
+    lastActiveIndexPos = _ref16$.activeIndexPos,
+    lastIsInverted = _ref16$.isInverted,
+    lastDiffType = _ref16$.diffType,
+    lastHideDeletedDiffs = _ref16$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref16$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref16$.showIndicators,
+    lastSmartThresholds = _ref16$.smartThresholds,
+    lastDeletedDiffPlacement = _ref16$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref16$.inlineDeletedDiffPlacement,
+    lastReveal = _ref16$.reveal;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if (isExtendedEnabled(diffType)) {
-    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) &&
+    var _ref17;
+    return (_ref17 = 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 &&
     // 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;
+    isEqual(reveal, lastReveal)) !== null && _ref17 !== void 0 ? _ref17 : 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;
+  return (_ref18 = 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 && _ref18 !== void 0 ? _ref18 : false;
 });

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

@@ -160,7 +160,7 @@ export var createAttributionColorMap = function createAttributionColorMap(stepAt
       if (!_identity || colors.has(_identity.key)) {
         continue;
       }
-      var _getParticipantColor2 = getParticipantColor(_identity.colorSeed),
+      var _getParticipantColor2 = getParticipantColor(_identity.colorSeed, _attribution === null || _attribution === void 0 ? void 0 : _attribution.agentType),
         _index = _getParticipantColor2.index;
       var hashedColor = HASHED_PARTICIPANT_COLOR_SCHEMES[_index];
       if (!hashedColor) {

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

@@ -59,6 +59,7 @@ var getStepAttrs = function getStepAttrs(step) {
 export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepContexts, originalDoc) {
   return attrStepContexts.map(function (attrStepContext) {
     var afterNode = attrStepContext.afterNode,
+      attributionKey = attrStepContext.attributionKey,
       beforeNode = attrStepContext.beforeNode,
       finalPos = attrStepContext.finalPos,
       originalPos = attrStepContext.originalPos,
@@ -86,7 +87,9 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
         if (attrsToCheck.some(function (v) {
           return watchedAttrs.includes(v);
         })) {
-          return _objectSpread({
+          return _objectSpread(_objectSpread({}, attributionKey ? {
+            attributionKey: attributionKey
+          } : {}), {}, {
             fromB: finalPos,
             toB: finalPos + nodeAtPos.nodeSize,
             isInline: true,
@@ -103,10 +106,12 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
     if (attrsToCheck.some(function (v) {
       return taskItemAttrs.includes(v);
     }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
-      return {
+      return _objectSpread(_objectSpread({}, attributionKey ? {
+        attributionKey: attributionKey
+      } : {}), {}, {
         fromB: finalPos,
         toB: finalPos + nodeAtPos.nodeSize
-      };
+      });
     }
 
     // panel node (incl. variants like panel_c1): type/colour/icon attribute change
@@ -116,7 +121,9 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
     if (attrsToCheck.some(function (v) {
       return panelAttrs.includes(v);
     }) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
-      return _objectSpread({
+      return _objectSpread(_objectSpread({}, attributionKey ? {
+        attributionKey: attributionKey
+      } : {}), {}, {
         fromB: finalPos,
         toB: finalPos + nodeAtPos.nodeSize
       }, originalPos !== undefined && originalNodeAtPos && {
@@ -134,11 +141,13 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
         return undefined;
       }
       var isInline = nodeAtPos.type.name === 'inlineExtension';
-      return {
+      return _objectSpread(_objectSpread({}, attributionKey ? {
+        attributionKey: attributionKey
+      } : {}), {}, {
         fromB: finalPos,
         toB: finalPos + nodeAtPos.nodeSize,
         isInline: isInline
-      };
+      });
     }
 
     // media node: id/collection/url attribute change — highlight the mediaSingle parent
@@ -146,10 +155,12 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
       return mediaAttrs.includes(v);
     }) && $pos.parent.type === doc.type.schema.nodes.mediaSingle) {
       var startPos = $pos.pos + $pos.parentOffset;
-      return {
+      return _objectSpread(_objectSpread({}, attributionKey ? {
+        attributionKey: attributionKey
+      } : {}), {}, {
         fromB: startPos,
         toB: startPos + $pos.parent.nodeSize - 1
-      };
+      });
     }
     return undefined;
   }).filter(filterUndefined)

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

@@ -1,7 +1,10 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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; }
 import { AddMarkStep, RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
+import { getAttributionKey } from '../colorSchemes/attributions';
+import { mapStepRangeToFinal } from './mapStepRangeToFinal';
 var extractMarkStep = function extractMarkStep(step) {
   if (step instanceof AddMarkStep) {
     return {
@@ -22,13 +25,17 @@ var extractMarkStep = function extractMarkStep(step) {
   return undefined;
 };
 export var getMarkChangeRanges = function getMarkChangeRanges(steps) {
+  var stepAttributions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var stepMaps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var resultRanges = [];
   var lastOp;
-  var _iterator = _createForOfIteratorHelper(steps),
+  var _iterator = _createForOfIteratorHelper(steps.entries()),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var step = _step.value;
+      var _step$value = _slicedToArray(_step.value, 2),
+        stepIndex = _step$value[0],
+        step = _step$value[1];
       var op = extractMarkStep(step);
       if (!op) {
         continue;
@@ -38,9 +45,15 @@ export var getMarkChangeRanges = function getMarkChangeRanges(steps) {
       if (lastOp && lastOp.from === op.from && lastOp.to === op.to && lastOp.markName === op.markName && lastOp.type !== op.type) {
         resultRanges.pop();
       } else {
+        var finalRange = mapStepRangeToFinal(op.from, op.to, stepIndex, stepMaps);
+        if (!finalRange) {
+          lastOp = op;
+          continue;
+        }
         resultRanges.push({
-          fromB: op.from,
-          toB: op.to
+          attributionKey: getAttributionKey(stepAttributions[stepIndex]),
+          fromB: finalRange.fromB,
+          toB: finalRange.toB
         });
       }
       lastOp = op;

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

@@ -0,0 +1,28 @@
+import { Mapping } from '@atlaskit/editor-prosemirror/transform';
+// ProseMirror's assoc value chooses which side of an insertion a mapped boundary stays on.
+var FROM_ASSOC = -1;
+var TO_ASSOC = 1;
+
+/** Maps a step's range into final-document coordinates when the rollout path supplies step maps. */
+export var mapStepRangeToFinal = function mapStepRangeToFinal(from, to, stepIndex, stepMaps) {
+  if (!stepMaps) {
+    return {
+      fromB: from,
+      toB: to
+    };
+  }
+
+  // The range is already in the document immediately after this step, so skip its own map and
+  // apply only the maps from subsequent steps.
+  var firstSubsequentStepIndex = stepIndex + 1;
+  var finalRange = new Mapping(stepMaps.slice(firstSubsequentStepIndex));
+  var fromB = finalRange.mapResult(from, FROM_ASSOC);
+  var toB = finalRange.mapResult(to, TO_ASSOC);
+  if (fromB.deleted && toB.deleted) {
+    return undefined;
+  }
+  return {
+    fromB: fromB.pos,
+    toB: toB.pos
+  };
+};

package/dist/esm/pm-plugins/main.js

@@ -7,6 +7,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform-override';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { getActiveDiffAnnouncement } from '../ui/DiffNavigation/announceActiveDiff';
 import { calculateDiffDecorations } from './calculateDiff/calculateDiffDecorations';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
 import { enforceCustomStepRegisters } from './enforceCustomStepRegisters';
@@ -272,6 +273,23 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
               api === null || api === void 0 || api.core.actions.execute(toggleExpandRange(activeDecoration.from, activeDecoration.to, true));
             }
             cancelPendingScrollToDecoration = scrollToDecoration(view, scrollableDecorations, pluginState.activeIndex);
+
+            // Stepping only scrolls — no focus moves and no content changes — so without this a
+            // screen-reader user gets silence. Announced through the live region rather than by
+            // focusing the change, since the "next change" control has to stay focused to be
+            // pressed again. After the scroll above, so the announcement never precedes it.
+            if (isExtendedEnabled(pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType)) {
+              var announcement = getActiveDiffAnnouncement({
+                activeIndex: pluginState.activeIndex,
+                contributorTags: pluginState.contributorTags,
+                decorations: scrollableDecorations,
+                intl: getIntl()
+              });
+              if (announcement) {
+                var _api$accessibilityUti;
+                api === null || api === void 0 || (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 || _api$accessibilityUti.actions.ariaNotify(announcement);
+              }
+            }
           }
         },
         destroy: function destroy() {