@atlaskit/editor-plugin-show-diff 14.2.6 → 14.2.8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 14.2.8
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.2.7
+
+### Patch Changes
+
+- [`68281638de8fc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/68281638de8fc) -
+  Group overlapping diff decorations into a single customer-facing edit and highlight the full edit
+  when navigating changes, gated by `confluence_ncs_step_diffing_version_history`.
+
 ## 14.2.6
 
 ### Patch Changes

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

@@ -131,6 +131,20 @@ var leafTextblockRanges = function leafTextblockRanges(doc, from, to) {
 // once it has more leaf textblocks (~cells) than this threshold. Small tables
 // keep the precise per-cell path.
 var LARGE_TABLE_LEAF_THRESHOLD = 40;
+
+/**
+ * An active scrollable change may contain several underlying diff changes. Treat ranges that
+ * overlap or touch the active range as part of the same active customer-facing edit.
+ */
+var isRangeActive = function isRangeActive(activeIndexPos, from, to) {
+  if (activeIndexPos === undefined) {
+    return undefined;
+  }
+  if (!(0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+    return from === activeIndexPos.from && to === activeIndexPos.to;
+  }
+  return from <= activeIndexPos.to && activeIndexPos.from <= to;
+};
 var isLargeInsertedTableRange = function isLargeInsertedTableRange(doc, from, to) {
   var containsTable = false;
   var leafCount = 0;
@@ -198,7 +212,7 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
     }
     if (node.isBlock && (!(0, _isExtendedEnabled.isExtendedEnabled)(diffType) || pos + node.nodeSize <= to)) {
       var nodeEnd = pos + node.nodeSize;
-      var isActive = activeIndexPos && pos === activeIndexPos.from && nodeEnd === activeIndexPos.to;
+      var isActive = isRangeActive(activeIndexPos, pos, nodeEnd);
       decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createBlockChangedDecoration.createBlockChangedDecoration)({
         change: {
           from: pos,
@@ -431,7 +445,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   var isInserted = !isInverted;
   var createDecorationsForChange = function createDecorationsForChange(change) {
     var changeColorScheme = attributionColors ? (0, _attributions.getColorSchemeForChange)(change, attributedChanges, attributionColors, colorScheme) : colorScheme;
-    var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
+    var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
 
     // Hoisted because it decides BOTH where the deleted widget is anchored and — since the
     // widget pins whichever end of the range it sits at — how the indicator anchors below are
@@ -559,11 +573,22 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   changes.forEach(function (change) {
     createDecorationsForChange(change);
   });
-  (0, _getMarkChangeRanges.getMarkChangeRanges)(steps).forEach(function (change) {
-    var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
+  // 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)(steps).filter(function (_ref10) {
+    var fromB = _ref10.fromB,
+      toB = _ref10.toB;
+    return !(0, _fg.fg)('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
+      return change.fromB === fromB && change.toB === toB;
+    });
+  }).forEach(function (change) {
+    var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
     decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
       change: change,
       colorScheme: colorScheme,
+      diffType: diffType,
       isActive: isActive,
       isInserted: true
     })));
@@ -571,7 +596,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   (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;
+      var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
       var isAtomicInlineNodeFlag = (0, _deprecatedPlatformFeatureExperiments.isExperimentEnabled)('platform_editor_improve_inline_diffs', function () {
         return (0, _expValEquals.expValEquals)('platform_editor_improve_inline_diffs', 'isEnabled', true);
       });
@@ -658,42 +683,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-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;
+function (_ref11, _ref12) {
+  var _ref16;
   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;
+    pluginState = _ref13$.pluginState,
+    state = _ref13$.state,
+    colorScheme = _ref13$.colorScheme,
+    intl = _ref13$.intl,
+    activeIndexPos = _ref13$.activeIndexPos,
+    isInverted = _ref13$.isInverted,
+    diffType = _ref13$.diffType,
+    hideDeletedDiffs = _ref13$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref13$.hideAddedDiffsUnderline,
+    showIndicators = _ref13$.showIndicators,
+    smartThresholds = _ref13$.smartThresholds,
+    deletedDiffPlacement = _ref13$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref13$.inlineDeletedDiffPlacement;
+  var _ref14 = (0, _slicedToArray2.default)(_ref12, 1),
+    _ref14$ = _ref14[0],
+    lastPluginState = _ref14$.pluginState,
+    lastState = _ref14$.state,
+    lastColorScheme = _ref14$.colorScheme,
+    lastIntl = _ref14$.intl,
+    lastActiveIndexPos = _ref14$.activeIndexPos,
+    lastIsInverted = _ref14$.isInverted,
+    lastDiffType = _ref14$.diffType,
+    lastHideDeletedDiffs = _ref14$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref14$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref14$.showIndicators,
+    lastSmartThresholds = _ref14$.smartThresholds,
+    lastDeletedDiffPlacement = _ref14$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref14$.inlineDeletedDiffPlacement;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    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;
+    var _ref15;
+    return (_ref15 = 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 && _ref15 !== void 0 ? _ref15 : 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;
+  return (_ref16 = 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 && _ref16 !== void 0 ? _ref16 : false;
 });

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

@@ -122,7 +122,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   // node renders beneath its replacement; otherwise anchor at the start (change.fromB).
   var anchorPos = placeBelow ? change.toB : change.fromB;
   var safeInsertPos = (0, _findSafeInsertPos.findSafeInsertPos)(newDoc, anchorPos, slice);
-  var isActive = activeIndexPos && safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to;
+  var isActive = activeIndexPos && ((0, _fg.fg)('confluence_ncs_step_diffing_version_history') ? safeInsertPos >= activeIndexPos.from && safeInsertPos <= activeIndexPos.to : safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to);
   if (slice.content.content.length === 0 || shouldSkipDeletedEmptyParagraphDecoration) {
     return [];
   }

package/dist/cjs/pm-plugins/getScrollableDecorations.js

@@ -8,6 +8,8 @@ exports.getScrollableDecorations = void 0;
 exports.isInlineDiffDecorationRenderableInDoc = isInlineDiffDecorationRenderableInDoc;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _view = require("@atlaskit/editor-prosemirror/view");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _decorationKeys = require("./decorations/decorationKeys");
 var _isExtendedEnabled = require("./isExtendedEnabled");
 /**
@@ -40,10 +42,6 @@ function isInlineDiffDecorationRenderableInDoc(doc, from, to) {
     return false;
   }
 }
-
-/**
- * Checks if range1 is fully contained within range2
- */
 function isRangeFullyInside(range1Start, range1End, range2Start, range2End) {
   return range2Start <= range1Start && range1End <= range2End;
 }
@@ -51,6 +49,61 @@ function specHasDiffKeyPrefix(spec, keyPrefix) {
   return Boolean(spec && (0, _typeof2.default)(spec) === 'object' && 'key' in spec && typeof spec.key === 'string' && spec.key.startsWith(keyPrefix));
 }
 
+/**
+ * Collapses decorations that represent one continuous customer-facing edit.
+ *
+ * Decorations are kept separate in the DecorationSet so each one can retain its own visual
+ * styling. This list is only used for change counting and navigation, where an insertion and a
+ * deletion at the same location should be treated as one replacement. Zero-width decorations
+ * (normally deleted-content widgets) can join a group, but cannot extend its range and therefore
+ * cannot bridge two otherwise separate edits.
+ */
+function groupTouchingDecorations(decorations, isInlineDecoration) {
+  if (decorations.length < 2) {
+    return decorations;
+  }
+  var groups = [];
+  var currentGroup = [];
+  var currentGroupFrom = 0;
+  var currentGroupTo = 0;
+  var sortedDecorations = (0, _toConsumableArray2.default)(decorations).sort(function (a, b) {
+    return a.from === b.from ? a.to - b.to : a.from - b.from;
+  });
+  sortedDecorations.forEach(function (decoration) {
+    if (currentGroup.length === 0 || decoration.from > currentGroupTo) {
+      currentGroup = [decoration];
+      currentGroupFrom = decoration.from;
+      currentGroupTo = decoration.to;
+      groups.push({
+        decorations: currentGroup,
+        from: currentGroupFrom,
+        to: currentGroupTo
+      });
+      return;
+    }
+    currentGroup.push(decoration);
+    // A zero-width decoration must not extend the group and bridge a gap.
+    currentGroupTo = Math.max(currentGroupTo, decoration.to);
+    groups[groups.length - 1].to = currentGroupTo;
+  });
+  return groups.map(function (_ref) {
+    var _ref2, _group$find;
+    var group = _ref.decorations,
+      from = _ref.from,
+      to = _ref.to;
+    var representative = (_ref2 = (_group$find = group.find(isInlineDecoration)) !== null && _group$find !== void 0 ? _group$find : group.find(function (decoration) {
+      return decoration.from !== decoration.to;
+    })) !== null && _ref2 !== void 0 ? _ref2 : group[0];
+    if (!representative || representative.from === from && representative.to === to) {
+      return representative;
+    }
+
+    // This decoration is only used for navigation and active-range calculation. The actual
+    // visual decorations remain in the DecorationSet with their original ranges and styles.
+    return isInlineDecoration(representative) ? _view.Decoration.inline(from, to, {}, representative.spec) : _view.Decoration.node(from, to, {}, representative.spec);
+  });
+}
+
 /**
  * Gets scrollable decorations from a DecorationSet, filtering out overlapping decorations
  * and applying various rules for diff visualization.
@@ -61,9 +114,11 @@ function specHasDiffKeyPrefix(spec, keyPrefix) {
  * 3. Deduplicates diff-block decorations with same from, to and nodeName
  * 4. When `doc` is passed: excludes diff-inline decorations whose range has no inline content
  *    (invalid positions, or block-only slices with no text/atoms — e.g. empty blocks)
- * 5. Excludes diff-inline decorations that are fully contained within a diff-block
- * 6. Excludes diff-block decorations that are fully contained within a diff-inline
- * 7. Results are sorted by from position, then by to position
+ * 5. When `confluence_ncs_step_diffing_version_history` is enabled, groups overlapping or
+ *    directly touching ranges across decoration types into one result, using the union of all
+ *    grouped ranges
+ *    (zero-width widgets can join a group without extending it)
+ * 6. Results are sorted by from position, then by to position
  *
  * @param set - The DecorationSet to extract scrollable decorations from
  * @param doc - Current document; when set, diff-inline ranges are validated against this doc
@@ -114,25 +169,19 @@ var getScrollableDecorations = exports.getScrollableDecorations = function getSc
     return isInlineDiffDecorationRenderableInDoc(doc, d.from, d.to);
   }) : rawInlines;
   var widgets = filtered.filter(isWidgetDecoration);
-
-  // Second pass: exclude overlapping decorations
-  // Rules:
-  // - If an inline is fully inside a block, exclude the block (inline takes priority)
-  // - If a block is fully inside an inline, exclude the block (inline takes priority)
-  var nonOverlappingBlocks = blocks.filter(function (block) {
-    // Exclude block if:
-    // 1. It's fully contained within any inline, OR
-    // 2. It fully contains any inline
-    return !inlines.some(function (inline) {
-      return isRangeFullyInside(block.from, block.to, inline.from, inline.to) ||
-      // block inside inline
-      isRangeFullyInside(inline.from, inline.to, block.from, block.to);
-    } // inline inside block
-    );
-  });
-
-  // Combine all non-overlapping decorations
-  var result = [].concat((0, _toConsumableArray2.default)(nonOverlappingBlocks), (0, _toConsumableArray2.default)(inlines), (0, _toConsumableArray2.default)(widgets));
+  var result;
+  if ((0, _fg.fg)('confluence_ncs_step_diffing_version_history')) {
+    // Group overlapping or directly touching ranges into one customer-facing edit.
+    result = groupTouchingDecorations([].concat((0, _toConsumableArray2.default)(blocks), (0, _toConsumableArray2.default)(inlines), (0, _toConsumableArray2.default)(widgets)), isInlineDecoration);
+  } else {
+    // Legacy behavior: exclude blocks that contain or are contained by an inline decoration.
+    var nonOverlappingBlocks = blocks.filter(function (block) {
+      return !inlines.some(function (inline) {
+        return isRangeFullyInside(block.from, block.to, inline.from, inline.to) || isRangeFullyInside(inline.from, inline.to, block.from, block.to);
+      });
+    });
+    result = [].concat((0, _toConsumableArray2.default)(nonOverlappingBlocks), (0, _toConsumableArray2.default)(inlines), (0, _toConsumableArray2.default)(widgets));
+  }
 
   // Sort by from position, then by to position
   result.sort(function (a, b) {

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

@@ -118,6 +118,20 @@ const leafTextblockRanges = (doc, from, to) => {
 // once it has more leaf textblocks (~cells) than this threshold. Small tables
 // keep the precise per-cell path.
 const LARGE_TABLE_LEAF_THRESHOLD = 40;
+
+/**
+ * An active scrollable change may contain several underlying diff changes. Treat ranges that
+ * overlap or touch the active range as part of the same active customer-facing edit.
+ */
+const isRangeActive = (activeIndexPos, from, to) => {
+  if (activeIndexPos === undefined) {
+    return undefined;
+  }
+  if (!fg('confluence_ncs_step_diffing_version_history')) {
+    return from === activeIndexPos.from && to === activeIndexPos.to;
+  }
+  return from <= activeIndexPos.to && activeIndexPos.from <= to;
+};
 const isLargeInsertedTableRange = (doc, from, to) => {
   let containsTable = false;
   let leafCount = 0;
@@ -175,7 +189,7 @@ const calculateNodesForBlockDecoration = ({
     }
     if (node.isBlock && (!isExtendedEnabled(diffType) || pos + node.nodeSize <= to)) {
       const nodeEnd = pos + node.nodeSize;
-      const isActive = activeIndexPos && pos === activeIndexPos.from && nodeEnd === activeIndexPos.to;
+      const isActive = isRangeActive(activeIndexPos, pos, nodeEnd);
       decorations.push(...createBlockChangedDecoration({
         change: {
           from: pos,
@@ -393,7 +407,7 @@ const calculateDiffDecorationsInner = ({
   const isInserted = !isInverted;
   const createDecorationsForChange = change => {
     const changeColorScheme = attributionColors ? getColorSchemeForChange(change, attributedChanges, attributionColors, colorScheme) : colorScheme;
-    const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
+    const isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
 
     // Hoisted because it decides BOTH where the deleted widget is anchored and — since the
     // widget pins whichever end of the range it sits at — how the indicator anchors below are
@@ -512,11 +526,19 @@ const calculateDiffDecorationsInner = ({
   changes.forEach(change => {
     createDecorationsForChange(change);
   });
-  getMarkChangeRanges(steps).forEach(change => {
-    const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
+  // 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(steps).filter(({
+    fromB,
+    toB
+  }) => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
+    const isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
     decorations.push(...createInlineChangedDecoration({
       change,
       colorScheme,
+      diffType,
       isActive,
       isInserted: true
     }));
@@ -524,7 +546,7 @@ const calculateDiffDecorationsInner = ({
   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;
+      const isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
       const isAtomicInlineNodeFlag = isExperimentEnabled('platform_editor_improve_inline_diffs', () => expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true));
       decorations.push(...createInlineChangedDecoration({
         change,

package/dist/es2019/pm-plugins/decorations/createNodeChangedDecorationWidget.js

@@ -115,7 +115,7 @@ export const createNodeChangedDecorationWidget = ({
   // node renders beneath its replacement; otherwise anchor at the start (change.fromB).
   const anchorPos = placeBelow ? change.toB : change.fromB;
   const safeInsertPos = findSafeInsertPos(newDoc, anchorPos, slice);
-  const isActive = activeIndexPos && safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to;
+  const isActive = activeIndexPos && (fg('confluence_ncs_step_diffing_version_history') ? safeInsertPos >= activeIndexPos.from && safeInsertPos <= activeIndexPos.to : safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to);
   if (slice.content.content.length === 0 || shouldSkipDeletedEmptyParagraphDecoration) {
     return [];
   }

package/dist/es2019/pm-plugins/getScrollableDecorations.js

@@ -1,3 +1,5 @@
+import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { DiffDecorationKey, isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
 import { isExtendedEnabled } from './isExtendedEnabled';
 
@@ -31,10 +33,6 @@ export function isInlineDiffDecorationRenderableInDoc(doc, from, to) {
     return false;
   }
 }
-
-/**
- * Checks if range1 is fully contained within range2
- */
 function isRangeFullyInside(range1Start, range1End, range2Start, range2End) {
   return range2Start <= range1Start && range1End <= range2End;
 }
@@ -42,6 +40,58 @@ function specHasDiffKeyPrefix(spec, keyPrefix) {
   return Boolean(spec && typeof spec === 'object' && 'key' in spec && typeof spec.key === 'string' && spec.key.startsWith(keyPrefix));
 }
 
+/**
+ * Collapses decorations that represent one continuous customer-facing edit.
+ *
+ * Decorations are kept separate in the DecorationSet so each one can retain its own visual
+ * styling. This list is only used for change counting and navigation, where an insertion and a
+ * deletion at the same location should be treated as one replacement. Zero-width decorations
+ * (normally deleted-content widgets) can join a group, but cannot extend its range and therefore
+ * cannot bridge two otherwise separate edits.
+ */
+function groupTouchingDecorations(decorations, isInlineDecoration) {
+  if (decorations.length < 2) {
+    return decorations;
+  }
+  const groups = [];
+  let currentGroup = [];
+  let currentGroupFrom = 0;
+  let currentGroupTo = 0;
+  const sortedDecorations = [...decorations].sort((a, b) => a.from === b.from ? a.to - b.to : a.from - b.from);
+  sortedDecorations.forEach(decoration => {
+    if (currentGroup.length === 0 || decoration.from > currentGroupTo) {
+      currentGroup = [decoration];
+      currentGroupFrom = decoration.from;
+      currentGroupTo = decoration.to;
+      groups.push({
+        decorations: currentGroup,
+        from: currentGroupFrom,
+        to: currentGroupTo
+      });
+      return;
+    }
+    currentGroup.push(decoration);
+    // A zero-width decoration must not extend the group and bridge a gap.
+    currentGroupTo = Math.max(currentGroupTo, decoration.to);
+    groups[groups.length - 1].to = currentGroupTo;
+  });
+  return groups.map(({
+    decorations: group,
+    from,
+    to
+  }) => {
+    var _ref, _group$find;
+    const representative = (_ref = (_group$find = group.find(isInlineDecoration)) !== null && _group$find !== void 0 ? _group$find : group.find(decoration => decoration.from !== decoration.to)) !== null && _ref !== void 0 ? _ref : group[0];
+    if (!representative || representative.from === from && representative.to === to) {
+      return representative;
+    }
+
+    // This decoration is only used for navigation and active-range calculation. The actual
+    // visual decorations remain in the DecorationSet with their original ranges and styles.
+    return isInlineDecoration(representative) ? Decoration.inline(from, to, {}, representative.spec) : Decoration.node(from, to, {}, representative.spec);
+  });
+}
+
 /**
  * Gets scrollable decorations from a DecorationSet, filtering out overlapping decorations
  * and applying various rules for diff visualization.
@@ -52,9 +102,11 @@ function specHasDiffKeyPrefix(spec, keyPrefix) {
  * 3. Deduplicates diff-block decorations with same from, to and nodeName
  * 4. When `doc` is passed: excludes diff-inline decorations whose range has no inline content
  *    (invalid positions, or block-only slices with no text/atoms — e.g. empty blocks)
- * 5. Excludes diff-inline decorations that are fully contained within a diff-block
- * 6. Excludes diff-block decorations that are fully contained within a diff-inline
- * 7. Results are sorted by from position, then by to position
+ * 5. When `confluence_ncs_step_diffing_version_history` is enabled, groups overlapping or
+ *    directly touching ranges across decoration types into one result, using the union of all
+ *    grouped ranges
+ *    (zero-width widgets can join a group without extending it)
+ * 6. Results are sorted by from position, then by to position
  *
  * @param set - The DecorationSet to extract scrollable decorations from
  * @param doc - Current document; when set, diff-inline ranges are validated against this doc
@@ -101,23 +153,15 @@ export const getScrollableDecorations = (set, doc, diffType) => {
   const rawInlines = filtered.filter(isInlineDecoration);
   const inlines = doc !== undefined ? rawInlines.filter(d => isInlineDiffDecorationRenderableInDoc(doc, d.from, d.to)) : rawInlines;
   const widgets = filtered.filter(isWidgetDecoration);
-
-  // Second pass: exclude overlapping decorations
-  // Rules:
-  // - If an inline is fully inside a block, exclude the block (inline takes priority)
-  // - If a block is fully inside an inline, exclude the block (inline takes priority)
-  const nonOverlappingBlocks = blocks.filter(block => {
-    // Exclude block if:
-    // 1. It's fully contained within any inline, OR
-    // 2. It fully contains any inline
-    return !inlines.some(inline => isRangeFullyInside(block.from, block.to, inline.from, inline.to) ||
-    // block inside inline
-    isRangeFullyInside(inline.from, inline.to, block.from, block.to) // inline inside block
-    );
-  });
-
-  // Combine all non-overlapping decorations
-  const result = [...nonOverlappingBlocks, ...inlines, ...widgets];
+  let result;
+  if (fg('confluence_ncs_step_diffing_version_history')) {
+    // Group overlapping or directly touching ranges into one customer-facing edit.
+    result = groupTouchingDecorations([...blocks, ...inlines, ...widgets], isInlineDecoration);
+  } else {
+    // Legacy behavior: exclude blocks that contain or are contained by an inline decoration.
+    const nonOverlappingBlocks = blocks.filter(block => !inlines.some(inline => isRangeFullyInside(block.from, block.to, inline.from, inline.to) || isRangeFullyInside(inline.from, inline.to, block.from, block.to)));
+    result = [...nonOverlappingBlocks, ...inlines, ...widgets];
+  }
 
   // Sort by from position, then by to position
   result.sort((a, b) => a.from === b.from ? a.to - b.to : a.from - b.from);

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

@@ -124,6 +124,20 @@ var leafTextblockRanges = function leafTextblockRanges(doc, from, to) {
 // once it has more leaf textblocks (~cells) than this threshold. Small tables
 // keep the precise per-cell path.
 var LARGE_TABLE_LEAF_THRESHOLD = 40;
+
+/**
+ * An active scrollable change may contain several underlying diff changes. Treat ranges that
+ * overlap or touch the active range as part of the same active customer-facing edit.
+ */
+var isRangeActive = function isRangeActive(activeIndexPos, from, to) {
+  if (activeIndexPos === undefined) {
+    return undefined;
+  }
+  if (!fg('confluence_ncs_step_diffing_version_history')) {
+    return from === activeIndexPos.from && to === activeIndexPos.to;
+  }
+  return from <= activeIndexPos.to && activeIndexPos.from <= to;
+};
 var isLargeInsertedTableRange = function isLargeInsertedTableRange(doc, from, to) {
   var containsTable = false;
   var leafCount = 0;
@@ -191,7 +205,7 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
     }
     if (node.isBlock && (!isExtendedEnabled(diffType) || pos + node.nodeSize <= to)) {
       var nodeEnd = pos + node.nodeSize;
-      var isActive = activeIndexPos && pos === activeIndexPos.from && nodeEnd === activeIndexPos.to;
+      var isActive = isRangeActive(activeIndexPos, pos, nodeEnd);
       decorations.push.apply(decorations, _toConsumableArray(createBlockChangedDecoration({
         change: {
           from: pos,
@@ -424,7 +438,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   var isInserted = !isInverted;
   var createDecorationsForChange = function createDecorationsForChange(change) {
     var changeColorScheme = attributionColors ? getColorSchemeForChange(change, attributedChanges, attributionColors, colorScheme) : colorScheme;
-    var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
+    var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
 
     // Hoisted because it decides BOTH where the deleted widget is anchored and — since the
     // widget pins whichever end of the range it sits at — how the indicator anchors below are
@@ -552,11 +566,22 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   changes.forEach(function (change) {
     createDecorationsForChange(change);
   });
-  getMarkChangeRanges(steps).forEach(function (change) {
-    var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
+  // 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(steps).filter(function (_ref10) {
+    var fromB = _ref10.fromB,
+      toB = _ref10.toB;
+    return !fg('confluence_ncs_step_diffing_version_history') || !changes.some(function (change) {
+      return change.fromB === fromB && change.toB === toB;
+    });
+  }).forEach(function (change) {
+    var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
     decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration({
       change: change,
       colorScheme: colorScheme,
+      diffType: diffType,
       isActive: isActive,
       isInserted: true
     })));
@@ -564,7 +589,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
   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;
+      var isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
       var isAtomicInlineNodeFlag = isExperimentEnabled('platform_editor_improve_inline_diffs', function () {
         return expValEquals('platform_editor_improve_inline_diffs', 'isEnabled', true);
       });
@@ -651,42 +676,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref7
 };
 export var calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-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;
+function (_ref11, _ref12) {
+  var _ref16;
   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;
+    pluginState = _ref13$.pluginState,
+    state = _ref13$.state,
+    colorScheme = _ref13$.colorScheme,
+    intl = _ref13$.intl,
+    activeIndexPos = _ref13$.activeIndexPos,
+    isInverted = _ref13$.isInverted,
+    diffType = _ref13$.diffType,
+    hideDeletedDiffs = _ref13$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref13$.hideAddedDiffsUnderline,
+    showIndicators = _ref13$.showIndicators,
+    smartThresholds = _ref13$.smartThresholds,
+    deletedDiffPlacement = _ref13$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref13$.inlineDeletedDiffPlacement;
+  var _ref14 = _slicedToArray(_ref12, 1),
+    _ref14$ = _ref14[0],
+    lastPluginState = _ref14$.pluginState,
+    lastState = _ref14$.state,
+    lastColorScheme = _ref14$.colorScheme,
+    lastIntl = _ref14$.intl,
+    lastActiveIndexPos = _ref14$.activeIndexPos,
+    lastIsInverted = _ref14$.isInverted,
+    lastDiffType = _ref14$.diffType,
+    lastHideDeletedDiffs = _ref14$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref14$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref14$.showIndicators,
+    lastSmartThresholds = _ref14$.smartThresholds,
+    lastDeletedDiffPlacement = _ref14$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref14$.inlineDeletedDiffPlacement;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if (isExtendedEnabled(diffType)) {
-    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;
+    var _ref15;
+    return (_ref15 = 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 && _ref15 !== void 0 ? _ref15 : 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;
+  return (_ref16 = 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 && _ref16 !== void 0 ? _ref16 : false;
 });

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

@@ -115,7 +115,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   // node renders beneath its replacement; otherwise anchor at the start (change.fromB).
   var anchorPos = placeBelow ? change.toB : change.fromB;
   var safeInsertPos = findSafeInsertPos(newDoc, anchorPos, slice);
-  var isActive = activeIndexPos && safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to;
+  var isActive = activeIndexPos && (fg('confluence_ncs_step_diffing_version_history') ? safeInsertPos >= activeIndexPos.from && safeInsertPos <= activeIndexPos.to : safeInsertPos === activeIndexPos.from && safeInsertPos === activeIndexPos.to);
   if (slice.content.content.length === 0 || shouldSkipDeletedEmptyParagraphDecoration) {
     return [];
   }

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

@@ -1,5 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/typeof";
+import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { DiffDecorationKey, isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
 import { isExtendedEnabled } from './isExtendedEnabled';
 
@@ -33,10 +35,6 @@ export function isInlineDiffDecorationRenderableInDoc(doc, from, to) {
     return false;
   }
 }
-
-/**
- * Checks if range1 is fully contained within range2
- */
 function isRangeFullyInside(range1Start, range1End, range2Start, range2End) {
   return range2Start <= range1Start && range1End <= range2End;
 }
@@ -44,6 +42,61 @@ function specHasDiffKeyPrefix(spec, keyPrefix) {
   return Boolean(spec && _typeof(spec) === 'object' && 'key' in spec && typeof spec.key === 'string' && spec.key.startsWith(keyPrefix));
 }
 
+/**
+ * Collapses decorations that represent one continuous customer-facing edit.
+ *
+ * Decorations are kept separate in the DecorationSet so each one can retain its own visual
+ * styling. This list is only used for change counting and navigation, where an insertion and a
+ * deletion at the same location should be treated as one replacement. Zero-width decorations
+ * (normally deleted-content widgets) can join a group, but cannot extend its range and therefore
+ * cannot bridge two otherwise separate edits.
+ */
+function groupTouchingDecorations(decorations, isInlineDecoration) {
+  if (decorations.length < 2) {
+    return decorations;
+  }
+  var groups = [];
+  var currentGroup = [];
+  var currentGroupFrom = 0;
+  var currentGroupTo = 0;
+  var sortedDecorations = _toConsumableArray(decorations).sort(function (a, b) {
+    return a.from === b.from ? a.to - b.to : a.from - b.from;
+  });
+  sortedDecorations.forEach(function (decoration) {
+    if (currentGroup.length === 0 || decoration.from > currentGroupTo) {
+      currentGroup = [decoration];
+      currentGroupFrom = decoration.from;
+      currentGroupTo = decoration.to;
+      groups.push({
+        decorations: currentGroup,
+        from: currentGroupFrom,
+        to: currentGroupTo
+      });
+      return;
+    }
+    currentGroup.push(decoration);
+    // A zero-width decoration must not extend the group and bridge a gap.
+    currentGroupTo = Math.max(currentGroupTo, decoration.to);
+    groups[groups.length - 1].to = currentGroupTo;
+  });
+  return groups.map(function (_ref) {
+    var _ref2, _group$find;
+    var group = _ref.decorations,
+      from = _ref.from,
+      to = _ref.to;
+    var representative = (_ref2 = (_group$find = group.find(isInlineDecoration)) !== null && _group$find !== void 0 ? _group$find : group.find(function (decoration) {
+      return decoration.from !== decoration.to;
+    })) !== null && _ref2 !== void 0 ? _ref2 : group[0];
+    if (!representative || representative.from === from && representative.to === to) {
+      return representative;
+    }
+
+    // This decoration is only used for navigation and active-range calculation. The actual
+    // visual decorations remain in the DecorationSet with their original ranges and styles.
+    return isInlineDecoration(representative) ? Decoration.inline(from, to, {}, representative.spec) : Decoration.node(from, to, {}, representative.spec);
+  });
+}
+
 /**
  * Gets scrollable decorations from a DecorationSet, filtering out overlapping decorations
  * and applying various rules for diff visualization.
@@ -54,9 +107,11 @@ function specHasDiffKeyPrefix(spec, keyPrefix) {
  * 3. Deduplicates diff-block decorations with same from, to and nodeName
  * 4. When `doc` is passed: excludes diff-inline decorations whose range has no inline content
  *    (invalid positions, or block-only slices with no text/atoms — e.g. empty blocks)
- * 5. Excludes diff-inline decorations that are fully contained within a diff-block
- * 6. Excludes diff-block decorations that are fully contained within a diff-inline
- * 7. Results are sorted by from position, then by to position
+ * 5. When `confluence_ncs_step_diffing_version_history` is enabled, groups overlapping or
+ *    directly touching ranges across decoration types into one result, using the union of all
+ *    grouped ranges
+ *    (zero-width widgets can join a group without extending it)
+ * 6. Results are sorted by from position, then by to position
  *
  * @param set - The DecorationSet to extract scrollable decorations from
  * @param doc - Current document; when set, diff-inline ranges are validated against this doc
@@ -107,25 +162,19 @@ export var getScrollableDecorations = function getScrollableDecorations(set, doc
     return isInlineDiffDecorationRenderableInDoc(doc, d.from, d.to);
   }) : rawInlines;
   var widgets = filtered.filter(isWidgetDecoration);
-
-  // Second pass: exclude overlapping decorations
-  // Rules:
-  // - If an inline is fully inside a block, exclude the block (inline takes priority)
-  // - If a block is fully inside an inline, exclude the block (inline takes priority)
-  var nonOverlappingBlocks = blocks.filter(function (block) {
-    // Exclude block if:
-    // 1. It's fully contained within any inline, OR
-    // 2. It fully contains any inline
-    return !inlines.some(function (inline) {
-      return isRangeFullyInside(block.from, block.to, inline.from, inline.to) ||
-      // block inside inline
-      isRangeFullyInside(inline.from, inline.to, block.from, block.to);
-    } // inline inside block
-    );
-  });
-
-  // Combine all non-overlapping decorations
-  var result = [].concat(_toConsumableArray(nonOverlappingBlocks), _toConsumableArray(inlines), _toConsumableArray(widgets));
+  var result;
+  if (fg('confluence_ncs_step_diffing_version_history')) {
+    // Group overlapping or directly touching ranges into one customer-facing edit.
+    result = groupTouchingDecorations([].concat(_toConsumableArray(blocks), _toConsumableArray(inlines), _toConsumableArray(widgets)), isInlineDecoration);
+  } else {
+    // Legacy behavior: exclude blocks that contain or are contained by an inline decoration.
+    var nonOverlappingBlocks = blocks.filter(function (block) {
+      return !inlines.some(function (inline) {
+        return isRangeFullyInside(block.from, block.to, inline.from, inline.to) || isRangeFullyInside(inline.from, inline.to, block.from, block.to);
+      });
+    });
+    result = [].concat(_toConsumableArray(nonOverlappingBlocks), _toConsumableArray(inlines), _toConsumableArray(widgets));
+  }
 
   // Sort by from position, then by to position
   result.sort(function (a, b) {

package/dist/types/pm-plugins/getScrollableDecorations.d.ts

@@ -1,5 +1,5 @@
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-import type { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { Decoration, type DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { DiffType } from '../showDiffPluginType';
 /**
  * Returns true when an inline decoration's [from, to) range can actually show in the document:
@@ -17,9 +17,11 @@ export declare function isInlineDiffDecorationRenderableInDoc(doc: PMNode, from:
  * 3. Deduplicates diff-block decorations with same from, to and nodeName
  * 4. When `doc` is passed: excludes diff-inline decorations whose range has no inline content
  *    (invalid positions, or block-only slices with no text/atoms — e.g. empty blocks)
- * 5. Excludes diff-inline decorations that are fully contained within a diff-block
- * 6. Excludes diff-block decorations that are fully contained within a diff-inline
- * 7. Results are sorted by from position, then by to position
+ * 5. When `confluence_ncs_step_diffing_version_history` is enabled, groups overlapping or
+ *    directly touching ranges across decoration types into one result, using the union of all
+ *    grouped ranges
+ *    (zero-width widgets can join a group without extending it)
+ * 6. Results are sorted by from position, then by to position
  *
  * @param set - The DecorationSet to extract scrollable decorations from
  * @param doc - Current document; when set, diff-inline ranges are validated against this doc

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "14.2.6",
+	"version": "14.2.8",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -21,15 +21,15 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^57.2.0",
-		"@atlaskit/custom-steps": "^1.0.0",
-		"@atlaskit/editor-plugin-analytics": "^16.0.0",
+		"@atlaskit/custom-steps": "^1.1.0",
+		"@atlaskit/editor-plugin-analytics": "^16.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^14.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
-		"@atlaskit/editor-tables": "^3.0.0",
+		"@atlaskit/editor-tables": "^3.1.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
-		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^168.0.0",
-		"@atlaskit/tokens": "^16.9.0",
+		"@atlaskit/platform-feature-flags": "^2.2.0",
+		"@atlaskit/tmp-editor-statsig": "^169.0.0",
+		"@atlaskit/tokens": "^16.10.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
 		"lodash": "^4.17.21",
@@ -37,18 +37,18 @@
 		"prosemirror-changeset": "^2.3.1"
 	},
 	"devDependencies": {
-		"@atlaskit/adf-utils": "^20.7.0",
-		"@atlaskit/button": "^25.2.0",
+		"@atlaskit/adf-utils": "^20.8.0",
+		"@atlaskit/button": "^25.3.0",
 		"@atlaskit/css": "^1.1.0",
-		"@atlaskit/dropdown-menu": "^18.2.0",
-		"@atlaskit/editor-core": "^226.1.0",
-		"@atlaskit/editor-json-transformer": "^9.7.0",
+		"@atlaskit/dropdown-menu": "^18.3.0",
+		"@atlaskit/editor-core": "^226.3.0",
+		"@atlaskit/editor-json-transformer": "^9.8.0",
 		"@atlaskit/editor-plugins": "^16.1.0",
-		"@atlaskit/form": "^17.1.0",
-		"@atlaskit/primitives": "^22.4.0",
-		"@atlaskit/section-message": "^10.1.0",
-		"@atlaskit/textarea": "^10.1.0",
-		"@atlaskit/textfield": "^10.1.0",
+		"@atlaskit/form": "^17.2.0",
+		"@atlaskit/primitives": "^22.5.0",
+		"@atlaskit/section-message": "^10.2.0",
+		"@atlaskit/textarea": "^10.2.0",
+		"@atlaskit/textfield": "^10.2.0",
 		"@atlaskit/util-data-test": "^19.1.0",
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
@@ -59,7 +59,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^120.7.0",
+		"@atlaskit/editor-common": "^120.10.0",
 		"react": "^18.2.0 || ^19.2.0"
 	},
 	"techstack": {