@atlaskit/editor-plugin-show-diff 12.1.1 → 12.1.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 12.1.3
+
+### Patch Changes
+
+- [`774c01e2f1cdd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/774c01e2f1cdd) -
+  Remove the `platform_editor_diff_granular_extended` experiment and retain its disabled behavior.
+- Updated dependencies
+
+## 12.1.2
+
+### Patch Changes
+
+- [`3d45d0ef1fb3f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3d45d0ef1fb3f) -
+  Prevent block diff content from overlapping preceding editor nodes
+
 ## 12.1.1
 
 ### Patch Changes

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

@@ -19,7 +19,6 @@ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _areDocsEqualByBlockStructureAndText = require("../areDocsEqualByBlockStructureAndText");
 var _createAnchorDecorationWidgets = require("../decorations/createAnchorDecorationWidgets");
 var _createBlockChangedDecoration = require("../decorations/createBlockChangedDecoration");
-var _createGranularBlockReferenceWidget = require("../decorations/createGranularBlockReferenceWidget");
 var _createInlineChangedDecoration = require("../decorations/createInlineChangedDecoration");
 var _createNodeChangedDecorationWidget = require("../decorations/createNodeChangedDecorationWidget");
 var _decorationKeys = require("../decorations/decorationKeys");
@@ -260,7 +259,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
 
   // Our default operations are insertions, so it should match the opposite of isInverted.
   var isInserted = !isInverted;
