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

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

@@ -28,8 +28,8 @@ import { createDeletedLineBreakDecoration } from '../decorations/utils/createDel
 import { getAttrChangeRanges, stepIsValidAttrChange } from '../decorations/utils/getAttrChangeRanges';
 import { getMarkChangeRanges } from '../decorations/utils/getMarkChangeRanges';
 import { createRemovedLozenge } from '../decorations/utils/wrapBlockNodeView';
+import { getDefaultDiffType } from '../getDefaultDiffType';
 import { getScrollableDecorations } from '../getScrollableDecorations';
-import { getDefaultDiffType, isExtendedEnabled } from '../isExtendedEnabled';
 import { emptyTextBlockContentPositions } from '../utils/emptyTextBlocks';
 import { diffBySteps } from './diffBySteps';
 import { groupChangesByBlock } from './groupChangesByBlock';
@@ -51,28 +51,24 @@ var getChanges = function getChanges(_ref) {
     steps = _ref.steps,
     intl = _ref.intl,
     smartThresholds = _ref.smartThresholds;
-  if (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' && fg('platform_editor_ai_smart_diff')) {
-      var _changes = simplifyChanges(changeset.changes, tr.doc);
-      return classifySmartChanges({
-        changes: _changes,
-        originalDoc: originalDoc,
-        newDoc: tr.doc,
-        locale: intl.locale,
-        thresholds: smartThresholds
-      });
-    }
-    if (diffType === 'step') {
-      return diffBySteps(originalDoc, steps);
-    }
-    if (diffType === 'block') {
-      return groupChangesByBlock(changeset.changes, originalDoc, steppedDoc);
-    }
-    var _changes2 = simplifyChanges(changeset.changes, tr.doc);
-    return 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' && fg('platform_editor_ai_smart_diff')) {
+    var _changes = simplifyChanges(changeset.changes, tr.doc);
+    return classifySmartChanges({
+      changes: _changes,
+      originalDoc: originalDoc,
+      newDoc: tr.doc,
+      locale: intl.locale,
+      thresholds: smartThresholds
+    });
+  }
+  if (diffType === 'step') {
+    return diffBySteps(originalDoc, steps);
+  }
+  if (diffType === 'block') {
+    return groupChangesByBlock(changeset.changes, originalDoc, steppedDoc);
   }
   var changes = simplifyChanges(changeset.changes, tr.doc);
   return optimizeChanges(changes);
@@ -88,13 +84,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 (isExtendedEnabled(diffType)) {
-    if (diffType === 'step') {
-      return attributedChanges;
-    }
-    if (diffType === 'block') {
-      return groupChangesByBlock(changeset.changes, originalDoc, steppedDoc);
-    }
+  if (diffType === 'step') {
+    return attributedChanges;
+  }
+  if (diffType === 'block') {
+    return groupChangesByBlock(changeset.changes, originalDoc, steppedDoc);
   }
   return simplifyChangesWithAttribution(attributedChanges, tr.doc);
 };
@@ -193,7 +187,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,
@@ -230,7 +223,6 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
           showContributorTags: showContributorTags,
           showIndicators: showIndicators,
           doc: doc,
-          diffType: diffType,
           tagMountContext: tagMountContext
         })));
       }
@@ -257,7 +249,7 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
         return;
       }
     }
-    if (node.isBlock && (!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, _toConsumableArray(createBlockChangedDecoration({
@@ -275,7 +267,6 @@ var calculateNodesForBlockDecoration = function calculateNodesForBlockDecoration
         showContributorTags: showContributorTags,
         showIndicators: showIndicators,
         doc: doc,
-        diffType: diffType,
         tagMountContext: tagMountContext
       })));
     }
@@ -324,10 +315,9 @@ export var isDeletedContentPlacedBelow = function isDeletedContentPlacedBelow(_r
  */
 var shouldHideDeletedSide = function shouldHideDeletedSide(_ref7) {
   var change = _ref7.change,
-    diffType = _ref7.diffType,
     hideDeletedDiffs = _ref7.hideDeletedDiffs,
     isInverted = _ref7.isInverted;
-  return isExtendedEnabled(diffType) && !isInverted && !!hideDeletedDiffs && (change.inserted.length > 0 || fg('platform_editor_diff_hide_pure_deletions') && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true);
+  return !isInverted && !!hideDeletedDiffs && (change.inserted.length > 0 || fg('platform_editor_diff_hide_pure_deletions') && UNSAFE_expValNoExposure('platform_editor_ai_streaming_ux_experience_m1', 'isEnabled', false) === true);
 };
 var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8) {
   var state = _ref8.state,
@@ -486,7 +476,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
         stepIndex: stepIndex
       });
     }));
