@atlaskit/editor-plugin-show-diff 19.0.3 → 20.0.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 20.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 19.0.4
+
+### Patch Changes
+
+- [`dec0b5dd31b2f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dec0b5dd31b2f) -
+  Add Figma, Lovable, and Replit contributor tags behind
+  confluence_ncs_step_diffing_version_history.
+- [`806c750c64957`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/806c750c64957) -
+  Clean up experiment `platform_editor_diff_plugin_extended`
+- Updated dependencies
+
 ## 19.0.3
 
 ### Patch Changes

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

@@ -30,8 +30,8 @@ var _createDeletedLineBreakWidget = require("../decorations/utils/createDeletedL
 var _getAttrChangeRanges = require("../decorations/utils/getAttrChangeRanges");
 var _getMarkChangeRanges = require("../decorations/utils/getMarkChangeRanges");
 var _wrapBlockNodeView = require("../decorations/utils/wrapBlockNodeView");
+var _getDefaultDiffType = require("../getDefaultDiffType");
 var _getScrollableDecorations = require("../getScrollableDecorations");
-var _isExtendedEnabled = require("../isExtendedEnabled");
 var _emptyTextBlocks = require("../utils/emptyTextBlocks");
 var _diffBySteps = require("./diffBySteps");
 var _groupChangesByBlock = require("./groupChangesByBlock");
@@ -58,28 +58,24 @@ var getChanges = function getChanges(_ref) {
     steps = _ref.steps,
     intl = _ref.intl,
     smartThresholds = _ref.smartThresholds;
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    // The `smart` diff type is gated behind `platform_editor_ai_smart_diff`. When the gate is
-    // off, `smart` falls through to the default (`inline`) path below so behaviour degrades
-    // gracefully (see docs/smart-diff-design.md §3).
-    if (diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff')) {
-      var _changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
-      return (0, _classifySmartChanges.classifySmartChanges)({
-        changes: _changes,
-        originalDoc: originalDoc,
-        newDoc: tr.doc,
-        locale: intl.locale,
-        thresholds: smartThresholds
-      });
-    }
-    if (diffType === 'step') {
-      return (0, _diffBySteps.diffBySteps)(originalDoc, steps);
-    }
-    if (diffType === 'block') {
-      return (0, _groupChangesByBlock.groupChangesByBlock)(changeset.changes, originalDoc, steppedDoc);
-    }
-    var _changes2 = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
-    return (0, _optimizeChanges.optimizeChanges)(_changes2);
+  // The `smart` diff type is gated behind `platform_editor_ai_smart_diff`. When the gate is
+  // off, `smart` falls through to the default (`inline`) path below so behaviour degrades
+  // gracefully (see docs/smart-diff-design.md §3).
+  if (diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff')) {
+    var _changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
+    return (0, _classifySmartChanges.classifySmartChanges)({
+      changes: _changes,
+      originalDoc: originalDoc,
+      newDoc: tr.doc,
+      locale: intl.locale,
+      thresholds: smartThresholds
+    });
+  }
+  if (diffType === 'step') {
+    return (0, _diffBySteps.diffBySteps)(originalDoc, steps);
+  }
+  if (diffType === 'block') {
+    return (0, _groupChangesByBlock.groupChangesByBlock)(changeset.changes, originalDoc, steppedDoc);
   }
   var changes = (0, _prosemirrorChangeset.simplifyChanges)(changeset.changes, tr.doc);
   return (0, _optimizeChanges.optimizeChanges)(changes);
@@ -95,13 +91,11 @@ var getAttributedChanges = function getAttributedChanges(_ref2) {
   // the step attribution and promotes ranges to sentence/paragraph/node granularity, so a promoted
   // range covers several actors' steps and the latest-writer rule credits all of it to one of them.
   // The attributed changeset keeps step granularity instead.
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    if (diffType === 'step') {
-      return attributedChanges;
-    }
-    if (diffType === 'block') {
-      return (0, _groupChangesByBlock.groupChangesByBlock)(changeset.changes, originalDoc, steppedDoc);
-    }
+  if (diffType === 'step') {
+    return attributedChanges;
+  }
+  if (diffType === 'block') {
+    return (0, _groupChangesByBlock.groupChangesByBlock)(changeset.changes, originalDoc, steppedDoc);
   }
   return (0, _simplifyChangesWithAttribution.simplifyChangesWithAttribution)(attributedChanges, tr.doc);
 };
@@ -200,7 +194,6 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
     showContributorTags = _ref5$showContributor === void 0 ? false : _ref5$showContributor,
     _ref5$showIndicators = _ref5.showIndicators,
     showIndicators = _ref5$showIndicators === void 0 ? false : _ref5$showIndicators,
-    diffType = _ref5.diffType,
     _ref5$coarseTableCell = _ref5.coarseTableCellsOnly,
     coarseTableCellsOnly = _ref5$coarseTableCell === void 0 ? false : _ref5$coarseTableCell,
     tagMountContext = _ref5.tagMountContext,
@@ -237,7 +230,6 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
           showContributorTags: showContributorTags,
           showIndicators: showIndicators,
           doc: doc,
-          diffType: diffType,
           tagMountContext: tagMountContext
         })));
       }
@@ -264,7 +256,7 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
         return;
       }
     }
-    if (node.isBlock && (!(0, _isExtendedEnabled.isExtendedEnabled)(diffType) || (!requireContainedBlocks || pos >= from) && pos + node.nodeSize <= to)) {
+    if (node.isBlock && (!requireContainedBlocks || pos >= from) && pos + node.nodeSize <= to) {
       var _nodeEnd = pos + node.nodeSize;
       var _isActive = isRangeActive(activeIndexPos, pos, _nodeEnd);
       decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createBlockChangedDecoration.createBlockChangedDecoration)({
@@ -282,7 +274,6 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
         showContributorTags: showContributorTags,
         showIndicators: showIndicators,
         doc: doc,
-        diffType: diffType,
         tagMountContext: tagMountContext
       })));
     }
@@ -331,10 +322,9 @@ var isDeletedContentPlacedBelow = exports.isDeletedContentPlacedBelow = function
  */
 var shouldHideDeletedSide = function shouldHideDeletedSide(_ref7) {
   var change = _ref7.change,
-    diffType = _ref7.diffType,
     hideDeletedDiffs = _ref7.hideDeletedDiffs,
     isInverted = _ref7.isInverted;
-  return (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && !isInverted && !!hideDeletedDiffs && (change.inserted.length > 0 || (0, _fg.fg)('platform_editor_diff_hide_pure_deletions') && (0, _unsafeExpValNoExposure.UNSAFE_expValNoExposure)('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true);
+  return !isInverted && !!hideDeletedDiffs && (change.inserted.length > 0 || (0, _fg.fg)('platform_editor_diff_hide_pure_deletions') && (0, _unsafeExpValNoExposure.UNSAFE_expValNoExposure)('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true);
 };
 var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8) {
   var state = _ref8.state,
@@ -347,7 +337,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     _ref8$isInverted = _ref8.isInverted,
     isInverted = _ref8$isInverted === void 0 ? false : _ref8$isInverted,
     _ref8$diffType = _ref8.diffType,
-    diffType = _ref8$diffType === void 0 ? (0, _isExtendedEnabled.getDefaultDiffType)() : _ref8$diffType,
+    diffType = _ref8$diffType === void 0 ? (0, _getDefaultDiffType.getDefaultDiffType)() : _ref8$diffType,
     _ref8$hideDeletedDiff = _ref8.hideDeletedDiffs,
     hideDeletedDiffs = _ref8$hideDeletedDiff === void 0 ? false : _ref8$hideDeletedDiff,
     _ref8$hideAddedDiffsU = _ref8.hideAddedDiffsUnderline,
@@ -493,7 +483,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         stepIndex: stepIndex
       });
     }));
-    attributedChanges = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && diffType === 'step' ? (0, _diffBySteps.diffBySteps)(originalDoc, simplifiedSteps, simplifiedStepAttributions) : (0, _toConsumableArray2.default)(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`.
     var uncollapsedChanges = getAttributedChanges({
@@ -528,15 +518,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   /**
    * If showIndicators is on, we create an anchor widget here to mark the doc margin.
    */
-  if (showIndicators && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+  if (showIndicators) {
     decorations.push((0, _createAnchorDecorationWidgets.createDocMarginAnchorWidget)());
   }
 
   // Our default operations are insertions, so it should match the opposite of isInverted.
   var isInserted = !isInverted;
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    changes = (0, _groupDeletedColumnChanges.groupDeletedColumnChanges)(changes, originalDoc, tr.doc, new _transform.Mapping(stepMaps), isInverted);
-  }
+  changes = (0, _groupDeletedColumnChanges.groupDeletedColumnChanges)(changes, originalDoc, tr.doc, new _transform.Mapping(stepMaps), isInverted);
   // A whole-table change owns every mark and attribute range inside its bounds, so those ranges
   // do not also get their own decoration.
   var tableChanges = changes.filter(function (change) {
@@ -601,7 +589,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     });
     if (change.inserted.length > 0) {
       // On an inverted diff the inserted side is visually the deleted side.
-      var shouldHideDeleted = (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? isInverted && hideDeletedDiffs : false;
+      var shouldHideDeleted = isInverted && hideDeletedDiffs;
 
       // A removed blank line — an empty paragraph or heading — has nothing to mark up. On an
       // inverted diff, the shape AI suggested edits renders, the block is still in the displayed
@@ -624,7 +612,6 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
             decorations.push((0, _createDeletedLineBreakWidget.createDeletedLineBreakDecoration)({
               attributionKey: attributionKey,
               colorScheme: changeColorScheme,
-              diffType: diffType,
               isActive: isActive,
               pos: pos,
               reveal: reveal,
@@ -659,7 +646,6 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       // boundary to keep the indicator bar continuous with the deleted content.
       var willRenderDeletedWidget = change.deleted.length > 0 && !isMarkOnly && !shouldHideDeletedSide({
         change: change,
-        diffType: diffType,
         hideDeletedDiffs: hideDeletedDiffs,
         isInverted: isInverted
       });
@@ -678,7 +664,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
             if (useCoarseTableDecoration && isInsideTable(coarseTables, from)) {
               continue;
             }
-            decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)(_objectSpread({
+            decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
               attributionKey: attributionKey,
               change: {
                 fromB: from,
@@ -688,8 +674,6 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
               doc: tr.doc,
               colorScheme: changeColorScheme,
               isActive: isActive,
-              diffType: diffType
-            }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
               isInserted: isInserted,
               shouldHideDeleted: shouldHideDeleted,
               showContributorTags: showContributorTags,
@@ -699,7 +683,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
               isDeletedWidgetBelow: isDeletedWidgetBelow,
               reveal: reveal,
               tagMountContext: tagMountContext
-            }))));
+            })));
           }
         } catch (err) {
           _iterator4.e(err);
@@ -707,15 +691,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           _iterator4.f();
         }
       } else {
-        decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)(_objectSpread({
+        decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
           attributionKey: attributionKey,
           change: change,
           leftAnchorId: leftAnchorId,
           doc: tr.doc,
           colorScheme: changeColorScheme,
           isActive: isActive,
-          diffType: diffType
-        }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
           isInserted: isInserted,
           shouldHideDeleted: shouldHideDeleted,
           showContributorTags: showContributorTags,
@@ -725,45 +707,39 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           isDeletedWidgetBelow: isDeletedWidgetBelow,
           reveal: reveal,
           tagMountContext: tagMountContext
-        }))));
+        })));
       }
