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

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

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

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

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

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

@@ -1,3 +1,6 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /** Green insertions, red deletions. */
 export var traditionalScheme = {
   insertColor: 'green',
@@ -52,9 +55,29 @@ export var standardScheme = {
   deletedQuoteNodeActiveTone: 'borderAccent',
   strikesDeletedEmbedCard: false
 };
+var createAttributionScheme = function createAttributionScheme(color) {
+  return _objectSpread(_objectSpread({}, standardScheme), {}, {
+    insertColor: color,
+    insertActiveColor: color,
+    deleteColor: color,
+    deleteActiveColor: color,
+    deletedCellColor: color
+  });
+};
 
-/** Maps the public ColorScheme string to its data object. Adding a scheme = one entry here. */
+/** Maps public schemes and attribution-only accents to their data objects. */
 export var colorSchemeRegistry = {
+  blue: createAttributionScheme('blue'),
+  green: createAttributionScheme('green'),
+  magenta: createAttributionScheme('magenta'),
+  orange: createAttributionScheme('orange'),
+  purple: createAttributionScheme('purple'),
+  teal: createAttributionScheme('teal'),
   traditional: traditionalScheme,
   standard: standardScheme
+};
+
+/** Attribution accents are impossible in the refactor-off cohort; fall back defensively. */
+export var getLegacyColorScheme = function getLegacyColorScheme(colorScheme) {
+  return colorScheme === 'standard' || colorScheme === 'traditional' ? colorScheme : undefined;
 };

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

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

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

@@ -1,11 +1,14 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedBlockNodeStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildInsertedBlockNodeStyle } from './colorSchemes/factory';
-import { colorSchemeRegistry } from './colorSchemes/schemes';
+import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createBlockIndicatorAnchorWidgets } from './createAnchorDecorationWidgets';
 import { buildDiffDecorationSpec } from './decorationKeys';
 import { getBlockNodeStyleLegacy, resolveCellOverlayStyleLegacy } from './createBlockChangedDecoration.styles.legacy';
