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

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 14.1.0
+
+### Minor Changes
+
+- [`69574af99ed9e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/69574af99ed9e) -
+  [ux] Add attributed-step inputs and internally selected, gated agent colours behind
+  `confluence_ncs_step_diffing_version_history` and
+  `platform_editor_show_diff_color_scheme_refactor`.
+
+## 14.0.4
+
+### Patch Changes
+
+- [`62c3227f6a3ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/62c3227f6a3ac) -
+  [CCI-19031] Fix large-table diffs suppressing decorations on adjacent inserted content. When a
+  paragraph (or other block) is inserted next to a large table, the smart classifier coalesces them
+  into a single node-level change. The coarse large-table decoration path now scopes cell-only
+  suppression to the table subtree, so adjacent inserted content keeps its highlight and indicator
+  instead of being dropped.
+- Updated dependencies
+
 ## 14.0.3
 
 ### Patch Changes

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isDeletedContentPlacedBelow = exports.calculateDiffDecorations = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
@@ -21,6 +21,7 @@ var _createAnchorDecorationWidgets = require("../decorations/createAnchorDecorat
 var _createBlockChangedDecoration = require("../decorations/createBlockChangedDecoration");
 var _createInlineChangedDecoration = require("../decorations/createInlineChangedDecoration");
 var _createNodeChangedDecorationWidget = require("../decorations/createNodeChangedDecorationWidget");
+var _attributions = require("../decorations/colorSchemes/attributions");
 var _decorationKeys = require("../decorations/decorationKeys");
 var _getAttrChangeRanges = require("../decorations/utils/getAttrChangeRanges");
 var _getMarkChangeRanges = require("../decorations/utils/getMarkChangeRanges");
@@ -29,6 +30,7 @@ var _attrAwareTokenEncoder = require("./attrAwareTokenEncoder");
 var _diffBySteps = require("./diffBySteps");
 var _groupChangesByBlock = require("./groupChangesByBlock");
 var _optimizeChanges = require("./optimizeChanges");
+var _simplifyChangesWithAttribution = require("./simplifyChangesWithAttribution");
 var _simplifySteps = require("./simplifySteps");
 var _classifySmartChanges = require("./smart/classifySmartChanges");
 var _helpers = require("./smart/helpers");
@@ -72,6 +74,34 @@ var getChanges = function getChanges(_ref) {
   var changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
   return (0, _optimizeChanges.optimizeChanges)(changes);
 };
+var getAttributedChanges = function getAttributedChanges(_ref2) {
+  var attributedChanges = _ref2.attributedChanges,
+    changeset = _ref2.changeset,
+    originalDoc = _ref2.originalDoc,
+    steppedDoc = _ref2.steppedDoc,
+    diffType = _ref2.diffType,
+    tr = _ref2.tr,
+    intl = _ref2.intl,
+    smartThresholds = _ref2.smartThresholds;
+  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+    if (diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff')) {
+      return (0, _classifySmartChanges.classifySmartChanges)({
+        changes: (0, _simplifyChangesWithAttribution.simplifyChangesWithAttribution)(attributedChanges, tr.doc),
+        originalDoc: originalDoc,
+        newDoc: tr.doc,
+        locale: intl.locale,
+        thresholds: smartThresholds
+      });
+    }
+    if (diffType === 'step') {
+      return attributedChanges;
+    }
+    if (diffType === 'block') {
+      return (0, _groupChangesByBlock.groupChangesByBlock)(changeset.changes, originalDoc, steppedDoc);
+    }
+  }
+  return (0, _simplifyChangesWithAttribution.simplifyChangesWithAttribution)(attributedChanges, tr.doc);
+};
 
 /**
  * Collect the inline-content ranges of every leaf text-bearing block (paragraph, heading, …)
@@ -115,27 +145,51 @@ var isLargeInsertedTableRange = function isLargeInsertedTableRange(doc, from, to
   });
   return containsTable && leafCount > LARGE_TABLE_LEAF_THRESHOLD;
 };
-var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(_ref2) {
-  var doc = _ref2.doc,
-    from = _ref2.from,
-    to = _ref2.to,
-    colorScheme = _ref2.colorScheme,
-    _ref2$isInserted = _ref2.isInserted,
-    isInserted = _ref2$isInserted === void 0 ? true : _ref2$isInserted,
-    activeIndexPos = _ref2.activeIndexPos,
-    _ref2$shouldHideDelet = _ref2.shouldHideDeleted,
-    shouldHideDeleted = _ref2$shouldHideDelet === void 0 ? false : _ref2$shouldHideDelet,
-    _ref2$showIndicators = _ref2.showIndicators,
-    showIndicators = _ref2$showIndicators === void 0 ? false : _ref2$showIndicators,
-    diffType = _ref2.diffType,
-    _ref2$coarseTableCell = _ref2.coarseTableCellsOnly,
-    coarseTableCellsOnly = _ref2$coarseTableCell === void 0 ? false : _ref2$coarseTableCell;
+
+// Collect the [from, to) ranges of every `table` node overlapping `[from, to)`. The coarse
+// large-table path must only suppress decorations inside these ranges
+var tableRanges = function tableRanges(doc, from, to) {
+  var ranges = [];
+  doc.nodesBetween(from, to, function (node, pos) {
+    if (node.type.name === 'table') {
+      ranges.push([pos, pos + node.nodeSize]);
+      return false;
+    }
+    return true;
+  });
+  return ranges;
+};
+var isInsideTable = function isInsideTable(tables, pos) {
+  return tables.some(function (_ref3) {
+    var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+      tFrom = _ref4[0],
+      tTo = _ref4[1];
+    return pos >= tFrom && pos < tTo;
+  });
+};
+var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration(_ref5) {
+  var doc = _ref5.doc,
+    from = _ref5.from,
+    to = _ref5.to,
+    colorScheme = _ref5.colorScheme,
+    _ref5$isInserted = _ref5.isInserted,
+    isInserted = _ref5$isInserted === void 0 ? true : _ref5$isInserted,
+    activeIndexPos = _ref5.activeIndexPos,
+    _ref5$shouldHideDelet = _ref5.shouldHideDeleted,
+    shouldHideDeleted = _ref5$shouldHideDelet === void 0 ? false : _ref5$shouldHideDelet,
+    _ref5$showIndicators = _ref5.showIndicators,
+    showIndicators = _ref5$showIndicators === void 0 ? false : _ref5$showIndicators,
+    diffType = _ref5.diffType,
+    _ref5$coarseTableCell = _ref5.coarseTableCellsOnly,
+    coarseTableCellsOnly = _ref5$coarseTableCell === void 0 ? false : _ref5$coarseTableCell;
   var decorations = [];
+  // Coarse path: inside the large table, only cell/header overlays are kept — the
+  // table/row/paragraph decorations there are redundant and cause expensive per-cell
+  // re-render. Blocks outside the table keep their normal decorations.
+  var coarseTables = coarseTableCellsOnly ? tableRanges(doc, from, to) : [];
   // Iterate over the document nodes within the range
   doc.nodesBetween(from, to, function (node, pos) {
-    // Coarse path: only cell/header overlays are visible; table/row/paragraph
-    // decorations are redundant and cause expensive per-cell re-render.
-    if (coarseTableCellsOnly) {
+    if (coarseTableCellsOnly && isInsideTable(coarseTables, pos)) {
       var name = node.type.name;
       if (name !== 'tableCell' && name !== 'tableHeader') {
         return;
@@ -173,10 +227,10 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
  *
  * Callers are responsible for the `smart` diffType and gate checks.
  */
