@atlaskit/editor-plugin-show-diff 16.0.1 → 16.0.3

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

@@ -1,10 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getMarkChangeRanges = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _attributions = require("../colorSchemes/attributions");
+var _mapStepRangeToFinal = require("./mapStepRangeToFinal");
 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; }
@@ -28,13 +32,17 @@ var extractMarkStep = function extractMarkStep(step) {
   return undefined;
 };
 var getMarkChangeRanges = exports.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 = (0, _slicedToArray2.default)(_step.value, 2),
+        stepIndex = _step$value[0],
+        step = _step$value[1];
       var op = extractMarkStep(step);
       if (!op) {
         continue;
@@ -44,9 +52,15 @@ var getMarkChangeRanges = exports.getMarkChangeRanges = function getMarkChangeRa
       if (lastOp && lastOp.from === op.from && lastOp.to === op.to && lastOp.markName === op.markName && lastOp.type !== op.type) {
         resultRanges.pop();
       } else {
+        var finalRange = (0, _mapStepRangeToFinal.mapStepRangeToFinal)(op.from, op.to, stepIndex, stepMaps);
+        if (!finalRange) {
+          lastOp = op;
+          continue;
+        }
         resultRanges.push({
-          fromB: op.from,
-          toB: op.to
+          attributionKey: (0, _attributions.getAttributionKey)(stepAttributions[stepIndex]),
+          fromB: finalRange.fromB,
+          toB: finalRange.toB
         });
       }
       lastOp = op;

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

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mapStepRangeToFinal = void 0;
+var _transform = require("@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. */
+var mapStepRangeToFinal = exports.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 _transform.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/cjs/pm-plugins/main.js

@@ -12,6 +12,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _transformOverride = require("@atlaskit/editor-prosemirror/transform-override");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _announceActiveDiff = require("../ui/DiffNavigation/announceActiveDiff");
 var _calculateDiffDecorations = require("./calculateDiff/calculateDiffDecorations");
 var _decorationKeys = require("./decorations/decorationKeys");
 var _enforceCustomStepRegisters = require("./enforceCustomStepRegisters");
@@ -279,6 +280,23 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
               api === null || api === void 0 || api.core.actions.execute((0, _expand.toggleExpandRange)(activeDecoration.from, activeDecoration.to, true));
             }
             cancelPendingScrollToDecoration = (0, _scrollToDiff.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 ((0, _isExtendedEnabled.isExtendedEnabled)(pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType)) {
+              var announcement = (0, _announceActiveDiff.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() {

package/dist/cjs/ui/ContributorTag/buildContributorTagDom.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildContributorTagDom = exports.TAG_EXIT_FALLBACK_MS = exports.MAX_TAG_WIDTH = exports.CONTRIBUTOR_TAG_Z_INDEX = exports.CONTRIBUTOR_TAG_TESTID = exports.CONTRIBUTOR_TAG_REVEALED_ATTRIBUTE = exports.CONTRIBUTOR_TAG_NAME_TESTID = exports.CONTRIBUTOR_TAG_CLASS = void 0;
+exports.buildContributorTagDom = exports.TAG_EXIT_FALLBACK_MS = exports.MAX_TAG_WIDTH = exports.CONTRIBUTOR_TAG_Z_INDEX = exports.CONTRIBUTOR_TAG_TOOLTIP_STYLES = exports.CONTRIBUTOR_TAG_TESTID = exports.CONTRIBUTOR_TAG_REVEALED_ATTRIBUTE = exports.CONTRIBUTOR_TAG_NAME_TESTID = exports.CONTRIBUTOR_TAG_CLASS = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var CONTRIBUTOR_TAG_TESTID = exports.CONTRIBUTOR_TAG_TESTID = 'diff-contributor-tag';
@@ -49,6 +49,30 @@ var CONTRIBUTOR_TAG_REVEALED_ATTRIBUTE = exports.CONTRIBUTOR_TAG_REVEALED_ATTRIB
  */
 var TAG_EXIT_FALLBACK_MS = exports.TAG_EXIT_FALLBACK_MS = 1200;
 
+/**
+ * The tooltip's look, inline rather than through `VANILLA_TOOLTIP_DEFAULT_CLASS`: this tooltip is
+ * hoisted out of the tag, and that class's rule is scoped under `.ProseMirror` — see
+ * `resolveTooltipContainer`. Otherwise `vanillaTooltipDefaultStyles` in editor-core, which is the
+ * look every other vanilla tooltip has; keep the two in step.
+ */
+var CONTRIBUTOR_TAG_TOOLTIP_STYLES = exports.CONTRIBUTOR_TAG_TOOLTIP_STYLES = {
+  boxSizing: 'border-box',
+  maxWidth: '240px',
+  backgroundColor: "var(--ds-background-neutral-bold, #292A2E)",
+  // A `popover` is given one by the UA stylesheet.
+  border: 'none',
+  borderRadius: "var(--ds-radius-small, 3px)",
+  color: "var(--ds-text-inverse, #FFFFFF)",
+  font: "var(--ds-font-body-small, normal 400 12px/16px \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+  fontFamily: "var(--ds-font-family-body, \"Atlassian Sans\", ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
+  overflowWrap: 'break-word',
+  paddingBlock: "var(--ds-space-050, 4px)",
+  paddingInline: "var(--ds-space-075, 6px)",
+  whiteSpace: 'normal',
+  // A tooltip is never a hit target — it hangs over the document's own content.
+  pointerEvents: 'none'
+};
+
 // Positioned against the host widget its decoration renders on the change's first character:
 // `bottom: 100%` lifts the tag onto the line above, `inset-inline-start` starts it on that
 // character.
@@ -132,6 +156,19 @@ var srLabelStyle = (0, _lazyNodeView.convertToInlineCss)({
   userSelect: 'none',
   whiteSpace: 'nowrap'
 });
+
+/**
+ * Ids for the hidden label that the tag's `aria-labelledby` points at. Namespaced and random because
+ * the tag renders inside the document and shares the host page's id space — the same reason
+ * `VanillaTooltip` does it this way. The counter is a fallback for non-secure contexts, where
+ * `crypto.randomUUID` is unavailable.
+ */
+var generateLabelId = function () {
+  var count = 0;
+  return function () {
+    return typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function' ? "".concat(CONTRIBUTOR_TAG_CLASS, "-label-").concat(crypto.randomUUID()) : "".concat(CONTRIBUTOR_TAG_CLASS, "-label-").concat(count += 1);
+  };
+}();
 var createSpan = function createSpan(doc, style) {
   var attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var span = doc.createElement('span');
@@ -151,21 +188,30 @@ var createSpan = function createSpan(doc, style) {
  * would need a cast per reference below.
  */
 var buildContributorTagDom = exports.buildContributorTagDom = function buildContributorTagDom(doc) {
+  var labelId = generateLabelId();
   var root = createSpan(doc, constraintStyle);
   var tag = createSpan(doc, tagStyle, {
     class: CONTRIBUTOR_TAG_CLASS,
     'data-testid': CONTRIBUTOR_TAG_TESTID,
-    // Deliberately no `aria-label`: it would be announced ahead of the element's contents, but
-    // design requires the contributor *after* the change — hence the visually hidden label.
+    // Named by the hidden label rather than `aria-label`, which would be a second copy of the same
+    // sentence. `role="note"` takes its name from the author, not its contents, so without this
+    // the tag is a focus stop with no accessible name.
+    'aria-labelledby': labelId,
     role: 'note',
-    // Focusable so keyboard and screen-reader users can reach the tag and its tooltip.
+    // Focusable so keyboard and screen-reader users can reach the tag and its tooltip. Its focus
+    // ring is drawn inward — see `contributorTagStyles` in editor-core.
     tabindex: '0'
   });
   var avatars = createSpan(doc, avatarsStyle);
+  // `aria-hidden`: the hidden label restates this name in a full sentence, so leaving it in the
+  // tree announced the contributor twice ("Priya Changed by Priya").
   var name = createSpan(doc, nameStyle, {
+    'aria-hidden': 'true',
     'data-testid': CONTRIBUTOR_TAG_NAME_TESTID
   });
-  var srLabel = createSpan(doc, srLabelStyle);
+  var srLabel = createSpan(doc, srLabelStyle, {
+    id: labelId
+  });
   tag.append(avatars, name, srLabel);
   root.appendChild(tag);
   return {

package/dist/cjs/ui/ContributorTag/contributorLabel.js

@@ -0,0 +1,55 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatContributorLabel = void 0;
+var _messages = require("./messages");
+var getContributorName = function getContributorName(contributor, formatMessage) {
+  var _contributor$name, _contributor$agentKin;
+  var 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(_messages.contributorTagMessages.externalAgentName);
+  }
+  return '';
+};
+
+/**
+ * Whether the label has to spell out that the contributor is an agent. A sighted user reads that off
+ * the `aria-hidden` avatar, so the label is the only other carrier.
+ *
+ * Excluded: a connected pair, which says it via `changedByConnected`, and an unnamed external agent,
+ * whose name `getContributorName` has already resolved to "External agent".
+ */
+var isUnaccompaniedNamedAgent = function isUnaccompaniedNamedAgent(model) {
+  var _model$contributor$na;
+  return !model.connectedContributor && model.contributor.kind === 'agent' && Boolean((_model$contributor$na = model.contributor.name) === null || _model$contributor$na === void 0 ? void 0 : _model$contributor$na.trim());
+};
+/**
+ * The two strings a tag's model resolves to. Shared with `getActiveDiffAnnouncement`, so stepping
+ * onto a change says the same sentence as the tag pinned to it rather than a copy free to drift.
+ */
+var formatContributorLabel = exports.formatContributorLabel = function formatContributorLabel(model, formatMessage) {
+  var isPrimaryAgent = model.contributor.kind === 'agent';
+  var primaryName = getContributorName(model.contributor, formatMessage);
+  var secondaryName = model.connectedContributor ? getContributorName(model.connectedContributor, formatMessage) : '';
+  var agentName = isPrimaryAgent ? primaryName : secondaryName;
+  var userName = isPrimaryAgent ? secondaryName : primaryName;
+  return {
+    fullLabel: model.connectedContributor ? formatMessage(_messages.contributorTagMessages.changedByConnected, {
+      agentName: agentName,
+      userName: userName
+    }) : formatMessage(isUnaccompaniedNamedAgent(model) ? _messages.contributorTagMessages.changedByAgent : _messages.contributorTagMessages.changedBy, {
+      name: primaryName
+    }),
+    // A connected pair only ever shows the agent; the pair is spelled out in `fullLabel`, because
+    // the tag is capped at `MAX_TAG_WIDTH` and two names rarely fit inside it.
+    visibleName: model.connectedContributor ? agentName || primaryName : primaryName
+  };
+};

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

@@ -15,22 +15,7 @@ var _factory = require("../../pm-plugins/decorations/colorSchemes/factory");
 var _schemes = require("../../pm-plugins/decorations/colorSchemes/schemes");
 var _buildContributorTagDom = require("./buildContributorTagDom");
 var _contributorAvatarRenderer = require("./contributorAvatarRenderer");
-var _messages = require("./messages");
-var getContributorName = function getContributorName(contributor, formatMessage) {
-  var _contributor$name, _contributor$agentKin;
-  var 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(_messages.contributorTagMessages.externalAgentName);
-  }
-  return '';
-};
-
+var _contributorLabel = require("./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.
@@ -113,8 +98,8 @@ var fadeTagOut = function fadeTagOut(tag, release) {
 /** The contributors a tag draws, keyed so a republished model can be recognised as the same pair. */
 var identityOf = function identityOf(model) {
   return [model === null || model === void 0 ? void 0 : model.contributor, model === null || model === void 0 ? void 0 : model.connectedContributor].map(function (contributor) {
-    var _contributor$agentKin2, _contributor$avatarUr;
-    return contributor ? "".concat(contributor.kind, ":").concat((_contributor$agentKin2 = contributor.agentKind) !== null && _contributor$agentKin2 !== void 0 ? _contributor$agentKin2 : '', ":").concat(contributor.name, ":").concat((_contributor$avatarUr = contributor.avatarUrl) !== null && _contributor$avatarUr !== void 0 ? _contributor$avatarUr : '') : '';
+    var _contributor$agentKin, _contributor$avatarUr;
+    return contributor ? "".concat(contributor.kind, ":").concat((_contributor$agentKin = contributor.agentKind) !== null && _contributor$agentKin !== void 0 ? _contributor$agentKin : '', ":").concat(contributor.name, ":").concat((_contributor$avatarUr = contributor.avatarUrl) !== null && _contributor$avatarUr !== void 0 ? _contributor$avatarUr : '') : '';
   }).join('|');
 };
 
@@ -355,24 +340,12 @@ var ContributorTagController = exports.ContributorTagController = /*#__PURE__*/f
       if (!this.dom) {
         return;
       }
-      var _this$options$getIntl = this.options.getIntl(),
-        formatMessage = _this$options$getIntl.formatMessage;
-      var isPrimaryAgent = model.contributor.kind === 'agent';
-      var primaryName = getContributorName(model.contributor, formatMessage);
-      var secondaryName = model.connectedContributor ? getContributorName(model.connectedContributor, formatMessage) : '';
-      var agentName = isPrimaryAgent ? primaryName : secondaryName;
-      var 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(_messages.contributorTagMessages.changedByConnected, {
-        agentName: agentName,
-        userName: userName
-      }) : formatMessage(_messages.contributorTagMessages.changedBy, {
-        name: primaryName
-      });
-      this.dom.srLabel.textContent = this.fullLabel;
+      var _formatContributorLab = (0, _contributorLabel.formatContributorLabel)(model, this.options.getIntl().formatMessage),
+        fullLabel = _formatContributorLab.fullLabel,
+        visibleName = _formatContributorLab.visibleName;
+      this.dom.name.textContent = visibleName;
+      this.fullLabel = fullLabel;
+      this.dom.srLabel.textContent = fullLabel;
     }
   }, {
     key: "accentOf",
@@ -438,15 +411,39 @@ var ContributorTagController = exports.ContributorTagController = /*#__PURE__*/f
       if (!content || !this.dom) {
         return;
       }
-      this.tooltip = new _vanillaTooltip.VanillaTooltip(this.dom.tag, content, undefined,
-      // `ak-editor-vanilla-tooltip-default` opts into the shared `VanillaTooltip` look, defined as
-      // `vanillaTooltipDefaultStyles` in both EditorContentContainer stylesheets — keep in sync when
-      // renaming. Those styles are scoped under `.ProseMirror`, and the tag renders inside it.
-      'ak-editor-vanilla-tooltip-default');
+      this.tooltip = new _vanillaTooltip.VanillaTooltip(this.dom.tag, content,
+      // Generated id.
+      undefined,
+      // No class: the look is inline, because a hoisted tooltip is outside the `.ProseMirror`
+      // scope `VANILLA_TOOLTIP_DEFAULT_CLASS` is keyed on — see `CONTRIBUTOR_TAG_TOOLTIP_STYLES`.
+      '',
+      // Default delay, no `onShow`, and the default `top` placement.
+      undefined, _buildContributorTagDom.CONTRIBUTOR_TAG_TOOLTIP_STYLES, undefined, undefined, this.resolveTooltipContainer());
       // `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');
+      // Out of the tag but still in the document, so its text would otherwise 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.tooltip.element.setAttribute('aria-hidden', 'true');
+    }
+
+    /**
+     * Where the tooltip is appended, rather than inside the tag.
+     *
+     * Popper and the browser only agree on a top-layer popover's origin when nothing above it is
+     * transformed, and the tag hangs under the editor's own transformed nodes — inside a wide image
+     * that is `.rich-media-item`, whose `translateX(-50%)` threw the tooltip off screen
+     * (EDITOR-8971). The content area is the nearest ancestor with none of that above it, and keeps
+     * the tooltip inside the editor it belongs to; the document body covers an appearance that has
+     * no content area.
+     */
+  }, {
+    key: "resolveTooltipContainer",
+    value: function resolveTooltipContainer() {
+      var _editorRoot$closest;
+      var editorRoot = this.options.getEditorRoot();
+      return (_editorRoot$closest = editorRoot === null || editorRoot === void 0 ? void 0 : editorRoot.closest('.ak-editor-content-area')) !== null && _editorRoot$closest !== void 0 ? _editorRoot$closest : editorRoot === null || editorRoot === void 0 ? void 0 : editorRoot.ownerDocument.body;
     }
 
     /**

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

@@ -11,6 +11,11 @@ var contributorTagMessages = exports.contributorTagMessages = (0, _reactIntl.def
     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/cjs/ui/DiffNavigation/announceActiveDiff.js

@@ -0,0 +1,54 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getActiveDiffAnnouncement = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _decorationKeys = require("../../pm-plugins/decorations/decorationKeys");
+var _contributorLabel = require("../ContributorTag/contributorLabel");
+var _messages = require("./messages");
+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; }
+/**
+ * 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.
+ */
+var findTagFor = function findTagFor(decoration, contributorTags) {
+  if (!(contributorTags !== null && contributorTags !== void 0 && contributorTags.length) || !(0, _decorationKeys.isDiffDecoration)(decoration)) {
+    return undefined;
+  }
+  var diffId = decoration.spec.diffId;
+  return contributorTags.find(function (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".
+ */
+var getActiveDiffAnnouncement = exports.getActiveDiffAnnouncement = function getActiveDiffAnnouncement(_ref) {
+  var activeIndex = _ref.activeIndex,
+    contributorTags = _ref.contributorTags,
+    decorations = _ref.decorations,
+    intl = _ref.intl;
+  var activeDecoration = decorations[activeIndex];
+  if (!activeDecoration) {
+    return undefined;
+  }
+  var position = {
+    index: activeIndex + 1,
+    total: decorations.length
+  };
+  var tag = findTagFor(activeDecoration, contributorTags);
+  return tag ? intl.formatMessage(_messages.diffNavigationMessages.activeChangeWithContributor, _objectSpread(_objectSpread({}, position), {}, {
+    contributor: (0, _contributorLabel.formatContributorLabel)(tag, intl.formatMessage).fullLabel
+  })) : intl.formatMessage(_messages.diffNavigationMessages.activeChange, position);
+};

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

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.diffNavigationMessages = void 0;
+var _reactIntl = require("react-intl");
+var diffNavigationMessages = exports.diffNavigationMessages = (0, _reactIntl.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/es2019/pm-plugins/calculateDiff/calculateDiffDecorations.js

@@ -17,6 +17,7 @@ import { extractDiffDescriptors } from '../decorations/decorationKeys';
 import { extractContributorTags } from '../decorations/extractContributorTags';
 import { getAttrChangeRanges, stepIsValidAttrChange } from '../decorations/utils/getAttrChangeRanges';
 import { getMarkChangeRanges } from '../decorations/utils/getMarkChangeRanges';
+import { getScrollableDecorations } from '../getScrollableDecorations';
 import { getDefaultDiffType, isExtendedEnabled } from '../isExtendedEnabled';
 import { diffBySteps } from './diffBySteps';
 import { groupChangesByBlock } from './groupChangesByBlock';
@@ -316,11 +317,12 @@ const calculateDiffDecorationsInner = ({
   }
   const pendingAttrSteps = [];
   const stepMaps = [];
-  for (const step of simplifiedSteps) {
+  for (const [stepIndex, step] of simplifiedSteps.entries()) {
     const 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,
@@ -335,6 +337,7 @@ const calculateDiffDecorationsInner = ({
   // The fallback deliberately preserves the legacy raw-position lookups for rollout safety.
   const attrStepContexts = fg('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(({
     afterNode,
+    attributionKey,
     beforeNode,
     mapIndex,
     step
@@ -345,6 +348,7 @@ const calculateDiffDecorationsInner = ({
     }
     const originalPosition = new Mapping(stepMaps.slice(0, mapIndex)).invert().mapResult(step.pos);
     return [{
+      attributionKey,
       afterNode,
       beforeNode,
       finalPos: finalPosition.pos,
@@ -354,8 +358,10 @@ const calculateDiffDecorationsInner = ({
       step
     }];
   }) : pendingAttrSteps.map(({
+    attributionKey,
     step
   }) => ({
+    attributionKey,
     afterNode: tr.doc.nodeAt(step.pos),
     beforeNode: originalDoc.nodeAt(step.pos),
     finalPos: step.pos,
@@ -608,31 +614,48 @@ const calculateDiffDecorationsInner = ({
   // 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(({
+  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(({
     fromB,
     toB
   }) => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
+    var _attributionColors$ge, _attributionColors;
+    const 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;
+    const attributionKey = showContributorTags ? change.attributionKey : undefined;
     const isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
     decorations.push(...createInlineChangedDecoration({
+      attributionKey,
       change,
-      colorScheme,
+      colorScheme: changeColorScheme,
+      doc: tr.doc,
       diffType,
       isActive,
       isInserted: true,
-      reveal
+      reveal,
+      showContributorTags,
+      tagMountContext
     }));
   });
-  getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).forEach(change => {
+  getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).filter(({
+    fromB,
+    toB
+  }) => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
+    var _attributionColors$ge2, _attributionColors2;
+    const 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;
+    const 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
       const isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
       decorations.push(...createInlineChangedDecoration({
+        attributionKey,
         change,
-        colorScheme,
+        colorScheme: changeColorScheme,
+        doc: tr.doc,
         isActive,
         isInserted: true,
         isAtomicInlineNode: true,
         inlineNodeName: change.inlineNodeName,
+        showContributorTags,
+        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,
@@ -650,12 +673,15 @@ const calculateDiffDecorationsInner = ({
             deleted: []
           },
           doc: originalDoc,
+          attributionKey,
           nodeViewSerializer,
-          colorScheme,
+          colorScheme: changeColorScheme,
           newDoc: tr.doc,
           intl,
           activeIndexPos,
-          isInserted: false
+          isInserted: false,
+          showContributorTags,
+          tagMountContext
         }));
       }
     } else {
@@ -663,11 +689,14 @@ const calculateDiffDecorationsInner = ({
         doc: tr.doc,
         from: change.fromB,
         to: change.toB,
-        colorScheme,
+        attributionKey,
+        colorScheme: changeColorScheme,
         isInserted: true,
         activeIndexPos,
         intl,
-        showIndicators
+        showContributorTags,
+        showIndicators,
+        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.
@@ -684,7 +713,8 @@ const calculateDiffDecorationsInner = ({
           },
           doc: originalDoc,
           nodeViewSerializer,
-          colorScheme,
+          attributionKey,
+          colorScheme: changeColorScheme,
           newDoc: tr.doc,
           intl,
           activeIndexPos,
@@ -694,14 +724,19 @@ const calculateDiffDecorationsInner = ({
             hideAddedDiffsUnderline,
             placeBelow
           }),
-          showIndicators
+          showIndicators,
+          showContributorTags,
+          tagMountContext
         }));
       }
     }
   });
   const decorationSet = DecorationSet.empty.add(tr.doc, decorations);
   return {
-    contributorTags: showContributorTags ? extractContributorTags(decorationSet, contributors) : [],
+    contributorTags: showContributorTags ? extractContributorTags(decorationSet, contributors, activeIndexPos,
+    // The stops the step buttons walk, so a stop cannot hold a second tag for one
+    // contributor that navigation can never reach.
+    getScrollableDecorations(decorationSet, tr.doc, diffType)) : [],
     decorations: decorationSet,
     diffDescriptors: extractDiffDescriptors(decorationSet)
   };