-  var createDecorationsForChange = function createDecorationsForChange(change, showGranularWithBlock) {
+  var createDecorationsForChange = function createDecorationsForChange(change) {
     var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
 
     // Hoisted because it decides BOTH where the deleted widget is anchored and — since the
@@ -272,10 +271,8 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       inlineDeletedDiffPlacement: inlineDeletedDiffPlacement
     });
     if (change.inserted.length > 0) {
-      // shouldHideDeleted for block/node decorations: suppressed when isInverted + hideDeletedDiffs,
-      // or when showGranularWithBlock (block reference widget is shown instead).
-      // isInverted gates both — on an inverted diff the inserted side is visually the deleted side.
-      var shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? isInverted && (hideDeletedDiffs || showGranularWithBlock && change.deleted.length > 0) : false;
+      // On an inverted diff the inserted side is visually the deleted side.
+      var shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? isInverted && hideDeletedDiffs : false;
 
       // For `smart` NODE-level promotions the change range spans a whole container
       // (e.g. an entire list/table/layout, using outer node bounds). Applying a SINGLE
@@ -292,7 +289,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       // change. Used to decide if indicator anchor positions should be adjusted
       // inward — when the widget is present the anchor must stay at the block
       // boundary to keep the indicator bar continuous with the deleted content.
-      var willRenderDeletedWidget = change.deleted.length > 0 && !((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInverted && (hideDeletedDiffs || showGranularWithBlock) && change.inserted.length > 0);
+      var willRenderDeletedWidget = change.deleted.length > 0 && !((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInverted && hideDeletedDiffs && change.inserted.length > 0);
       if (isSmartNodeLevel) {
         var _iterator2 = _createForOfIteratorHelper(leafTextblockRanges(tr.doc, change.fromB, change.toB)),
           _step2;
@@ -356,7 +353,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       }))));
     }
     if (change.deleted.length > 0) {
-      var _shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? !isInverted && (hideDeletedDiffs || showGranularWithBlock) && change.inserted.length > 0 : false;
+      var _shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? !isInverted && hideDeletedDiffs && change.inserted.length > 0 : false;
       if (!_shouldHideDeleted) {
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)(_objectSpread(_objectSpread({
           change: change,
@@ -377,88 +374,9 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
       }
     }
   };
-  if (diffType === 'step' && (0, _expValEquals.expValEquals)('platform_editor_diff_granular_extended', 'isEnabled', true)) {
-    // Uses getStepChanges instead of getChanges so that we have per-step granularity metadata.
-    // Specifically, we need to know how many granular changes each step produced in order to
-    // apply the shouldHideDeleted suppression threshold (> 3 granular changes per step).
-    // getChanges returns a flat Change[] with no per-step grouping, making this count impossible
-    // to derive after the fact without re-introducing per-change metadata.
-    var stepChanges = (0, _diffBySteps.getStepChanges)(originalDoc, steps);
-    stepChanges.forEach(function (_ref5) {
-      var isGranular = _ref5.isGranular,
-        stepChangeList = _ref5.changes;
-      var granularCount = isGranular ? stepChangeList.length : 0;
-
-      // Calculate the average ratio of changed content on both A (original) and B (new)
-      // sides of the diff. If 30% or more of the block has changed on average, we show
-      // the block reference widget even if the granular change count is below the threshold.
-      // Block length is derived from the enclosing text block boundaries rather than the
-      // first/last change positions, so unchanged words at the start/end are accounted for.
-      var avgChangedRatio = 0;
-      if (isGranular && stepChangeList.length > 0) {
-        var first = stepChangeList[0];
-        var last = stepChangeList[stepChangeList.length - 1];
-        var resolvedA = originalDoc.resolve(first.fromA);
-        var resolvedB = tr.doc.resolve(first.fromB);
-        var blockStartA = first.fromA;
-        var blockEndA = last.toA;
-        var blockStartB = first.fromB;
-        var blockEndB = last.toB;
-        for (var depth = resolvedA.depth; depth >= 0; depth--) {
-          var node = resolvedA.node(depth);
-          if (node.isTextblock) {
-            blockStartA = resolvedA.start(depth);
-            blockEndA = blockStartA + node.nodeSize - 2; // exclude open/close tokens
-            break;
-          }
-        }
-        for (var _depth = resolvedB.depth; _depth >= 0; _depth--) {
-          var _node = resolvedB.node(_depth);
-          if (_node.isTextblock) {
-            blockStartB = resolvedB.start(_depth);
-            blockEndB = blockStartB + _node.nodeSize - 2; // exclude open/close tokens
-            break;
-          }
-        }
-        var blockLengthA = blockEndA - blockStartA;
-        var blockLengthB = blockEndB - blockStartB;
-        var totalChangedA = stepChangeList.reduce(function (sum, c) {
-          return sum + (c.toA - c.fromA);
-        }, 0);
-        var totalChangedB = stepChangeList.reduce(function (sum, c) {
-          return sum + (c.toB - c.fromB);
-        }, 0);
-        var ratioA = blockLengthA > 0 ? totalChangedA / blockLengthA : 0;
-        var ratioB = blockLengthB > 0 ? totalChangedB / blockLengthB : 0;
-        avgChangedRatio = (ratioA + ratioB) / 2;
-      }
-      var showGranularWithBlock = isGranular && granularCount !== 1 && (granularCount > 3 || avgChangedRatio >= 0.3);
-      stepChangeList.forEach(function (change) {
-        createDecorationsForChange(change, showGranularWithBlock);
-      });
-      if (showGranularWithBlock && stepChangeList.length > 0 && !hideDeletedDiffs) {
-        var lastChange = stepChangeList[stepChangeList.length - 1];
-        var granularBlockDiffId = crypto.randomUUID();
-        var blockWidgets = (0, _createGranularBlockReferenceWidget.createGranularBlockReferenceWidget)({
-          change: lastChange,
-          originalDoc: originalDoc,
-          newDoc: tr.doc,
-          isInverted: isInverted,
-          nodeViewSerializer: nodeViewSerializer,
-          colorScheme: colorScheme,
-          intl: intl,
-          activeIndexPos: activeIndexPos,
-          diffId: granularBlockDiffId,
-          showIndicators: showIndicators
-        });
-        decorations.push.apply(decorations, (0, _toConsumableArray2.default)(blockWidgets));
-      }
-    });
-  } else {
-    changes.forEach(function (change) {
-      createDecorationsForChange(change, /* showGranularWithBlock */false);
-    });
-  }
+  changes.forEach(function (change) {
+    createDecorationsForChange(change);
+  });
   (0, _getMarkChangeRanges.getMarkChangeRanges)(steps).forEach(function (change) {
     var isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
     decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
@@ -530,42 +448,42 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref4
 };
 var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOne.default)(calculateDiffDecorationsInner,
 // Cache results unless relevant inputs change
-function (_ref6, _ref7) {
-  var _ref1;
+function (_ref5, _ref6) {
+  var _ref0;
+  var _ref7 = (0, _slicedToArray2.default)(_ref5, 1),
+    _ref7$ = _ref7[0],
+    pluginState = _ref7$.pluginState,
+    state = _ref7$.state,
+    colorScheme = _ref7$.colorScheme,
+    intl = _ref7$.intl,
+    activeIndexPos = _ref7$.activeIndexPos,
+    isInverted = _ref7$.isInverted,
+    diffType = _ref7$.diffType,
+    hideDeletedDiffs = _ref7$.hideDeletedDiffs,
+    hideAddedDiffsUnderline = _ref7$.hideAddedDiffsUnderline,
+    showIndicators = _ref7$.showIndicators,
+    smartThresholds = _ref7$.smartThresholds,
+    deletedDiffPlacement = _ref7$.deletedDiffPlacement,
+    inlineDeletedDiffPlacement = _ref7$.inlineDeletedDiffPlacement;
   var _ref8 = (0, _slicedToArray2.default)(_ref6, 1),
     _ref8$ = _ref8[0],
-    pluginState = _ref8$.pluginState,
-    state = _ref8$.state,
-    colorScheme = _ref8$.colorScheme,
-    intl = _ref8$.intl,
-    activeIndexPos = _ref8$.activeIndexPos,
-    isInverted = _ref8$.isInverted,
-    diffType = _ref8$.diffType,
-    hideDeletedDiffs = _ref8$.hideDeletedDiffs,
-    hideAddedDiffsUnderline = _ref8$.hideAddedDiffsUnderline,
-    showIndicators = _ref8$.showIndicators,
-    smartThresholds = _ref8$.smartThresholds,
-    deletedDiffPlacement = _ref8$.deletedDiffPlacement,
-    inlineDeletedDiffPlacement = _ref8$.inlineDeletedDiffPlacement;
-  var _ref9 = (0, _slicedToArray2.default)(_ref7, 1),
-    _ref9$ = _ref9[0],
-    lastPluginState = _ref9$.pluginState,
-    lastState = _ref9$.state,
-    lastColorScheme = _ref9$.colorScheme,
-    lastIntl = _ref9$.intl,
-    lastActiveIndexPos = _ref9$.activeIndexPos,
-    lastIsInverted = _ref9$.isInverted,
-    lastDiffType = _ref9$.diffType,
-    lastHideDeletedDiffs = _ref9$.hideDeletedDiffs,
-    lastHideAddedDiffsUnderline = _ref9$.hideAddedDiffsUnderline,
-    lastShowIndicators = _ref9$.showIndicators,
-    lastSmartThresholds = _ref9$.smartThresholds,
-    lastDeletedDiffPlacement = _ref9$.deletedDiffPlacement,
-    lastInlineDeletedDiffPlacement = _ref9$.inlineDeletedDiffPlacement;
+    lastPluginState = _ref8$.pluginState,
+    lastState = _ref8$.state,
+    lastColorScheme = _ref8$.colorScheme,
+    lastIntl = _ref8$.intl,
+    lastActiveIndexPos = _ref8$.activeIndexPos,
+    lastIsInverted = _ref8$.isInverted,
+    lastDiffType = _ref8$.diffType,
+    lastHideDeletedDiffs = _ref8$.hideDeletedDiffs,
+    lastHideAddedDiffsUnderline = _ref8$.hideAddedDiffsUnderline,
+    lastShowIndicators = _ref8$.showIndicators,
+    lastSmartThresholds = _ref8$.smartThresholds,
+    lastDeletedDiffPlacement = _ref8$.deletedDiffPlacement,
+    lastInlineDeletedDiffPlacement = _ref8$.inlineDeletedDiffPlacement;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
   if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    var _ref0;
-    return (_ref0 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref0 !== void 0 ? _ref0 : false;
+    var _ref9;
+    return (_ref9 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement) !== null && _ref9 !== void 0 ? _ref9 : false;
   }
-  return (_ref1 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref1 !== void 0 ? _ref1 : false;
+  return (_ref0 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref0 !== void 0 ? _ref0 : false;
 });

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getStepChanges = exports.diffBySteps = void 0;
+exports.diffBySteps = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _prosemirrorChangeset = require("prosemirror-changeset");
@@ -407,127 +407,4 @@ var diffBySteps = exports.diffBySteps = function diffBySteps(originalDoc, steps)
     });
   }
   return mergeOverlappingByNewDocRange(changes);
-};
-
-/**
- * A fork of `diffBySteps` that returns changes grouped per step, rather than as a flat list.
- *
- * Why forked rather than refactoring `diffBySteps`:
- * - `diffBySteps` returns a flat `Change[]` and is consumed by the existing decoration path.
- *   Changing its return shape would require threading per-step metadata through all callers,
- *   adding complexity to a stable code path.
- * - The per-step grouping is only needed for the `platform_editor_diff_granular_extended` gate,
- *   where we need to know how many granular changes a single step produced in order to decide
- *   whether to suppress deleted decorations (threshold: > 3 granular changes per step).
- * - Keeping the two functions separate means each has a clear, focused contract and neither
- *   accumulates the other's concerns. Shared logic (mapping helpers, `mergeOverlappingByNewDocRange`,
- *   `shouldCheckGranularDiff`, etc.) is already extracted and reused by both.
- */
-var getStepChanges = exports.getStepChanges = function getStepChanges(originalDoc, steps) {
-  var result = [];
-  var currentDoc = originalDoc;
-  var successfulStepMaps = [];
-  var rangedSteps = [];
-  var _iterator4 = _createForOfIteratorHelper(steps),
-    _step4;
-  try {
-    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-      var step = _step4.value;
-      var before = currentDoc;
-      var stepResult = step.apply(currentDoc);
-      if (stepResult.failed !== null || !stepResult.doc) {
-        continue;
-      }
-      var stepMap = step.getMap();
-      var rangeStep = step;
-      if (typeof rangeStep.from === 'number' && typeof rangeStep.to === 'number') {
-        rangedSteps.push({
-          before: before,
-          doc: stepResult.doc,
-          from: rangeStep.from,
-          to: rangeStep.to,
-          mapIndex: successfulStepMaps.length,
-          step: step,
-          stepMap: stepMap
-        });
-      }
-      successfulStepMaps.push(stepMap);
-      currentDoc = stepResult.doc;
-    }
-  } catch (err) {
-    _iterator4.e(err);
-  } finally {
-    _iterator4.f();
-  }
-  for (var _i2 = 0, _rangedSteps2 = rangedSteps; _i2 < _rangedSteps2.length; _i2++) {
-    var rangedStep = _rangedSteps2[_i2];
-    var originalToBeforeStep = createMapping(successfulStepMaps.slice(0, rangedStep.mapIndex));
-    var beforeStepToOriginal = originalToBeforeStep.invert();
-    var fromA = mapPosition(beforeStepToOriginal, rangedStep.from);
-    var toA = mapPosition(beforeStepToOriginal, rangedStep.to);
-    var fromAfterStep = rangedStep.stepMap.map(rangedStep.from, -1);
-    var toAfterStep = rangedStep.stepMap.map(rangedStep.to, 1);
-    var afterStepToFinal = createMapping(successfulStepMaps.slice(rangedStep.mapIndex + 1));
-    var fromB = mapPosition(afterStepToFinal, fromAfterStep);
-    var toB = mapPosition(afterStepToFinal, toAfterStep);
-    if (shouldCheckGranularDiff(rangedStep.step, rangedStep.before, rangedStep.from, rangedStep.to)) {
-      var granularStepChanges = _prosemirrorChangeset.ChangeSet.create(rangedStep.before).addSteps(rangedStep.doc, [rangedStep.stepMap], null);
-      var optimizedGranularStepChanges = (0, _optimizeChanges.optimizeChanges)((0, _prosemirrorChangeset.simplifyChanges)(granularStepChanges.changes, rangedStep.doc));
-      var stepChanges = [];
-      var _iterator5 = _createForOfIteratorHelper(optimizedGranularStepChanges),
-        _step5;
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var granularChange = _step5.value;
-          var expandedA = expandToWordBoundaries(rangedStep.before, granularChange.fromA, granularChange.toA);
-          var expandedB = expandToWordBoundaries(rangedStep.doc, granularChange.fromB, granularChange.toB);
-          var aLeftDelta = granularChange.fromA - expandedA.from;
-          var aRightDelta = expandedA.to - granularChange.toA;
-          var bLeftDelta = granularChange.fromB - expandedB.from;
-          var bRightDelta = expandedB.to - granularChange.toB;
-          var finalA = expandedA;
-          var finalB = expandedB;
-          if (aLeftDelta > bLeftDelta || aRightDelta > bRightDelta) {
-            var extraLeft = Math.max(0, aLeftDelta - bLeftDelta);
-            var extraRight = Math.max(0, aRightDelta - bRightDelta);
-            finalB = expandToWordBoundaries(rangedStep.doc, Math.max(expandedB.from - extraLeft, 0), expandedB.to + extraRight);
-          }
-          if (bLeftDelta > aLeftDelta || bRightDelta > aRightDelta) {
-            var _extraLeft2 = Math.max(0, bLeftDelta - aLeftDelta);
-            var _extraRight2 = Math.max(0, bRightDelta - aRightDelta);
-            finalA = expandToWordBoundaries(rangedStep.before, Math.max(expandedA.from - _extraLeft2, 0), expandedA.to + _extraRight2);
-          }
-          stepChanges.push({
-            fromA: mapPosition(beforeStepToOriginal, finalA.from),
-            toA: mapPosition(beforeStepToOriginal, finalA.to),
-            fromB: mapPosition(afterStepToFinal, finalB.from),
-            toB: mapPosition(afterStepToFinal, finalB.to),
-            deleted: createSpans(Math.max(0, finalA.to - finalA.from)),
-            inserted: createSpans(Math.max(0, finalB.to - finalB.from))
-          });
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
-      }
-      result.push({
-        isGranular: true,
-        changes: mergeOverlappingByNewDocRange(stepChanges)
-      });
-      continue;
-    }
-    result.push({
-      isGranular: false,
-      changes: [{
-        fromA: fromA,
-        toA: toA,
-        fromB: fromB,
-        toB: toB,
-        deleted: createSpans(Math.max(0, toA - fromA)),
-        inserted: createSpans(Math.max(0, toB - fromB))
-      }]
-    });
-  }
-  return result;
 };

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

