@atlaskit/editor-plugin-show-diff 14.0.4 → 14.1.0

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

@@ -1,10 +1,13 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(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; }
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
-
+import { getAttributionKey } from '../decorations/colorSchemes/attributions';
 /**
  * Attempts to merge two consecutive ReplaceStep operations.
  * This merges steps where:
@@ -46,21 +49,67 @@ export function simplifySteps(steps, originalDoc) {
     return acc;
   }, []);
 }
+var mergeAttributions = function mergeAttributions(first, second) {
+  var _second$wasOffline;
+  if (!first) {
+    return second;
+  }
+  if (!second) {
+    return first;
+  }
+  return _objectSpread(_objectSpread(_objectSpread({}, first), second), {}, {
+    wasOffline: first.wasOffline === true || second.wasOffline === true ? true : (_second$wasOffline = second.wasOffline) !== null && _second$wasOffline !== void 0 ? _second$wasOffline : first.wasOffline
+  });
+};
+
+/**
+ * Attribution-preserving variant of `simplifySteps`.
+ *
+ * Steps may only merge when they have the same effective actor identity. Keeping the attribution
+ * coupled to the step also ensures filtering a no-op/analytics step cannot shift array indexes.
+ */
+export function simplifyStepsWithAttribution(steps, stepAttributions, originalDoc) {
+  var stepsToFilter = removeUnusedAttributedSteps(steps.map(function (step, index) {
+    return {
+      step: step,
+      stepAttribution: stepAttributions[index]
+    };
+  }), originalDoc);
+  return stepsToFilter.filter(function (_ref) {
+    var step = _ref.step;
+    return !(step instanceof AnalyticsStep);
+  }).reduce(function (acc, current) {
+    var _previous$step$merge, _previous$step$merge2, _previous$step;
+    var previous = acc[acc.length - 1];
+    var isSameIdentity = previous && getAttributionKey(previous.stepAttribution) === getAttributionKey(current.stepAttribution);
+    var merged = isSameIdentity ? (_previous$step$merge = (_previous$step$merge2 = (_previous$step = previous.step).merge) === null || _previous$step$merge2 === void 0 ? void 0 : _previous$step$merge2.call(_previous$step, current.step)) !== null && _previous$step$merge !== void 0 ? _previous$step$merge : mergeReplaceSteps(previous.step, current.step) : null;
+    if (merged) {
+      acc[acc.length - 1] = {
+        step: merged,
+        stepAttribution: mergeAttributions(previous.stepAttribution, current.stepAttribution)
+      };
+    } else {
+      acc.push(current);
+    }
+    return acc;
+  }, []);
+}
 
 /**
  * Does a first pass to remove steps that don't impact the document
  */