-    attributedChanges = isExtendedEnabled(diffType) && diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : _toConsumableArray(changeset.changes);
+    attributedChanges = diffType === 'step' ? diffBySteps(originalDoc, simplifiedSteps, simplifiedStepAttributions) : _toConsumableArray(changeset.changes);
     // The attributed pipeline gives no guarantee that its output ranges are disjoint — see
     // `collapseOverlappingChanges`.
     var uncollapsedChanges = getAttributedChanges({
@@ -521,15 +511,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
   /**
    * If showIndicators is on, we create an anchor widget here to mark the doc margin.
    */
-  if (showIndicators && isExtendedEnabled(diffType)) {
+  if (showIndicators) {
     decorations.push(createDocMarginAnchorWidget());
   }
 
   // Our default operations are insertions, so it should match the opposite of isInverted.
   var isInserted = !isInverted;
-  if (isExtendedEnabled(diffType)) {
-    changes = groupDeletedColumnChanges(changes, originalDoc, tr.doc, new Mapping(stepMaps), isInverted);
-  }
+  changes = groupDeletedColumnChanges(changes, originalDoc, tr.doc, new 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) {
@@ -594,7 +582,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 = 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
@@ -617,7 +605,6 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
             decorations.push(createDeletedLineBreakDecoration({
               attributionKey: attributionKey,
               colorScheme: changeColorScheme,
-              diffType: diffType,
               isActive: isActive,
               pos: pos,
               reveal: reveal,
@@ -652,7 +639,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
       });
@@ -671,7 +657,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
             if (useCoarseTableDecoration && isInsideTable(coarseTables, from)) {
               continue;
             }
-            decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration(_objectSpread({
+            decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration({
               attributionKey: attributionKey,
               change: {
                 fromB: from,
@@ -681,8 +667,6 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
               doc: tr.doc,
               colorScheme: changeColorScheme,
               isActive: isActive,
-              diffType: diffType
-            }, isExtendedEnabled(diffType) && {
               isInserted: isInserted,
               shouldHideDeleted: shouldHideDeleted,
               showContributorTags: showContributorTags,
@@ -692,7 +676,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
               isDeletedWidgetBelow: isDeletedWidgetBelow,
               reveal: reveal,
               tagMountContext: tagMountContext
-            }))));
+            })));
           }
         } catch (err) {
           _iterator4.e(err);
@@ -700,15 +684,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           _iterator4.f();
         }
       } else {
-        decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration(_objectSpread({
+        decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration({
           attributionKey: attributionKey,
           change: change,
           leftAnchorId: leftAnchorId,
           doc: tr.doc,
           colorScheme: changeColorScheme,
           isActive: isActive,
-          diffType: diffType
-        }, isExtendedEnabled(diffType) && {
           isInserted: isInserted,
           shouldHideDeleted: shouldHideDeleted,
           showContributorTags: showContributorTags,
@@ -718,45 +700,39 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           isDeletedWidgetBelow: isDeletedWidgetBelow,
           reveal: reveal,
           tagMountContext: tagMountContext
-        }))));
+        })));
       }