@@ -20,7 +20,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * that is not in the current document.
  */
 var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidget = function createNodeChangedDecorationWidget(_ref) {
-  var _slice$content, _slice$content2, _slice$content3, _slice$content$firstC;
+  var _slice$content, _slice$content2, _slice$content3, _$safeInsertPos$nodeB, _slice$content$firstC;
   var change = _ref.change,
     doc = _ref.doc,
     nodeViewSerializer = _ref.nodeViewSerializer,
@@ -77,6 +77,14 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
 
   // For non-table content, use the existing span wrapper approach
   var dom = document.createElement('span');
+  var $safeInsertPos = newDoc.resolve(safeInsertPos);
+  var isTopLevelInsert = $safeInsertPos.depth === 0;
+  var hasPreviousBlock = ((_$safeInsertPos$nodeB = $safeInsertPos.nodeBefore) === null || _$safeInsertPos$nodeB === void 0 ? void 0 : _$safeInsertPos$nodeB.isBlock) === true;
+  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isTopLevelInsert && hasPreviousBlock) {
+    // Editor CSS removes the top margin from a block when it is its parent's first child.
+    // Keep the serialized block as a subsequent child so each block type retains its own margin.
+    dom.append(dom.ownerDocument.createElement('div'));
+  }
   // When mediaSingle nodes are rendered inside a widget decoration (e.g. as part of
   // a replaced panel), the centering CSS (margin-left: 50%; transform: translateX(-50%))
   // incorrectly applies because isNestedNode resolves to false (getPos returns 0).

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

