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

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 14.1.1
+
+### Patch Changes
+
+- [`b1510eccd9729`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b1510eccd9729) -
+  Reduce false-positive attribute diff decorations behind
+  `platform_editor_reduce_diff_attr_sensitivity`.
+- Updated dependencies
+
+## 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

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

@@ -13,6 +13,7 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
 var _deprecatedPlatformFeatureExperiments = require("@atlaskit/editor-common/deprecated-platform-feature-experiments");
 var _document = require("@atlaskit/editor-common/utils/document");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -21,6 +22,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 +31,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 +75,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, …)
@@ -130,28 +161,28 @@ var tableRanges = function tableRanges(doc, from, to) {
   return ranges;
 };
 var isInsideTable = function isInsideTable(tables, pos) {
-  return tables.some(function (_ref2) {
-    var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-      tFrom = _ref3[0],
-      tTo = _ref3[1];
+  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(_ref4) {
-  var doc = _ref4.doc,
-    from = _ref4.from,
-    to = _ref4.to,
-    colorScheme = _ref4.colorScheme,
-    _ref4$isInserted = _ref4.isInserted,
-    isInserted = _ref4$isInserted === void 0 ? true : _ref4$isInserted,
-    activeIndexPos = _ref4.activeIndexPos,
-    _ref4$shouldHideDelet = _ref4.shouldHideDeleted,
-    shouldHideDeleted = _ref4$shouldHideDelet === void 0 ? false : _ref4$shouldHideDelet,
-    _ref4$showIndicators = _ref4.showIndicators,
-    showIndicators = _ref4$showIndicators === void 0 ? false : _ref4$showIndicators,
-    diffType = _ref4.diffType,
-    _ref4$coarseTableCell = _ref4.coarseTableCellsOnly,
-    coarseTableCellsOnly = _ref4$coarseTableCell === void 0 ? false : _ref4$coarseTableCell;
+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
@@ -197,10 +228,10 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
  *
  * Callers are responsible for the `smart` diffType and gate checks.
  */
-var isDeletedContentPlacedBelow = exports.isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_ref5) {
-  var change = _ref5.change,
-    deletedDiffPlacement = _ref5.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref5.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';
@@ -209,31 +240,32 @@ var isDeletedContentPlacedBelow = exports.isDeletedContentPlacedBelow = function
   // Inline-level (undefined) and sentence-level changes.
   return inlineDeletedDiffPlacement === 'after';
 };
-var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6) {
-  var state = _ref6.state,
-    pluginState = _ref6.pluginState,
-    nodeViewSerializer = _ref6.nodeViewSerializer,
-    colorScheme = _ref6.colorScheme,
-    intl = _ref6.intl,
-    activeIndexPos = _ref6.activeIndexPos,
-    api = _ref6.api,
-    _ref6$isInverted = _ref6.isInverted,
-    isInverted = _ref6$isInverted === void 0 ? false : _ref6$isInverted,
-    _ref6$diffType = _ref6.diffType,
-    diffType = _ref6$diffType === void 0 ? (0, _isExtendedEnabled.getDefaultDiffType)() : _ref6$diffType,
-    _ref6$hideDeletedDiff = _ref6.hideDeletedDiffs,
-    hideDeletedDiffs = _ref6$hideDeletedDiff === void 0 ? false : _ref6$hideDeletedDiff,
-    _ref6$hideAddedDiffsU = _ref6.hideAddedDiffsUnderline,
-    hideAddedDiffsUnderlineParam = _ref6$hideAddedDiffsU === void 0 ? false : _ref6$hideAddedDiffsU,
-    _ref6$showIndicators = _ref6.showIndicators,
-    showIndicators = _ref6$showIndicators === void 0 ? false : _ref6$showIndicators,
-    smartThresholds = _ref6.smartThresholds,
-    _ref6$deletedDiffPlac = _ref6.deletedDiffPlacement,
-    deletedDiffPlacement = _ref6$deletedDiffPlac === void 0 ? 'top' : _ref6$deletedDiffPlac,
-    _ref6$inlineDeletedDi = _ref6.inlineDeletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref6$inlineDeletedDi === void 0 ? 'before' : _ref6$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 {
@@ -247,8 +279,23 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
   var hideAddedDiffsUnderline = hideAddedDiffsUnderlineParam && (0, _fg.fg)('platform_editor_ai_smart_diff');
   var tr = state.tr;
   var steppedDoc = originalDoc;
-  var attrSteps = [];
-  var simplifiedSteps = (0, _simplifySteps.simplifySteps)(steps, 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 pendingAttrSteps = [];
   var stepMaps = [];
   var _iterator = _createForOfIteratorHelper(simplifiedSteps),
     _step;
@@ -258,20 +305,56 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
       var result = step.apply(steppedDoc);
       if (result.failed === null && result.doc) {
         if ((0, _getAttrChangeRanges.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: step
+          });
         }
         stepMaps.push(step.getMap());
         steppedDoc = result.doc;
       }
     }
-
-    // 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
+    // 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.
   } catch (err) {
     _iterator.e(err);
   } finally {
     _iterator.f();
   }
+  var attrStepContexts = (0, _fg.fg)('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(function (_ref0) {
+    var afterNode = _ref0.afterNode,
+      beforeNode = _ref0.beforeNode,
+      mapIndex = _ref0.mapIndex,
+      step = _ref0.step;
+    var finalPosition = new _transform.Mapping(stepMaps.slice(mapIndex + 1)).mapResult(step.pos);
+    if (finalPosition.deleted) {
+      return [];
+    }
+    var originalPosition = new _transform.Mapping(stepMaps.slice(0, mapIndex)).invert().mapResult(step.pos);
+    return [_objectSpread(_objectSpread({
+      afterNode: afterNode,
+      beforeNode: beforeNode,
+      finalPos: finalPosition.pos
+    }, originalPosition.deleted ? {} : {
+      originalPos: originalPosition.pos
+    }), {}, {
+      step: step
+    })];
+  }) : pendingAttrSteps.map(function (_ref1) {
+    var step = _ref1.step;
+    return {
+      afterNode: tr.doc.nodeAt(step.pos),
+      beforeNode: originalDoc.nodeAt(step.pos),
+      finalPos: step.pos,
+      originalPos: step.pos,
+      step: 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
   if (!(0, _document.areNodesEqualIgnoreAttrs)(steppedDoc, tr.doc)) {
     var _api$analytics;
     var recoveredViaContentEquality = (0, _areDocsEqualByBlockStructureAndText.areDocsEqualByBlockStructureAndText)(steppedDoc, tr.doc);
@@ -296,17 +379,45 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
   // 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 = [];
 
   /**
@@ -319,6 +430,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
   // 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
@@ -373,7 +485,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
                 toB: to
               },
               doc: tr.doc,
-              colorScheme: colorScheme,
+              colorScheme: changeColorScheme,
               isActive: isActive,
               diffType: diffType
             }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
@@ -394,7 +506,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
         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) && {
@@ -410,7 +522,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
         doc: tr.doc,
         from: change.fromB,
         to: change.toB,
-        colorScheme: colorScheme
+        colorScheme: changeColorScheme
       }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
         isInserted: isInserted,
         shouldHideDeleted: shouldHideDeleted,
@@ -429,7 +541,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
           change: change,
           doc: originalDoc,
           nodeViewSerializer: nodeViewSerializer,
-          colorScheme: colorScheme,
+          colorScheme: changeColorScheme,
           newDoc: tr.doc,
           intl: intl,
           activeIndexPos: activeIndexPos
@@ -456,7 +568,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
       isInserted: true
     })));
   });
-  (0, _getAttrChangeRanges.getAttrChangeRanges)(tr.doc, attrSteps, originalDoc).forEach(function (change) {
+  (0, _getAttrChangeRanges.getAttrChangeRanges)(tr.doc, attrStepContexts, originalDoc).forEach(function (change) {
     if (change.isInline) {
       // Inline nodes (e.g. date, emoji, mention, status) need an inline decoration rather than a block decoration
       var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
@@ -546,42 +658,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref6
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-function (_ref7, _ref8) {
-  var _ref10;
-  var _ref9 = (0, _slicedToArray2.default)(_ref7, 1),
-    _ref9$ = _ref9[0],
-    pluginState = _ref9$.pluginState,
-    state = _ref9$.state,
-    colorScheme = _ref9$.colorScheme,
-    intl = _ref9$.intl,
-    activeIndexPos = _ref9$.activeIndexPos,
-    isInverted = _ref9$.isInverted,
-    diffType = _ref9$.diffType,
-    hideDeletedDiffs = _ref9$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref9$.hideAddedDiffsUnderline,
-    showIndicators = _ref9$.showIndicators,
-    smartThresholds = _ref9$.smartThresholds,
-    deletedDiffPlacement = _ref9$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref9$.inlineDeletedDiffPlacement;
-  var _ref0 = (0, _slicedToArray2.default)(_ref8, 1),
-    _ref0$ = _ref0[0],
-    lastPluginState = _ref0$.pluginState,
-    lastState = _ref0$.state,
-    lastColorScheme = _ref0$.colorScheme,
-    lastIntl = _ref0$.intl,
-    lastActiveIndexPos = _ref0$.activeIndexPos,
-    lastIsInverted = _ref0$.isInverted,
-    lastDiffType = _ref0$.diffType,
-    lastHideDeletedDiffs = _ref0$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref0$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref0$.showIndicators,
-    lastSmartThresholds = _ref0$.smartThresholds,
-    lastDeletedDiffPlacement = _ref0$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref0$.inlineDeletedDiffPlacement;
+function (_ref10, _ref11) {
+  var _ref15;
+  var _ref12 = (0, _slicedToArray2.default)(_ref10, 1),
+    _ref12$ = _ref12[0],
+    pluginState = _ref12$.pluginState,
+    state = _ref12$.state,
+    colorScheme = _ref12$.colorScheme,
+    intl = _ref12$.intl,
+    activeIndexPos = _ref12$.activeIndexPos,
+    isInverted = _ref12$.isInverted,
+    diffType = _ref12$.diffType,
+    hideDeletedDiffs = _ref12$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref12$.hideAddedDiffsUnderline,
+    showIndicators = _ref12$.showIndicators,
+    smartThresholds = _ref12$.smartThresholds,
+    deletedDiffPlacement = _ref12$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref12$.inlineDeletedDiffPlacement;
+  var _ref13 = (0, _slicedToArray2.default)(_ref11, 1),
+    _ref13$ = _ref13[0],
+    lastPluginState = _ref13$.pluginState,
+    lastState = _ref13$.state,
+    lastColorScheme = _ref13$.colorScheme,
+    lastIntl = _ref13$.intl,
+    lastActiveIndexPos = _ref13$.activeIndexPos,
+    lastIsInverted = _ref13$.isInverted,
+    lastDiffType = _ref13$.diffType,
+    lastHideDeletedDiffs = _ref13$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref13$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref13$.showIndicators,
+    lastSmartThresholds = _ref13$.smartThresholds,
+    lastDeletedDiffPlacement = _ref13$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref13$.inlineDeletedDiffPlacement;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    var _ref1;
-    return (_ref1 = 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 && _ref1 !== void 0 ? _ref1 : false;
+    var _ref14;
+    return (_ref14 = 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 && _ref14 !== void 0 ? _ref14 : false;
   }
-  return (_ref10 = 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 && _ref10 !== void 0 ? _ref10 : false;
+  return (_ref15 = 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 && _ref15 !== void 0 ? _ref15 : 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);