-      decorations.push.apply(decorations, _toConsumableArray(calculateNodesForBlockDecoration(_objectSpread(_objectSpread({
+      decorations.push.apply(decorations, _toConsumableArray(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
-      }, 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, _toConsumableArray(createNodeChangedDecorationWidget(_objectSpread(_objectSpread({
+        decorations.push.apply(decorations, _toConsumableArray(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: isExtendedEnabled(diffType) ? reveal : undefined,
+          reveal: reveal,
           change: change,
           doc: originalDoc,
           nodeViewSerializer: nodeViewSerializer,
@@ -766,15 +742,12 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           activeIndexPos: activeIndexPos,
           leftAnchorId: leftAnchorId,
           showContributorTags: showContributorTags,
-          tagMountContext: tagMountContext
-        }, isExtendedEnabled(diffType) && {
+          tagMountContext: tagMountContext,
           isInserted: !isInserted,
-          diffType: diffType,
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
-          placeBelow: isDeletedWidgetBelow
-        }), {}, {
+          placeBelow: isDeletedWidgetBelow,
           showIndicators: showIndicators
-        }))));
+        })));
       }
     }
   };
@@ -805,7 +778,6 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       change: change,
       colorScheme: changeColorScheme,
       doc: tr.doc,
-      diffType: diffType,
       isActive: isActive,
       isInserted: true,
       reveal: reveal,
@@ -843,8 +815,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.
@@ -888,7 +859,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
       var isSmartNodeLevelAttrChange = diffType === 'smart' && fg('platform_editor_ai_smart_diff') && expValEqualsNoExposure('platform_editor_ai_xstate_migration', 'isEnabled', true) && 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, _toConsumableArray(createNodeChangedDecorationWidget(_objectSpread(_objectSpread({
+        decorations.push.apply(decorations, _toConsumableArray(createNodeChangedDecorationWidget({
           change: {
             fromA: change.fromA,
             toA: change.toA,
@@ -903,16 +874,13 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
           newDoc: tr.doc,
           intl: intl,
           activeIndexPos: activeIndexPos,
-          isInserted: false
-        }, isExtendedEnabled(diffType) && {
-          diffType: diffType,
+          isInserted: false,
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
-          placeBelow: placeBelow
-        }), {}, {
+          placeBelow: placeBelow,
           showIndicators: showIndicators,
           showContributorTags: showContributorTags,
           tagMountContext: tagMountContext
-        }))));
+        })));
       }
     }
   });
@@ -921,7 +889,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     contributorTags: showContributorTags ? 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.
-    getScrollableDecorations(decorationSet, tr.doc, diffType)) : [],
+    getScrollableDecorations(decorationSet, tr.doc)) : [],
     decorations: decorationSet,
     diffDescriptors: extractDiffDescriptors(decorationSet)
   };
