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

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

@@ -12,7 +12,6 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { isExtendedEnabled } from '../isExtendedEnabled';
 import { buildAddedCellOverlayRoundedStyle, buildAddedCellOverlayStyle, buildDeletedCellOverlayRoundedStyle, buildDeletedCellOverlayStyle, buildDeletedRowStyle } from './colorSchemes/factory';
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
 import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
@@ -28,8 +27,7 @@ import { createRemovedLozenge } from './utils/wrapBlockNodeView';
 var extractChangedRows = function extractChangedRows(_ref) {
   var change = _ref.change,
     originalDoc = _ref.originalDoc,
-    newDoc = _ref.newDoc,
-    diffType = _ref.diffType;
+    newDoc = _ref.newDoc;
   var changedRows = [];
 
   // Find the table in the original document
@@ -67,7 +65,7 @@ var extractChangedRows = function extractChangedRows(_ref) {
   // Find which rows were changed by analyzing the change range
   var changeStartInTable = change.fromA - tableOld.pos - 1;
   var changeEndInTable = change.toA - tableOld.pos - 1;
-  var edgeAttrsByOffset = isExtendedEnabled(diffType) && expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && isExperimentEnabled('platform_editor_table_diff_rounded_corners') ? getTableTopAndBottomCellEdgeAttrs(oldTableMap) : undefined;
+  var edgeAttrsByOffset = expValEquals('platform_editor_table_q4_loveability', 'isEnabled', true) && isExperimentEnabled('platform_editor_table_diff_rounded_corners') ? getTableTopAndBottomCellEdgeAttrs(oldTableMap) : undefined;
   var currentOffset = 0;
   var rowIndex = 0;
   tableOld.node.content.forEach(function (rowNode) {
@@ -76,7 +74,7 @@ var extractChangedRows = function extractChangedRows(_ref) {
 
     // Check if this row overlaps with the deletion range
     var rowOverlapsChange = rowStart >= changeStartInTable && rowStart < changeEndInTable || rowEnd > changeStartInTable && rowEnd <= changeEndInTable || rowStart < changeStartInTable && rowEnd > changeEndInTable;
-    if (rowOverlapsChange && rowNode.type.name === 'tableRow' && (isExtendedEnabled(diffType) || !isEmptyRow(rowNode))) {
+    if (rowOverlapsChange && rowNode.type.name === 'tableRow') {
       var rowLocalId = rowNode.attrs.localId;
       var isTableRowReplacement = rowLocalId && tableNew.node.children.some(function (candidateRow) {
         return candidateRow.type.name === 'tableRow' && candidateRow.attrs.localId === rowLocalId;
@@ -141,32 +139,6 @@ var extractChangedRows = function extractChangedRows(_ref) {
     return true;
   });
 };
-
-/**
- * Checks if a table row is empty (contains no meaningful content)
- */
-var isEmptyRow = function isEmptyRow(rowNode) {
-  var isEmpty = true;
-  rowNode.descendants(function (node) {
-    if (!isEmpty) {
-      return false;
-    }
-
-    // If we find any inline content with size > 0, the row is not empty
-    if (node.isInline && node.nodeSize > 0) {
-      isEmpty = false;
-      return false;
-    }
-
-    // If we find text content, the row is not empty
-    if (node.isText && node.text && node.text.trim() !== '') {
-      isEmpty = false;
-      return false;
-    }
-    return true;
-  });
-  return isEmpty;
-};
 /**
  * Creates a DOM representation of a deleted table row
  */
@@ -177,7 +149,6 @@ var createChangedRowDOM = function createChangedRowDOM(_ref3) {
     isTableRowReplacement = _ref3.isTableRowReplacement,
     colorScheme = _ref3.colorScheme,
     isInserted = _ref3.isInserted,
-    diffType = _ref3.diffType,
     hasAnchoredRemovedLozenge = _ref3.hasAnchoredRemovedLozenge,
     intl = _ref3.intl,
     isActive = _ref3.isActive;
@@ -187,16 +158,15 @@ var createChangedRowDOM = function createChangedRowDOM(_ref3) {
   }
   var colors = colorSchemeRegistry[colorScheme !== null && colorScheme !== void 0 ? colorScheme : 'standard'];
   var deletedTreatment = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? buildDeletedRowStyle(colors) : resolveDeletedRowStyleLegacy(getLegacyColorScheme(colorScheme));
-  var hostsRemovedLozenge = Boolean(intl) && isExtendedEnabled(diffType) && !isInserted && !hasAnchoredRemovedLozenge;
+  var hostsRemovedLozenge = Boolean(intl) && !isInserted && !hasAnchoredRemovedLozenge;
 
   // Inserted rows keep their natural styling; the row strikethrough is deletions only.
-  if (!isExtendedEnabled(diffType) || !isInserted) {
+  if (!isInserted) {
     tr.setAttribute('style', deletedTreatment);
   }
-  // Mirrors the strikethrough condition above: under the extended experience an `isInserted` row
-  // is ADDED content, so it must not claim the "deleted" testid — page models match that as
+  // Mirrors the strikethrough condition above: an `isInserted` row is ADDED content, so it must not claim the "deleted" testid — page models match that as
   // removed content (same reasoning as `createTableCellContentWidgets`).
-  tr.setAttribute('data-testid', isExtendedEnabled(diffType) && isInserted && fg('platform_editor_ai_show_diff_patch_1') ? 'show-diff-changed-row' : 'show-diff-deleted-row');
+  tr.setAttribute('data-testid', isInserted && fg('platform_editor_ai_show_diff_patch_1') ? 'show-diff-changed-row' : 'show-diff-deleted-row');
   if (fg('platform_editor_ai_show_diff_patch_1')) {
     tr.style.setProperty('scroll-margin-top', scrollMarginTopValue);
   }
@@ -209,17 +179,15 @@ var createChangedRowDOM = function createChangedRowDOM(_ref3) {
       if (nodeView) {
         if (nodeView instanceof HTMLElement) {
           applyCellEdgeAttrs(nodeView, cellEdgeAttrs === null || cellEdgeAttrs === void 0 ? void 0 : cellEdgeAttrs[cellIndex]);
-          if (isExtendedEnabled(diffType)) {
-            var overlay = document.createElement('span');
-            var isRoundedTable = isExperimentEnabled('platform_editor_table_diff_rounded_corners');
-            var overlayStyle = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? isInserted ? isRoundedTable ? buildAddedCellOverlayRoundedStyle(colors) : buildAddedCellOverlayStyle(colors) : isRoundedTable ? buildDeletedCellOverlayRoundedStyle(colors) : buildDeletedCellOverlayStyle(colors) : resolveCellOverlayStyleLegacy({
-              colorScheme: getLegacyColorScheme(colorScheme),
-              isInserted: isInserted,
-              isRoundedTable: isRoundedTable
-            });
-            overlay.setAttribute('style', overlayStyle);
-            nodeView.appendChild(overlay);
-          }
+          var overlay = document.createElement('span');
+          var isRoundedTable = isExperimentEnabled('platform_editor_table_diff_rounded_corners');
+          var overlayStyle = isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? isInserted ? isRoundedTable ? buildAddedCellOverlayRoundedStyle(colors) : buildAddedCellOverlayStyle(colors) : isRoundedTable ? buildDeletedCellOverlayRoundedStyle(colors) : buildDeletedCellOverlayStyle(colors) : resolveCellOverlayStyleLegacy({
+            colorScheme: getLegacyColorScheme(colorScheme),
+            isInserted: isInserted,
+            isRoundedTable: isRoundedTable
+          });
+          overlay.setAttribute('style', overlayStyle);
+          nodeView.appendChild(overlay);
         }
         tr.appendChild(nodeView);
       } else {
@@ -274,8 +242,7 @@ var createAnchoredRemovedLozengeWidget = function createAnchoredRemovedLozengeWi
 var expandDiffForChangedRows = function expandDiffForChangedRows(_ref5) {
   var changes = _ref5.changes,
     originalDoc = _ref5.originalDoc,
-    newDoc = _ref5.newDoc,
-    diffType = _ref5.diffType;
+    newDoc = _ref5.newDoc;
   var rowInfo = [];
   var _iterator = _createForOfIteratorHelper(changes),
     _step;
@@ -286,8 +253,7 @@ var expandDiffForChangedRows = function expandDiffForChangedRows(_ref5) {
       var changedRows = extractChangedRows({
         change: change,
         originalDoc: originalDoc,
-        newDoc: newDoc,
-        diffType: diffType
+        newDoc: newDoc
       });
       if (changedRows.length > 0) {
         rowInfo.push.apply(rowInfo, _toConsumableArray(changedRows));
@@ -315,7 +281,6 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     _ref6$isInserted = _ref6.isInserted,
     isInserted = _ref6$isInserted === void 0 ? false : _ref6$isInserted,
     leftAnchorId = _ref6.leftAnchorId,
-    diffType = _ref6.diffType,
     intl = _ref6.intl,
     _ref6$showIndicators = _ref6.showIndicators,
     showIndicators = _ref6$showIndicators === void 0 ? false : _ref6$showIndicators,
@@ -328,13 +293,12 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
       return change.deleted.length > 0;
     }),
     originalDoc: originalDoc,
-    newDoc: newDoc,
-    diffType: diffType
+    newDoc: newDoc
   });
   return changedRows.flatMap(function (changedRow) {
     // Keep the ID stable while contributor tags are enabled so recalculation preserves their state.
     var diffId = showContributorTags ? "widget-row-".concat(changedRow.fromA, "-").concat(changedRow.toA) : crypto.randomUUID();
-    var hasAnchoredRemovedLozenge = Boolean(intl) && isExtendedEnabled(diffType) && !isInserted && supportsAnchorPositioning();
+    var hasAnchoredRemovedLozenge = Boolean(intl) && !isInserted && supportsAnchorPositioning();
     var rowDOM = createChangedRowDOM({
       rowNode: changedRow.rowNode,
       isTableRowReplacement: changedRow.isTableRowReplacement,
@@ -342,7 +306,6 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,
       isInserted: isInserted,
-      diffType: diffType,
       hasAnchoredRemovedLozenge: hasAnchoredRemovedLozenge,
       intl: intl,
       isActive: isActive
@@ -360,7 +323,7 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     // is still created but can never resolve a position, so it silently does not render and the
     // bar covers only the row being changed. `createNodeChangedDecorationWidget` sets the same
     // property on its own widget DOM for non-table content; this path returns before reaching it.
-    if (showIndicators && isExtendedEnabled(diffType) && fg('platform_editor_ai_show_diff_patch_1')) {
+    if (showIndicators && fg('platform_editor_ai_show_diff_patch_1')) {
       rowAnchorNames.push(buildAnchorDecorationKey({
         diffId: diffId
       }));
@@ -415,8 +378,7 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
       diffId: diffId,
       leftAnchorId: leftAnchorId,
       isActive: isActive,
-      isInserted: isInserted,
-      diffType: diffType
+      isInserted: isInserted
     })));
     decorations.push(rowWidget);
     if (intl && removedLozengeAnchorName) {

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

@@ -7,7 +7,6 @@ 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 { CONTRIBUTOR_TAG_Z_INDEX } from '../../ui/ContributorTag/buildContributorTagDom';
-import { isExtendedEnabled } from '../isExtendedEnabled';
 import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
 import { buildAtomicInlineChangedCSSVariables, buildDeletedInlineContentStyleExtended, buildDeletedInlineNodeCSSVariables, buildDeletedInlineStyle, buildDeletedInlineStyleStandard, buildInsertStyle, buildInsertStyleActive, buildInsertStyleExtended, buildInsertStyleExtendedActive, buildInsertStyleExtendedNoUnderline, buildInsertStyleExtendedNoUnderlineActive } from './colorSchemes/factory';
 import { colorSchemeRegistry, getLegacyColorScheme } from './colorSchemes/schemes';
@@ -60,7 +59,7 @@ var getAtomicInlineNodeClassName = function getAtomicInlineNodeClassName(inlineN
   return classNames.join(' ');
 };
 
-/** Inline style for inserted content under the extended diff experience. */
+/** Inline style for inserted content. */
 var getExtendedInsertStyle = function getExtendedInsertStyle(colors, isActive, hideAddedDiffsUnderline) {
   if (colors.insertedInlineTreatment === 'underline') {
     // hideAddedDiffsUnderline only targets the 'borderBottom' rule, so it does not apply here.
@@ -72,7 +71,7 @@ var getExtendedInsertStyle = function getExtendedInsertStyle(colors, isActive, h
   return hideAddedDiffsUnderline ? buildInsertStyleExtendedNoUnderline(colors) : buildInsertStyleExtended(colors);
 };
 
-/** Inline style for deleted content under the extended diff experience. */
+/** Inline style for deleted content. */
 var getExtendedDeletedStyle = function getExtendedDeletedStyle(colors, isActive) {
   if (colors.deletedInlineTreatment === 'strikethrough') {
     // Identical in both states — the block decoration carries the active emphasis.
@@ -84,14 +83,10 @@ var getExtendedDeletedStyle = function getExtendedDeletedStyle(colors, isActive)
 /** Registry-driven inline `style` for a changed-content decoration. */
 var resolveInlineChangedStyleRefactored = function resolveInlineChangedStyleRefactored(_ref) {
   var colors = _ref.colors,
-    diffType = _ref.diffType,
     hideAddedDiffsUnderline = _ref.hideAddedDiffsUnderline,
     isActive = _ref.isActive,
     isInserted = _ref.isInserted;
-  if (isExtendedEnabled(diffType)) {
-    return isInserted ? getExtendedInsertStyle(colors, isActive, hideAddedDiffsUnderline) : getExtendedDeletedStyle(colors, isActive);
-  }
-  return isActive ? buildInsertStyleActive(colors) : buildInsertStyle(colors);
+  return isInserted ? getExtendedInsertStyle(colors, isActive, hideAddedDiffsUnderline) : getExtendedDeletedStyle(colors, isActive);
 };
 
 /**
@@ -149,7 +144,6 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
     _ref2$showIndicators = _ref2.showIndicators,
     showIndicators = _ref2$showIndicators === void 0 ? false : _ref2$showIndicators,
     doc = _ref2.doc,
-    diffType = _ref2.diffType,
     _ref2$hideAddedDiffsU = _ref2.hideAddedDiffsUnderline,
     hideAddedDiffsUnderline = _ref2$hideAddedDiffsU === void 0 ? false : _ref2$hideAddedDiffsU,
     inlineNodeName = _ref2.inlineNodeName,
@@ -166,7 +160,7 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
 
   // Match the rendered shape: whitespace text is eligible, while an empty paragraph is structural
   // content with no tag host.
-  var canTagChange = showContributorTags && !!doc && isExtendedEnabled(diffType) && isContributorTagWidgetEnabled() && !isEmptyParagraphSlice(doc.slice(change.fromB, change.toB));
+  var canTagChange = showContributorTags && !!doc && isContributorTagWidgetEnabled() && !isEmptyParagraphSlice(doc.slice(change.fromB, change.toB));
   if (shouldHideDeleted) {
     return [Decoration.inline(change.fromB, change.toB, {
       style: displayNoneStyle
@@ -184,19 +178,17 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
   var colors = getColorScheme(colorScheme);
 
   // The reveal withholds the static highlight so the wipe has something to reveal, so it supplies
-  // the whole style rather than adding to the usual one. Extended pipeline only — the AI review
-  // surface is the only consumer, and the non-extended styles have no background to wipe.
-  var revealed = isExtendedEnabled(diffType) ? resolveRevealStyle({
+  // the whole style rather than adding to the usual one.
+  var revealed = resolveRevealStyle({
     colorScheme: colorScheme,
     hideAddedDiffsUnderline: hideAddedDiffsUnderline,
     isActive: isActive,
     isInserted: isInserted,
     reveal: reveal
-  }) : undefined;
+  });
   var style = (_revealed$style = revealed === null || revealed === void 0 ? void 0 : revealed.style) !== null && _revealed$style !== void 0 ? _revealed$style : resolveInlineChangedStyle({
     colors: colors,
     colorScheme: colorScheme,
-    diffType: diffType,
     hideAddedDiffsUnderline: hideAddedDiffsUnderline,
     isActive: isActive,
     isInserted: isInserted
@@ -244,7 +236,7 @@ export var createInlineChangedDecoration = function createInlineChangedDecoratio
     isActive: isActive,
     isInserted: isInserted
   }))];
-  if (showIndicators && doc && isExtendedEnabled(diffType)) {
+  if (showIndicators && doc) {
     // For paragraphs, fromB/toB land on the outer block
     // boundary. Adjust anchor widgets into inline content so the indicator
     // bar doesn't extend into the preceding block's margin.

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

@@ -8,41 +8,26 @@
  * remains unchanged. Delete the whole file at experiment cleanup (EDITOR-8281).
  */
 
-import { isExtendedEnabled } from '../isExtendedEnabled';
-import { deletedInlineContentStyleExtended, editingStyle, editingStyleActive, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, getStandardDeletedContentStyle, getStandardDeletedContentStyleActive } from './colorSchemes/standard';
+import { deletedInlineContentStyleExtended, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, getStandardDeletedContentStyle, getStandardDeletedContentStyleActive } from './colorSchemes/standard';
 import { getDeletedTraditionalInlineStyle, traditionalInsertStyle, traditionalInsertStyleActive } from './colorSchemes/traditional';
 /**
  * Pre-refactor inline `style` computation for `createInlineChangedDecoration`.
  */
 export var resolveInlineChangedStyleLegacy = function resolveInlineChangedStyleLegacy(_ref) {
   var colorScheme = _ref.colorScheme,
-    diffType = _ref.diffType,
     hideAddedDiffsUnderline = _ref.hideAddedDiffsUnderline,
     isActive = _ref.isActive,
     isInserted = _ref.isInserted;
-  var style;
-  if (isExtendedEnabled(diffType)) {
-    if (isInserted) {
-      if (colorScheme === 'traditional') {
-        style = isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
-      } else {
-        style = isActive ? hideAddedDiffsUnderline ? editingStyleActiveExtendedNoUnderline : editingStyleActiveExtended : hideAddedDiffsUnderline ? editingStyleExtendedNoUnderline : editingStyleExtended;
-      }
-    } else {
-      if (colorScheme === 'traditional') {
-        style = getDeletedTraditionalInlineStyle(false);
-      } else {
-        style = (isActive ? getStandardDeletedContentStyleActive() : getStandardDeletedContentStyle()) + deletedInlineContentStyleExtended;
-      }
-    }
-  } else {
+  if (isInserted) {
     if (colorScheme === 'traditional') {
-      style = isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
-    } else {
-      style = isActive ? editingStyleActive : editingStyle;
+      return isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
     }
+    return isActive ? hideAddedDiffsUnderline ? editingStyleActiveExtendedNoUnderline : editingStyleActiveExtended : hideAddedDiffsUnderline ? editingStyleExtendedNoUnderline : editingStyleExtended;
+  }
+  if (colorScheme === 'traditional') {
+    return getDeletedTraditionalInlineStyle(false);
   }
-  return style;
+  return (isActive ? getStandardDeletedContentStyleActive() : getStandardDeletedContentStyle()) + deletedInlineContentStyleExtended;
 };
 
 /**

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

@@ -3,7 +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 { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { isExtendedEnabled } from '../isExtendedEnabled';
 import { countEmptyTextBlockOnlySlice } from '../utils/emptyTextBlocks';
 import { isEmptyParagraphSlice } from '../utils/isEmptyParagraphSlice';
 import { clampAnchorPosIntoCell, createLeftAnchorWidget } from './createAnchorDecorationWidgets';
@@ -34,8 +33,7 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
     nodeViewSerializer = _ref.nodeViewSerializer,
     colorScheme = _ref.colorScheme,
     isInserted = _ref.isInserted,
-    leftAnchorId = _ref.leftAnchorId,
-    diffType = _ref.diffType;
+    leftAnchorId = _ref.leftAnchorId;
   // Collect the inner content position of each cell in the new document within
   // the change range. Whole-cell replacement preserves cell count/order, so the
   // nth new-doc cell corresponds to the nth cell in the slice.
@@ -63,7 +61,7 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
     // so every block inside the cell is rendered.
     cellNode.content.forEach(function (blockNode) {
       var nodeView = nodeViewSerializer.tryCreateNodeView(blockNode);
-      var wrapper = createContentWrapper(colorScheme, false, isInserted, diffType);
+      var wrapper = createContentWrapper(colorScheme, false, isInserted);
       if (nodeView) {
         wrapper.append(nodeView);
       } else {
@@ -87,16 +85,14 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
 
     // Skip findSafeInsertPos: it walks forward to a schema-valid cell-insert point
     // and pushes the widget into the next cell. `targetPos` is the correct spot.
-    decorations.push(Decoration.widget(targetPos, dom, _objectSpread({}, buildDiffDecorationSpec(_objectSpread({
+    decorations.push(Decoration.widget(targetPos, dom, _objectSpread({}, buildDiffDecorationSpec({
       colorScheme: colorScheme,
       decorationType: 'widget',
       diffId: crypto.randomUUID(),
       leftAnchorId: leftAnchorId,
       isInserted: isInserted,
-      diffType: diffType
-    }, isExtendedEnabled(diffType) && {
       side: -1
-    })))));
+    }))));
   });
   return decorations;
 };
@@ -124,7 +120,6 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     showIndicators = _ref2$showIndicators === void 0 ? false : _ref2$showIndicators,
     _ref2$placeBelow = _ref2.placeBelow,
     placeBelow = _ref2$placeBelow === void 0 ? false : _ref2$placeBelow,
-    diffType = _ref2.diffType,
     _ref2$hideAddedDiffsU = _ref2.hideAddedDiffsUnderline,
     hideAddedDiffsUnderline = _ref2$hideAddedDiffsU === void 0 ? false : _ref2$hideAddedDiffsU,
     reveal = _ref2.reveal,
@@ -156,7 +151,6 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     return [createDeletedLineBreakDecoration({
       colorScheme: colorScheme,
       count: deletedBlankLineCount,
-      diffType: diffType,
       isActive: isActive,
       pos: safeInsertPos,
       reveal: reveal,
@@ -181,8 +175,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,
       isInserted: isInserted,
-      leftAnchorId: leftAnchorId,
-      diffType: diffType
+      leftAnchorId: leftAnchorId
     });
   }
   if (tableDiffMode.kind === 'none') {
@@ -199,7 +192,6 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       isActive: isActive,
       isInserted: isInserted,
       leftAnchorId: leftAnchorId,
-      diffType: diffType,
       intl: intl,
       // Needed for the row's own indicator anchor; this path returns before the
       // `anchor-name` assignment further down.
@@ -226,8 +218,8 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   var isVisuallyFirstInParent = !placeBelow && $safeInsertPos.parentOffset === 0;
   var isTopLevelInsert = $safeInsertPos.depth === 0;
   var hasPreviousBlock = ((_$safeInsertPos$nodeB = $safeInsertPos.nodeBefore) === null || _$safeInsertPos$nodeB === void 0 ? void 0 : _$safeInsertPos$nodeB.isBlock) === true;
-  var isFirstDocHeadingReplacement = isExtendedEnabled(diffType) && !placeBelow && change.fromB === 0 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type.name) === 'heading' && ((_newDoc$firstChild = newDoc.firstChild) === null || _newDoc$firstChild === void 0 ? void 0 : _newDoc$firstChild.type.name) === 'heading';
-  if (isExtendedEnabled(diffType) && isTopLevelInsert && hasPreviousBlock && !isFirstDocHeadingReplacement) {
+  var isFirstDocHeadingReplacement = !placeBelow && change.fromB === 0 && ((_slice$content$firstC = slice.content.firstChild) === null || _slice$content$firstC === void 0 ? void 0 : _slice$content$firstC.type.name) === 'heading' && ((_newDoc$firstChild = newDoc.firstChild) === null || _newDoc$firstChild === void 0 ? void 0 : _newDoc$firstChild.type.name) === 'heading';
+  if (isTopLevelInsert && hasPreviousBlock && !isFirstDocHeadingReplacement) {
     // 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'));
@@ -243,27 +235,23 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   // incorrectly applies because isNestedNode resolves to false (getPos returns 0).
   // Observe DOM mutations and override the transform on .rich-media-item elements
   // after React mounts to prevent the image from shifting outside its parent container.
-  var constrainMediaObserver;
-  if (isExtendedEnabled(diffType)) {
-    constrainMediaObserver = new MutationObserver(function () {
-      var richMediaItems = dom.querySelectorAll('.rich-media-item');
-      richMediaItems.forEach(function (el) {
-        if (el instanceof HTMLElement) {
-          el.style.transform = 'none';
-          el.style.marginLeft = '0';
-          el.style.maxWidth = '100%';
-        }
-      });
-      if (richMediaItems.length > 0) {
-        var _constrainMediaObserv;
-        (_constrainMediaObserv = constrainMediaObserver) === null || _constrainMediaObserv === void 0 || _constrainMediaObserv.disconnect();
+  var constrainMediaObserver = new MutationObserver(function () {
+    var richMediaItems = dom.querySelectorAll('.rich-media-item');
+    richMediaItems.forEach(function (el) {
+      if (el instanceof HTMLElement) {
+        el.style.transform = 'none';
+        el.style.marginLeft = '0';
+        el.style.maxWidth = '100%';
       }
     });
-    constrainMediaObserver.observe(dom, {
-      childList: true,
-      subtree: true
-    });
-  }
+    if (richMediaItems.length > 0) {
+      constrainMediaObserver.disconnect();
+    }
+  });
+  constrainMediaObserver.observe(dom, {
+    childList: true,
+    subtree: true
+  });
   // Derived from the deleted range so it survives a recalculation — see the same reasoning in
   // `createInlineChangedDecoration`.
   var diffId = showContributorTags ? "widget-".concat(change.fromA, "-").concat(change.toA) : crypto.randomUUID();
@@ -316,14 +304,14 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
           if (childNodeView) {
             var lineBreak = document.createElement('br');
             dom.append(lineBreak);
-            var wrapper = createContentWrapper(colorScheme, isActive, isInserted, diffType);
+            var wrapper = createContentWrapper(colorScheme, isActive, isInserted);
             wrapper.append(childNodeView);
             dom.append(wrapper);
           } else {
             // Fallback to serializing the individual child node
             var serializedChild = serializer.serializeNode(childNode);
             if (serializedChild) {
-              var _wrapper = createContentWrapper(colorScheme, isActive, isInserted, diffType);
+              var _wrapper = createContentWrapper(colorScheme, isActive, isInserted);
               _wrapper.append(serializedChild);
               dom.append(_wrapper);
             }
@@ -370,7 +358,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     var nodeView = serializer.tryCreateNodeView(node);
     if (nodeView) {
       if (node.isInline) {
-        var wrapper = createContentWrapper(colorScheme, isActive, isInserted, diffType, reveal);
+        var wrapper = createContentWrapper(colorScheme, isActive, isInserted, reveal);
         wrapper.append(nodeView);
         dom.append(wrapper);
       } else {
@@ -383,7 +371,6 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
           intl: intl,
           isActive: isActive,
           isInserted: isInserted,
-          diffType: diffType,
           hideAddedDiffsUnderline: hideAddedDiffsUnderline,
           highlightInlineLeafNodes: shouldPreserveCompleteMultiInlineBlock
         });
@@ -400,12 +387,11 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
             colorScheme: colorScheme,
             isActive: isActive,
             isInserted: isInserted,
-            diffType: diffType,
             reveal: reveal
           });
           dom.append(injectedNode);
         } else {
-          var _wrapper2 = createContentWrapper(colorScheme, isActive, isInserted, diffType, reveal);
+          var _wrapper2 = createContentWrapper(colorScheme, isActive, isInserted, reveal);
           _wrapper2.append(fallbackNode);
           dom.append(_wrapper2);
         }
@@ -474,7 +460,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
 
   // Needed even when the indicator bar is off, because a contributor tag also anchors against the
   // widget.
-  if ((showIndicators || showContributorTags) && isExtendedEnabled(diffType)) {
+  if (showIndicators || showContributorTags) {
     dom.style.setProperty('anchor-name', "--".concat(buildAnchorDecorationKey({
       diffId: diffId
     })));
@@ -531,7 +517,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       }
     }
   }
-  if (showIndicators && isExtendedEnabled(diffType)) {
+  if (showIndicators) {
     var leftAnchor = createLeftAnchorWidget({
       doc: newDoc,
       from: safeInsertPos,
@@ -548,7 +534,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       decorations.push(leftAnchor);
     }
   }
-  decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread({}, buildDiffDecorationSpec(_objectSpread({
+  decorations.push(Decoration.widget(safeInsertPos, dom, _objectSpread(_objectSpread({}, buildDiffDecorationSpec({
     attributionKey: canTagWidget ? attributionKey : undefined,
     colorScheme: colorScheme,
     decorationType: 'widget',
@@ -556,20 +542,17 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
     leftAnchorId: leftAnchorId,
     isActive: isActive,
     isInserted: isInserted,
-    diffType: diffType
-  }, isExtendedEnabled(diffType) && {
     // placeBelow anchors at the end of the new content, so render on the
     // trailing side (1); otherwise render before the new content (-1).
     side: placeBelow ? 1 : -1
-  }))), {}, {
+  })), {}, {
     // Without an explicit mark set, prosemirror-view wraps the widget in the marks of the
     // adjacent text in the NEW document. `dom` already carries the original marks, so a
     // formatting change would render the deleted side wrapped in the very mark the edit
     // introduced — unbolded text shown struck through but still bold.
     marks: [],
     destroy: function destroy() {
-      var _constrainMediaObserv2;
-      (_constrainMediaObserv2 = constrainMediaObserver) === null || _constrainMediaObserv2 === void 0 || _constrainMediaObserv2.disconnect();
+      constrainMediaObserver.disconnect();
       unmountContributorTag(tagMount);
       tagMount = undefined;
     }
@@ -590,7 +573,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
   // Away from the parent's start the node below keeps its own margin, and it is the block *inside*
   // the widget that loses one — handled by `absorbFirstChildMarginReset` above, not here.
   var nodeAfterWidget = $safeInsertPos.nodeAfter;
-  if (fg('platform_editor_ai_show_diff_patch_2') && isExtendedEnabled(diffType) && isVisuallyFirstInParent && nodeAfterWidget) {
+  if (fg('platform_editor_ai_show_diff_patch_2') && isVisuallyFirstInParent && nodeAfterWidget) {
     var shapedSpacer = createNodeShapedMarginSpacer({
       node: nodeAfterWidget,
       serializer: serializer,
@@ -614,7 +597,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       }));
     }
   }
-  if (!fg('platform_editor_ai_show_diff_patch_2') && isDiffWidgetAtStartOfDoc && isSingleBlock && isPureDeletion && isExtendedEnabled(diffType)) {
+  if (!fg('platform_editor_ai_show_diff_patch_2') && isDiffWidgetAtStartOfDoc && isSingleBlock && isPureDeletion) {
     var followingNode = $safeInsertPos.nodeAfter;
     var headingLevel = (followingNode === null || followingNode === void 0 ? void 0 : followingNode.type.name) === 'heading' ? followingNode.attrs.level : undefined;
     if (isHeadingLevel(headingLevel)) {
@@ -637,8 +620,7 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
         colorScheme: colorScheme,
         decorationType: 'widget',
         diffId: crypto.randomUUID(),
-        isInserted: isInserted,
-        diffType: diffType
+        isInserted: isInserted
       }))));
     }
   }

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

@@ -2,7 +2,6 @@ import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _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 { isExtendedEnabled } from '../isExtendedEnabled';
 /**
  * Decoration families produced by the show-diff plugin.
  * Each family owns its own key space and spec shape.
@@ -54,19 +53,14 @@ export var buildAnchorDecorationKey = function buildAnchorDecorationKey(_ref) {
 };
 
 /**
- * Builds a diff decoration key. The extended experience includes the `diffId`
- * in the key so independently rendered decorations for the same type remain
- * distinguishable.
+ * Builds a diff decoration key. The key includes the `diffId` so independently
+ * rendered decorations for the same type remain distinguishable.
  */
 export var buildDiffDecorationKey = function buildDiffDecorationKey(_ref2) {
   var decorationKeyPrefix = _ref2.decorationKeyPrefix,
     isActive = _ref2.isActive,
-    diffId = _ref2.diffId,
-    diffType = _ref2.diffType;
-  if (isExtendedEnabled(diffType)) {
-    return "".concat(decorationKeyPrefix, "-").concat(diffId, "-").concat(isActive ? 'active' : 'inactive');
-  }
-  return isActive !== undefined ? "".concat(decorationKeyPrefix, "-").concat(isActive ? 'active' : 'inactive') : decorationKeyPrefix;
+    diffId = _ref2.diffId;
+  return "".concat(decorationKeyPrefix, "-").concat(diffId, "-").concat(isActive ? 'active' : 'inactive');
 };
 export var buildDiffDecorationSpec = function buildDiffDecorationSpec(_ref3) {
   var attributionKey = _ref3.attributionKey,
@@ -77,8 +71,7 @@ export var buildDiffDecorationSpec = function buildDiffDecorationSpec(_ref3) {
     isInserted = _ref3.isInserted,
     leftAnchorId = _ref3.leftAnchorId,
     nodeName = _ref3.nodeName,
-    side = _ref3.side,
-    diffType = _ref3.diffType;
+    side = _ref3.side;
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
     decorationFamily: DecorationFamily.diff,
     decorationType: decorationType,
@@ -86,8 +79,7 @@ export var buildDiffDecorationSpec = function buildDiffDecorationSpec(_ref3) {
     key: buildDiffDecorationKey({
       decorationKeyPrefix: DiffDecorationKey[decorationType],
       diffId: diffId,
-      isActive: isActive,
-      diffType: diffType
+      isActive: isActive
     })
   }, attributionKey ? {
     attributionKey: attributionKey