-function removeUnusedSteps(steps, originalDoc) {
+function removeUnusedAttributedSteps(stepsWithAttribution, originalDoc) {
   var finalSteps = [];
   var firstPassDoc = originalDoc;
-  var _iterator = _createForOfIteratorHelper(steps),
+  var _iterator = _createForOfIteratorHelper(stepsWithAttribution),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var step = _step.value;
+      var stepWithAttribution = _step.value;
+      var step = stepWithAttribution.step;
       var result = step.apply(firstPassDoc);
       if (result.failed === null && result.doc && !areNodesEqualIgnoreAttrs(firstPassDoc, result.doc, ['localId'])) {
-        finalSteps.push(step);
+        finalSteps.push(stepWithAttribution);
         firstPassDoc = result.doc;
       }
     }
@@ -70,4 +119,29 @@ function removeUnusedSteps(steps, originalDoc) {
     _iterator.f();
   }
   return finalSteps;
+}
+
+/**
+ * Does a first pass to remove steps that don't impact the document
+ */
+function removeUnusedSteps(steps, originalDoc) {
+  var finalSteps = [];
+  var firstPassDoc = originalDoc;
+  var _iterator2 = _createForOfIteratorHelper(steps),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var step = _step2.value;
+      var result = step.apply(firstPassDoc);
+      if (result.failed === null && result.doc && !areNodesEqualIgnoreAttrs(firstPassDoc, result.doc, ['localId'])) {
+        finalSteps.push(step);
+        firstPassDoc = result.doc;
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return finalSteps;
 }

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

@@ -0,0 +1,61 @@
+import _typeof from "@babel/runtime/helpers/typeof";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+var ATTRIBUTION_COLOR_PALETTE = ['purple', 'blue', 'teal', 'magenta', 'orange', 'green'];
+
+/** `userId` is primary; `agentId`, or `agentType` as its fallback, separates shared users. */
+export var getAttributionKey = function getAttributionKey(attribution) {
+  var _attribution$userId, _attribution$agentId, _attribution$agentTyp;
+  var userId = attribution === null || attribution === void 0 || (_attribution$userId = attribution.userId) === null || _attribution$userId === void 0 ? void 0 : _attribution$userId.trim();
+  var agentId = attribution === null || attribution === void 0 || (_attribution$agentId = attribution.agentId) === null || _attribution$agentId === void 0 ? void 0 : _attribution$agentId.trim();
+  var agentType = attribution === null || attribution === void 0 || (_attribution$agentTyp = attribution.agentType) === null || _attribution$agentTyp === void 0 ? void 0 : _attribution$agentTyp.trim();
+  if (!userId && !agentId && !agentType) {
+    return undefined;
+  }
+  var agentIdentity = agentId || (agentType ? "type:".concat(agentType) : '');
+  return "user:".concat(userId !== null && userId !== void 0 ? userId : '', "|agent:").concat(agentIdentity);
+};
+export var areAttributionColorGatesEnabled = function areAttributionColorGatesEnabled() {
+  return fg('confluence_ncs_step_diffing_version_history') && isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor');
+};
+export var isAttributionColoringEnabled = function isAttributionColoringEnabled(stepAttributions) {
+  return areAttributionColorGatesEnabled() && (stepAttributions === null || stepAttributions === void 0 ? void 0 : stepAttributions.some(function (attribution) {
+    return getAttributionKey(attribution) !== undefined;
+  })) === true;
+};
+export var createAttributionColorMap = function createAttributionColorMap(stepAttributions) {
+  var keys = Array.from(new Set(stepAttributions.map(getAttributionKey).filter(function (key) {
+    return key !== undefined;
+  }))).sort();
+  return new Map(keys.map(function (key, index) {
+    return [key, ATTRIBUTION_COLOR_PALETTE[index % ATTRIBUTION_COLOR_PALETTE.length]];
+  }));
+};
+var getLatestAttribution = function getLatestAttribution(changes) {
+  var data = changes.flatMap(function (change) {
+    return [].concat(_toConsumableArray(change.deleted), _toConsumableArray(change.inserted));
+  }).map(function (span) {
+    return span.data;
+  }).filter(function (value) {
+    return _typeof(value) === 'object' && value !== null && 'stepIndex' in value && typeof value.stepIndex === 'number';
+  });
+  return data.reduce(function (latest, attribution) {
+    return !latest || attribution.stepIndex > latest.stepIndex ? attribution : latest;
+  }, undefined);
+};
+var rangesOverlap = function rangesOverlap(fromA, toA, fromB, toB) {
+  return fromA < toB && fromB < toA;
+};
+var changesOverlap = function changesOverlap(change, attributedChange) {
+  var insertedOverlap = change.inserted.length > 0 && attributedChange.inserted.length > 0 && rangesOverlap(change.fromB, change.toB, attributedChange.fromB, attributedChange.toB);
+  var deletedOverlap = change.deleted.length > 0 && attributedChange.deleted.length > 0 && rangesOverlap(change.fromA, change.toA, attributedChange.fromA, attributedChange.toA);
+  return insertedOverlap || deletedOverlap;
+};
+export var getColorSchemeForChange = function getColorSchemeForChange(change, attributedChanges, attributionColors, fallback) {
+  var _attributionColors$ge;
+  var key = getAttributionKey(getLatestAttribution(attributedChanges.filter(function (attributedChange) {
+    return changesOverlap(change, attributedChange);
+  })));
+  return key ? (_attributionColors$ge = attributionColors.get(key)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : fallback : fallback;
+};

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

@@ -1,3 +1,6 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
 /** Green insertions, red deletions. */
 export var traditionalScheme = {
   insertColor: 'green',
@@ -52,9 +55,29 @@ export var standardScheme = {
   deletedQuoteNodeActiveTone: 'borderAccent',
   strikesDeletedEmbedCard: false
 };
+var createAttributionScheme = function createAttributionScheme(color) {
+  return _objectSpread(_objectSpread({}, standardScheme), {}, {
+    insertColor: color,
+    insertActiveColor: color,
+    deleteColor: color,
+    deleteActiveColor: color,
+    deletedCellColor: color
+  });
+};
 
-/** Maps the public ColorScheme string to its data object. Adding a scheme = one entry here. */
+/** Maps public schemes and attribution-only accents to their data objects. */
 export var colorSchemeRegistry = {
+  blue: createAttributionScheme('blue'),
+  green: createAttributionScheme('green'),
+  magenta: createAttributionScheme('magenta'),
+  orange: createAttributionScheme('orange'),
+  purple: createAttributionScheme('purple'),
+  teal: createAttributionScheme('teal'),
   traditional: traditionalScheme,
   standard: standardScheme
+};
+
+/** Attribution accents are impossible in the refactor-off cohort; fall back defensively. */
+export var getLegacyColorScheme = function getLegacyColorScheme(colorScheme) {
+  return colorScheme === 'standard' || colorScheme === 'traditional' ? colorScheme : undefined;
 };

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

@@ -0,0 +1 @@
+export {};

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

@@ -1,11 +1,14 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedBlockNodeStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildInsertedBlockNodeStyle } from './colorSchemes/factory';
-import { colorSchemeRegistry } from './colorSchemes/schemes';
+import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createBlockIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { buildDiffDecorationSpec } from './decorationKeys';
 import { getBlockNodeStyleLegacy, resolveCellOverlayStyleLegacy } from './createBlockChangedDecoration.styles.legacy';
@@ -98,7 +101,9 @@ var getBlockNodeStyleNext = function getBlockNodeStyleNext(_ref) {
  * same style strings for both shipped schemes; see EDITOR-8281.
  */
 var getBlockNodeStyle = function getBlockNodeStyle(props) {
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getBlockNodeStyleNext(props) : getBlockNodeStyleLegacy(props);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getBlockNodeStyleNext(props) : getBlockNodeStyleLegacy(_objectSpread(_objectSpread({}, props), {}, {
+    colorScheme: getLegacyColorScheme(props.colorScheme)
+  }));
 };
 
 /**
@@ -172,7 +177,7 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
     var isEmptyCellBeingFilled = !isInserted && !!cellNode && isCellEmpty(cellNode);
     var useAddedStyle = isInserted || isEmptyCellBeingFilled;
     var cellOverlayStyle = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? useAddedStyle ? isRoundedTable ? buildAddedCellOverlayRoundedStyle(colors) : buildAddedCellOverlayStyle(colors) : isRoundedTable ? buildDeletedCellOverlayRoundedStyle(colors) : buildDeletedCellOverlayStyle(colors) : resolveCellOverlayStyleLegacy({
-      colorScheme: colorScheme,
+      colorScheme: getLegacyColorScheme(colorScheme),
       isRoundedTable: isRoundedTable,
       useAddedStyle: useAddedStyle
     });

package/dist/esm/pm-plugins/decorations/createChangedRowDecorationWidgets.js

@@ -13,7 +13,7 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildDeletedRowStyle } from './colorSchemes/factory';
-import { colorSchemeRegistry } from './colorSchemes/schemes';
+import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { resolveCellOverlayStyleLegacy, resolveDeletedRowStyleLegacy } from './createChangedRowDecorationWidgets.styles.legacy';
 import { buildDiffDecorationSpec } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
@@ -134,7 +134,7 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
 
   // Inserted rows keep their natural styling; the row strikethrough is deletions only.
   if (!isExtendedEnabled(diffType) || !isInserted) {
-    tr.setAttribute('style', isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? buildDeletedRowStyle(colors) : resolveDeletedRowStyleLegacy(colorScheme));
+    tr.setAttribute('style', isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? buildDeletedRowStyle(colors) : resolveDeletedRowStyleLegacy(getLegacyColorScheme(colorScheme)));
   }
   tr.setAttribute('data-testid', 'show-diff-deleted-row');
 
@@ -150,7 +150,7 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
             var overlay = document.createElement('span');
             var isRoundedTable = expValEquals('platform_editor_table_diff_rounded_corners', 'isEnabled', true);
             var overlayStyle = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? isInserted ? isRoundedTable ? buildAddedCellOverlayRoundedStyle(colors) : buildAddedCellOverlayStyle(colors) : isRoundedTable ? buildDeletedCellOverlayRoundedStyle(colors) : buildDeletedCellOverlayStyle(colors) : resolveCellOverlayStyleLegacy({
-              colorScheme: colorScheme,
+              colorScheme: getLegacyColorScheme(colorScheme),
               isInserted: isInserted,
               isRoundedTable: isRoundedTable
             });

package/dist/esm/pm-plugins/decorations/createInlineChangedDecoration.js

@@ -7,7 +7,7 @@ import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAtomicInlineChangedCSSVariables, buildDeletedInlineContentStyleExtended, buildDeletedInlineStyle, buildDeletedInlineStyleStandard, buildInsertStyle, buildInsertStyleActive, buildInsertStyleExtended, buildInsertStyleExtendedActive, buildInsertStyleExtendedNoUnderline, buildInsertStyleExtendedNoUnderlineActive } from './colorSchemes/factory';
-import { colorSchemeRegistry } from './colorSchemes/schemes';
+import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createInlineIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { getAtomicInlineNodeClassNameLegacy, resolveInlineChangedStyleLegacy } from './createInlineChangedDecoration.styles.legacy';
 import { buildDiffDecorationSpec } from './decorationKeys';
@@ -70,7 +70,9 @@ var resolveInlineChangedStyleRefactored = function resolveInlineChangedStyleRefa
  * verbatim pre-refactor per-scheme constants when it is off.
  */
 var resolveInlineChangedStyle = function resolveInlineChangedStyle(args) {
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveInlineChangedStyleRefactored(args) : resolveInlineChangedStyleLegacy(args);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveInlineChangedStyleRefactored(args) : resolveInlineChangedStyleLegacy(_objectSpread(_objectSpread({}, args), {}, {
+    colorScheme: getLegacyColorScheme(args.colorScheme)
+  }));
 };
 
 /**
@@ -84,7 +86,7 @@ var resolveAtomicInlineAttrs = function resolveAtomicInlineAttrs(inlineNodeName,
     className: getAtomicInlineNodeClassName(inlineNodeName),
     styleSuffix: buildAtomicInlineChangedCSSVariables(colors)
   } : {
-    className: getAtomicInlineNodeClassNameLegacy(inlineNodeName, colorScheme),
+    className: getAtomicInlineNodeClassNameLegacy(inlineNodeName, getLegacyColorScheme(colorScheme)),
     styleSuffix: ''
   };
 };

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

@@ -1,3 +1,6 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
 /**
  * Style resolution for the `wrapBlockNodeView` nodeview decorations.
  *
@@ -14,7 +17,7 @@ import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-e
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildAddedCellOverlayStyleNew, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildDeletedInlineContentStyle, buildDeletedInlineContentStyleExtended, buildDeletedLozengeActiveStyle, buildDeletedLozengeStyle, buildDeletedNodeCSSVariables, buildDeletedQuoteNodeWithLozengeStyle, buildDeletedStrikethroughLine, buildDeletedWrappedBlockOutline, buildInsertedBlockNodeStyle, buildInsertedInlineStyle, buildInsertStyleInBlockExtended, buildInsertStyleInBlockExtendedNoUnderline, buildInsertStyleNode } from '../colorSchemes/factory';
-import { colorSchemeRegistry, standardScheme } from '../colorSchemes/schemes';
+import { colorSchemeRegistry, getLegacyColorScheme, standardScheme } from '../colorSchemes/schemes';
 import { getChangedContentStyleLegacy, getChangedNodeStyleLegacy, getDeletedContentStyleLegacy, getDeletedContentStyleUnboundedLegacy, getInsertedContentStyleLegacy, hasRestingDeletedRingLegacy, resolveCellOverlayStyleLegacy, resolveNestedInsertedNodeStyleLegacy, resolveRemovedLozengeStyleLegacy } from './wrapBlockNodeViewStyles.legacy';
 var DEFAULT_COLOR_SCHEME = 'standard';
 var getColorScheme = function getColorScheme(colorScheme) {
@@ -135,7 +138,7 @@ export var getChangedContentStyle = function getChangedContentStyle(colorScheme)
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var diffType = arguments.length > 3 ? arguments[3] : undefined;
   var hideAddedDiffsUnderline = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedContentStyleNext(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline) : getChangedContentStyleLegacy(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedContentStyleNext(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline) : getChangedContentStyleLegacy(getLegacyColorScheme(colorScheme), isActive, isInserted, diffType, hideAddedDiffsUnderline);
 };
 
 /** Node-specific style for a changed block node, or `undefined` when the node type has none. */
@@ -144,27 +147,27 @@ export var getChangedNodeStyle = function getChangedNodeStyle(nodeName, colorSch
   var isActive = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var diffType = arguments.length > 4 ? arguments[4] : undefined;
   var hideAddedDiffsUnderline = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedNodeStyleNext(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) : getChangedNodeStyleLegacy(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getChangedNodeStyleNext(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) : getChangedNodeStyleLegacy(nodeName, getLegacyColorScheme(colorScheme), isInserted, isActive, diffType, hideAddedDiffsUnderline);
 };
 
 /** The positioned line drawn across deleted content spanning an unbounded range. */
 export var getDeletedContentStyleUnbounded = function getDeletedContentStyleUnbounded(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleUnboundedNext(colorScheme, isActive) : getDeletedContentStyleUnboundedLegacy(colorScheme, isActive);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleUnboundedNext(colorScheme, isActive) : getDeletedContentStyleUnboundedLegacy(getLegacyColorScheme(colorScheme), isActive);
 };
 
 /** Inline style for inserted content. */
 export var getInsertedContentStyle = function getInsertedContentStyle(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var hideAddedDiffsUnderline = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getInsertedContentStyleNext(colorScheme, isActive, hideAddedDiffsUnderline) : getInsertedContentStyleLegacy(colorScheme, isActive, hideAddedDiffsUnderline);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getInsertedContentStyleNext(colorScheme, isActive, hideAddedDiffsUnderline) : getInsertedContentStyleLegacy(getLegacyColorScheme(colorScheme), isActive, hideAddedDiffsUnderline);
 };
 
 /** Inline style for deleted content. */
 export var getDeletedContentStyle = function getDeletedContentStyle(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var diffType = arguments.length > 2 ? arguments[2] : undefined;
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, diffType) : getDeletedContentStyleLegacy(colorScheme, isActive, diffType);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, diffType) : getDeletedContentStyleLegacy(getLegacyColorScheme(colorScheme), isActive, diffType);
 };
 
 /**
@@ -172,12 +175,14 @@ export var getDeletedContentStyle = function getDeletedContentStyle(colorScheme)
  * `querySelectorAll('td, th')` loop in `wrapBlockNodeView.ts` resolves it once.
  */
 export var resolveCellOverlayStyle = function resolveCellOverlayStyle(args) {
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveCellOverlayStyleNext(args) : resolveCellOverlayStyleLegacy(args);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveCellOverlayStyleNext(args) : resolveCellOverlayStyleLegacy(_objectSpread(_objectSpread({}, args), {}, {
+    colorScheme: getLegacyColorScheme(args.colorScheme)
+  }));
 };
 
 /** Inner style for the "Removed" lozenge on a deleted block node. */
 export var resolveRemovedLozengeStyle = function resolveRemovedLozengeStyle(colorScheme, isActive) {
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveRemovedLozengeStyleNext(colorScheme, isActive) : resolveRemovedLozengeStyleLegacy(colorScheme, isActive);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? resolveRemovedLozengeStyleNext(colorScheme, isActive) : resolveRemovedLozengeStyleLegacy(getLegacyColorScheme(colorScheme), isActive);
 };
 
 /**
@@ -194,7 +199,7 @@ export var resolveNestedInsertedNodeStyle = function resolveNestedInsertedNodeSt
  * is what the `show-diff-deleted-outline-new` class styles in editor-core's smartCardStyles.
  */
 export var hasRestingDeletedRing = function hasRestingDeletedRing(colorScheme) {
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? hasRestingDeletedRingNext(colorScheme) : hasRestingDeletedRingLegacy(colorScheme);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? hasRestingDeletedRingNext(colorScheme) : hasRestingDeletedRingLegacy(getLegacyColorScheme(colorScheme));
 };
 
 /**

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

@@ -30,6 +30,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
         var defaultDiffType = getDefaultDiffType();
         return _objectSpread({
           steps: [],
+          stepAttributions: [],
           originalDoc: undefined,
           decorations: DecorationSet.empty,
           isDisplayingChanges: false

package/dist/esm/showDiffPlugin.js

@@ -1,4 +1,6 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["stepsWithAttribution"];
 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) { _defineProperty(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; }
 import React from 'react';
@@ -7,9 +9,28 @@ import { getDeletedWidgets as _getDeletedWidgets } from './pm-plugins/getDeleted
 import { getScrollableDecorations } from './pm-plugins/getScrollableDecorations';
 import { createPlugin, showDiffPluginKey } from './pm-plugins/main';
 import { IndicatorBarContentComponent } from './ui/IndicatorBar/IndicatorBarContentComponent';
-export var showDiffPlugin = function showDiffPlugin(_ref) {
-  var api = _ref.api,
-    config = _ref.config;
+var normalizeShowDiffParams = function normalizeShowDiffParams(params) {
+  if (!params || !('stepsWithAttribution' in params)) {
+    return params ? _objectSpread(_objectSpread({}, params), {}, {
+      stepAttributions: []
+    }) : params;
+  }
+  var stepsWithAttribution = params.stepsWithAttribution,
+    rest = _objectWithoutProperties(params, _excluded);
+  return _objectSpread(_objectSpread({}, rest), {}, {
+    steps: stepsWithAttribution.map(function (_ref) {
+      var step = _ref.step;
+      return step;
+    }),
+    stepAttributions: stepsWithAttribution.map(function (_ref2) {
+      var stepAttribution = _ref2.stepAttribution;
+      return stepAttribution;
+    })
+  });
+};
+export var showDiffPlugin = function showDiffPlugin(_ref3) {
+  var api = _ref3.api,
+    config = _ref3.config;
   // Captured from the plugin's view lifecycle (see `createPlugin`) so read-only actions can access
   // the current state without exposing the plugin key to consumers.
   var editorView;
@@ -25,21 +46,21 @@ export var showDiffPlugin = function showDiffPlugin(_ref) {
     },
     commands: {
       showDiff: function showDiff(params) {
-        return function (_ref2) {
-          var tr = _ref2.tr;
+        return function (_ref4) {
+          var tr = _ref4.tr;
           if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
             var _api$userIntent;
             api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || _api$userIntent.commands.setCurrentUserIntent('viewingDiff')({
               tr: tr
             });
           }
-          return tr.setMeta(showDiffPluginKey, _objectSpread(_objectSpread({}, params), {}, {
+          return tr.setMeta(showDiffPluginKey, _objectSpread(_objectSpread({}, normalizeShowDiffParams(params)), {}, {
             action: 'SHOW_DIFF'
           }));
         };
       },
-      hideDiff: function hideDiff(_ref3) {
-        var tr = _ref3.tr;
+      hideDiff: function hideDiff(_ref5) {
+        var tr = _ref5.tr;
         if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
           var _api$userIntent2;
           api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || _api$userIntent2.commands.setCurrentUserIntent('default')({
@@ -48,17 +69,18 @@ export var showDiffPlugin = function showDiffPlugin(_ref) {
         }
         return tr.setMeta(showDiffPluginKey, {
           steps: [],
+          stepAttributions: [],
           action: 'HIDE_DIFF'
         });
       },
-      scrollToNext: function scrollToNext(_ref4) {
-        var tr = _ref4.tr;
+      scrollToNext: function scrollToNext(_ref6) {
+        var tr = _ref6.tr;
         return tr.setMeta(showDiffPluginKey, {
           action: 'SCROLL_TO_NEXT'
         });
       },
-      scrollToPrevious: function scrollToPrevious(_ref5) {
-        var tr = _ref5.tr;
+      scrollToPrevious: function scrollToPrevious(_ref7) {
+        var tr = _ref7.tr;
         return tr.setMeta(showDiffPluginKey, {
           action: 'SCROLL_TO_PREVIOUS'
         });
@@ -67,8 +89,8 @@ export var showDiffPlugin = function showDiffPlugin(_ref) {
     pmPlugins: function pmPlugins() {
       return [{
         name: 'showDiffPlugin',
-        plugin: function plugin(_ref6) {
-          var getIntl = _ref6.getIntl;
+        plugin: function plugin(_ref8) {
+          var getIntl = _ref8.getIntl;
           return createPlugin(config, getIntl, api, setEditorView);
         }
       }];

package/dist/types/entry-points/show-diff-plugin-type.d.ts

@@ -1 +1 @@
-export type { DeletedDiffPlacement, DeletedDiffWidget, DiffParams, DiffType, PMDiffParams, ShowDiffPlugin, SmartDiffThresholds, } from '../showDiffPluginType';
+export type { DeletedDiffPlacement, DeletedDiffWidget, DiffParams, DiffStepAttribution, DiffType, PMDiffParams, ShowDiffPlugin, SmartDiffThresholds, StepWithAttribution, } from '../showDiffPluginType';

package/dist/types/pm-plugins/calculateDiff/diffBySteps.d.ts

@@ -1,4 +1,5 @@
 import { type Change } from 'prosemirror-changeset';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Step } from '@atlaskit/editor-prosemirror/transform-override';
-export declare const diffBySteps: (originalDoc: PMNode, steps: Step[]) => Change[];
+import type { DiffStepAttribution } from '../../showDiffPluginType';
+export declare const diffBySteps: (originalDoc: PMNode, steps: Step[], stepAttributions?: Array<DiffStepAttribution | undefined>) => Change[];

package/dist/types/pm-plugins/calculateDiff/simplifyChangesWithAttribution.d.ts

@@ -0,0 +1,7 @@
+import { type Change } from 'prosemirror-changeset';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+/**
+ * Simplifies and optimizes consecutive changes without crossing an attribution boundary.
+ * A change which already contains more than one identity is deliberately kept isolated.
+ */
+export declare const simplifyChangesWithAttribution: (changes: readonly Change[], doc: PMNode) => Change[];

package/dist/types/pm-plugins/calculateDiff/simplifySteps.d.ts

@@ -1,3 +1,13 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform-override';
+import type { DiffStepAttribution, StepWithAttribution } from '../../showDiffPluginType';
+type ProseMirrorStepWithAttribution = StepWithAttribution<ProseMirrorStep>;
 export declare function simplifySteps(steps: ProseMirrorStep[], originalDoc: PMNode): ProseMirrorStep[];
+/**
+ * Attribution-preserving variant of `simplifySteps`.
+ *
+ * Steps may only merge when they have the same effective actor identity. Keeping the attribution
+ * coupled to the step also ensures filtering a no-op/analytics step cannot shift array indexes.
+ */
+export declare function simplifyStepsWithAttribution(steps: ProseMirrorStep[], stepAttributions: Array<DiffStepAttribution | undefined>, originalDoc: PMNode): ProseMirrorStepWithAttribution[];
+export {};

package/dist/types/pm-plugins/decorations/colorSchemes/attributions.d.ts

@@ -0,0 +1,12 @@
+import type { Change } from 'prosemirror-changeset';
+import type { ColorScheme as PublicColorScheme, DiffStepAttribution } from '../../../showDiffPluginType';
+import type { ColorScheme, DiffAccentColor } from './types';
+export type DiffAttributionSpanData = DiffStepAttribution & {
+    stepIndex: number;
+};
+/** `userId` is primary; `agentId`, or `agentType` as its fallback, separates shared users. */
+export declare const getAttributionKey: (attribution: DiffStepAttribution | undefined) => string | undefined;
+export declare const areAttributionColorGatesEnabled: () => boolean;
+export declare const isAttributionColoringEnabled: (stepAttributions: Array<DiffStepAttribution | undefined> | undefined) => boolean;
+export declare const createAttributionColorMap: (stepAttributions: Array<DiffStepAttribution | undefined>) => Map<string, DiffAccentColor>;
+export declare const getColorSchemeForChange: (change: Change, attributedChanges: Change[], attributionColors: Map<string, DiffAccentColor>, fallback: PublicColorScheme | undefined) => ColorScheme | undefined;

package/dist/types/pm-plugins/decorations/colorSchemes/schemes.d.ts

@@ -1,8 +1,10 @@
-import type { ColorScheme } from '../../../showDiffPluginType';
-import type { DiffColorScheme } from './types';
+import type { ColorScheme as PublicColorScheme } from '../../../showDiffPluginType';
+import type { ColorScheme, DiffColorScheme } from './types';
 /** Green insertions, red deletions. */
 export declare const traditionalScheme: DiffColorScheme;
 /** Purple insertions, gray deletions (red on active). */
 export declare const standardScheme: DiffColorScheme;
-/** Maps the public ColorScheme string to its data object. Adding a scheme = one entry here. */
+/** Maps public schemes and attribution-only accents to their data objects. */
 export declare const colorSchemeRegistry: Record<ColorScheme, DiffColorScheme>;
+/** Attribution accents are impossible in the refactor-off cohort; fall back defensively. */
+export declare const getLegacyColorScheme: (colorScheme: ColorScheme | undefined) => PublicColorScheme | undefined;

package/dist/types/pm-plugins/decorations/colorSchemes/types.d.ts

@@ -1,8 +1,13 @@
+import type { ColorScheme as PublicColorScheme } from '../../../showDiffPluginType';
+/** Attribution-only accents selected by the plugin, never by consumers. */
+export type DiffAccentColor = 'blue' | 'green' | 'magenta' | 'orange' | 'purple' | 'teal';
+/** A public scheme or an attribution accent resolved internally for one change. */
+export type ColorScheme = PublicColorScheme | DiffAccentColor;
 /**
  * ADS accent colours for which every token path used by `factory.ts` exists. Closed set, so
  * interpolating a colour name into a token path is compile-time safe.
  */
-export type AdsAccentColor = 'green' | 'teal' | 'blue' | 'purple' | 'red' | 'orange' | 'yellow' | 'magenta' | 'gray';
+export type AdsAccentColor = DiffAccentColor | 'red' | 'yellow' | 'gray';
 /**
  * A show-diff colour scheme. Colour fields are accent names that `factory.ts` expands into token
  * paths; the rest encode structural differences no colour can express. Ring widths, padding,

package/dist/types/pm-plugins/decorations/createBlockChangedDecoration.d.ts

@@ -1,6 +1,7 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import type { ColorScheme, DiffType } from '../../showDiffPluginType';
+import type { DiffType } from '../../showDiffPluginType';
+import type { ColorScheme } from './colorSchemes/types';
 /**
  * Node decoration used for block-level insertions. When isActive, uses emphasised (pressed) styling.
  *

package/dist/types/pm-plugins/decorations/createChangedRowDecorationWidgets.d.ts

@@ -1,8 +1,9 @@
 import type { Change } from 'prosemirror-changeset';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import type { ColorScheme, DiffType } from '../../showDiffPluginType';
+import type { DiffType } from '../../showDiffPluginType';
 import type { NodeViewSerializer } from '../NodeViewSerializer';
+import type { ColorScheme } from './colorSchemes/types';
 type SimpleChange = Pick<Change, 'fromA' | 'toA' | 'fromB' | 'deleted'>;
 /**
  * Main function to handle deleted rows - computes diff and creates decorations

package/dist/types/pm-plugins/decorations/createInlineChangedDecoration.d.ts

@@ -1,6 +1,7 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import type { ColorScheme, DiffType } from '../../showDiffPluginType';
+import type { DiffType } from '../../showDiffPluginType';
+import type { ColorScheme } from './colorSchemes/types';
 import type { InlineAttrChangeNodeName } from './utils/getAttrChangeRanges';
 /**
  * Inline decoration used for insertions as the content already exists in the document