@@ -930,7 +898,7 @@ export var calculateDiffDecorations = memoizeOne(calculateDiffDecorationsInner,
 // 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 = _slicedToArray(_ref14, 1),
     _ref16$ = _ref16[0],
     pluginState = _ref16$.pluginState,
@@ -964,14 +932,10 @@ function (_ref14, _ref15) {
     lastInlineDeletedDiffPlacement = _ref17$.inlineDeletedDiffPlacement,
     lastReveal = _ref17$.reveal;
   var originalDocIsSame = lastPluginState.originalDoc && pluginState.originalDoc && pluginState.originalDoc.eq(lastPluginState.originalDoc);
-  if (isExtendedEnabled(diffType)) {
-    var _ref18;
-    return (_ref18 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
-    // Contributors can arrive after the first calculation; without this, tags never appear.
-    isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(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.
-    isEqual(reveal, lastReveal)) !== null && _ref18 !== void 0 ? _ref18 : false;
-  }
-  return (_ref19 = originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) && isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isEqual(activeIndexPos, lastActiveIndexPos) && hideDeletedDiffs === lastHideDeletedDiffs) !== null && _ref19 !== void 0 ? _ref19 : false;
+  return (_ref18 = colorScheme === lastColorScheme && intl.locale === lastIntl.locale && isInverted === lastIsInverted && diffType === lastDiffType && isEqual(activeIndexPos, lastActiveIndexPos) && originalDocIsSame && isEqual(pluginState.steps, lastPluginState.steps) && isEqual(pluginState.stepAttributions, lastPluginState.stepAttributions) &&
+  // Contributors can arrive after the first calculation; without this, tags never appear.
+  isEqual(pluginState.contributors, lastPluginState.contributors) && state.doc.eq(lastState.doc) && hideDeletedDiffs === lastHideDeletedDiffs && hideAddedDiffsUnderline === lastHideAddedDiffsUnderline && showIndicators === lastShowIndicators && isEqual(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.
+  isEqual(reveal, lastReveal)) !== null && _ref18 !== void 0 ? _ref18 : false;
 });

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

@@ -833,7 +833,7 @@ export 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`.
  */
 export function buildInsertedInlineStyle(colors, isActive, hideAddedDiffsUnderline) {

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

@@ -3,32 +3,6 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { getStandardDeletedTextDecorationStyle } from './getStandardDeletedTextDecorationStyle';
-
-// delete on platform_editor_diff_plugin_extended cleanup
-export var editingStyle = 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
-export var editingContentStyleInBlock = 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
-export var editingStyleActive = 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)"
-});
 export var editingStyleExtended = convertToInlineCss({
   background: "var(--ds-background-accent-purple-subtlest, #F8EEFE)",
   borderBottom: "2px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),

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

@@ -7,7 +7,6 @@ import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { isExtendedEnabled } from '../isExtendedEnabled';
 import { isTaggableBlockNode } from '../utils/taggableBlockNodes';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedBlockNodeStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildInsertedBlockNodeStyle } from './colorSchemes/factory';
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
@@ -44,10 +43,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 || !isExtendedEnabled(diffType)) {
+  if (doc === undefined) {
     return false;
   }
   var nodeType = (_doc$nodeAt = doc.nodeAt(from)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type;
@@ -106,19 +104,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 isExtendedEnabled(diffType) ? cellPositionStyle : undefined;
+    return cellPositionStyle;
   }
   var colors = colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
-
-  // Deleted nodes only differ under the extended experience; otherwise all are insertions.
-  if (!isInserted && isExtendedEnabled(diffType)) {
+  if (!isInserted) {
     return buildDeletedBlockNodeStyle(colors, getDeletedBlockNodeCategory(nodeName), isActive);
   }
   return buildInsertedBlockNodeStyle(colors, getInsertedBlockNodeShape(nodeName), isActive);
@@ -185,14 +179,12 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
     _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
   });
@@ -211,11 +203,10 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
       leftAnchorId: leftAnchorId,
       isActive: isActive,
       isInserted: isInserted,
-      nodeName: change.name,
-      diffType: diffType
+      nodeName: change.name
     }))];
   }
-  if (isExtendedEnabled(diffType) && CELL_NODES.includes(change.name)) {
+  if (CELL_NODES.includes(change.name)) {
     var cellOverlay = document.createElement('div');
     var colors = colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : DEFAULT_COLOR_SCHEME];
     var isRoundedTable = isExperimentEnabled('platform_editor_table_diff_rounded_corners');
@@ -239,15 +230,13 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
       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, convertToInlineCss({
     anchorName: "--".concat(tagAnchorName)
@@ -268,8 +257,7 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
       leftAnchorId: leftAnchorId,
       isActive: isActive,
       isInserted: isInserted,
-      nodeName: change.name,
-      diffType: diffType
+      nodeName: change.name
     })));
   }
   if (decorations.length === 0) {
@@ -277,7 +265,7 @@ export var createBlockChangedDecoration = function createBlockChangedDecoration(
     // there is nothing for a tag to hang off even when the node type would otherwise be taggable.
     return decorations;
   }
-  if (showIndicators && doc && isExtendedEnabled(diffType)) {
+  if (showIndicators && doc) {
     decorations.push.apply(decorations, _toConsumableArray(createBlockIndicatorAnchorWidgets({
       doc: doc,
       from: change.from,

package/dist/esm/pm-plugins/decorations/createBlockChangedDecoration.styles.legacy.js

@@ -9,7 +9,6 @@
  * cleanup, together with `colorSchemes/standard.ts`, `colorSchemes/traditional.ts` (EDITOR-8281).
  */
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
-import { isExtendedEnabled } from '../isExtendedEnabled';
 import { standardDecorationMarkerVariable, deletedDecorationMarkerVariable, editingStyleQuoteNode, editingStyleRuleNode, editingStyleCardBlockNode, editingStyleNode, getStandardDeletedContentStyleNew, deletedStyleQuoteNode, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from './colorSchemes/standard';
 import { traditionalDecorationMarkerVariableActive, traditionalDecorationMarkerVariableNew, traditionalDeletedDecorationMarkerVariableActive, traditionalDeletedDecorationMarkerVariableNew, traditionalStyleQuoteNodeActive, traditionalStyleQuoteNodeNew, traditionalStyleRuleNodeActive, traditionalStyleRuleNodeNew, traditionalStyleCardBlockNodeActive, traditionalStyleCardBlockNodeNew, traditionalStyleNodeActive, traditionalStyleNodeNew, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, traditionalAddedCellOverlayStyle, traditionalAddedCellOverlayRoundedStyle, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from './colorSchemes/traditional';
 
@@ -29,8 +28,7 @@ export var getBlockNodeStyleLegacy = function getBlockNodeStyleLegacy(_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;
   var isTraditional = colorScheme === 'traditional';
   if (['mediaSingle', 'mediaGroup', 'table',
   // Handle table separately to avoid border issues
@@ -42,77 +40,47 @@ export var getBlockNodeStyleLegacy = function getBlockNodeStyleLegacy(_ref2) {
   }
   // Media nodes inside mediaSingle should not get position:relative
   // as it shifts the image outside its parent container (e.g. panel)
-  if (nodeName === 'media') {
-    if (!isInserted && isExtendedEnabled(diffType)) {
+  if (nodeName === 'media' || nodeName === 'panel') {
+    if (!isInserted) {
       return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedDecorationMarkerVariable;
     }
     return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
   }
   if (['tableCell', 'tableHeader'].includes(nodeName)) {
-    if (isExtendedEnabled(diffType)) {
-      // This is used for positioning the cell overlay widget decorations
-      return convertToInlineCss({
-        position: 'relative'
-      });
-    }
-    // When gate is off, it should return undefined as above
-    return undefined;
-  }
-  if (nodeName === 'panel') {
-    if (!isInserted && isExtendedEnabled(diffType)) {
-      return isTraditional ? getDeletedTraditionalInlineStyle(false) : deletedDecorationMarkerVariable;
-    }
-    return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
+    // This is used for positioning the cell overlay widget decorations
+    return convertToInlineCss({
+      position: 'relative'
+    });
   }
   if (['extension', 'embedCard', 'listItem'].includes(nodeName)) {
-    if (isExtendedEnabled(diffType)) {
-      if (isInserted) {
-        return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
-      } else {
-        if (nodeName === 'listItem') {
-          return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : deletedDecorationMarkerVariable;
-        }
-        return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : getStandardDeletedContentStyleNew();
-      }
+    if (isInserted) {
+      return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
     }
-    return isTraditional && isActive ? traditionalDecorationMarkerVariableActive : isTraditional ? traditionalDecorationMarkerVariableNew : standardDecorationMarkerVariable;
+    if (nodeName === 'listItem') {
+      return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : deletedDecorationMarkerVariable;
+    }
+    return isTraditional && isActive ? traditionalDeletedDecorationMarkerVariableActive : isTraditional ? traditionalDeletedDecorationMarkerVariableNew : getStandardDeletedContentStyleNew();
   }
   if (nodeName === 'blockquote') {
-    if (isExtendedEnabled(diffType)) {
-      if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
-      } else {
-        return isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNode;
-      }
+    if (isInserted) {
+      return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
     }
-    return isTraditional ? isActive ? traditionalStyleQuoteNodeActive : traditionalStyleQuoteNodeNew : editingStyleQuoteNode;
+    return isTraditional ? deletedTraditionalStyleQuoteNode : deletedStyleQuoteNode;
   }
   if (nodeName === 'rule') {
-    if (isExtendedEnabled(diffType)) {
-      if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
-      } else {
-        return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
-      }
+    if (isInserted) {
+      return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
     }
-    return isTraditional ? isActive ? traditionalStyleRuleNodeActive : traditionalStyleRuleNodeNew : editingStyleRuleNode;
+    return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
   }
   if (nodeName === 'blockCard') {
-    if (isExtendedEnabled(diffType)) {
-      if (isInserted) {
-        return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
-      } else {
-        return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
-      }
-    }
-    return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
-  }
-  if (isExtendedEnabled(diffType)) {
     if (isInserted) {
-      return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
-    } else {
-      return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
+      return isTraditional ? isActive ? traditionalStyleCardBlockNodeActive : traditionalStyleCardBlockNodeNew : editingStyleCardBlockNode;
     }
+    return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
+  }
+  if (isInserted) {
+    return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
   }
-  return isTraditional ? isActive ? traditionalStyleNodeActive : traditionalStyleNodeNew : editingStyleNode;
+  return isTraditional ? getDeletedTraditionalInlineStyle(false) : getStandardDeletedContentStyleNew();
 };