@@ -98,7 +101,9 @@ var getBlockNodeStyleNext = function getBlockNodeStyleNext(_ref) {
  * same style strings for both shipped schemes; see EDITOR-8281.
  */
 var getBlockNodeStyle = function getBlockNodeStyle(props) {
-  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getBlockNodeStyleNext(props) : getBlockNodeStyleLegacy(props);
+  return isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? getBlockNodeStyleNext(props) : getBlockNodeStyleLegacy(_objectSpread(_objectSpread({}, props), {}, {
+    colorScheme: getLegacyColorScheme(props.colorScheme)
+  }));
 };
 
 /**
@@ -172,7 +177,7 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
     var isEmptyCellBeingFilled = !isInserted && !!cellNode && isCellEmpty(cellNode);
     var useAddedStyle = isInserted || isEmptyCellBeingFilled;
     var cellOverlayStyle = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? useAddedStyle ? isRoundedTable ? buildAddedCellOverlayRoundedStyle(colors) : buildAddedCellOverlayStyle(colors) : isRoundedTable ? buildDeletedCellOverlayRoundedStyle(colors) : buildDeletedCellOverlayStyle(colors) : resolveCellOverlayStyleLegacy({
-      colorScheme: colorScheme,
+      colorScheme: getLegacyColorScheme(colorScheme),
       isRoundedTable: isRoundedTable,
       useAddedStyle: useAddedStyle
     });

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

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

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

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

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

@@ -1,10 +1,13 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import isEqual from 'lodash/isEqual';
+import omit from 'lodash/omit';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
 import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getRequiredIncludedDiffableAttrs, isDiffableAttr } from './diffableAttrs';
 var filterUndefined = function filterUndefined(x) {
@@ -34,33 +37,57 @@ var isInlineAttrChangeNodeName = function isInlineAttrChangeNodeName(nodeName) {
 // Extension node type names. Their "any attr except localId" exclude rule lives
 // in the shared `diffableAttrs` map and is applied via `isDiffableAttr` below.
 var extensionNodeNames = ['extension', 'inlineExtension', 'bodiedExtension'];
+var transientExtensionAttrPaths = ['localId', 'parameters.macroParams._parentId'];
+
+/**
+ * Removes extension metadata that can change between document versions without changing the
+ * extension's user-visible configuration.
+ */
+var getComparableExtensionAttrs = function getComparableExtensionAttrs(node) {
+  return omit(node.attrs, transientExtensionAttrPaths);
+};
+var haveSameRelevantExtensionAttrs = function haveSameRelevantExtensionAttrs(beforeNode, afterNode) {
+  return isEqual(getComparableExtensionAttrs(beforeNode), getComparableExtensionAttrs(afterNode));
+};
 var getStepAttrs = function getStepAttrs(step) {
   if (step instanceof AttrStep) {
     return [step.attr];
   }
-  if (step instanceof SetAttrsStep && step.attrs) {
+  if (step.attrs) {
     return Object.keys(step.attrs);
   }
   return [];
 };
-export var getAttrChangeRanges = function getAttrChangeRanges(doc, steps, originalDoc) {
-  return steps.map(function (step) {
+export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepContexts, originalDoc) {
+  return attrStepContexts.map(function (attrStepContext) {
+    var afterNode = attrStepContext.afterNode,
+      beforeNode = attrStepContext.beforeNode,
+      finalPos = attrStepContext.finalPos,
+      originalPos = attrStepContext.originalPos,
+      step = attrStepContext.step;
     if (!(step instanceof AttrStep) && !(step instanceof SetAttrsStep)) {
       return undefined;
     }
     var stepAttrs = getStepAttrs(step);
-    var $pos = doc.resolve(step.pos);
-    var nodeAtPos = doc.nodeAt(step.pos);
+    // SetAttrsStep contains the complete replacement attrs, not only the attrs that changed.
+    // Keep the legacy payload-based checks until the rollout gate is enabled, and fall back
+    // to them if either step-time node is unavailable.
+    var attrsToCheck = fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode ? stepAttrs.filter(function (attrName) {
+      return !isEqual(beforeNode.attrs[attrName], afterNode.attrs[attrName]);
+    }) : stepAttrs;
+    var $pos = doc.resolve(finalPos);
+    var nodeAtPos = doc.nodeAt(finalPos);
+    var originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
 
     // date node: timestamp attribute change — highlight the date node itself (inline)
-    if (stepAttrs.some(function (v) {
+    if (attrsToCheck.some(function (v) {
       return dateAttrs.includes(v);
     }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !isExperimentEnabled('platform_editor_improve_inline_diffs', function () {
       return expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true);
     })) {
       return {
-        fromB: step.pos,
-        toB: step.pos + nodeAtPos.nodeSize,
+        fromB: finalPos,
+        toB: finalPos + nodeAtPos.nodeSize,
         isInline: true,
         inlineNodeName: 'date'
       };
@@ -75,30 +102,29 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, steps, origin
       var nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         var watchedAttrs = inlineNodeAttrMap[nodeName];
-        if (stepAttrs.some(function (v) {
+        if (attrsToCheck.some(function (v) {
           return watchedAttrs.includes(v);
         })) {
-          var originalNodeAtPos = originalDoc === null || originalDoc === void 0 ? void 0 : originalDoc.nodeAt(step.pos);
           return _objectSpread({
-            fromB: step.pos,
-            toB: step.pos + nodeAtPos.nodeSize,
+            fromB: finalPos,
+            toB: finalPos + nodeAtPos.nodeSize,
             isInline: true,
             inlineNodeName: nodeName
-          }, originalNodeAtPos && {
-            fromA: step.pos,
-            toA: step.pos + originalNodeAtPos.nodeSize
+          }, originalPos !== undefined && originalNodeAtPos && {
+            fromA: originalPos,
+            toA: originalPos + originalNodeAtPos.nodeSize
           });
         }
       }
     }
 
     // taskItem node: state attribute change — highlight the taskItem node
-    if (stepAttrs.some(function (v) {
+    if (attrsToCheck.some(function (v) {
       return taskItemAttrs.includes(v);
     }) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
       return {
-        fromB: step.pos,
-        toB: step.pos + nodeAtPos.nodeSize
+        fromB: finalPos,
+        toB: finalPos + nodeAtPos.nodeSize
       };
     }
 
@@ -106,33 +132,36 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, steps, origin
     // (e.g. note -> warning) — highlight the new panel and, when the original node
     // is resolvable, expose its range (fromA/toA) so the caller can render the old
     // panel as a "deleted" widget for a before/after comparison.
-    if (stepAttrs.some(function (v) {
+    if (attrsToCheck.some(function (v) {
       return panelAttrs.includes(v);
     }) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
-      var _originalNodeAtPos = originalDoc === null || originalDoc === void 0 ? void 0 : originalDoc.nodeAt(step.pos);
       return _objectSpread({
-        fromB: step.pos,
-        toB: step.pos + nodeAtPos.nodeSize
-      }, _originalNodeAtPos && {
-        fromA: step.pos,
-        toA: step.pos + _originalNodeAtPos.nodeSize
+        fromB: finalPos,
+        toB: finalPos + nodeAtPos.nodeSize
+      }, originalPos !== undefined && originalNodeAtPos && {
+        fromA: originalPos,
+        toA: originalPos + originalNodeAtPos.nodeSize
       });
     }
 
-    // extension nodes: highlight on any diffable attr change (exclude rule in shared map)
-    if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && stepAttrs.some(function (v) {
+    // Extension nodes: highlight changes to user-visible configuration. When enabled,
+    // transient extension metadata is ignored by the comparison below.
+    if (nodeAtPos && extensionNodeNames.includes(nodeAtPos.type.name) && attrsToCheck.some(function (v) {
       return isDiffableAttr(nodeAtPos.type.name, v);
     })) {
+      if (fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode && beforeNode.type === afterNode.type && haveSameRelevantExtensionAttrs(beforeNode, afterNode)) {
+        return undefined;
+      }
       var isInline = nodeAtPos.type.name === 'inlineExtension';
       return {
-        fromB: step.pos,
-        toB: step.pos + nodeAtPos.nodeSize,
+        fromB: finalPos,
+        toB: finalPos + nodeAtPos.nodeSize,
         isInline: isInline
       };
     }
 
     // media node: id/collection/url attribute change — highlight the mediaSingle parent
-    if (stepAttrs.some(function (v) {
+    if (attrsToCheck.some(function (v) {
       return mediaAttrs.includes(v);
     }) && $pos.parent.type === doc.type.schema.nodes.mediaSingle) {
       var startPos = $pos.pos + $pos.parentOffset;

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

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

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

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