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

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

@@ -1,16 +1,19 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveRemovedLozengeStyle = exports.resolveNestedInsertedNodeStyle = exports.resolveDeletedNodeCSSVariables = exports.resolveCellOverlayStyle = exports.isTextLikeBlockNode = exports.isMultiContainerBlockNode = exports.hasRestingDeletedRing = exports.getInsertedContentStyle = exports.getDeletedContentStyleUnbounded = exports.getDeletedContentStyle = exports.getChangedNodeStyle = exports.getChangedContentStyle = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _isExtendedEnabled = require("../../isExtendedEnabled");
 var _factory = require("../colorSchemes/factory");
 var _schemes = require("../colorSchemes/schemes");
 var _wrapBlockNodeViewStyles = require("./wrapBlockNodeViewStyles.legacy");
-/**
+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; } /**
  * Style resolution for the `wrapBlockNodeView` nodeview decorations.
  *
  * Every exported resolver is a single gate: the `colorSchemeRegistry` + `factory.ts`
@@ -22,7 +25,6 @@ var _wrapBlockNodeViewStyles = require("./wrapBlockNodeViewStyles.legacy");
  * On cleanup (EDITOR-8281): drop the `isExperimentEnabled` dispatch and the `*Legacy` imports,
  * keeping the `*Next` bodies.
  */