-      decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration(_objectSpread(_objectSpread({
+      decorations.push.apply(decorations, (0, _toConsumableArray2.default)(calculateNodesForBlockDecoration({
         attributionKey: attributionKey,
         doc: tr.doc,
         from: change.fromB,
         to: change.toB,
         // A split piece's own range no longer covers the container it opened (EDITOR-8932).
         nodeRanges: change.blockNodeRangesB,
-        colorScheme: changeColorScheme
-      }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
+        colorScheme: changeColorScheme,
         isInserted: isInserted,
         shouldHideDeleted: shouldHideDeleted,
         showContributorTags: showContributorTags,
         showIndicators: showIndicators,
-        tagMountContext: tagMountContext
-      }), {}, {
+        tagMountContext: tagMountContext,
         activeIndexPos: activeIndexPos,
         intl: intl,
-        diffType: diffType,
         coarseTableCellsOnly: useCoarseTableDecoration,
         leftAnchorId: leftAnchorId
-      }))));
+      })));
     }
     if (change.deleted.length > 0 && !isMarkOnly && !hasNoDeletedContent) {
       var _shouldHideDeleted = shouldHideDeletedSide({
         change: change,
-        diffType: diffType,
         hideDeletedDiffs: hideDeletedDiffs,
         isInverted: isInverted
       });
       if (!_shouldHideDeleted) {
-        decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)(_objectSpread(_objectSpread({
+        decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)({
           deletedColumns: deletedColumns,
           // The deleted side has no inline decoration, so the widget carries the actor.
           attributionKey: attributionKey,
-          // Extended pipeline only, matching the inline path: the non-extended styles have no
-          // background for the wipe to act on.
-          reveal: (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? reveal : undefined,
+          reveal: reveal,
           change: change,
           doc: originalDoc,
           nodeViewSerializer: nodeViewSerializer,
@@ -773,15 +749,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           activeIndexPos: activeIndexPos,
           leftAnchorId: leftAnchorId,
           showContributorTags: showContributorTags,
-          tagMountContext: tagMountContext
-        }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
+          tagMountContext: tagMountContext,
           isInserted: !isInserted,
-          diffType: diffType,
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
-          placeBelow: isDeletedWidgetBelow
-        }), {}, {
+          placeBelow: isDeletedWidgetBelow,
           showIndicators: showIndicators
-        }))));
+        })));
       }
     }
   };