-var isDeletedContentPlacedBelow = exports.isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_ref3) {
-  var change = _ref3.change,
-    deletedDiffPlacement = _ref3.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref3.inlineDeletedDiffPlacement;
+var isDeletedContentPlacedBelow = exports.isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_ref6) {
+  var change = _ref6.change,
+    deletedDiffPlacement = _ref6.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref6.inlineDeletedDiffPlacement;
   var level = (0, _helpers.smartChangeLevel)(change);
   if (level === 'node' || level === 'paragraph') {
     return deletedDiffPlacement === 'bottom';
@@ -185,31 +239,32 @@ var isDeletedContentPlacedBelow = exports.isDeletedContentPlacedBelow = function
   // Inline-level (undefined) and sentence-level changes.
   return inlineDeletedDiffPlacement === 'after';
 };
-var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4) {
-  var state = _ref4.state,
-    pluginState = _ref4.pluginState,
-    nodeViewSerializer = _ref4.nodeViewSerializer,
-    colorScheme = _ref4.colorScheme,
-    intl = _ref4.intl,
-    activeIndexPos = _ref4.activeIndexPos,
-    api = _ref4.api,
-    _ref4$isInverted = _ref4.isInverted,
-    isInverted = _ref4$isInverted === void 0 ? false : _ref4$isInverted,
-    _ref4$diffType = _ref4.diffType,
-    diffType = _ref4$diffType === void 0 ? (0, _isExtendedEnabled.getDefaultDiffType)() : _ref4$diffType,
-    _ref4$hideDeletedDiff = _ref4.hideDeletedDiffs,
-    hideDeletedDiffs = _ref4$hideDeletedDiff === void 0 ? false : _ref4$hideDeletedDiff,
-    _ref4$hideAddedDiffsU = _ref4.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderlineParam = _ref4$hideAddedDiffsU === void 0 ? false : _ref4$hideAddedDiffsU,
-    _ref4$showIndicators = _ref4.showIndicators,
-    showIndicators = _ref4$showIndicators === void 0 ? false : _ref4$showIndicators,
-    smartThresholds = _ref4.smartThresholds,
-    _ref4$deletedDiffPlac = _ref4.deletedDiffPlacement,
-    deletedDiffPlacement = _ref4$deletedDiffPlac === void 0 ? 'top' : _ref4$deletedDiffPlac,
-    _ref4$inlineDeletedDi = _ref4.inlineDeletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref4$inlineDeletedDi === void 0 ? 'before' : _ref4$inlineDeletedDi;
+var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7) {
+  var state = _ref7.state,
+    pluginState = _ref7.pluginState,
+    nodeViewSerializer = _ref7.nodeViewSerializer,
+    colorScheme = _ref7.colorScheme,
+    intl = _ref7.intl,
+    activeIndexPos = _ref7.activeIndexPos,
+    api = _ref7.api,
+    _ref7$isInverted = _ref7.isInverted,
+    isInverted = _ref7$isInverted === void 0 ? false : _ref7$isInverted,
+    _ref7$diffType = _ref7.diffType,
+    diffType = _ref7$diffType === void 0 ? (0, _isExtendedEnabled.getDefaultDiffType)() : _ref7$diffType,
+    _ref7$hideDeletedDiff = _ref7.hideDeletedDiffs,
+    hideDeletedDiffs = _ref7$hideDeletedDiff === void 0 ? false : _ref7$hideDeletedDiff,
+    _ref7$hideAddedDiffsU = _ref7.hideAddedDiffsUnderline,
+    hideAddedDiffsUnderlineParam = _ref7$hideAddedDiffsU === void 0 ? false : _ref7$hideAddedDiffsU,
+    _ref7$showIndicators = _ref7.showIndicators,
+    showIndicators = _ref7$showIndicators === void 0 ? false : _ref7$showIndicators,
+    smartThresholds = _ref7.smartThresholds,
+    _ref7$deletedDiffPlac = _ref7.deletedDiffPlacement,
+    deletedDiffPlacement = _ref7$deletedDiffPlac === void 0 ? 'top' : _ref7$deletedDiffPlac,
+    _ref7$inlineDeletedDi = _ref7.inlineDeletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref7$inlineDeletedDi === void 0 ? 'before' : _ref7$inlineDeletedDi;
   var originalDoc = pluginState.originalDoc,
     steps = pluginState.steps,
+    stepAttributions = pluginState.stepAttributions,
     isDisplayingChanges = pluginState.isDisplayingChanges;
   if (!originalDoc || !isDisplayingChanges) {
     return {
@@ -223,8 +278,23 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
   var hideAddedDiffsUnderline = hideAddedDiffsUnderlineParam && (0, _fg.fg)('platform_editor_ai_smart_diff');
   var tr = state.tr;
   var steppedDoc = originalDoc;
+  var attributionColoringEnabled = (0, _attributions.isAttributionColoringEnabled)(stepAttributions);
+  var simplifiedSteps;
+  var simplifiedStepAttributions = [];
+  if (attributionColoringEnabled) {
+    var simplifiedStepsWithAttribution = (0, _simplifySteps.simplifyStepsWithAttribution)(steps, stepAttributions !== null && stepAttributions !== void 0 ? stepAttributions : [], originalDoc);
+    simplifiedSteps = simplifiedStepsWithAttribution.map(function (_ref8) {
+      var step = _ref8.step;
+      return step;
+    });
+    simplifiedStepAttributions = simplifiedStepsWithAttribution.map(function (_ref9) {
+      var stepAttribution = _ref9.stepAttribution;
+      return stepAttribution;
+    });
+  } else {
+    simplifiedSteps = (0, _simplifySteps.simplifySteps)(steps, originalDoc);
+  }
   var attrSteps = [];
-  var simplifiedSteps = (0, _simplifySteps.simplifySteps)(steps, originalDoc);
   var stepMaps = [];
   var _iterator = _createForOfIteratorHelper(simplifiedSteps),
     _step;
@@ -272,17 +342,45 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
   // gated with it; other diff types keep the library default so their output is
   // unchanged.
   var tokenEncoder = diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff') ? _attrAwareTokenEncoder.attrAwareTokenEncoder : undefined;
-  var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
-  var changes = getChanges({
-    changeset: changeset,
-    originalDoc: originalDoc,
-    steppedDoc: steppedDoc,
-    diffType: diffType,
-    tr: tr,
-    steps: steps,
-    intl: intl,
-    smartThresholds: smartThresholds
-  });
+  var changes;
+  var attributedChanges = [];
+  var attributionColors;
+  if (attributionColoringEnabled) {
+    var changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc, function (left, right) {
+      return (0, _attributions.getAttributionKey)(left) === (0, _attributions.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(function (attribution, stepIndex) {
+      return _objectSpread(_objectSpread({}, attribution), {}, {
+        stepIndex: stepIndex
+      });
+    }));
+    attributedChanges = (0, _diffBySteps.diffBySteps)(originalDoc, simplifiedSteps, simplifiedStepAttributions);
+    changes = getAttributedChanges({
+      changeset: changeset,
+      originalDoc: originalDoc,
+      steppedDoc: steppedDoc,
+      diffType: diffType,
+      tr: tr,
+      attributedChanges: attributedChanges,
+      intl: intl,
+      smartThresholds: smartThresholds
+    });
+    attributionColors = (0, _attributions.createAttributionColorMap)(simplifiedStepAttributions);
+  } else {
+    var _changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
+    changes = getChanges({
+      changeset: _changeset,
+      originalDoc: originalDoc,
+      steppedDoc: steppedDoc,
+      diffType: diffType,
+      tr: tr,
+      steps: simplifiedSteps,
+      intl: intl,
+      smartThresholds: smartThresholds
+    });
+  }
   var decorations = [];
 
   /**
@@ -295,6 +393,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
   // Our default operations are insertions, so it should match the opposite of isInverted.
   var isInserted = !isInverted;
   var createDecorationsForChange = function createDecorationsForChange(change) {
+    var changeColorScheme = attributionColors ? (0, _attributions.getColorSchemeForChange)(change, attributedChanges, attributionColors, colorScheme) : colorScheme;
     var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
 
     // Hoisted because it decides BOTH where the deleted widget is anchored and — since the
@@ -328,10 +427,11 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       // inward — when the widget is present the anchor must stay at the block
       // boundary to keep the indicator bar continuous with the deleted content.
       var willRenderDeletedWidget = change.deleted.length > 0 && !((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInverted && hideDeletedDiffs && change.inserted.length > 0);
-      if (useCoarseTableDecoration) {
-        // Skip the O(cells) inline decorations; the cell overlays (added below)
-        // provide the highlight without the expensive content re-render.
-      } else if (isSmartNodeLevel) {
+      if (isSmartNodeLevel) {
+        // For a large inserted table, skip the O(cells) inline decorations inside the
+        // table (the cell overlays added below provide the highlight without the
+        // expensive content re-render); leaf blocks outside the table still get theirs.
+        var coarseTables = useCoarseTableDecoration ? tableRanges(tr.doc, change.fromB, change.toB) : [];
         var _iterator2 = _createForOfIteratorHelper(leafTextblockRanges(tr.doc, change.fromB, change.toB)),
           _step2;
         try {
@@ -339,13 +439,16 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
             var _step2$value = (0, _slicedToArray2.default)(_step2.value, 2),
               from = _step2$value[0],
               to = _step2$value[1];
+            if (useCoarseTableDecoration && isInsideTable(coarseTables, from)) {
+              continue;
+            }
             decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)(_objectSpread({
               change: {
                 fromB: from,
                 toB: to
               },
               doc: tr.doc,
-              colorScheme: colorScheme,
+              colorScheme: changeColorScheme,
               isActive: isActive,
               diffType: diffType
             }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
@@ -366,7 +469,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)(_objectSpread({
           change: change,
           doc: tr.doc,
-          colorScheme: colorScheme,
+          colorScheme: changeColorScheme,
           isActive: isActive,
           diffType: diffType
         }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
@@ -382,7 +485,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
         doc: tr.doc,
         from: change.fromB,
         to: change.toB,
-        colorScheme: colorScheme
+        colorScheme: changeColorScheme
       }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
         isInserted: isInserted,
         shouldHideDeleted: shouldHideDeleted,
@@ -401,7 +504,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
           change: change,
           doc: originalDoc,
           nodeViewSerializer: nodeViewSerializer,
-          colorScheme: colorScheme,
+          colorScheme: changeColorScheme,
           newDoc: tr.doc,
           intl: intl,
           activeIndexPos: activeIndexPos
@@ -518,42 +621,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-function (_ref5, _ref6) {
-  var _ref0;
-  var _ref7 = (0, _slicedToArray2.default)(_ref5, 1),
-    _ref7$ = _ref7[0],
-    pluginState = _ref7$.pluginState,
-    state = _ref7$.state,
-    colorScheme = _ref7$.colorScheme,
-    intl = _ref7$.intl,
-    activeIndexPos = _ref7$.activeIndexPos,
-    isInverted = _ref7$.isInverted,
-    diffType = _ref7$.diffType,
-    hideDeletedDiffs = _ref7$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref7$.hideAddedDiffsUnderline,
-    showIndicators = _ref7$.showIndicators,
-    smartThresholds = _ref7$.smartThresholds,
-    deletedDiffPlacement = _ref7$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref7$.inlineDeletedDiffPlacement;
-  var _ref8 = (0, _slicedToArray2.default)(_ref6, 1),
-    _ref8$ = _ref8[0],
-    lastPluginState = _ref8$.pluginState,
-    lastState = _ref8$.state,
-    lastColorScheme = _ref8$.colorScheme,
-    lastIntl = _ref8$.intl,
-    lastActiveIndexPos = _ref8$.activeIndexPos,
-    lastIsInverted = _ref8$.isInverted,
-    lastDiffType = _ref8$.diffType,
-    lastHideDeletedDiffs = _ref8$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref8$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref8$.showIndicators,
-    lastSmartThresholds = _ref8$.smartThresholds,
-    lastDeletedDiffPlacement = _ref8$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref8$.inlineDeletedDiffPlacement;
+function (_ref0, _ref1) {
+  var _ref13;
+  var _ref10 = (0, _slicedToArray2.default)(_ref0, 1),
+    _ref10$ = _ref10[0],
+    pluginState = _ref10$.pluginState,
+    state = _ref10$.state,
+    colorScheme = _ref10$.colorScheme,
+    intl = _ref10$.intl,
+    activeIndexPos = _ref10$.activeIndexPos,
+    isInverted = _ref10$.isInverted,
+    diffType = _ref10$.diffType,
+    hideDeletedDiffs = _ref10$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref10$.hideAddedDiffsUnderline,
+    showIndicators = _ref10$.showIndicators,
+    smartThresholds = _ref10$.smartThresholds,
+    deletedDiffPlacement = _ref10$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref10$.inlineDeletedDiffPlacement;
+  var _ref11 = (0, _slicedToArray2.default)(_ref1, 1),
+    _ref11$ = _ref11[0],
+    lastPluginState = _ref11$.pluginState,
+    lastState = _ref11$.state,
+    lastColorScheme = _ref11$.colorScheme,
+    lastIntl = _ref11$.intl,
+    lastActiveIndexPos = _ref11$.activeIndexPos,
+    lastIsInverted = _ref11$.isInverted,
+    lastDiffType = _ref11$.diffType,
+    lastHideDeletedDiffs = _ref11$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref11$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref11$.showIndicators,
+    lastSmartThresholds = _ref11$.smartThresholds,
+    lastDeletedDiffPlacement = _ref11$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref11$.inlineDeletedDiffPlacement;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    var _ref9;
-    return (_ref9 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref9 !== void 0 ? _ref9 : false;
+    var _ref12;
+    return (_ref12 = 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) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref12 !== void 0 ? _ref12 : false;
   }
-  return (_ref0 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref0 !== void 0 ? _ref0 : false;
+  return (_ref13 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref13 !== void 0 ? _ref13 : false;
 });

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

@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.diffBySteps = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _attributions = require("../decorations/colorSchemes/attributions");
 var _attrAwareTokenEncoder = require("./attrAwareTokenEncoder");
 var _optimizeChanges = require("./optimizeChanges");
 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; }
@@ -205,9 +207,10 @@ var createMapping = function createMapping(maps) {
   return mapping;
 };
 var createSpans = function createSpans(length) {
+  var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   return length > 0 ? [{
     length: length,
-    data: null
+    data: data
   }] : [];
 };
 var mergeOverlappingByNewDocRange = function mergeOverlappingByNewDocRange(changes) {
@@ -220,8 +223,11 @@ var mergeOverlappingByNewDocRange = function mergeOverlappingByNewDocRange(chang
   var merged = [];
   var current = _objectSpread({}, sortedChanges[0]);
   for (var i = 1; i < sortedChanges.length; i++) {
+    var _, _2;
     var next = sortedChanges[i];
-    var isOverlapping = next.fromB <= current.toB;
+    var currentIdentity = (0, _attributions.getAttributionKey)((_ = [].concat((0, _toConsumableArray2.default)(current.deleted), (0, _toConsumableArray2.default)(current.inserted))[0]) === null || _ === void 0 ? void 0 : _.data);
+    var nextIdentity = (0, _attributions.getAttributionKey)((_2 = [].concat((0, _toConsumableArray2.default)(next.deleted), (0, _toConsumableArray2.default)(next.inserted))[0]) === null || _2 === void 0 ? void 0 : _2.data);
+    var isOverlapping = next.fromB <= current.toB && currentIdentity === nextIdentity;
     if (isOverlapping) {
       current = {
         fromA: Math.min(current.fromA, next.fromA),
@@ -275,16 +281,18 @@ var shouldCheckGranularDiff = function shouldCheckGranularDiff(step, before, fro
   var 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);
 };
-var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps) {
+var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps, stepAttributions) {
   var changes = [];
   var currentDoc = originalDoc;
   var successfulStepMaps = [];
   var rangedSteps = [];
-  var _iterator2 = _createForOfIteratorHelper(steps),
+  var _iterator2 = _createForOfIteratorHelper(steps.entries()),
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var step = _step2.value;
+      var _step2$value = (0, _slicedToArray2.default)(_step2.value, 2),
+        stepIndex = _step2$value[0],
+        step = _step2$value[1];
       var before = currentDoc;
       var result = step.apply(currentDoc);
       if (result.failed !== null || !result.doc) {
@@ -299,6 +307,9 @@ var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps)
           from: rangeStep.from,
           to: rangeStep.to,
           mapIndex: successfulStepMaps.length,
+          stepAttribution: stepAttributions !== null && stepAttributions !== void 0 && stepAttributions[stepIndex] ? _objectSpread(_objectSpread({}, stepAttributions[stepIndex]), {}, {
+            stepIndex: stepIndex
+          }) : null,
           step: step,
           stepMap: stepMap
         });
@@ -384,8 +395,8 @@ var diffBySteps = exports.diffBySteps = function 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)
           });
         }
       } catch (err) {
@@ -400,8 +411,8 @@ var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps)
       toA: toA,
       fromB: fromB,
       toB: 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/cjs/pm-plugins/calculateDiff/simplifyChangesWithAttribution.js

@@ -0,0 +1,89 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.simplifyChangesWithAttribution = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _prosemirrorChangeset = require("prosemirror-changeset");
+var _attributions = require("../decorations/colorSchemes/attributions");
+var _optimizeChanges = require("./optimizeChanges");
+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) { (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 getAttributionIdentity = function getAttributionIdentity(change) {
+  var identities = new Set();
+  for (var _i = 0, _arr = [].concat((0, _toConsumableArray2.default)(change.deleted), (0, _toConsumableArray2.default)(change.inserted)); _i < _arr.length; _i++) {
+    var span = _arr[_i];
+    identities.add((0, _attributions.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.
+ */
+var simplifyChangesWithAttribution = exports.simplifyChangesWithAttribution = function simplifyChangesWithAttribution(changes, doc) {
+  var result = [];
+  var run = [];
+  var runIdentity;
+  var flush = function 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.
+      var normalizedRun = run.map(function (change) {
+        return _objectSpread(_objectSpread({}, change), {}, {
+          get lenA() {
+            return change.toA - change.fromA;
+          },
+          get lenB() {
+            return change.toB - change.fromB;
+          }
+        });
+      });
+      result.push.apply(result, (0, _toConsumableArray2.default)((0, _optimizeChanges.optimizeChanges)((0, _prosemirrorChangeset.simplifyChanges)(normalizedRun, doc))));
+    }
+    run = [];
+    runIdentity = undefined;
+  };
+  var _iterator = _createForOfIteratorHelper(changes),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _runIdentity;
+      var change = _step.value;
+      var identity = getAttributionIdentity(change);
+      var 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();
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  flush();
+  return result;
+};