-
 var DEFAULT_COLOR_SCHEME = 'standard';
 var getColorScheme = function getColorScheme(colorScheme) {
   return _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
@@ -142,7 +144,7 @@ var getChangedContentStyle = exports.getChangedContentStyle = function getChange
   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 (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getChangedContentStyleNext(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getChangedContentStyleLegacy)(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getChangedContentStyleNext(colorScheme, isActive, isInserted, diffType, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getChangedContentStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme), isActive, isInserted, diffType, hideAddedDiffsUnderline);
 };
 
 /** Node-specific style for a changed block node, or `undefined` when the node type has none. */
@@ -151,27 +153,27 @@ var getChangedNodeStyle = exports.getChangedNodeStyle = function getChangedNodeS
   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 (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getChangedNodeStyleNext(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getChangedNodeStyleLegacy)(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getChangedNodeStyleNext(nodeName, colorScheme, isInserted, isActive, diffType, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getChangedNodeStyleLegacy)(nodeName, (0, _schemes.getLegacyColorScheme)(colorScheme), isInserted, isActive, diffType, hideAddedDiffsUnderline);
 };
 
 /** The positioned line drawn across deleted content spanning an unbounded range. */
 var getDeletedContentStyleUnbounded = exports.getDeletedContentStyleUnbounded = function getDeletedContentStyleUnbounded(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleUnboundedNext(colorScheme, isActive) : (0, _wrapBlockNodeViewStyles.getDeletedContentStyleUnboundedLegacy)(colorScheme, isActive);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleUnboundedNext(colorScheme, isActive) : (0, _wrapBlockNodeViewStyles.getDeletedContentStyleUnboundedLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme), isActive);
 };
 
 /** Inline style for inserted content. */
 var getInsertedContentStyle = exports.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 (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getInsertedContentStyleNext(colorScheme, isActive, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getInsertedContentStyleLegacy)(colorScheme, isActive, hideAddedDiffsUnderline);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getInsertedContentStyleNext(colorScheme, isActive, hideAddedDiffsUnderline) : (0, _wrapBlockNodeViewStyles.getInsertedContentStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme), isActive, hideAddedDiffsUnderline);
 };
 
 /** Inline style for deleted content. */
 var getDeletedContentStyle = exports.getDeletedContentStyle = function getDeletedContentStyle(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var diffType = arguments.length > 2 ? arguments[2] : undefined;
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, diffType) : (0, _wrapBlockNodeViewStyles.getDeletedContentStyleLegacy)(colorScheme, isActive, diffType);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getDeletedContentStyleNext(colorScheme, isActive, diffType) : (0, _wrapBlockNodeViewStyles.getDeletedContentStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme), isActive, diffType);
 };
 
 /**
@@ -179,12 +181,14 @@ var getDeletedContentStyle = exports.getDeletedContentStyle = function getDelete
  * `querySelectorAll('td, th')` loop in `wrapBlockNodeView.ts` resolves it once.
  */
 var resolveCellOverlayStyle = exports.resolveCellOverlayStyle = function resolveCellOverlayStyle(args) {
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? resolveCellOverlayStyleNext(args) : (0, _wrapBlockNodeViewStyles.resolveCellOverlayStyleLegacy)(args);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? resolveCellOverlayStyleNext(args) : (0, _wrapBlockNodeViewStyles.resolveCellOverlayStyleLegacy)(_objectSpread(_objectSpread({}, args), {}, {
+    colorScheme: (0, _schemes.getLegacyColorScheme)(args.colorScheme)
+  }));
 };
 
 /** Inner style for the "Removed" lozenge on a deleted block node. */
 var resolveRemovedLozengeStyle = exports.resolveRemovedLozengeStyle = function resolveRemovedLozengeStyle(colorScheme, isActive) {
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? resolveRemovedLozengeStyleNext(colorScheme, isActive) : (0, _wrapBlockNodeViewStyles.resolveRemovedLozengeStyleLegacy)(colorScheme, isActive);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? resolveRemovedLozengeStyleNext(colorScheme, isActive) : (0, _wrapBlockNodeViewStyles.resolveRemovedLozengeStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme), isActive);
 };
 
 /**
@@ -201,7 +205,7 @@ var resolveNestedInsertedNodeStyle = exports.resolveNestedInsertedNodeStyle = fu
  * is what the `show-diff-deleted-outline-new` class styles in editor-core's smartCardStyles.
  */
 var hasRestingDeletedRing = exports.hasRestingDeletedRing = function hasRestingDeletedRing(colorScheme) {
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? hasRestingDeletedRingNext(colorScheme) : (0, _wrapBlockNodeViewStyles.hasRestingDeletedRingLegacy)(colorScheme);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? hasRestingDeletedRingNext(colorScheme) : (0, _wrapBlockNodeViewStyles.hasRestingDeletedRingLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme));
 };
 
 /**

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

@@ -37,6 +37,7 @@ var createPlugin = exports.createPlugin = function createPlugin(config, getIntl,
         var defaultDiffType = (0, _isExtendedEnabled.getDefaultDiffType)();
         return _objectSpread({
           steps: [],
+          stepAttributions: [],
           originalDoc: undefined,
           decorations: _view.DecorationSet.empty,
           isDisplayingChanges: false

package/dist/cjs/showDiffPlugin.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.showDiffPlugin = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -12,11 +13,31 @@ var _getDeletedWidgets2 = require("./pm-plugins/getDeletedWidgets");
 var _getScrollableDecorations = require("./pm-plugins/getScrollableDecorations");
 var _main = require("./pm-plugins/main");
 var _IndicatorBarContentComponent = require("./ui/IndicatorBar/IndicatorBarContentComponent");
+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) { (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; }
-var showDiffPlugin = exports.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 = (0, _objectWithoutProperties2.default)(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;
+    })
+  });
+};
+var showDiffPlugin = exports.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;
@@ -32,21 +53,21 @@ var showDiffPlugin = exports.showDiffPlugin = function showDiffPlugin(_ref) {
     },
     commands: {
       showDiff: function showDiff(params) {
-        return function (_ref2) {
-          var tr = _ref2.tr;
+        return function (_ref4) {
+          var tr = _ref4.tr;
           if ((0, _expValEquals.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(_main.showDiffPluginKey, _objectSpread(_objectSpread({}, params), {}, {
+          return tr.setMeta(_main.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 ((0, _expValEquals.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')({
@@ -55,17 +76,18 @@ var showDiffPlugin = exports.showDiffPlugin = function showDiffPlugin(_ref) {
         }
         return tr.setMeta(_main.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(_main.showDiffPluginKey, {
           action: 'SCROLL_TO_NEXT'
         });
       },
-      scrollToPrevious: function scrollToPrevious(_ref5) {
-        var tr = _ref5.tr;
+      scrollToPrevious: function scrollToPrevious(_ref7) {
+        var tr = _ref7.tr;
         return tr.setMeta(_main.showDiffPluginKey, {
           action: 'SCROLL_TO_PREVIOUS'
         });
@@ -74,8 +96,8 @@ var showDiffPlugin = exports.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 (0, _main.createPlugin)(config, getIntl, api, setEditorView);
         }
       }];

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

@@ -3,6 +3,7 @@ import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
+import { Mapping } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -11,6 +12,7 @@ import { createDocMarginAnchorWidget } from '../decorations/createAnchorDecorati
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
 import { createInlineChangedDecoration } from '../decorations/createInlineChangedDecoration';
 import { createNodeChangedDecorationWidget } from '../decorations/createNodeChangedDecorationWidget';
+import { createAttributionColorMap, getAttributionKey, getColorSchemeForChange, isAttributionColoringEnabled } from '../decorations/colorSchemes/attributions';
 import { extractDiffDescriptors } from '../decorations/decorationKeys';
 import { getAttrChangeRanges, stepIsValidAttrChange } from '../decorations/utils/getAttrChangeRanges';
 import { getMarkChangeRanges } from '../decorations/utils/getMarkChangeRanges';
@@ -19,7 +21,8 @@ import { attrAwareTokenEncoder } from './attrAwareTokenEncoder';
 import { diffBySteps } from './diffBySteps';
 import { groupChangesByBlock } from './groupChangesByBlock';
 import { optimizeChanges } from './optimizeChanges';
-import { simplifySteps } from './simplifySteps';
+import { simplifyChangesWithAttribution } from './simplifyChangesWithAttribution';
+import { simplifySteps, simplifyStepsWithAttribution } from './simplifySteps';
 import { classifySmartChanges } from './smart/classifySmartChanges';
 import { smartChangeLevel } from './smart/helpers';
 const getChanges = ({
@@ -58,6 +61,35 @@ const getChanges = ({
   const changes = simplifyChanges(changeset.changes, tr.doc);
   return optimizeChanges(changes);
 };
+const getAttributedChanges = ({
+  attributedChanges,
+  changeset,
+  originalDoc,
+  steppedDoc,
+  diffType,
+  tr,
+  intl,
+  smartThresholds
+}) => {
+  if (isExtendedEnabled(diffType)) {
+    if (diffType === 'smart' && fg('platform_editor_ai_smart_diff')) {
+      return classifySmartChanges({
+        changes: simplifyChangesWithAttribution(attributedChanges, tr.doc),
+        originalDoc,
+        newDoc: tr.doc,
+        locale: intl.locale,
+        thresholds: smartThresholds
+      });
+    }
+    if (diffType === 'step') {
+      return attributedChanges;
+    }
+    if (diffType === 'block') {
+      return groupChangesByBlock(changeset.changes, originalDoc, steppedDoc);
+    }
+  }
+  return simplifyChangesWithAttribution(attributedChanges, tr.doc);
+};
 
 /**
  * Collect the inline-content ranges of every leaf text-bearing block (paragraph, heading, …)
@@ -206,6 +238,7 @@ const calculateDiffDecorationsInner = ({
   const {
     originalDoc,
     steps,
+    stepAttributions,
     isDisplayingChanges
   } = pluginState;
   if (!originalDoc || !isDisplayingChanges) {
@@ -222,19 +255,68 @@ const calculateDiffDecorationsInner = ({
     tr
   } = state;
   let steppedDoc = originalDoc;
-  const attrSteps = [];
-  const simplifiedSteps = simplifySteps(steps, originalDoc);
+  const attributionColoringEnabled = isAttributionColoringEnabled(stepAttributions);
+  let simplifiedSteps;
+  let simplifiedStepAttributions = [];
+  if (attributionColoringEnabled) {
+    const simplifiedStepsWithAttribution = simplifyStepsWithAttribution(steps, stepAttributions !== null && stepAttributions !== void 0 ? stepAttributions : [], originalDoc);
+    simplifiedSteps = simplifiedStepsWithAttribution.map(({
+      step
+    }) => step);
+    simplifiedStepAttributions = simplifiedStepsWithAttribution.map(({
+      stepAttribution
+    }) => stepAttribution);
+  } else {
+    simplifiedSteps = simplifySteps(steps, originalDoc);
+  }
+  const pendingAttrSteps = [];
   const stepMaps = [];
   for (const step of simplifiedSteps) {
     const result = step.apply(steppedDoc);
     if (result.failed === null && result.doc) {
       if (stepIsValidAttrChange(step, steppedDoc, result.doc)) {
-        attrSteps.push(step);
+        pendingAttrSteps.push({
+          afterNode: result.doc.nodeAt(step.pos),
+          beforeNode: steppedDoc.nodeAt(step.pos),
+          mapIndex: stepMaps.length,
+          step
+        });
       }
       stepMaps.push(step.getMap());
       steppedDoc = result.doc;
     }
   }
+  // Gate the complete attribution fix: mapped positions and step-time nodes are used together.
+  // The fallback deliberately preserves the legacy raw-position lookups for rollout safety.
+  const attrStepContexts = fg('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(({
+    afterNode,
+    beforeNode,
+    mapIndex,
+    step
+  }) => {
+    const finalPosition = new Mapping(stepMaps.slice(mapIndex + 1)).mapResult(step.pos);
+    if (finalPosition.deleted) {
+      return [];
+    }
+    const originalPosition = new Mapping(stepMaps.slice(0, mapIndex)).invert().mapResult(step.pos);
+    return [{
+      afterNode,
+      beforeNode,
+      finalPos: finalPosition.pos,
+      ...(originalPosition.deleted ? {} : {
+        originalPos: originalPosition.pos
+      }),
+      step
+    }];
+  }) : pendingAttrSteps.map(({
+    step
+  }) => ({
+    afterNode: tr.doc.nodeAt(step.pos),
+    beforeNode: originalDoc.nodeAt(step.pos),
+    finalPos: step.pos,
+    originalPos: step.pos,
+    step
+  }));
 
   // Rather than using .eq() we use a custom function that only checks for structural
   // changes and ignores differences in attributes which don't affect decoration positions
@@ -262,17 +344,42 @@ const calculateDiffDecorationsInner = ({
   // gated with it; other diff types keep the library default so their output is
   // unchanged.
   const tokenEncoder = diffType === 'smart' && fg('platform_editor_ai_smart_diff') ? attrAwareTokenEncoder : undefined;
-  const changeset = ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
-  const changes = getChanges({
-    changeset,
-    originalDoc,
-    steppedDoc,
-    diffType,
-    tr,
-    steps,
-    intl,
-    smartThresholds
-  });
+  let changes;
+  let attributedChanges = [];
+  let attributionColors;
+  if (attributionColoringEnabled) {
+    const changeset = ChangeSet.create(originalDoc, (left, right) => getAttributionKey(left) === getAttributionKey(right) ? left.stepIndex > right.stepIndex ? left : right :
+    // `prosemirror-changeset` uses null as its incompatible-data sentinel even
+    // though its public combine callback is typed as returning Data.
+    null, tokenEncoder).addSteps(steppedDoc, stepMaps, simplifiedStepAttributions.map((attribution, stepIndex) => ({
+      ...attribution,
+      stepIndex
+    })));
+    attributedChanges = diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions);
+    changes = getAttributedChanges({
+      changeset,
+      originalDoc,
+      steppedDoc,
+      diffType,
+      tr,
+      attributedChanges,
+      intl,
+      smartThresholds
+    });
+    attributionColors = createAttributionColorMap(simplifiedStepAttributions);
+  } else {
+    const changeset = ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
+    changes = getChanges({
+      changeset,
+      originalDoc,
+      steppedDoc,
+      diffType,
+      tr,
+      steps: simplifiedSteps,
+      intl,
+      smartThresholds
+    });
+  }
   const decorations = [];
 
   /**
@@ -285,6 +392,7 @@ const calculateDiffDecorationsInner = ({
   // Our default operations are insertions, so it should match the opposite of isInverted.
   const isInserted = !isInverted;
   const createDecorationsForChange = change => {
+    const changeColorScheme = attributionColors ? getColorSchemeForChange(change, attributedChanges, attributionColors, colorScheme) : colorScheme;
     const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
 
     // Hoisted because it decides BOTH where the deleted widget is anchored and — since the
@@ -333,7 +441,7 @@ const calculateDiffDecorationsInner = ({
               toB: to
             },
             doc: tr.doc,
-            colorScheme,
+            colorScheme: changeColorScheme,
             isActive,
             diffType,
             ...(isExtendedEnabled(diffType) && {
@@ -350,7 +458,7 @@ const calculateDiffDecorationsInner = ({
         decorations.push(...createInlineChangedDecoration({
           change,
           doc: tr.doc,
-          colorScheme,
+          colorScheme: changeColorScheme,
           isActive,
           diffType,
           ...(isExtendedEnabled(diffType) && {
@@ -367,7 +475,7 @@ const calculateDiffDecorationsInner = ({
         doc: tr.doc,
         from: change.fromB,
         to: change.toB,
-        colorScheme,
+        colorScheme: changeColorScheme,
         ...(isExtendedEnabled(diffType) && {
           isInserted,
           shouldHideDeleted,
@@ -386,7 +494,7 @@ const calculateDiffDecorationsInner = ({
           change,
           doc: originalDoc,
           nodeViewSerializer,
-          colorScheme,
+          colorScheme: changeColorScheme,
           newDoc: tr.doc,
           intl,
           activeIndexPos,
@@ -413,7 +521,7 @@ const calculateDiffDecorationsInner = ({
       isInserted: true
     }));
   });
-  getAttrChangeRanges(tr.doc, attrSteps, originalDoc).forEach(change => {
+  getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).forEach(change => {
     if (change.isInline) {
       // Inline nodes (e.g. date, emoji, mention, status) need an inline decoration rather than a block decoration
       const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
@@ -532,7 +640,7 @@ export const calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner
   const originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if (isExtendedEnabled(diffType)) {
     var _ref;
-    return (_ref = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref !== void 0 ? _ref : false;
+    return (_ref = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref !== void 0 ? _ref : false;
   }
-  return (_ref2 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref2 !== void 0 ? _ref2 : false;
+  return (_ref2 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref2 !== void 0 ? _ref2 : false;
 });

package/dist/es2019/pm-plugins/calculateDiff/diffBySteps.js

@@ -1,6 +1,7 @@
 import { simplifyChanges, ChangeSet } from 'prosemirror-changeset';
 import { Mark } from '@atlaskit/editor-prosemirror/model';
 import { Mapping, ReplaceStep } from '@atlaskit/editor-prosemirror/transform';
+import { getAttributionKey } from '../decorations/colorSchemes/attributions';
 import { attrAwareTokenEncoder } from './attrAwareTokenEncoder';
 import { optimizeChanges } from './optimizeChanges';
 const WORD_CHAR_REGEX = /[\p{L}\p{N}_]/u;
@@ -177,9 +178,9 @@ const createMapping = maps => {
   }
   return mapping;
 };
-const createSpans = length => length > 0 ? [{
+const createSpans = (length, data = null) => length > 0 ? [{
   length,
-  data: null
+  data
 }] : [];
 const mergeOverlappingByNewDocRange = changes => {
   if (changes.length <= 1) {
@@ -191,8 +192,11 @@ const mergeOverlappingByNewDocRange = changes => {
     ...sortedChanges[0]
   };
   for (let i = 1; i < sortedChanges.length; i++) {
+    var _, _2;
     const next = sortedChanges[i];
-    const isOverlapping = next.fromB <= current.toB;
+    const currentIdentity = getAttributionKey((_ = [...current.deleted, ...current.inserted][0]) === null || _ === void 0 ? void 0 : _.data);
+    const nextIdentity = getAttributionKey((_2 = [...next.deleted, ...next.inserted][0]) === null || _2 === void 0 ? void 0 : _2.data);
+    const isOverlapping = next.fromB <= current.toB && currentIdentity === nextIdentity;
     if (isOverlapping) {
       current = {
         fromA: Math.min(current.fromA, next.fromA),
@@ -248,12 +252,12 @@ const shouldCheckGranularDiff = (step, before, from, to) => {
   const isTextContentEqual = (replacedNode === null || replacedNode === void 0 ? void 0 : replacedNode.textContent) === (replacingNode === null || replacingNode === void 0 ? void 0 : replacingNode.textContent);
   return !isTextContentEqual || isTextContentEqual && hasSameChildMarks(replacedNode, replacingNode);
 };
-export const diffBySteps = (originalDoc, steps) => {
+export const diffBySteps = (originalDoc, steps, stepAttributions) => {
   const changes = [];
   let currentDoc = originalDoc;
   const successfulStepMaps = [];
   const rangedSteps = [];
-  for (const step of steps) {
+  for (const [stepIndex, step] of steps.entries()) {
     const before = currentDoc;
     const result = step.apply(currentDoc);
     if (result.failed !== null || !result.doc) {
@@ -268,6 +272,10 @@ export const diffBySteps = (originalDoc, steps) => {
         from: rangeStep.from,
         to: rangeStep.to,
         mapIndex: successfulStepMaps.length,
+        stepAttribution: stepAttributions !== null && stepAttributions !== void 0 && stepAttributions[stepIndex] ? {
+          ...stepAttributions[stepIndex],
+          stepIndex
+        } : null,
         step,
         stepMap
       });
@@ -343,8 +351,8 @@ export const diffBySteps = (originalDoc, steps) => {
           toA: granularToA,
           fromB: granularFromB,
           toB: granularToB,
-          deleted: createSpans(Math.max(0, granularToA - granularFromA)),
-          inserted: createSpans(Math.max(0, granularToB - granularFromB))
+          deleted: createSpans(Math.max(0, granularToA - granularFromA), rangedStep.stepAttribution),
+          inserted: createSpans(Math.max(0, granularToB - granularFromB), rangedStep.stepAttribution)
         });
       }
       continue;
@@ -354,8 +362,8 @@ export const diffBySteps = (originalDoc, steps) => {
       toA,
       fromB,
       toB,
-      deleted: createSpans(Math.max(0, toA - fromA)),
-      inserted: createSpans(Math.max(0, toB - fromB))
+      deleted: createSpans(Math.max(0, toA - fromA), rangedStep.stepAttribution),
+      inserted: createSpans(Math.max(0, toB - fromB), rangedStep.stepAttribution)
     });
   }
   return mergeOverlappingByNewDocRange(changes);

package/dist/es2019/pm-plugins/calculateDiff/simplifyChangesWithAttribution.js

@@ -0,0 +1,64 @@
+import { simplifyChanges } from 'prosemirror-changeset';
+import { getAttributionKey } from '../decorations/colorSchemes/attributions';
+import { optimizeChanges } from './optimizeChanges';
+const getAttributionIdentity = change => {
+  const identities = new Set();
+  for (const span of [...change.deleted, ...change.inserted]) {
+    identities.add(getAttributionKey(span.data));
+  }
+  if (identities.size > 1) {
+    return {
+      key: undefined,
+      mergeable: false
+    };
+  }
+  return {
+    key: identities.values().next().value,
+    mergeable: true
+  };
+};
+
+/**
+ * Simplifies and optimizes consecutive changes without crossing an attribution boundary.
+ * A change which already contains more than one identity is deliberately kept isolated.
+ */
+export const simplifyChangesWithAttribution = (changes, doc) => {
+  const result = [];
+  let run = [];
+  let runIdentity;
+  const flush = () => {
+    if (run.length > 0) {
+      // Some show-diff producers use structurally compatible Change objects rather than the
+      // library class. `simplifyChanges` reads runtime `lenA`/`lenB` getters even though they
+      // are intentionally omitted from its public declarations, so add equivalent getters
+      // without calling the library's internal constructor.
+      const normalizedRun = run.map(change => ({
+        ...change,
+        get lenA() {
+          return change.toA - change.fromA;
+        },
+        get lenB() {
+          return change.toB - change.fromB;
+        }
+      }));
+      result.push(...optimizeChanges(simplifyChanges(normalizedRun, doc)));
+    }
+    run = [];
+    runIdentity = undefined;
+  };
+  for (const change of changes) {
+    var _runIdentity;
+    const identity = getAttributionIdentity(change);
+    const canJoinRun = ((_runIdentity = runIdentity) === null || _runIdentity === void 0 ? void 0 : _runIdentity.mergeable) === true && identity.mergeable && runIdentity.key === identity.key;
+    if (run.length > 0 && !canJoinRun) {
+      flush();
+    }
+    run.push(change);
+    runIdentity = identity;
+    if (!identity.mergeable) {
+      flush();
+    }
+  }
+  flush();
+  return result;
+};