@@ -812,7 +785,6 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       change: change,
       colorScheme: changeColorScheme,
       doc: tr.doc,
-      diffType: diffType,
       isActive: isActive,
       isInserted: true,
       reveal: reveal,
@@ -850,8 +822,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         tagMountContext: tagMountContext,
         // Suppress the border-bottom underline for atomic inline nodeviews —
         // it doesn't render on custom nodeview DOM elements and is unnecessary noise.
-        hideAddedDiffsUnderline: true,
-        diffType: diffType
+        hideAddedDiffsUnderline: true
       })));
       // If we have the original node position, also render the old node as a "deleted" widget
       // so the user can see what it looked like before the change.
@@ -895,7 +866,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       var isSmartNodeLevelAttrChange = diffType === 'smart' && (0, _fg.fg)('platform_editor_ai_smart_diff') && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_ai_xstate_migration', 'isEnabled', true) && (0, _unsafeExpValNoExposure.UNSAFE_expValNoExposure)('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true;
       if (isSmartNodeLevelAttrChange && change.fromA !== undefined && change.toA !== undefined) {
         var placeBelow = deletedDiffPlacement === 'bottom';
-        decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)(_objectSpread(_objectSpread({
+        decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createNodeChangedDecorationWidget.createNodeChangedDecorationWidget)({
           change: {
             fromA: change.fromA,
             toA: change.toA,
@@ -910,16 +881,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           newDoc: tr.doc,
           intl: intl,
           activeIndexPos: activeIndexPos,
-          isInserted: false
-        }, (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && {
-          diffType: diffType,
+          isInserted: false,
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
-          placeBelow: placeBelow
-        }), {}, {
+          placeBelow: placeBelow,
           showIndicators: showIndicators,
           showContributorTags: showContributorTags,
           tagMountContext: tagMountContext
-        }))));
+        })));
       }
     }
   });