@@ -10,14 +10,13 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { areDocsEqualByBlockStructureAndText } from '../areDocsEqualByBlockStructureAndText';
 import { createDocMarginAnchorWidget } from '../decorations/createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
-import { createGranularBlockReferenceWidget } from '../decorations/createGranularBlockReferenceWidget';
 import { createInlineChangedDecoration } from '../decorations/createInlineChangedDecoration';
 import { createNodeChangedDecorationWidget } from '../decorations/createNodeChangedDecorationWidget';
 import { extractDiffDescriptors } from '../decorations/decorationKeys';
 import { getAttrChangeRanges, stepIsValidAttrChange } from '../decorations/utils/getAttrChangeRanges';
 import { getMarkChangeRanges } from '../decorations/utils/getMarkChangeRanges';
 import { isExtendedEnabled } from '../isExtendedEnabled';
-import { diffBySteps, getStepChanges } from './diffBySteps';
+import { diffBySteps } from './diffBySteps';
 import { groupChangesByBlock } from './groupChangesByBlock';
 import { optimizeChanges } from './optimizeChanges';
 import { simplifySteps } from './simplifySteps';
@@ -235,7 +234,7 @@ const calculateDiffDecorationsInner = ({
 
   // Our default operations are insertions, so it should match the opposite of isInverted.
   const isInserted = !isInverted;
-  const createDecorationsForChange = (change, showGranularWithBlock) => {
+  const createDecorationsForChange = change => {
     const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
 
     // Hoisted because it decides BOTH where the deleted widget is anchored and — since the
@@ -247,10 +246,8 @@ const calculateDiffDecorationsInner = ({
       inlineDeletedDiffPlacement
     });
     if (change.inserted.length > 0) {
-      // shouldHideDeleted for block/node decorations: suppressed when isInverted + hideDeletedDiffs,
-      // or when showGranularWithBlock (block reference widget is shown instead).
-      // isInverted gates both — on an inverted diff the inserted side is visually the deleted side.
-      const shouldHideDeleted = isExtendedEnabled(diffType) ? isInverted && (hideDeletedDiffs || showGranularWithBlock && change.deleted.length > 0) : false;
+      // On an inverted diff the inserted side is visually the deleted side.
+      const shouldHideDeleted = isExtendedEnabled(diffType) ? isInverted && hideDeletedDiffs : false;
 
       // For `smart` NODE-level promotions the change range spans a whole container
       // (e.g. an entire list/table/layout, using outer node bounds). Applying a SINGLE
@@ -267,7 +264,7 @@ const calculateDiffDecorationsInner = ({
       // change. Used to decide if indicator anchor positions should be adjusted
       // inward — when the widget is present the anchor must stay at the block
       // boundary to keep the indicator bar continuous with the deleted content.
-      const willRenderDeletedWidget = change.deleted.length > 0 && !(isExtendedEnabled(diffType) && !isInverted && (hideDeletedDiffs || showGranularWithBlock) && change.inserted.length > 0);
+      const willRenderDeletedWidget = change.deleted.length > 0 && !(isExtendedEnabled(diffType) && !isInverted && hideDeletedDiffs && change.inserted.length > 0);
       if (isSmartNodeLevel) {
         for (const [from, to] of leafTextblockRanges(tr.doc, change.fromB, change.toB)) {
           decorations.push(...createInlineChangedDecoration({
@@ -322,7 +319,7 @@ const calculateDiffDecorationsInner = ({
       }));
     }
     if (change.deleted.length > 0) {
-      const shouldHideDeleted = isExtendedEnabled(diffType) ? !isInverted && (hideDeletedDiffs || showGranularWithBlock) && change.inserted.length > 0 : false;
+      const shouldHideDeleted = isExtendedEnabled(diffType) ? !isInverted && hideDeletedDiffs && change.inserted.length > 0 : false;
       if (!shouldHideDeleted) {
         decorations.push(...createNodeChangedDecorationWidget({
           change,
@@ -343,85 +340,9 @@ const calculateDiffDecorationsInner = ({
       }
     }
   };
-  if (diffType === 'step' && expValEquals('platform_editor_diff_granular_extended', 'isEnabled', true)) {
-    // Uses getStepChanges instead of getChanges so that we have per-step granularity metadata.
-    // Specifically, we need to know how many granular changes each step produced in order to
-    // apply the shouldHideDeleted suppression threshold (> 3 granular changes per step).
-    // getChanges returns a flat Change[] with no per-step grouping, making this count impossible
-    // to derive after the fact without re-introducing per-change metadata.
-    const stepChanges = getStepChanges(originalDoc, steps);
-    stepChanges.forEach(({
-      isGranular,
-      changes: stepChangeList
-    }) => {
-      const granularCount = isGranular ? stepChangeList.length : 0;
-
-      // Calculate the average ratio of changed content on both A (original) and B (new)
-      // sides of the diff. If 30% or more of the block has changed on average, we show
-      // the block reference widget even if the granular change count is below the threshold.
-      // Block length is derived from the enclosing text block boundaries rather than the
-      // first/last change positions, so unchanged words at the start/end are accounted for.
-      let avgChangedRatio = 0;
-      if (isGranular && stepChangeList.length > 0) {
-        const first = stepChangeList[0];
-        const last = stepChangeList[stepChangeList.length - 1];
-        const resolvedA = originalDoc.resolve(first.fromA);
-        const resolvedB = tr.doc.resolve(first.fromB);
-        let blockStartA = first.fromA;
-        let blockEndA = last.toA;
-        let blockStartB = first.fromB;
-        let blockEndB = last.toB;
-        for (let depth = resolvedA.depth; depth >= 0; depth--) {
-          const node = resolvedA.node(depth);
-          if (node.isTextblock) {
-            blockStartA = resolvedA.start(depth);
-            blockEndA = blockStartA + node.nodeSize - 2; // exclude open/close tokens
-            break;
-          }
-        }
-        for (let depth = resolvedB.depth; depth >= 0; depth--) {
-          const node = resolvedB.node(depth);
-          if (node.isTextblock) {
-            blockStartB = resolvedB.start(depth);
-            blockEndB = blockStartB + node.nodeSize - 2; // exclude open/close tokens
-            break;
-          }
-        }
-        const blockLengthA = blockEndA - blockStartA;
-        const blockLengthB = blockEndB - blockStartB;
-        const totalChangedA = stepChangeList.reduce((sum, c) => sum + (c.toA - c.fromA), 0);
-        const totalChangedB = stepChangeList.reduce((sum, c) => sum + (c.toB - c.fromB), 0);
-        const ratioA = blockLengthA > 0 ? totalChangedA / blockLengthA : 0;
-        const ratioB = blockLengthB > 0 ? totalChangedB / blockLengthB : 0;
-        avgChangedRatio = (ratioA + ratioB) / 2;
-      }
-      const showGranularWithBlock = isGranular && granularCount !== 1 && (granularCount > 3 || avgChangedRatio >= 0.3);
-      stepChangeList.forEach(change => {
-        createDecorationsForChange(change, showGranularWithBlock);
-      });
-      if (showGranularWithBlock && stepChangeList.length > 0 && !hideDeletedDiffs) {
-        const lastChange = stepChangeList[stepChangeList.length - 1];
-        const granularBlockDiffId = crypto.randomUUID();
-        const blockWidgets = createGranularBlockReferenceWidget({
-          change: lastChange,
-          originalDoc,
-          newDoc: tr.doc,
-          isInverted,
-          nodeViewSerializer,
-          colorScheme,
-          intl,
-          activeIndexPos,
-          diffId: granularBlockDiffId,
-          showIndicators
-        });
-        decorations.push(...blockWidgets);
-      }
-    });
-  } else {
-    changes.forEach(change => {
-      createDecorationsForChange(change, /* showGranularWithBlock */false);
-    });
-  }
+  changes.forEach(change => {
+    createDecorationsForChange(change);
+  });
   getMarkChangeRanges(steps).forEach(change => {
     const isActive = activeIndexPos && change.fromB === activeIndexPos.from && change.toB === activeIndexPos.to;
     decorations.push(...createInlineChangedDecoration({

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

@@ -362,108 +362,4 @@ export const diffBySteps = (originalDoc, steps) => {
     });
   }
   return mergeOverlappingByNewDocRange(changes);
-};
-
-/**
- * A fork of `diffBySteps` that returns changes grouped per step, rather than as a flat list.
- *
- * Why forked rather than refactoring `diffBySteps`:
- * - `diffBySteps` returns a flat `Change[]` and is consumed by the existing decoration path.
- *   Changing its return shape would require threading per-step metadata through all callers,
- *   adding complexity to a stable code path.
- * - The per-step grouping is only needed for the `platform_editor_diff_granular_extended` gate,
- *   where we need to know how many granular changes a single step produced in order to decide
- *   whether to suppress deleted decorations (threshold: > 3 granular changes per step).
- * - Keeping the two functions separate means each has a clear, focused contract and neither
- *   accumulates the other's concerns. Shared logic (mapping helpers, `mergeOverlappingByNewDocRange`,
- *   `shouldCheckGranularDiff`, etc.) is already extracted and reused by both.
- */
-export const getStepChanges = (originalDoc, steps) => {
-  const result = [];
-  let currentDoc = originalDoc;
-  const successfulStepMaps = [];
-  const rangedSteps = [];
-  for (const step of steps) {
-    const before = currentDoc;
-    const stepResult = step.apply(currentDoc);
-    if (stepResult.failed !== null || !stepResult.doc) {
-      continue;
-    }
-    const stepMap = step.getMap();
-    const rangeStep = step;
-    if (typeof rangeStep.from === 'number' && typeof rangeStep.to === 'number') {
-      rangedSteps.push({
-        before,
-        doc: stepResult.doc,
-        from: rangeStep.from,
-        to: rangeStep.to,
-        mapIndex: successfulStepMaps.length,
-        step,
-        stepMap
-      });
-    }
-    successfulStepMaps.push(stepMap);
-    currentDoc = stepResult.doc;
-  }
-  for (const rangedStep of rangedSteps) {
-    const originalToBeforeStep = createMapping(successfulStepMaps.slice(0, rangedStep.mapIndex));
-    const beforeStepToOriginal = originalToBeforeStep.invert();
-    const fromA = mapPosition(beforeStepToOriginal, rangedStep.from);
-    const toA = mapPosition(beforeStepToOriginal, rangedStep.to);
-    const fromAfterStep = rangedStep.stepMap.map(rangedStep.from, -1);
-    const toAfterStep = rangedStep.stepMap.map(rangedStep.to, 1);
-    const afterStepToFinal = createMapping(successfulStepMaps.slice(rangedStep.mapIndex + 1));
-    const fromB = mapPosition(afterStepToFinal, fromAfterStep);
-    const toB = mapPosition(afterStepToFinal, toAfterStep);
-    if (shouldCheckGranularDiff(rangedStep.step, rangedStep.before, rangedStep.from, rangedStep.to)) {
-      const granularStepChanges = ChangeSet.create(rangedStep.before).addSteps(rangedStep.doc, [rangedStep.stepMap], null);
-      const optimizedGranularStepChanges = optimizeChanges(simplifyChanges(granularStepChanges.changes, rangedStep.doc));
-      const stepChanges = [];
-      for (const granularChange of optimizedGranularStepChanges) {
-        const expandedA = expandToWordBoundaries(rangedStep.before, granularChange.fromA, granularChange.toA);
-        const expandedB = expandToWordBoundaries(rangedStep.doc, granularChange.fromB, granularChange.toB);
-        const aLeftDelta = granularChange.fromA - expandedA.from;
-        const aRightDelta = expandedA.to - granularChange.toA;
-        const bLeftDelta = granularChange.fromB - expandedB.from;
-        const bRightDelta = expandedB.to - granularChange.toB;
-        let finalA = expandedA;
-        let finalB = expandedB;
-        if (aLeftDelta > bLeftDelta || aRightDelta > bRightDelta) {
-          const extraLeft = Math.max(0, aLeftDelta - bLeftDelta);
-          const extraRight = Math.max(0, aRightDelta - bRightDelta);
-          finalB = expandToWordBoundaries(rangedStep.doc, Math.max(expandedB.from - extraLeft, 0), expandedB.to + extraRight);
-        }
-        if (bLeftDelta > aLeftDelta || bRightDelta > aRightDelta) {
-          const extraLeft = Math.max(0, bLeftDelta - aLeftDelta);
-          const extraRight = Math.max(0, bRightDelta - aRightDelta);
-          finalA = expandToWordBoundaries(rangedStep.before, Math.max(expandedA.from - extraLeft, 0), expandedA.to + extraRight);
-        }
-        stepChanges.push({
-          fromA: mapPosition(beforeStepToOriginal, finalA.from),
-          toA: mapPosition(beforeStepToOriginal, finalA.to),
-          fromB: mapPosition(afterStepToFinal, finalB.from),
-          toB: mapPosition(afterStepToFinal, finalB.to),
-          deleted: createSpans(Math.max(0, finalA.to - finalA.from)),
-          inserted: createSpans(Math.max(0, finalB.to - finalB.from))
-        });
-      }
-      result.push({
-        isGranular: true,
-        changes: mergeOverlappingByNewDocRange(stepChanges)
-      });
-      continue;
-    }
-    result.push({
-      isGranular: false,
-      changes: [{
-        fromA,
-        toA,
-        fromB,
-        toB,
-        deleted: createSpans(Math.max(0, toA - fromA)),
-        inserted: createSpans(Math.max(0, toB - fromB))
-      }]
-    });
-  }
-  return result;
 };