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

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 16.0.2
+
+### Patch Changes
+
+- [`44acf8971ef0e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/44acf8971ef0e) -
+  Preserve contributor attribution for attribute-only diff decorations so they use the correct
+  colour and contributor tags.
+- [`683c1a024bcb3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/683c1a024bcb3) -
+  Improve the accessibility of contributor diff tags, behind the
+  `confluence_ncs_step_diffing_version_history` gate. A tag now announces its contributor once
+  rather than three times over, names itself through `aria-labelledby` so it is no longer a focus
+  stop without an accessible name, says in its label when the contributor is an AI agent, and draws
+  an inset focus ring that reads against every accent fill.
+
+  Stepping to the next or previous change now announces the reader's position in the diff and who
+  made the change, through the editor's shared live region. Behind the
+  `platform_editor_diff_plugin_extended` experiment.
+
+- Updated dependencies
+
 ## 16.0.1
 
 ### Patch Changes

package/afm-products/tsconfig.json

@@ -26,6 +26,9 @@
 		{
 			"path": "../../custom-steps/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../editor-plugin-accessibility-utils/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../editor-plugin-analytics/afm-products/tsconfig.json"
 		},

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

@@ -344,15 +344,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 = (0, _slicedToArray2.default)(_step.value, 2),
+        stepIndex = _step$value[0],
+        step = _step$value[1];
       var result = step.apply(steppedDoc);
       if (result.failed === null && result.doc) {
         if ((0, _getAttrChangeRanges.stepIsValidAttrChange)(step, steppedDoc, result.doc)) {
           pendingAttrSteps.push({
+            attributionKey: (0, _attributions.getAttributionKey)(simplifiedStepAttributions[stepIndex]),
             afterNode: result.doc.nodeAt(step.pos),
             beforeNode: steppedDoc.nodeAt(step.pos),
             mapIndex: stepMaps.length,
@@ -372,6 +375,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   }
   var attrStepContexts = (0, _fg.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;
@@ -381,6 +385,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     }
     var originalPosition = new _transform.Mapping(stepMaps.slice(0, mapIndex)).invert().mapResult(step.pos);
     return [_objectSpread(_objectSpread({
+      attributionKey: attributionKey,
       afterNode: afterNode,
       beforeNode: beforeNode,
       finalPos: finalPosition.pos
@@ -390,8 +395,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,
@@ -656,34 +663,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.
-  (0, _getMarkChangeRanges.getMarkChangeRanges)(steps).filter(function (_ref11) {
+  (0, _getMarkChangeRanges.getMarkChangeRanges)(simplifiedSteps, simplifiedStepAttributions, (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref11) {
     var fromB = _ref11.fromB,
       toB = _ref11.toB;
     return !(0, _fg.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, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.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
     })));
   });
-  (0, _getAttrChangeRanges.getAttrChangeRanges)(tr.doc, attrStepContexts, originalDoc).forEach(function (change) {
+  (0, _getAttrChangeRanges.getAttrChangeRanges)(tr.doc, attrStepContexts, originalDoc).filter(function (_ref12) {
+    var fromB = _ref12.fromB,
+      toB = _ref12.toB;
+    return !(0, _fg.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, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.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,
@@ -701,12 +728,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 {
@@ -714,11 +744,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.
@@ -735,7 +768,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           },
           doc: originalDoc,
           nodeViewSerializer: nodeViewSerializer,
-          colorScheme: colorScheme,
+          attributionKey: attributionKey,
+          colorScheme: changeColorScheme,
           newDoc: tr.doc,
           intl: intl,
           activeIndexPos: activeIndexPos,
@@ -745,7 +779,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
           placeBelow: placeBelow
         }), {}, {
-          showIndicators: showIndicators
+          showIndicators: showIndicators,
+          showContributorTags: showContributorTags,
+          tagMountContext: tagMountContext
         }))));
       }
     }
@@ -760,49 +796,49 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(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 = (0, _slicedToArray2.default)(_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 = (0, _slicedToArray2.default)(_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 = (0, _slicedToArray2.default)(_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 ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    var _ref16;
-    return (_ref16 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
+    var _ref17;
+    return (_ref17 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
     // Contributors can arrive after the first calculation; without this, tags never appear.
     (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement &&
     // 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.
-    (0, _isEqual.default)(reveal, lastReveal)) !== null && _ref16 !== void 0 ? _ref16 : false;
+    (0, _isEqual.default)(reveal, lastReveal)) !== null && _ref17 !== void 0 ? _ref17 : false;
   }
-  return (_ref17 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref17 !== void 0 ? _ref17 : false;
+  return (_ref18 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref18 !== void 0 ? _ref18 : false;
 });

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

@@ -66,6 +66,7 @@ var getStepAttrs = function getStepAttrs(step) {
 var getAttrChangeRanges = exports.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,
@@ -93,7 +94,9 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
         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,
@@ -110,10 +113,12 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     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
@@ -123,7 +128,9 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     if (attrsToCheck.some(function (v) {
       return panelAttrs.includes(v);
     }) && nodeAtPos && (0, _nodeTypeUtils.getBaseNodeTypeName)(nodeAtPos.type) === 'panel') {
-      return _objectSpread({
+      return _objectSpread(_objectSpread({}, attributionKey ? {
+        attributionKey: attributionKey
+      } : {}), {}, {
         fromB: finalPos,
         toB: finalPos + nodeAtPos.nodeSize
       }, originalPos !== undefined && originalNodeAtPos && {
@@ -141,11 +148,13 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
         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
@@ -153,10 +162,12 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
       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/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

@@ -132,6 +132,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 +164,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
+  };
+};