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

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 14.2.0
+
+### Minor Changes
+
+- [`391eb60fad28b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/391eb60fad28b) -
+  Export `ShowDiffParams` from the public show-diff type entry point.
+
+## 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

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");
@@ -294,7 +295,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   } else {
     simplifiedSteps = (0, _simplifySteps.simplifySteps)(steps, originalDoc);
   }
-  var attrSteps = [];
+  var pendingAttrSteps = [];
   var stepMaps = [];
   var _iterator = _createForOfIteratorHelper(simplifiedSteps),
     _step;
@@ -304,20 +305,56 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       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);
@@ -531,7 +568,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       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;
@@ -621,42 +658,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-function (_ref0, _ref1) {
-  var _ref13;
-  var _ref10 = (0, _slicedToArray2.default)(_ref0, 1),
-    _ref10$ = _ref10[0],
-    pluginState = _ref10$.pluginState,
-    state = _ref10$.state,
-    colorScheme = _ref10$.colorScheme,
-    intl = _ref10$.intl,
-    activeIndexPos = _ref10$.activeIndexPos,
-    isInverted = _ref10$.isInverted,
-    diffType = _ref10$.diffType,
-    hideDeletedDiffs = _ref10$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref10$.hideAddedDiffsUnderline,
-    showIndicators = _ref10$.showIndicators,
-    smartThresholds = _ref10$.smartThresholds,
-    deletedDiffPlacement = _ref10$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref10$.inlineDeletedDiffPlacement;
-  var _ref11 = (0, _slicedToArray2.default)(_ref1, 1),
-    _ref11$ = _ref11[0],
-    lastPluginState = _ref11$.pluginState,
-    lastState = _ref11$.state,
-    lastColorScheme = _ref11$.colorScheme,
-    lastIntl = _ref11$.intl,
-    lastActiveIndexPos = _ref11$.activeIndexPos,
-    lastIsInverted = _ref11$.isInverted,
-    lastDiffType = _ref11$.diffType,
-    lastHideDeletedDiffs = _ref11$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref11$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref11$.showIndicators,
-    lastSmartThresholds = _ref11$.smartThresholds,
-    lastDeletedDiffPlacement = _ref11$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref11$.inlineDeletedDiffPlacement;
+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 _ref12;
-    return (_ref12 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref12 !== void 0 ? _ref12 : false;
+    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 (_ref13 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref13 !== void 0 ? _ref13 : false;
+  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/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;

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

@@ -3,6 +3,7 @@ import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
+import { Mapping } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -268,18 +269,54 @@ const calculateDiffDecorationsInner = ({
   } else {
     simplifiedSteps = simplifySteps(steps, originalDoc);
   }
-  const attrSteps = [];
+  const pendingAttrSteps = [];
   const stepMaps = [];
   for (const step of simplifiedSteps) {
     const result = step.apply(steppedDoc);
     if (result.failed === null && result.doc) {
       if (stepIsValidAttrChange(step, steppedDoc, result.doc)) {
-        attrSteps.push(step);
+        pendingAttrSteps.push({
+          afterNode: result.doc.nodeAt(step.pos),
+          beforeNode: steppedDoc.nodeAt(step.pos),
+          mapIndex: stepMaps.length,
+          step
+        });
       }
       stepMaps.push(step.getMap());
       steppedDoc = result.doc;
     }
   }
+  // Gate the complete attribution fix: mapped positions and step-time nodes are used together.
+  // The fallback deliberately preserves the legacy raw-position lookups for rollout safety.
+  const attrStepContexts = fg('platform_editor_reduce_diff_attr_sensitivity') ? pendingAttrSteps.flatMap(({
+    afterNode,
+    beforeNode,
+    mapIndex,
+    step
+  }) => {
+    const finalPosition = new Mapping(stepMaps.slice(mapIndex + 1)).mapResult(step.pos);
+    if (finalPosition.deleted) {
+      return [];
+    }
+    const originalPosition = new Mapping(stepMaps.slice(0, mapIndex)).invert().mapResult(step.pos);
+    return [{
+      afterNode,
+      beforeNode,
+      finalPos: finalPosition.pos,
+      ...(originalPosition.deleted ? {} : {
+        originalPos: originalPosition.pos
+      }),
+      step
+    }];
+  }) : pendingAttrSteps.map(({
+    step
+  }) => ({
+    afterNode: tr.doc.nodeAt(step.pos),
+    beforeNode: originalDoc.nodeAt(step.pos),
+    finalPos: step.pos,
+    originalPos: step.pos,
+    step
+  }));
 
   // Rather than using .eq() we use a custom function that only checks for structural
   // changes and ignores differences in attributes which don't affect decoration positions
@@ -484,7 +521,7 @@ const calculateDiffDecorationsInner = ({
       isInserted: true
     }));
   });
-  getAttrChangeRanges(tr.doc, attrSteps, originalDoc).forEach(change => {
+  getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).forEach(change => {
     if (change.isInline) {
       // Inline nodes (e.g. date, emoji, mention, status) need an inline decoration rather than a block decoration
       const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;

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

@@ -1,7 +1,10 @@
+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';
 const filterUndefined = x => !!x;
@@ -27,29 +30,49 @@ const isInlineAttrChangeNodeName = nodeName => nodeName in inlineNodeAttrMap;
 // Extension node type names. Their "any attr except localId" exclude rule lives
 // in the shared `diffableAttrs` map and is applied via `isDiffableAttr` below.
 const extensionNodeNames = ['extension', 'inlineExtension', 'bodiedExtension'];
+const transientExtensionAttrPaths = ['localId', 'parameters.macroParams._parentId'];
+
+/**
+ * Removes extension metadata that can change between document versions without changing the
+ * extension's user-visible configuration.
+ */
+const getComparableExtensionAttrs = node => omit(node.attrs, transientExtensionAttrPaths);
+const haveSameRelevantExtensionAttrs = (beforeNode, afterNode) => isEqual(getComparableExtensionAttrs(beforeNode), getComparableExtensionAttrs(afterNode));
 const 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 const getAttrChangeRanges = (doc, steps, originalDoc) => {
-  return steps.map(step => {
+export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
+  return attrStepContexts.map(attrStepContext => {
+    const {
+      afterNode,
+      beforeNode,
+      finalPos,
+      originalPos,
+      step
+    } = attrStepContext;
     if (!(step instanceof AttrStep) && !(step instanceof SetAttrsStep)) {
       return undefined;
     }
     const stepAttrs = getStepAttrs(step);
-    const $pos = doc.resolve(step.pos);
-    const 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.
+    const attrsToCheck = fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode ? stepAttrs.filter(attrName => !isEqual(beforeNode.attrs[attrName], afterNode.attrs[attrName])) : stepAttrs;
+    const $pos = doc.resolve(finalPos);
+    const nodeAtPos = doc.nodeAt(finalPos);
+    const originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
 
     // date node: timestamp attribute change — highlight the date node itself (inline)
-    if (stepAttrs.some(v => dateAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !isExperimentEnabled('platform_editor_improve_inline_diffs', () => expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true))) {
+    if (attrsToCheck.some(v => dateAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'date' && !isExperimentEnabled('platform_editor_improve_inline_diffs', () => 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'
       };
@@ -62,16 +85,15 @@ export const getAttrChangeRanges = (doc, steps, originalDoc) => {
       const nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         const watchedAttrs = inlineNodeAttrMap[nodeName];
-        if (stepAttrs.some(v => watchedAttrs.includes(v))) {
-          const originalNodeAtPos = originalDoc === null || originalDoc === void 0 ? void 0 : originalDoc.nodeAt(step.pos);
+        if (attrsToCheck.some(v => watchedAttrs.includes(v))) {
           return {
-            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
             })
           };
         }
@@ -79,10 +101,10 @@ export const getAttrChangeRanges = (doc, steps, originalDoc) => {
     }
 
     // taskItem node: state attribute change — highlight the taskItem node
-    if (stepAttrs.some(v => taskItemAttrs.includes(v)) && (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type.name) === 'taskItem') {
+    if (attrsToCheck.some(v => 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
       };
     }
 
@@ -90,30 +112,33 @@ export const getAttrChangeRanges = (doc, steps, originalDoc) => {
     // (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(v => panelAttrs.includes(v)) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
-      const originalNodeAtPos = originalDoc === null || originalDoc === void 0 ? void 0 : originalDoc.nodeAt(step.pos);
+    if (attrsToCheck.some(v => panelAttrs.includes(v)) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
       return {
-        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(v => isDiffableAttr(nodeAtPos.type.name, 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(v => isDiffableAttr(nodeAtPos.type.name, v))) {
+      if (fg('platform_editor_reduce_diff_attr_sensitivity') && beforeNode && afterNode && beforeNode.type === afterNode.type && haveSameRelevantExtensionAttrs(beforeNode, afterNode)) {
+        return undefined;
+      }
       const isInline = nodeAtPos.type.name === 'inlineExtension';
       return {
-        fromB: step.pos,
-        toB: step.pos + nodeAtPos.nodeSize,
+        fromB: finalPos,
+        toB: finalPos + nodeAtPos.nodeSize,
         isInline
       };
     }
 
     // media node: id/collection/url attribute change — highlight the mediaSingle parent
-    if (stepAttrs.some(v => mediaAttrs.includes(v)) && $pos.parent.type === doc.type.schema.nodes.mediaSingle) {
+    if (attrsToCheck.some(v => mediaAttrs.includes(v)) && $pos.parent.type === doc.type.schema.nodes.mediaSingle) {
       const startPos = $pos.pos + $pos.parentOffset;
       return {
         fromB: startPos,

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

@@ -11,6 +11,7 @@ import memoizeOne from 'memoize-one';
 import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { isExperimentEnabled } from '@atlaskit/editor-common/deprecated-platform-feature-experiments';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
+import { Mapping } from '@atlaskit/editor-prosemirror/transform';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -287,7 +288,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   } else {
     simplifiedSteps = simplifySteps(steps, originalDoc);
   }
-  var attrSteps = [];
+  var pendingAttrSteps = [];
   var stepMaps = [];
   var _iterator = _createForOfIteratorHelper(simplifiedSteps),
     _step;
@@ -297,20 +298,56 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       var result = step.apply(steppedDoc);
       if (result.failed === null && result.doc) {
         if (stepIsValidAttrChange(step, steppedDoc, result.doc)) {
-          attrSteps.push(step);
+          pendingAttrSteps.push({
+            afterNode: result.doc.nodeAt(step.pos),
+            beforeNode: steppedDoc.nodeAt(step.pos),
+            mapIndex: stepMaps.length,
+            step: 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 = 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 Mapping(stepMaps.slice(mapIndex + 1)).mapResult(step.pos);
+    if (finalPosition.deleted) {
+      return [];
+    }
+    var originalPosition = new 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 (!areNodesEqualIgnoreAttrs(steppedDoc, tr.doc)) {
     var _api$analytics;
     var recoveredViaContentEquality = areDocsEqualByBlockStructureAndText(steppedDoc, tr.doc);
@@ -524,7 +561,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
       isInserted: true
     })));
   });
-  getAttrChangeRanges(tr.doc, attrSteps, originalDoc).forEach(function (change) {
+  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;
@@ -614,42 +651,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
 };
 export var calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-function (_ref0, _ref1) {
-  var _ref13;
-  var _ref10 = _slicedToArray(_ref0, 1),
-    _ref10$ = _ref10[0],
-    pluginState = _ref10$.pluginState,
-    state = _ref10$.state,
-    colorScheme = _ref10$.colorScheme,
-    intl = _ref10$.intl,
-    activeIndexPos = _ref10$.activeIndexPos,
-    isInverted = _ref10$.isInverted,
-    diffType = _ref10$.diffType,
-    hideDeletedDiffs = _ref10$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref10$.hideAddedDiffsUnderline,
-    showIndicators = _ref10$.showIndicators,
-    smartThresholds = _ref10$.smartThresholds,
-    deletedDiffPlacement = _ref10$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref10$.inlineDeletedDiffPlacement;
-  var _ref11 = _slicedToArray(_ref1, 1),
-    _ref11$ = _ref11[0],
-    lastPluginState = _ref11$.pluginState,
-    lastState = _ref11$.state,
-    lastColorScheme = _ref11$.colorScheme,
-    lastIntl = _ref11$.intl,
-    lastActiveIndexPos = _ref11$.activeIndexPos,
-    lastIsInverted = _ref11$.isInverted,
-    lastDiffType = _ref11$.diffType,
-    lastHideDeletedDiffs = _ref11$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref11$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref11$.showIndicators,
-    lastSmartThresholds = _ref11$.smartThresholds,
-    lastDeletedDiffPlacement = _ref11$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref11$.inlineDeletedDiffPlacement;
+function (_ref10, _ref11) {
+  var _ref15;
+  var _ref12 = _slicedToArray(_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 = _slicedToArray(_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 (isExtendedEnabled(diffType)) {
-    var _ref12;
-    return (_ref12 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref12 !== void 0 ? _ref12 : false;
+    var _ref14;
+    return (_ref14 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref14 !== void 0 ? _ref14 : false;
   }
-  return (_ref13 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref13 !== void 0 ? _ref13 : false;
+  return (_ref15 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref15 !== void 0 ? _ref15 : false;
 });

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/types/entry-points/show-diff-plugin-type.d.ts

@@ -1 +1 @@
-export type { DeletedDiffPlacement, DeletedDiffWidget, DiffParams, DiffStepAttribution, DiffType, PMDiffParams, ShowDiffPlugin, SmartDiffThresholds, StepWithAttribution, } from '../showDiffPluginType';
+export type { DeletedDiffPlacement, DeletedDiffWidget, DiffParams, DiffStepAttribution, DiffType, PMDiffParams, ShowDiffParams, ShowDiffPlugin, SmartDiffThresholds, StepWithAttribution, } from '../showDiffPluginType';

package/dist/types/pm-plugins/decorations/utils/getAttrChangeRanges.d.ts

@@ -1,6 +1,16 @@
+import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform-override';
+import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
 export type InlineAttrChangeNodeName = 'date' | 'emoji' | 'mention' | 'status';
+type AttrChangeStep = AttrStep | SetAttrsStep;
+export type AttrStepContext = {
+    afterNode: PMNode | null;
+    beforeNode: PMNode | null;
+    finalPos: number;
+    originalPos?: number;
+    step: AttrChangeStep;
+};
 type StepRange = {
     /**
      * Position of the original (before) node in the original doc.
@@ -16,7 +26,7 @@ type StepRange = {
     toA?: number;
     toB: number;
 };
-export declare const getAttrChangeRanges: (doc: PMNode, steps: ProseMirrorStep[], originalDoc: PMNode) => StepRange[];
+export declare const getAttrChangeRanges: (doc: PMNode, attrStepContexts: AttrStepContext[], originalDoc: PMNode) => StepRange[];
 /**
  * Check if the step was a valid attr change and affected the doc
  *
@@ -25,5 +35,5 @@ export declare const getAttrChangeRanges: (doc: PMNode, steps: ProseMirrorStep[]
  * @param afterDoc Doc after the step
  * @returns Boolean if the change should show a decoration
  */
-export declare const stepIsValidAttrChange: (step: ProseMirrorStep, beforeDoc: PMNode, afterDoc: PMNode) => boolean;
+export declare const stepIsValidAttrChange: (step: ProseMirrorStep, beforeDoc: PMNode, afterDoc: PMNode) => step is AttrChangeStep;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "14.1.0",
+	"version": "14.2.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -20,7 +20,7 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^57.1.0",
+		"@atlaskit/adf-schema": "^57.2.0",
 		"@atlaskit/custom-steps": "^1.0.0",
 		"@atlaskit/editor-plugin-analytics": "^16.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^14.0.0",
@@ -28,7 +28,7 @@
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^162.0.0",
+		"@atlaskit/tmp-editor-statsig": "^163.0.0",
 		"@atlaskit/tokens": "^16.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -39,9 +39,9 @@
 	"devDependencies": {
 		"@atlaskit/adf-utils": "^20.7.0",
 		"@atlaskit/button": "^25.2.0",
-		"@atlaskit/css": "^1.0.0",
+		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/dropdown-menu": "^18.2.0",
-		"@atlaskit/editor-core": "^226.0.0",
+		"@atlaskit/editor-core": "^226.1.0",
 		"@atlaskit/editor-json-transformer": "^9.6.0",
 		"@atlaskit/editor-plugins": "^16.1.0",
 		"@atlaskit/form": "^17.1.0",
@@ -104,6 +104,9 @@
 		},
 		"confluence_ncs_step_diffing_version_history": {
 			"type": "boolean"
+		},
+		"platform_editor_reduce_diff_attr_sensitivity": {
+			"type": "boolean"
 		}
 	}
 }