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

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;
+};

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

@@ -1,15 +1,21 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.simplifySteps = simplifySteps;
+exports.simplifyStepsWithAttribution = simplifyStepsWithAttribution;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _attributions = require("../decorations/colorSchemes/attributions");
 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; }
 /**
  * Attempts to merge two consecutive ReplaceStep operations.
  * This merges steps where:
@@ -51,21 +57,67 @@ 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.
+ */
+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 _steps.AnalyticsStep);
+  }).reduce(function (acc, current) {
+    var _previous$step$merge, _previous$step$merge2, _previous$step;
+    var previous = acc[acc.length - 1];
+    var isSameIdentity = previous && (0, _attributions.getAttributionKey)(previous.stepAttribution) === (0, _attributions.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 && !(0, _document.areNodesEqualIgnoreAttrs)(firstPassDoc, result.doc, ['localId'])) {
-        finalSteps.push(step);
+        finalSteps.push(stepWithAttribution);
         firstPassDoc = result.doc;
       }
     }
@@ -75,4 +127,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 && !(0, _document.areNodesEqualIgnoreAttrs)(firstPassDoc, result.doc, ['localId'])) {
+        finalSteps.push(step);
+        firstPassDoc = result.doc;
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return finalSteps;
 }

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

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isAttributionColoringEnabled = exports.getColorSchemeForChange = exports.getAttributionKey = exports.createAttributionColorMap = exports.areAttributionColorGatesEnabled = void 0;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _fg = require("@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. */
+var getAttributionKey = exports.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);
+};
+var areAttributionColorGatesEnabled = exports.areAttributionColorGatesEnabled = function areAttributionColorGatesEnabled() {
+  return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor');
+};
+var isAttributionColoringEnabled = exports.isAttributionColoringEnabled = function isAttributionColoringEnabled(stepAttributions) {
+  return areAttributionColorGatesEnabled() && (stepAttributions === null || stepAttributions === void 0 ? void 0 : stepAttributions.some(function (attribution) {
+    return getAttributionKey(attribution) !== undefined;
+  })) === true;
+};
+var createAttributionColorMap = exports.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((0, _toConsumableArray2.default)(change.deleted), (0, _toConsumableArray2.default)(change.inserted));
+  }).map(function (span) {
+    return span.data;
+  }).filter(function (value) {
+    return (0, _typeof2.default)(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;
+};
+var getColorSchemeForChange = exports.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/cjs/pm-plugins/decorations/colorSchemes/schemes.js

@@ -1,9 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.traditionalScheme = exports.standardScheme = exports.colorSchemeRegistry = void 0;
+exports.traditionalScheme = exports.standardScheme = exports.getLegacyColorScheme = exports.colorSchemeRegistry = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@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) { (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; }
 /** Green insertions, red deletions. */
 var traditionalScheme = exports.traditionalScheme = {
   insertColor: 'green',
@@ -58,9 +62,29 @@ var standardScheme = exports.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. */
 var colorSchemeRegistry = exports.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. */
+var getLegacyColorScheme = exports.getLegacyColorScheme = function getLegacyColorScheme(colorScheme) {
+  return colorScheme === 'standard' || colorScheme === 'traditional' ? colorScheme : undefined;
 };

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

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createBlockChangedDecoration = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
@@ -16,6 +17,8 @@ var _schemes = require("./colorSchemes/schemes");
 var _createAnchorDecorationWidgets = require("./createAnchorDecorationWidgets");
 var _decorationKeys = require("./decorationKeys");
 var _createBlockChangedDecorationStyles = require("./createBlockChangedDecoration.styles.legacy");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var displayNoneStyle = (0, _lazyNodeView.convertToInlineCss)({
   display: 'none'
 });
@@ -105,7 +108,9 @@ var getBlockNodeStyleNext = function getBlockNodeStyleNext(_ref) {
  * same style strings for both shipped schemes; see EDITOR-8281.
  */
 var getBlockNodeStyle = function getBlockNodeStyle(props) {
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getBlockNodeStyleNext(props) : (0, _createBlockChangedDecorationStyles.getBlockNodeStyleLegacy)(props);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? getBlockNodeStyleNext(props) : (0, _createBlockChangedDecorationStyles.getBlockNodeStyleLegacy)(_objectSpread(_objectSpread({}, props), {}, {
+    colorScheme: (0, _schemes.getLegacyColorScheme)(props.colorScheme)
+  }));
 };
 
 /**
@@ -179,7 +184,7 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
     var isEmptyCellBeingFilled = !isInserted && !!cellNode && isCellEmpty(cellNode);
     var useAddedStyle = isInserted || isEmptyCellBeingFilled;
     var cellOverlayStyle = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? useAddedStyle ? isRoundedTable ? (0, _factory.buildAddedCellOverlayRoundedStyle)(colors) : (0, _factory.buildAddedCellOverlayStyle)(colors) : isRoundedTable ? (0, _factory.buildDeletedCellOverlayRoundedStyle)(colors) : (0, _factory.buildDeletedCellOverlayStyle)(colors) : (0, _createBlockChangedDecorationStyles.resolveCellOverlayStyleLegacy)({
-      colorScheme: colorScheme,
+      colorScheme: (0, _schemes.getLegacyColorScheme)(colorScheme),
       isRoundedTable: isRoundedTable,
       useAddedStyle: useAddedStyle
     });

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

@@ -141,7 +141,7 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
 
   // Inserted rows keep their natural styling; the row strikethrough is deletions only.
   if (!(0, _isExtendedEnabled.isExtendedEnabled)(diffType) || !isInserted) {
-    tr.setAttribute('style', (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? (0, _factory.buildDeletedRowStyle)(colors) : (0, _createChangedRowDecorationWidgetsStyles.resolveDeletedRowStyleLegacy)(colorScheme));
+    tr.setAttribute('style', (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? (0, _factory.buildDeletedRowStyle)(colors) : (0, _createChangedRowDecorationWidgetsStyles.resolveDeletedRowStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme)));
   }
   tr.setAttribute('data-testid', 'show-diff-deleted-row');
 
@@ -157,7 +157,7 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
             var overlay = document.createElement('span');
             var isRoundedTable = (0, _expValEquals.expValEquals)('platform_editor_table_diff_rounded_corners', 'isEnabled', true);
             var overlayStyle = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? isInserted ? isRoundedTable ? (0, _factory.buildAddedCellOverlayRoundedStyle)(colors) : (0, _factory.buildAddedCellOverlayStyle)(colors) : isRoundedTable ? (0, _factory.buildDeletedCellOverlayRoundedStyle)(colors) : (0, _factory.buildDeletedCellOverlayStyle)(colors) : (0, _createChangedRowDecorationWidgetsStyles.resolveCellOverlayStyleLegacy)({
-              colorScheme: colorScheme,
+              colorScheme: (0, _schemes.getLegacyColorScheme)(colorScheme),
               isInserted: isInserted,
               isRoundedTable: isRoundedTable
             });

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

@@ -77,7 +77,9 @@ var resolveInlineChangedStyleRefactored = function resolveInlineChangedStyleRefa
  * verbatim pre-refactor per-scheme constants when it is off.
  */
 var resolveInlineChangedStyle = function resolveInlineChangedStyle(args) {
-  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? resolveInlineChangedStyleRefactored(args) : (0, _createInlineChangedDecorationStyles.resolveInlineChangedStyleLegacy)(args);
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? resolveInlineChangedStyleRefactored(args) : (0, _createInlineChangedDecorationStyles.resolveInlineChangedStyleLegacy)(_objectSpread(_objectSpread({}, args), {}, {
+    colorScheme: (0, _schemes.getLegacyColorScheme)(args.colorScheme)
+  }));
 };
 
 /**
@@ -91,7 +93,7 @@ var resolveAtomicInlineAttrs = function resolveAtomicInlineAttrs(inlineNodeName,
     className: getAtomicInlineNodeClassName(inlineNodeName),
     styleSuffix: (0, _factory.buildAtomicInlineChangedCSSVariables)(colors)
   } : {
-    className: (0, _createInlineChangedDecorationStyles.getAtomicInlineNodeClassNameLegacy)(inlineNodeName, colorScheme),
+    className: (0, _createInlineChangedDecorationStyles.getAtomicInlineNodeClassNameLegacy)(inlineNodeName, (0, _schemes.getLegacyColorScheme)(colorScheme)),
     styleSuffix: ''
   };
 };

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

@@ -6,10 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.stepIsValidAttrChange = exports.getAttrChangeRanges = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _omit = _interopRequireDefault(require("lodash/omit"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _deprecatedPlatformFeatureExperiments = require("@atlaskit/editor-common/deprecated-platform-feature-experiments");
 var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _diffableAttrs = require("./diffableAttrs");
 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; }
@@ -41,33 +44,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 (0, _omit.default)(node.attrs, transientExtensionAttrPaths);
+};
+var haveSameRelevantExtensionAttrs = function haveSameRelevantExtensionAttrs(beforeNode, afterNode) {
+  return (0, _isEqual.default)(getComparableExtensionAttrs(beforeNode), getComparableExtensionAttrs(afterNode));
+};
 var getStepAttrs = function getStepAttrs(step) {
   if (step instanceof _transform.AttrStep) {
     return [step.attr];
   }
-  if (step instanceof _steps.SetAttrsStep && step.attrs) {
+  if (step.attrs) {
     return Object.keys(step.attrs);
   }
   return [];
 };
-var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRanges(doc, steps, originalDoc) {
-  return steps.map(function (step) {
+var getAttrChangeRanges = exports.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 _transform.AttrStep) && !(step instanceof _steps.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 = (0, _fg.fg)('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode ? stepAttrs.filter(function (attrName) {
+      return !(0, _isEqual.default)(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' && !(0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
       return (0, _expValEquals.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'
       };
@@ -82,30 +109,29 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
       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
       };
     }
 
@@ -113,33 +139,36 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     // (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 && (0, _nodeTypeUtils.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 (0, _diffableAttrs.isDiffableAttr)(nodeAtPos.type.name, v);
     })) {
+      if ((0, _fg.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;