@atlaskit/editor-plugin-show-diff 21.0.1 → 21.0.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 21.0.2
+
+### Patch Changes
+
+- [`1647c1098fca5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1647c1098fca5) -
+  Highlight changed inline nodes and the edited portion of link display text
+
 ## 21.0.1
 
 ### Patch Changes

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

@@ -464,11 +464,14 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       };
     }
   }
-  // The attribute-aware encoder is only needed by the smart classifier and is gated with it.
-  var _selectTokenEncoder = (0, _selectTokenEncoder2.selectTokenEncoder)(diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff')),
+  // The attribute-aware encoder is needed by the smart classifier and is gated with it.
+  // The NCS version-history path also uses it so the main diff calculation detects attribute-only
+  // node replacements, e.g. changing an emoji or mention without changing the node type.
+  var _selectTokenEncoder = (0, _selectTokenEncoder2.selectTokenEncoder)(diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff') || (0, _fg.fg)('confluence_ncs_step_diffing_version_history')),
     tokenEncoder = _selectTokenEncoder.tokenEncoder,
     shouldHideMarkOnlyDeletions = _selectTokenEncoder.shouldHideMarkOnlyDeletions;
   var changes;
+  var contentChanges;
   var attributedChanges = [];
   var attributionColors;
   if (attributedChangesetEnabled) {
@@ -482,6 +485,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         stepIndex: stepIndex
       });
     }));
+    contentChanges = changeset.changes;
     attributedChanges = diffType === 'step' ? (0, _diffBySteps.diffBySteps)(originalDoc, simplifiedSteps, simplifiedStepAttributions) : (0, _toConsumableArray2.default)(changeset.changes);
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
@@ -501,6 +505,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     }
   } else {
     var _changeset = _prosemirrorChangeset.ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
+    contentChanges = _changeset.changes;
     changes = getChanges({
       changeset: _changeset,
       originalDoc: originalDoc,
@@ -760,20 +765,52 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   changes.forEach(function (change) {
     createDecorationsForChange(change);
   });
-  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
-  // smart path. Only add the legacy step-range decoration when no equivalent changeset range was
-  // produced; otherwise the same content receives two inline decorations (and two navigation
-  // changes), usually one attribution colour and one default purple decoration.
-  (0, _getMarkChangeRanges.getMarkChangeRanges)(simplifiedSteps, simplifiedStepAttributions, (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref10) {
+  // Compare the content outside replacement ranges at matching positions in both documents.
+  // This preserves real formatting edits without highlighting an unchanged link mark reapplied
+  // while editing its display text.
+  var hasUnhighlightedMarkChanges = function hasUnhighlightedMarkChanges(_ref10) {
     var fromB = _ref10.fromB,
       toB = _ref10.toB;
-    return !isHandledByTable(fromB, toB);
-  }).filter(function (_ref11) {
+    var from = fromB;
+    var offset = 0;
+    var differs = function differs(to) {
+      return from < to && !originalDoc.slice(from + offset, to + offset).content.eq(tr.doc.slice(from, to).content);
+    };
+    var _iterator5 = _createForOfIteratorHelper(contentChanges),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var change = _step5.value;
+        if (change.fromB >= toB) {
+          break;
+        }
+        if (change.toB > from) {
+          if (differs(change.fromB)) {
+            return true;
+          }
+          from = change.toB;
+        }
+        offset = change.toA - change.toB;
+      }
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
+    }
+    return differs(toB);
+  };
+
+  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
+  // smart path and the NCS version-history path. For NCS version history, only skip the step-range
+  // highlight if the main diff covers it or the remaining content has unchanged formatting.
+  (0, _getMarkChangeRanges.getMarkChangeRanges)(simplifiedSteps, simplifiedStepAttributions, (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref11) {
     var fromB = _ref11.fromB,
       toB = _ref11.toB;
+    return !isHandledByTable(fromB, toB);
+  }).filter(function (range) {
     return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
-      return change.fromB === fromB && change.toB === toB;
-    });
+      return change.fromB <= range.fromB && change.toB >= range.toB;
+    }) && hasUnhighlightedMarkChanges(range);
   }).forEach(function (change) {
     var _attributionColors$ge, _attributionColors;
     var changeColorScheme = change.attributionKey ? (_attributionColors$ge = (_attributionColors = attributionColors) === null || _attributionColors === void 0 ? void 0 : _attributionColors.get(change.attributionKey)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : colorScheme : colorScheme;
@@ -797,8 +834,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     return !isHandledByTable(fromB, toB);
   }).filter(function (_ref13) {
     var fromB = _ref13.fromB,
-      toB = _ref13.toB;
-    return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
+      toB = _ref13.toB,
+      isInline = _ref13.isInline;
+    return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !isInline || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
   }).forEach(function (change) {

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

@@ -20,7 +20,8 @@ var typeID = function typeID(type) {
  *
  * Deliberately narrower than `attrAwareTokenEncoder`: node-start tokens keep the library default
  * and do not fold in diffable attributes, which `getAttrChangeRanges` already reports for every
- * diff type.
+ * diff type. The NCS version-history path also uses `attrAwareTokenEncoder` so main diff calculation
+ * detects attribute-only node replacements.
  */
 var markAwareTokenEncoder = exports.markAwareTokenEncoder = {
   encodeCharacter: function encodeCharacter(char, marks) {

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

@@ -11,7 +11,7 @@ var _markAwareTokenEncoder = require("./markAwareTokenEncoder");
  * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
- * into the token.
+ * into the token. Also used by the NCS version-history path to detect attribute-only node changes.
  */
 var selectTokenEncoder = exports.selectTokenEncoder = function selectTokenEncoder(useAttrAwareEncoder) {
   if (useAttrAwareEncoder) {

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isDiffableAttr = exports.getRequiredIncludedDiffableAttrs = exports.getIncludedDiffableAttrs = exports.getDiffableAttrNames = exports.DIFFABLE_ATTRS_BY_NODE_TYPE = void 0;
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 /**
  * Single source of truth for which attributes of a node type represent a
  * meaningful change. Shared by `attrAwareTokenEncoder` (changeset detection)
@@ -94,10 +95,13 @@ var getRequiredIncludedDiffableAttrs = exports.getRequiredIncludedDiffableAttrs
  * order is not stable across the two diffed documents.
  */
 var getDiffableAttrNames = exports.getDiffableAttrNames = function getDiffableAttrNames(nodeTypeName, attrs) {
+  // Adding a column updates existing widths, ignore this attribute change. Move this into
+  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up confluence_ncs_step_diffing_version_history
+  var ignoreColumnWidth = nodeTypeName === 'layoutColumn' && (0, _fg.fg)('confluence_ncs_step_diffing_version_history');
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
     return Object.keys(attrs).filter(function (name) {
-      return !DEFAULT_EXCLUDED_ATTRS.includes(name);
+      return !DEFAULT_EXCLUDED_ATTRS.includes(name) && !(ignoreColumnWidth && name === 'width');
     }).sort();
   }
   if ('include' in rule) {

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

@@ -90,6 +90,11 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
     var $pos = doc.resolve(finalPos);
     var nodeAtPos = doc.nodeAt(finalPos);
     var originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
+    var hasChangedAttr = function hasChangedAttr(watchedAttrs) {
+      return attrsToCheck.some(function (attr) {
+        return watchedAttrs.includes(attr) && (!(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !(0, _isEqual.default)(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr]));
+      });
+    };
 
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
@@ -97,9 +102,7 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
       var nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         var watchedAttrs = inlineNodeAttrMap[nodeName];
-        if (attrsToCheck.some(function (v) {
-          return watchedAttrs.includes(v);
-        })) {
+        if (hasChangedAttr(watchedAttrs)) {
           return _objectSpread(_objectSpread({}, attributionKey ? {
             attributionKey: attributionKey
           } : {}), {}, {
@@ -131,9 +134,7 @@ 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 (attrsToCheck.some(function (v) {
-      return panelAttrs.includes(v);
-    }) && nodeAtPos && (0, _nodeTypeUtils.getBaseNodeTypeName)(nodeAtPos.type) === 'panel') {
+    if (hasChangedAttr(panelAttrs) && nodeAtPos && (0, _nodeTypeUtils.getBaseNodeTypeName)(nodeAtPos.type) === 'panel') {
       return _objectSpread(_objectSpread({}, attributionKey ? {
         attributionKey: attributionKey
       } : {}), {}, {
@@ -181,7 +182,9 @@ var getAttrChangeRanges = exports.getAttrChangeRanges = function getAttrChangeRa
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
   .filter(function (range, i, arr) {
-    return arr.findIndex(function (r) {
+    return (0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? !arr.some(function (r, nextIndex) {
+      return nextIndex > i && r.fromB === range.fromB;
+    }) : arr.findIndex(function (r) {
       return r.fromB === range.fromB;
     }) === i;
   });

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

@@ -418,12 +418,15 @@ const calculateDiffDecorationsInner = ({
       };
     }
   }
-  // The attribute-aware encoder is only needed by the smart classifier and is gated with it.
+  // The attribute-aware encoder is needed by the smart classifier and is gated with it.
+  // The NCS version-history path also uses it so the main diff calculation detects attribute-only
+  // node replacements, e.g. changing an emoji or mention without changing the node type.
   const {
     tokenEncoder,
     shouldHideMarkOnlyDeletions
-  } = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff'));
+  } = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff') || fg('confluence_ncs_step_diffing_version_history'));
   let changes;
+  let contentChanges;
   let attributedChanges = [];
   let attributionColors;
   if (attributedChangesetEnabled) {
@@ -434,6 +437,7 @@ const calculateDiffDecorationsInner = ({
       ...attribution,
       stepIndex
     })));
+    contentChanges = changeset.changes;
     attributedChanges = diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : [...changeset.changes];
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
@@ -453,6 +457,7 @@ const calculateDiffDecorationsInner = ({
     }
   } else {
     const changeset = ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
+    contentChanges = changeset.changes;
     changes = getChanges({
       changeset,
       originalDoc,
@@ -686,17 +691,38 @@ const calculateDiffDecorationsInner = ({
   changes.forEach(change => {
     createDecorationsForChange(change);
   });
-  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
-  // smart path. Only add the legacy step-range decoration when no equivalent changeset range was
-  // produced; otherwise the same content receives two inline decorations (and two navigation
-  // changes), usually one attribution colour and one default purple decoration.
-  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(({
+  // Compare the content outside replacement ranges at matching positions in both documents.
+  // This preserves real formatting edits without highlighting an unchanged link mark reapplied
+  // while editing its display text.
+  const hasUnhighlightedMarkChanges = ({
     fromB,
     toB
-  }) => !isHandledByTable(fromB, toB)).filter(({
+  }) => {
+    let from = fromB;
+    let offset = 0;
+    const differs = to => from < to && !originalDoc.slice(from + offset, to + offset).content.eq(tr.doc.slice(from, to).content);
+    for (const change of contentChanges) {
+      if (change.fromB >= toB) {
+        break;
+      }
+      if (change.toB > from) {
+        if (differs(change.fromB)) {
+          return true;
+        }
+        from = change.toB;
+      }
+      offset = change.toA - change.toB;
+    }
+    return differs(toB);
+  };
+
+  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
+  // smart path and the NCS version-history path. For NCS version history, only skip the step-range
+  // highlight if the main diff covers it or the remaining content has unchanged formatting.
+  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(({
     fromB,
     toB
-  }) => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
+  }) => !isHandledByTable(fromB, toB)).filter(range => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB <= range.fromB && change.toB >= range.toB) && hasUnhighlightedMarkChanges(range)).forEach(change => {
     var _attributionColors$ge, _attributionColors;
     const changeColorScheme = change.attributionKey ? (_attributionColors$ge = (_attributionColors = attributionColors) === null || _attributionColors === void 0 ? void 0 : _attributionColors.get(change.attributionKey)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : colorScheme : colorScheme;
     const attributionKey = showContributorTags ? change.attributionKey : undefined;
@@ -718,8 +744,9 @@ const calculateDiffDecorationsInner = ({
     toB
   }) => !isHandledByTable(fromB, toB)).filter(({
     fromB,
-    toB
-  }) => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
+    toB,
+    isInline
+  }) => !fg('confluence_ncs_step_diffing_version_history') || !isInline || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
     var _attributionColors$ge2, _attributionColors2;
     const changeColorScheme = change.attributionKey ? (_attributionColors$ge2 = (_attributionColors2 = attributionColors) === null || _attributionColors2 === void 0 ? void 0 : _attributionColors2.get(change.attributionKey)) !== null && _attributionColors$ge2 !== void 0 ? _attributionColors$ge2 : colorScheme : colorScheme;
     const attributionKey = showContributorTags ? change.attributionKey : undefined;

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

@@ -15,7 +15,8 @@ const typeID = type => {
  *
  * Deliberately narrower than `attrAwareTokenEncoder`: node-start tokens keep the library default
  * and do not fold in diffable attributes, which `getAttrChangeRanges` already reports for every
- * diff type.
+ * diff type. The NCS version-history path also uses `attrAwareTokenEncoder` so main diff calculation
+ * detects attribute-only node replacements.
  */
 export const markAwareTokenEncoder = {
   encodeCharacter: (char, marks) => encodeCharacterWithMarks(char, marks),

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

@@ -5,7 +5,7 @@ import { markAwareTokenEncoder } from './markAwareTokenEncoder';
  * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
- * into the token.
+ * into the token. Also used by the NCS version-history path to detect attribute-only node changes.
  */
 export const selectTokenEncoder = useAttrAwareEncoder => {
   if (useAttrAwareEncoder) {

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

@@ -1,3 +1,5 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+
 /**
  * Single source of truth for which attributes of a node type represent a
  * meaningful change. Shared by `attrAwareTokenEncoder` (changeset detection)
@@ -88,9 +90,12 @@ export const getRequiredIncludedDiffableAttrs = nodeTypeName => {
  * order is not stable across the two diffed documents.
  */
 export const getDiffableAttrNames = (nodeTypeName, attrs) => {
+  // Adding a column updates existing widths, ignore this attribute change. Move this into
+  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up confluence_ncs_step_diffing_version_history
+  const ignoreColumnWidth = nodeTypeName === 'layoutColumn' && fg('confluence_ncs_step_diffing_version_history');
   const rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
-    return Object.keys(attrs).filter(name => !DEFAULT_EXCLUDED_ATTRS.includes(name)).sort();
+    return Object.keys(attrs).filter(name => !DEFAULT_EXCLUDED_ATTRS.includes(name) && !(ignoreColumnWidth && name === 'width')).sort();
   }
   if ('include' in rule) {
     return rule.include;

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

@@ -74,6 +74,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
     const $pos = doc.resolve(finalPos);
     const nodeAtPos = doc.nodeAt(finalPos);
     const originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
+    const hasChangedAttr = watchedAttrs => attrsToCheck.some(attr => watchedAttrs.includes(attr) && (!fg('confluence_ncs_step_diffing_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !isEqual(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr])));
 
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
@@ -81,7 +82,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
       const nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         const watchedAttrs = inlineNodeAttrMap[nodeName];
-        if (attrsToCheck.some(v => watchedAttrs.includes(v))) {
+        if (hasChangedAttr(watchedAttrs)) {
           return {
             ...(attributionKey ? {
               attributionKey
@@ -114,7 +115,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, 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 (attrsToCheck.some(v => panelAttrs.includes(v)) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
+    if (hasChangedAttr(panelAttrs) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
       return {
         ...(attributionKey ? {
           attributionKey
@@ -161,7 +162,7 @@ export const getAttrChangeRanges = (doc, attrStepContexts, originalDoc) => {
   // Deduplicate by node position: multiple AttrSteps on the same node
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
-  .filter((range, i, arr) => arr.findIndex(r => r.fromB === range.fromB) === i);
+  .filter((range, i, arr) => fg('confluence_ncs_step_diffing_version_history') ? !arr.some((r, nextIndex) => nextIndex > i && r.fromB === range.fromB) : arr.findIndex(r => r.fromB === range.fromB) === i);
 };
 
 /**

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

@@ -457,11 +457,14 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       };
     }
   }
-  // The attribute-aware encoder is only needed by the smart classifier and is gated with it.
-  var _selectTokenEncoder = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff')),
+  // The attribute-aware encoder is needed by the smart classifier and is gated with it.
+  // The NCS version-history path also uses it so the main diff calculation detects attribute-only
+  // node replacements, e.g. changing an emoji or mention without changing the node type.
+  var _selectTokenEncoder = selectTokenEncoder(diffType === 'smart' && fg('platform_editor_ai_smart_diff') || fg('confluence_ncs_step_diffing_version_history')),
     tokenEncoder = _selectTokenEncoder.tokenEncoder,
     shouldHideMarkOnlyDeletions = _selectTokenEncoder.shouldHideMarkOnlyDeletions;
   var changes;
+  var contentChanges;
   var attributedChanges = [];
   var attributionColors;
   if (attributedChangesetEnabled) {
@@ -475,6 +478,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         stepIndex: stepIndex
       });
     }));
+    contentChanges = changeset.changes;
     attributedChanges = diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : _toConsumableArray(changeset.changes);
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
@@ -494,6 +498,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     }
   } else {
     var _changeset = ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
+    contentChanges = _changeset.changes;
     changes = getChanges({
       changeset: _changeset,
       originalDoc: originalDoc,
@@ -753,20 +758,52 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   changes.forEach(function (change) {
     createDecorationsForChange(change);
   });
-  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
-  // smart path. Only add the legacy step-range decoration when no equivalent changeset range was
-  // produced; otherwise the same content receives two inline decorations (and two navigation
-  // changes), usually one attribution colour and one default purple decoration.
-  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref10) {
+  // Compare the content outside replacement ranges at matching positions in both documents.
+  // This preserves real formatting edits without highlighting an unchanged link mark reapplied
+  // while editing its display text.
+  var hasUnhighlightedMarkChanges = function hasUnhighlightedMarkChanges(_ref10) {
     var fromB = _ref10.fromB,
       toB = _ref10.toB;
-    return !isHandledByTable(fromB, toB);
-  }).filter(function (_ref11) {
+    var from = fromB;
+    var offset = 0;
+    var differs = function differs(to) {
+      return from < to && !originalDoc.slice(from + offset, to + offset).content.eq(tr.doc.slice(from, to).content);
+    };
+    var _iterator5 = _createForOfIteratorHelper(contentChanges),
+      _step5;
+    try {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        var change = _step5.value;
+        if (change.fromB >= toB) {
+          break;
+        }
+        if (change.toB > from) {
+          if (differs(change.fromB)) {
+            return true;
+          }
+          from = change.toB;
+        }
+        offset = change.toA - change.toB;
+      }
+    } catch (err) {
+      _iterator5.e(err);
+    } finally {
+      _iterator5.f();
+    }
+    return differs(toB);
+  };
+
+  // The attribute-aware token encoder already reports mark-only changes as regular changes in the
+  // smart path and the NCS version-history path. For NCS version history, only skip the step-range
+  // highlight if the main diff covers it or the remaining content has unchanged formatting.
+  getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(function (_ref11) {
     var fromB = _ref11.fromB,
       toB = _ref11.toB;
+    return !isHandledByTable(fromB, toB);
+  }).filter(function (range) {
     return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
-      return change.fromB === fromB && change.toB === toB;
-    });
+      return change.fromB <= range.fromB && change.toB >= range.toB;
+    }) && hasUnhighlightedMarkChanges(range);
   }).forEach(function (change) {
     var _attributionColors$ge, _attributionColors;
     var changeColorScheme = change.attributionKey ? (_attributionColors$ge = (_attributionColors = attributionColors) === null || _attributionColors === void 0 ? void 0 : _attributionColors.get(change.attributionKey)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : colorScheme : colorScheme;
@@ -790,8 +827,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     return !isHandledByTable(fromB, toB);
   }).filter(function (_ref13) {
     var fromB = _ref13.fromB,
-      toB = _ref13.toB;
-    return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
+      toB = _ref13.toB,
+      isInline = _ref13.isInline;
+    return !fg('confluence_ncs_step_diffing_version_history') || !isInline || !changes.some(function (change) {
       return change.fromB === fromB && change.toB === toB;
     });
   }).forEach(function (change) {

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

@@ -15,7 +15,8 @@ var typeID = function typeID(type) {
  *
  * Deliberately narrower than `attrAwareTokenEncoder`: node-start tokens keep the library default
  * and do not fold in diffable attributes, which `getAttrChangeRanges` already reports for every
- * diff type.
+ * diff type. The NCS version-history path also uses `attrAwareTokenEncoder` so main diff calculation
+ * detects attribute-only node replacements.
  */
 export var markAwareTokenEncoder = {
   encodeCharacter: function encodeCharacter(char, marks) {

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

@@ -5,7 +5,7 @@ import { markAwareTokenEncoder } from './markAwareTokenEncoder';
  * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
- * into the token.
+ * into the token. Also used by the NCS version-history path to detect attribute-only node changes.
  */
 export var selectTokenEncoder = function selectTokenEncoder(useAttrAwareEncoder) {
   if (useAttrAwareEncoder) {

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

@@ -1,3 +1,5 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+
 /**
  * Single source of truth for which attributes of a node type represent a
  * meaningful change. Shared by `attrAwareTokenEncoder` (changeset detection)
@@ -88,10 +90,13 @@ export var getRequiredIncludedDiffableAttrs = function getRequiredIncludedDiffab
  * order is not stable across the two diffed documents.
  */
 export var getDiffableAttrNames = function getDiffableAttrNames(nodeTypeName, attrs) {
+  // Adding a column updates existing widths, ignore this attribute change. Move this into
+  // DIFFABLE_ATTRS_BY_NODE_TYPE when cleaning up confluence_ncs_step_diffing_version_history
+  var ignoreColumnWidth = nodeTypeName === 'layoutColumn' && fg('confluence_ncs_step_diffing_version_history');
   var rule = DIFFABLE_ATTRS_BY_NODE_TYPE[nodeTypeName];
   if (!rule) {
     return Object.keys(attrs).filter(function (name) {
-      return !DEFAULT_EXCLUDED_ATTRS.includes(name);
+      return !DEFAULT_EXCLUDED_ATTRS.includes(name) && !(ignoreColumnWidth && name === 'width');
     }).sort();
   }
   if ('include' in rule) {

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

@@ -83,6 +83,11 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
     var $pos = doc.resolve(finalPos);
     var nodeAtPos = doc.nodeAt(finalPos);
     var originalNodeAtPos = originalPos === undefined ? null : originalDoc.nodeAt(originalPos);
+    var hasChangedAttr = function hasChangedAttr(watchedAttrs) {
+      return attrsToCheck.some(function (attr) {
+        return watchedAttrs.includes(attr) && (!fg('confluence_ncs_step_diffing_version_history') || !originalNodeAtPos || originalNodeAtPos.type !== (nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.type) || !isEqual(originalNodeAtPos.attrs[attr], nodeAtPos === null || nodeAtPos === void 0 ? void 0 : nodeAtPos.attrs[attr]));
+      });
+    };
 
     // The changeset path (createDecorationsForChange) handles the deletion widget via
     // prosemirror-changeset; we only need to add the inline insertion highlight here.
@@ -90,9 +95,7 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
       var nodeName = nodeAtPos.type.name;
       if (isInlineAttrChangeNodeName(nodeName)) {
         var watchedAttrs = inlineNodeAttrMap[nodeName];
-        if (attrsToCheck.some(function (v) {
-          return watchedAttrs.includes(v);
-        })) {
+        if (hasChangedAttr(watchedAttrs)) {
           return _objectSpread(_objectSpread({}, attributionKey ? {
             attributionKey: attributionKey
           } : {}), {}, {
@@ -124,9 +127,7 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
     // (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 (attrsToCheck.some(function (v) {
-      return panelAttrs.includes(v);
-    }) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
+    if (hasChangedAttr(panelAttrs) && nodeAtPos && getBaseNodeTypeName(nodeAtPos.type) === 'panel') {
       return _objectSpread(_objectSpread({}, attributionKey ? {
         attributionKey: attributionKey
       } : {}), {}, {
@@ -174,7 +175,9 @@ export var getAttrChangeRanges = function getAttrChangeRanges(doc, attrStepConte
   // (e.g. setNodeAttribute(pos, 'text', ...) + setNodeAttribute(pos, 'color', ...))
   // should produce only one decoration, not one per step.
   .filter(function (range, i, arr) {
-    return arr.findIndex(function (r) {
+    return fg('confluence_ncs_step_diffing_version_history') ? !arr.some(function (r, nextIndex) {
+      return nextIndex > i && r.fromB === range.fromB;
+    }) : arr.findIndex(function (r) {
       return r.fromB === range.fromB;
     }) === i;
   });

package/dist/types/pm-plugins/calculateDiff/markAwareTokenEncoder.d.ts

@@ -4,6 +4,7 @@ import type { TokenEncoder } from 'prosemirror-changeset';
  *
  * Deliberately narrower than `attrAwareTokenEncoder`: node-start tokens keep the library default
  * and do not fold in diffable attributes, which `getAttrChangeRanges` already reports for every
- * diff type.
+ * diff type. The NCS version-history path also uses `attrAwareTokenEncoder` so main diff calculation
+ * detects attribute-only node replacements.
  */
 export declare const markAwareTokenEncoder: TokenEncoder<string | number>;

package/dist/types/pm-plugins/calculateDiff/selectTokenEncoder.d.ts

@@ -10,6 +10,6 @@ export type TokenEncoderSelection = {
  * `computeDiffChanges` so the two cannot drift.
  *
  * @param useAttrAwareEncoder Caller is running the smart classifier, which needs node attrs folded
- * into the token.
+ * into the token. Also used by the NCS version-history path to detect attribute-only node changes.
  */
 export declare const selectTokenEncoder: (useAttrAwareEncoder: boolean) => TokenEncoderSelection;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "21.0.1",
+	"version": "21.0.2",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",