@@ -928,7 +896,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     contributorTags: showContributorTags ? (0, _extractContributorTags.extractContributorTags)(decorationSet, contributors, activeIndexPos,
     // The stops the step buttons walk, so a stop cannot hold a second tag for one
     // contributor that navigation can never reach.
-    (0, _getScrollableDecorations.getScrollableDecorations)(decorationSet, tr.doc, diffType)) : [],
+    (0, _getScrollableDecorations.getScrollableDecorations)(decorationSet, tr.doc)) : [],
     decorations: decorationSet,
     diffDescriptors: (0, _decorationKeys.extractDiffDescriptors)(decorationSet)
   };
@@ -937,7 +905,7 @@ var calculateDiffDecorations = exports.calculateDiffDecorations = (0, _memoizeOn
 // Cache results unless relevant inputs change. `tagMountContext` is deliberately absent: it is
 // built once per plugin instance, so it can never be the reason a diff needs recalculating.
 function (_ref14, _ref15) {
-  var _ref19;
+  var _ref18;
   var _ref16 = (0, _slicedToArray2.default)(_ref14, 1),
     _ref16$ = _ref16[0],
     pluginState = _ref16$.pluginState,
@@ -971,14 +939,10 @@ function (_ref14, _ref15) {
     lastInlineDeletedDiffPlacement = _ref17$.inlineDeletedDiffPlacement,
     lastReveal = _ref17$.reveal;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
-    var _ref18;
-    return (_ref18 = 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) &&
-    // Contributors can arrive after the first calculation; without this, tags never appear.
-    (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement &&
-    // Turning the reveal on or off changes the emitted styles, so a cached result from the
-    // other setting would leave the diff painted in the wrong resting state.
-    (0, _isEqual.default)(reveal, lastReveal)) !== null && _ref18 !== void 0 ? _ref18 : false;
-  }
-  return (_ref19 = originalDocIsSame && (0, _isEqual.default)(pluginState.steps, lastPluginState.steps) && (0, _isEqual.default)(pluginState.stepAttributions, lastPluginState.stepAttributions) && (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && (0, _isEqual.default)(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref19 !== void 0 ? _ref19 : false;
+  return (_ref18 = 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) &&
+  // Contributors can arrive after the first calculation; without this, tags never appear.
+  (0, _isEqual.default)(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && (0, _isEqual.default)(smartThresholds, lastSmartThresholds) && deletedDiffPlacement === lastDeletedDiffPlacement && inlineDeletedDiffPlacement === lastInlineDeletedDiffPlacement &&
+  // Turning the reveal on or off changes the emitted styles, so a cached result from the
+  // other setting would leave the diff painted in the wrong resting state.
+  (0, _isEqual.default)(reveal, lastReveal)) !== null && _ref18 !== void 0 ? _ref18 : false;
 });

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

@@ -909,7 +909,7 @@ function buildDeletedCellOverlayRoundedStyle(colors) {
 // --- Inline content style dispatch ---
 
 /**
- * Inserted inline content under the extended diff experience. `insertedInlineTreatment` picks
+ * Inserted inline content. `insertedInlineTreatment` picks
  * `text-decoration` vs a `border-bottom` rule; only the latter honours `hideAddedDiffsUnderline`.
  */
 function buildInsertedInlineStyle(colors, isActive, hideAddedDiffsUnderline) {

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

@@ -4,37 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.standardDecorationMarkerVariable = exports.getStandardDeletedRowStyle = exports.getStandardDeletedContentStyleNew = exports.getStandardDeletedContentStyleActive = exports.getStandardDeletedContentStyle = exports.editingStyleRuleNode = exports.editingStyleQuoteNode = exports.editingStyleNode = exports.editingStyleExtendedNoUnderline = exports.editingStyleExtended = exports.editingStyleCardBlockNode = exports.editingStyleActiveExtendedNoUnderline = exports.editingStyleActiveExtended = exports.editingStyleActive = exports.editingStyle = exports.editingContentStyleInBlockExtendedNoUnderline = exports.editingContentStyleInBlockExtended = exports.editingContentStyleInBlock = exports.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedInlineContentStyleExtended = exports.deletedDecorationMarkerVariable = exports.deletedContentStyleUnbounded = exports.deletedCellOverlayStyle = exports.deletedCellOverlayRoundedStyle = exports.deletedBlockOutlineRoundedActive = exports.deletedBlockOutlineRounded = exports.deletedBlockOutlineActive = exports.deletedBlockOutline = exports.addedCellOverlayStyle = exports.addedCellOverlayRoundedStyle = void 0;
+exports.standardDecorationMarkerVariable = exports.getStandardDeletedRowStyle = exports.getStandardDeletedContentStyleNew = exports.getStandardDeletedContentStyleActive = exports.getStandardDeletedContentStyle = exports.editingStyleRuleNode = exports.editingStyleQuoteNode = exports.editingStyleNode = exports.editingStyleExtendedNoUnderline = exports.editingStyleExtended = exports.editingStyleCardBlockNode = exports.editingStyleActiveExtendedNoUnderline = exports.editingStyleActiveExtended = exports.editingContentStyleInBlockExtendedNoUnderline = exports.editingContentStyleInBlockExtended = exports.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedInlineContentStyleExtended = exports.deletedDecorationMarkerVariable = exports.deletedContentStyleUnbounded = exports.deletedCellOverlayStyle = exports.deletedCellOverlayRoundedStyle = exports.deletedBlockOutlineRoundedActive = exports.deletedBlockOutlineRounded = exports.deletedBlockOutlineActive = exports.deletedBlockOutline = exports.addedCellOverlayStyle = exports.addedCellOverlayRoundedStyle = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _getStandardDeletedTextDecorationStyle = require("./getStandardDeletedTextDecorationStyle");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-// delete on platform_editor_diff_plugin_extended cleanup
-var editingStyle = exports.editingStyle = (0, _lazyNodeView.convertToInlineCss)({
-  background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
-  textDecoration: 'underline',
-  textDecorationStyle: 'dotted',
-  textDecorationThickness: "var(--ds-space-025, 2px)",
-  textDecorationColor: "var(--ds-border-accent-purple, #AF59E1)"
-});
-
-// delete on platform_editor_diff_plugin_extended cleanup
-var editingContentStyleInBlock = exports.editingContentStyleInBlock = (0, _lazyNodeView.convertToInlineCss)({
-  textDecoration: 'underline',
-  textDecorationStyle: 'dotted',
-  textDecorationThickness: "var(--ds-space-025, 2px)",
-  textDecorationColor: "var(--ds-border-accent-purple, #AF59E1)"
-});
-
-// delete on platform_editor_diff_plugin_extended cleanup
-var editingStyleActive = exports.editingStyleActive = (0, _lazyNodeView.convertToInlineCss)({
-  background: "var(--ds-background-accent-purple-subtler-pressed, #D8A0F7)",
-  textDecoration: 'underline',
-  textDecorationStyle: 'dotted',
-  textDecorationThickness: "var(--ds-space-025, 2px)",
-  textDecorationColor: "var(--ds-text-accent-purple, #803FA5)"
-});
 var editingStyleExtended = exports.editingStyleExtended = (0, _lazyNodeView.convertToInlineCss)({
   background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
   borderBottom: "2px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),

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

@@ -12,7 +12,6 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _isExtendedEnabled = require("../isExtendedEnabled");
 var _taggableBlockNodes = require("../utils/taggableBlockNodes");
 var _factory = require("./colorSchemes/factory");
 var _schemes = require("./colorSchemes/schemes");
@@ -51,10 +50,9 @@ var isInsideTable = function isInsideTable(doc, pos) {
  */
 var canTagBlock = function canTagBlock(_ref) {
   var _doc$nodeAt;
-  var diffType = _ref.diffType,
-    doc = _ref.doc,
+  var doc = _ref.doc,
     from = _ref.from;
-  if (doc === undefined || !(0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+  if (doc === undefined) {
     return false;
   }
   var nodeType = (_doc$nodeAt = doc.nodeAt(from)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type;
@@ -113,19 +111,15 @@ var getBlockNodeStyleNext = function getBlockNodeStyleNext(_ref2) {
     _ref2$isInserted = _ref2.isInserted,
     isInserted = _ref2$isInserted === void 0 ? true : _ref2$isInserted,
     _ref2$isActive = _ref2.isActive,
-    isActive = _ref2$isActive === void 0 ? false : _ref2$isActive,
-    diffType = _ref2.diffType;
+    isActive = _ref2$isActive === void 0 ? false : _ref2$isActive;
   if (UNSTYLED_NODES.includes(nodeName)) {
     return undefined;
   }
   if (CELL_NODES.includes(nodeName)) {
-    // When the gate is off, cells get no styling — as with UNSTYLED_NODES above.
-    return (0, _isExtendedEnabled.isExtendedEnabled)(diffType) ? cellPositionStyle : undefined;
+    return cellPositionStyle;
   }
   var colors = _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
-
-  // Deleted nodes only differ under the extended experience; otherwise all are insertions.
-  if (!isInserted && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+  if (!isInserted) {
     return (0, _factory.buildDeletedBlockNodeStyle)(colors, getDeletedBlockNodeCategory(nodeName), isActive);
   }
   return (0, _factory.buildInsertedBlockNodeStyle)(colors, getInsertedBlockNodeShape(nodeName), isActive);
@@ -192,14 +186,12 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
     _ref3$showIndicators = _ref3.showIndicators,
     showIndicators = _ref3$showIndicators === void 0 ? false : _ref3$showIndicators,
     doc = _ref3.doc,
-    diffType = _ref3.diffType,
     tagMountContext = _ref3.tagMountContext;
   var decorations = [];
   // Derived from the node range so it survives a recalculation, as in
   // `createInlineChangedDecoration`. Changes are disjoint, so no two of them decorate one node.
   var diffId = showContributorTags ? "block-".concat(change.from, "-").concat(change.to) : crypto.randomUUID();
   var shouldTagBlock = showContributorTags && canTagBlock({
-    diffType: diffType,
     doc: doc,
     from: change.from
   });
@@ -218,11 +210,10 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
       leftAnchorId: leftAnchorId,
       isActive: isActive,
       isInserted: isInserted,
-      nodeName: change.name,
-      diffType: diffType
+      nodeName: change.name
     }))];
   }
-  if ((0, _isExtendedEnabled.isExtendedEnabled)(diffType) && CELL_NODES.includes(change.name)) {
+  if (CELL_NODES.includes(change.name)) {
     var cellOverlay = document.createElement('div');
     var colors = _schemes.colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
     var isRoundedTable = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_table_diff_rounded_corners');
@@ -246,15 +237,13 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
       key: 'cell-overlay-decoration'
     }));
   }
-  // isInserted is only read under the extended experience, so pass it unconditionally. `change.name`
-  // verbatim: base-name resolution stays in `canTagBlock`, which needs tags on, so a schema
-  // variant's legacy style is untouched — see `resolveBaseNodeName`.
+  // `change.name` verbatim: base-name resolution stays in `canTagBlock`, which needs tags on, so a
+  // schema variant's legacy style is untouched — see `resolveBaseNodeName`.
   var nodeStyle = getBlockNodeStyle({
     nodeName: change.name,
     colorScheme: colorScheme,
     isInserted: isInserted,
-    isActive: isActive,
-    diffType: diffType
+    isActive: isActive
   });
   var style = tagAnchorName ? [nodeStyle, (0, _lazyNodeView.convertToInlineCss)({
     anchorName: "--".concat(tagAnchorName)
@@ -275,8 +264,7 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
       leftAnchorId: leftAnchorId,
       isActive: isActive,
       isInserted: isInserted,
-      nodeName: change.name,
-      diffType: diffType
+      nodeName: change.name
     })));
   }
   if (decorations.length === 0) {
@@ -284,7 +272,7 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
     // there is nothing for a tag to hang off even when the node type would otherwise be taggable.
     return decorations;
   }
-  if (showIndicators && doc && (0, _isExtendedEnabled.isExtendedEnabled)(diffType)) {
+  if (showIndicators && doc) {
     decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createAnchorDecorationWidgets.createBlockIndicatorAnchorWidgets)({
       doc: doc,
       from: change.from,