@atlaskit/editor-plugin-show-diff 30.0.14 → 30.0.15

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 30.0.15
+
+### Patch Changes
+
+- [`446002cd24365`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/446002cd24365) -
+  Cleanup `feature_gate` `platform_editor_ai_show_diff_patch_1`. The show-diff correctness fixes
+  (layout/quote indicators, table row replacement diffs, ADF-safe strike styling, scroll targeting)
+  and the AI suggestion expand/localId wrapping fixes are now permanent.
+
 ## 30.0.14
 
 ### Patch Changes

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

@@ -614,7 +614,7 @@ var calculateDiffDecorationsInner = function calculateDiffDecorationsInner(_ref8
     // the other deleted-side suppressions, so the widget is never asked for a slice it can only
     // render as an empty copy of the block (EDITOR-8912). Its inserted side is untouched, and
     // the node's content change is a change of its own.
-    var hasNoDeletedContent = (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') && change.deleted.length > 0 && (0, _isOpenTokenOnlyChange.isOpenTokenOnlyChange)({
+    var hasNoDeletedContent = change.deleted.length > 0 && (0, _isOpenTokenOnlyChange.isOpenTokenOnlyChange)({
       change: change,
       originalDoc: originalDoc
     });

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

@@ -56,7 +56,6 @@ exports.buildInsertStyleExtendedActive = buildInsertStyleExtendedActive;
 exports.buildInsertStyleExtendedNoUnderline = buildInsertStyleExtendedNoUnderline;
 exports.buildInsertStyleExtendedNoUnderlineActive = buildInsertStyleExtendedNoUnderlineActive;
 exports.buildInsertStyleInBlock = buildInsertStyleInBlock;
-exports.buildInsertStyleInBlockExtended = buildInsertStyleInBlockExtended;
 exports.buildInsertStyleInBlockExtendedNoUnderline = buildInsertStyleInBlockExtendedNoUnderline;
 exports.buildInsertStyleNode = buildInsertStyleNode;
 exports.buildInsertStyleNodeActive = buildInsertStyleNodeActive;
@@ -306,14 +305,6 @@ function buildInsertStyleExtended(colors) {
   }));
 }
 
-/** Extended insert style for content within a block node (border-bottom only, no background). */
-function buildInsertStyleInBlockExtended(colors) {
-  return (0, _cssHelper.convertToInlineCss)({
-    borderBottom: "2px solid ".concat(insertedInlineBorderColor(colors)),
-    padding: "1px 0 2px"
-  });
-}
-
 /** Active state of the extended insert style. */
 function buildInsertStyleExtendedActive(colors) {
   var _ref2, _brand$activeBorder;

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

@@ -4,16 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getStandardDeletedTextDecorationStyle = void 0;
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 /**
  * The ADF strike parser recognises the `text-decoration` shorthand when a decorated NodeView is
  * reconciled. Use the visually equivalent longhand for AI suggestion diffs so presentation-only
  * styling cannot be retained as document content.
  */
 var getStandardDeletedTextDecorationStyle = exports.getStandardDeletedTextDecorationStyle = function getStandardDeletedTextDecorationStyle() {
-  return (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? {
+  return {
     textDecorationLine: 'line-through'
-  } : {
-    textDecoration: 'line-through'
   };
 };

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

@@ -4,7 +4,7 @@ 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.editingContentStyleInBlockExtendedNoUnderline = exports.editingContentStyleInBlockExtended = exports.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedListItemMarkerVariable = 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.deletedStyleQuoteNodeWithLozengeActive = exports.deletedStyleQuoteNodeWithLozenge = exports.deletedStyleQuoteNode = exports.deletedListItemMarkerVariable = 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 _cssHelper = require("@atlaskit/editor-common/css-helper");
 var _getStandardDeletedTextDecorationStyle = require("./getStandardDeletedTextDecorationStyle");
@@ -15,10 +15,6 @@ var editingStyleExtended = exports.editingStyleExtended = (0, _cssHelper.convert
   borderBottom: "2px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
   padding: "1px 0 2px"
 });
-var editingContentStyleInBlockExtended = exports.editingContentStyleInBlockExtended = (0, _cssHelper.convertToInlineCss)({
-  borderBottom: "2px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),
-  padding: "1px 0 2px"
-});
 var editingStyleActiveExtended = exports.editingStyleActiveExtended = (0, _cssHelper.convertToInlineCss)({
   background: "var(--ds-background-accent-purple-subtler-pressed, #D8A0F7)",
   borderBottom: "2px solid ".concat("var(--ds-border-accent-purple, #AF59E1)"),

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

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.createLeftAnchorWidget = exports.createInlineIndicatorAnchorWidgets = exports.createDocMarginAnchorWidget = exports.createBlockIndicatorAnchorWidgets = exports.createAnchorNameSpan = exports.clampAnchorPosIntoCell = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 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 _decorationKeys = require("./decorationKeys");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -56,7 +56,7 @@ var edgeCases = function edgeCases(doc, from, nodeOverride) {
     nodeStart = resolved.nodeStart,
     beforePos = resolved.beforePos;
   var node = (0, _fg.fg)('platform_editor_ai_show_diff_patch_2') ? nodeOverride !== null && nodeOverride !== void 0 ? nodeOverride : resolvedNode : resolvedNode;
-  if (node.type.name === 'layoutSection' && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+  if (node.type.name === 'layoutSection') {
     // Columns extend past the node-view wrapper via negative margins (12px or 20px).
     // Measure their container so the indicator stays outside the diff outline, including
     // breakout layouts and after responsive resizing, without changing the column geometry.
@@ -421,9 +421,9 @@ var createBlockIndicatorAnchorWidgets = exports.createBlockIndicatorAnchorWidget
   var parentCellOrRow = (0, _utils.findParentNodeClosestToPos)($from, function (ancestor) {
     return ['tableCell', 'tableHeader', 'tableRow'].includes(ancestor.type.name);
   });
-  var parentLayout = (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? (0, _utils.findParentNodeClosestToPos)($from, function (ancestor) {
+  var parentLayout = (0, _utils.findParentNodeClosestToPos)($from, function (ancestor) {
     return ancestor.type.name === 'layoutSection';
-  }) : undefined;
+  });
   // Layouts flatten direct widget children with display: contents. Such a wrapper has no
   // bounding box or positioning context, so measuring its top produces an offset from the
   // viewport origin and displaces the indicator into content below the editor. Keep the

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

@@ -239,7 +239,7 @@ var createBlockChangedDecoration = exports.createBlockChangedDecoration = functi
   });
   var styleOld = tagAnchorName ? [nodeStyle, (0, _cssHelper.convertToInlineCss)({
     anchorName: "--".concat(tagAnchorName)
-  }), (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? _decorationKeys.scrollMarginTopStyle : undefined].filter(Boolean).join(' ') : nodeStyle;
+  }), _decorationKeys.scrollMarginTopStyle].filter(Boolean).join(' ') : nodeStyle;
   var style = (0, _fg.fg)('platform_editor_ai_show_diff_patch_2') ? [nodeStyle, tagAnchorName ? (0, _cssHelper.convertToInlineCss)({
     anchorName: "--".concat(tagAnchorName)
   }) : undefined,

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

@@ -61,7 +61,7 @@ var extractChangedRows = function extractChangedRows(_ref) {
   // was written for deletions only, so it used to discard every replacement and the changed row's
   // content was never rendered anywhere. The reviewer was left with just the removed side.
   var isRowDeletion = oldTableMap.height > newTableMap.height;
-  var handleRowReplacement = oldTableMap.height === newTableMap.height && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1');
+  var handleRowReplacement = oldTableMap.height === newTableMap.height;
   // If no rows were changed, return empty
   if (!(isRowDeletion || handleRowReplacement) ||
   // For now ignore if there are column deletions as well
@@ -173,10 +173,8 @@ var createChangedRowDOM = function createChangedRowDOM(_ref3) {
   }
   // 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', isInserted && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? 'show-diff-changed-row' : 'show-diff-deleted-row');
-  if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
-    tr.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
-  }
+  tr.setAttribute('data-testid', isInserted ? 'show-diff-changed-row' : 'show-diff-deleted-row');
+  tr.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
 
   // Serialize each cell in the row
   var cellIndex = 0;
@@ -333,7 +331,7 @@ var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidget
     // 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 && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+    if (showIndicators) {
       rowAnchorNames.push((0, _decorationKeys.buildAnchorDecorationKey)({
         diffId: diffId
       }));

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

@@ -210,7 +210,7 @@ var createInlineChangedDecoration = exports.createInlineChangedDecoration = func
     diffId: diffId,
     mountContext: tagMountContext
   }) : undefined;
-  var inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, deletedInlineNodeAttrs === null || deletedInlineNodeAttrs === void 0 ? void 0 : deletedInlineNodeAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined, (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? _decorationKeys.scrollMarginTopStyle : undefined].filter(Boolean).join('');
+  var inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, deletedInlineNodeAttrs === null || deletedInlineNodeAttrs === void 0 ? void 0 : deletedInlineNodeAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined, _decorationKeys.scrollMarginTopStyle].filter(Boolean).join('');
   var decorations = [_view.Decoration.inline(change.fromB, change.toB, _objectSpread(_objectSpread(_objectSpread({
     style: inlineStyle
   }, atomicInlineAttrs && {

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

@@ -108,9 +108,7 @@ var createTableCellContentWidgets = function createTableCellContentWidgets(_ref)
     // This helper only runs for added content, so use the "changed" testid — not
     // "deleted", which page models match as removed content.
     dom.setAttribute('data-testid', 'show-diff-changed-decoration');
-    if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
-      dom.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
-    }
+    dom.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
 
     // 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.
@@ -331,7 +329,6 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
   var replacementNode = newDoc.nodeAt(change.fromB);
   var firstReplacedNode = slice.content.firstChild;
   var lastReplacedNode = slice.content.lastChild;
-  var showDiffPatch1 = (0, _fg.fg)('platform_editor_ai_show_diff_patch_1');
   // Whether the slice's outermost textblocks still hold all of their original content.
   //
   // `openStart`/`openEnd` say whether the cut landed inside a block, but not whether it took
@@ -357,7 +354,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     var isFirst = firstReplacedNode === node;
     var isLast = lastReplacedNode === node;
     var isOpenAtSliceBoundary = isFirst && slice.openStart > 0 || isLast && slice.openEnd > 0;
-    var shouldPreserveCompleteMultiInlineBlock = showDiffPatch1 && node.isBlock && node.type.inlineContent && node.content.childCount > 1 && !isOpenAtSliceBoundary && isCompleteSameTypeReplacement;
+    var shouldPreserveCompleteMultiInlineBlock = node.isBlock && node.type.inlineContent && node.content.childCount > 1 && !isOpenAtSliceBoundary && isCompleteSameTypeReplacement;
     // A textblock is otherwise serialized as its inline content only, with no `<p>`/`<h2>` wrapper.
     // That is right when the diff cuts into an existing block — the deleted text belongs on the same
     // line as the text that replaced it — but when the whole block went away it drops the very
@@ -524,9 +521,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
     });
   }
   dom.setAttribute('data-testid', 'show-diff-deleted-decoration');
-  if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
-    dom.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
-  }
+  dom.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
 
   // A block node serialized into the widget is the widget's first child, and the editor's
   // first-child reset is written against the parent element rather than the document position — so
@@ -706,9 +701,7 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       defaultSpacer.dataset.testid = 'show-diff-default-margin-spacer';
       defaultSpacer.style.display = 'block';
       defaultSpacer.style.marginTop = "var(--ds-space-100, 8px)";
-      if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
-        defaultSpacer.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
-      }
+      defaultSpacer.style.setProperty('scroll-margin-top', _decorationKeys.scrollMarginTopValue);
       decorations.push(_view.Decoration.widget(safeInsertPos, defaultSpacer,
       // Spacing only: a diff spec would make it an untagged navigation stop.
       showContributorTags ? {} : (0, _decorationKeys.buildDiffDecorationSpec)({

package/dist/cjs/pm-plugins/decorations/utils/wrapBlockNodeView.js

@@ -202,13 +202,13 @@ var applyMultiContainerLikeStyles = function applyMultiContainerLikeStyles(_ref5
     var nestedInsertedNodeStyle = (0, _wrapBlockNodeViewStyles.resolveNestedInsertedNodeStyle)(colorScheme);
     element.querySelectorAll('li').forEach(function (listItem) {
       var currentListItemStyle = listItem.getAttribute('style') || '';
-      listItem.setAttribute('style', (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? combineStyles(currentListItemStyle, nestedInsertedNodeStyle) : "".concat(currentListItemStyle).concat(nestedInsertedNodeStyle));
+      listItem.setAttribute('style', combineStyles(currentListItemStyle, nestedInsertedNodeStyle));
     });
   } else if (targetNode.type.name === 'layoutSection') {
     var _nestedInsertedNodeStyle = (0, _wrapBlockNodeViewStyles.resolveNestedInsertedNodeStyle)(colorScheme);
     element.querySelectorAll('[data-layout-column="true"]').forEach(function (section) {
       var currentSectionStyle = section.getAttribute('style') || '';
-      section.setAttribute('style', (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? combineStyles(currentSectionStyle, _nestedInsertedNodeStyle) : "".concat(currentSectionStyle).concat(_nestedInsertedNodeStyle));
+      section.setAttribute('style', combineStyles(currentSectionStyle, _nestedInsertedNodeStyle));
     });
   } else if (targetNode.type.name === 'taskList') {
     var _nestedInsertedNodeStyle2 = (0, _wrapBlockNodeViewStyles.resolveNestedInsertedNodeStyle)(colorScheme);
@@ -217,7 +217,7 @@ var applyMultiContainerLikeStyles = function applyMultiContainerLikeStyles(_ref5
       listItem.setAttribute('style', "".concat(currentListItemStyle).concat(_nestedInsertedNodeStyle2));
     });
   }
-  element.setAttribute('style', (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? combineStyles(currentStyle, nodeSpecificStyle) : "".concat(currentStyle, ";").concat(nodeSpecificStyle));
+  element.setAttribute('style', combineStyles(currentStyle, nodeSpecificStyle));
 };
 var combineStyles = function combineStyles(currentStyle, appendedStyle) {
   var separator = currentStyle && appendedStyle && !currentStyle.trimEnd().endsWith(';') ? '; ' : '';
@@ -598,7 +598,7 @@ var wrapBlockNodeView = exports.wrapBlockNodeView = function wrapBlockNodeView(_
         hideAddedDiffsUnderline: hideAddedDiffsUnderline,
         highlightInlineLeafNodes: highlightInlineLeafNodes
       });
-      if (targetNode.type.name === 'blockquote' && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+      if (targetNode.type.name === 'blockquote') {
         appendStyleToElement(nodeView, quoteBlockLevelStyle);
       }
       dom.append(nodeView);

package/dist/cjs/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.js

@@ -29,7 +29,7 @@ var getColorScheme = function getColorScheme(colorScheme) {
 };
 
 /**
- * Preserve the historical purple nested outlines when the layout/decision diff patch is off.
+ * Scheme for the outline of an inserted multi-container block (layouts, decision lists, etc.).
  */
 var nestedContentScheme = _schemes.standardScheme;
 
@@ -72,7 +72,7 @@ var getChangedNodeStyleNext = function getChangedNodeStyleNext(nodeName, colorSc
   var colors = getColorScheme(colorScheme);
   if (isInserted) {
     if (isMultiContainerBlockNode(nodeName)) {
-      return hideAddedDiffsUnderline || (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? (0, _factory.buildInsertStyleInBlockExtendedNoUnderline)(nestedContentScheme) : (0, _factory.buildInsertStyleInBlockExtended)(nestedContentScheme);
+      return (0, _factory.buildInsertStyleInBlockExtendedNoUnderline)(nestedContentScheme);
     }
     if (isTextLikeBlockNode(nodeName)) {
       return undefined;
@@ -132,7 +132,7 @@ var resolveRemovedLozengeStyleNext = function resolveRemovedLozengeStyleNext(col
   return isActive ? (0, _factory.buildDeletedLozengeActiveStyle)(colors) : (0, _factory.buildDeletedLozengeStyle)(colors);
 };
 var resolveNestedInsertedNodeStyleNext = function resolveNestedInsertedNodeStyleNext(colorScheme) {
-  return (0, _factory.buildInsertStyleNode)((0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? getColorScheme(colorScheme) : nestedContentScheme);
+  return (0, _factory.buildInsertStyleNode)(getColorScheme(colorScheme));
 };
 
 // Only 'stateful' schemes have a resting ring.

package/dist/cjs/pm-plugins/decorations/utils/wrapBlockNodeViewStyles.legacy.js

@@ -115,7 +115,7 @@ var getChangedNodeStyleLegacy = exports.getChangedNodeStyleLegacy = function get
   var isTraditional = colorScheme === 'traditional';
   if (isInserted) {
     if (isMultiContainerBlockNode(nodeName)) {
-      return hideAddedDiffsUnderline || (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? _standard.editingContentStyleInBlockExtendedNoUnderline : _standard.editingContentStyleInBlockExtended;
+      return _standard.editingContentStyleInBlockExtendedNoUnderline;
     }
     if (isTextLikeBlockNode(nodeName)) {
       return undefined;

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

@@ -8,8 +8,8 @@ exports.getScrollableDecorations = void 0;
 exports.isInlineDiffDecorationRenderableInDoc = isInlineDiffDecorationRenderableInDoc;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 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 _decorationKeys = require("./decorations/decorationKeys");
 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; }
@@ -155,17 +155,15 @@ function groupTouchingDecorations(decorations, isInlineDecoration, doc) {
     // Keep the group's range for navigation and active-range calculation, but scroll to the widget.
     var scrollTarget;
     var startNode = doc === null || doc === void 0 ? void 0 : doc.nodeAt(from);
-    if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
-      if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_2_fix') && ((startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableCell' || (startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableHeader')) {
-        scrollTarget = group.find(function (decoration) {
-          return decoration.from === from + 1 && decorationSide(decoration) < decorationSide(representative);
-        });
-      }
-      if (!scrollTarget) {
-        scrollTarget = group.find(function (decoration) {
-          return decoration.from === from && decorationSide(decoration) < decorationSide(representative);
-        });
-      }
+    if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_2_fix') && ((startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableCell' || (startNode === null || startNode === void 0 ? void 0 : startNode.type.name) === 'tableHeader')) {
+      scrollTarget = group.find(function (decoration) {
+        return decoration.from === from + 1 && decorationSide(decoration) < decorationSide(representative);
+      });
+    }
+    if (!scrollTarget) {
+      scrollTarget = group.find(function (decoration) {
+        return decoration.from === from && decorationSide(decoration) < decorationSide(representative);
+      });
     }
     if (!scrollTarget && representative.from === from && representative.to === to) {
       return representative;
@@ -194,8 +192,7 @@ function groupTouchingDecorations(decorations, isInlineDecoration, doc) {
  * 5. When `platform_editor_attributed_version_history` is enabled, groups overlapping or
  *    directly touching ranges across decoration types into one result per contributor, using the
  *    union of all grouped ranges
- *    (zero-width widgets can join a group without extending it). Under
- *    `platform_editor_ai_show_diff_patch_1`, a group that starts with content painting above
+ *    (zero-width widgets can join a group without extending it). A group that starts with content painting above
  * 	  the content that replaced it — reports that widget as its `scrollTarget` spec,
  *    so scrolling reaches the visual start of the edit
  * 6. Results are sorted by from position, then by to position

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

@@ -9,16 +9,6 @@ var _getStickyHeaderHeight = require("@atlaskit/editor-common/table/get-sticky-h
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _decorationKeys = require("./decorations/decorationKeys");
 var _getWidgetElement = require("./decorations/utils/getWidgetElement");
-/**
- * Extra space above the scrolled-to element so it does not sit flush under the
- * viewport edge (helps with sticky table headers, toolbars, etc.).
- *
- * Implemented with `scroll-margin-top` so we still use the browser’s native
- * `scrollIntoView`, which scrolls every relevant scrollport (nested containers
- * and the window). A single manual `scrollTop` on one ancestor often misses
- * outer scroll or mis-identifies the active scroll container.
- */
-var SCROLL_TOP_MARGIN_PX = 100;
 function updateScrollTargetMargin(view, targetPos, api) {
   var _api$limitedMode;
   var isLimitedModeEnabled = Boolean(api === null || api === void 0 || (_api$limitedMode = api.limitedMode) === null || _api$limitedMode === void 0 || (_api$limitedMode = _api$limitedMode.sharedState.currentState()) === null || _api$limitedMode === void 0 ? void 0 : _api$limitedMode.enabled);
@@ -38,19 +28,7 @@ function scrollToSelection(node) {
   if ((0, _fg.fg)('platform_editor_ai_suggestion_table_scroll_fix')) {
     scrollOptions.inline = 'center';
   }
-  if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
-    element.scrollIntoView(scrollOptions);
-    return;
-  }
-
-  // scroll-margin is included in scroll-into-view math; it does not change layout.
-  var previousScrollMarginTop = element.style.scrollMarginTop;
-  element.style.scrollMarginTop = "".concat(SCROLL_TOP_MARGIN_PX, "px");
-  try {
-    element.scrollIntoView(scrollOptions);
-  } finally {
-    element.style.scrollMarginTop = previousScrollMarginTop;
-  }
+  element.scrollIntoView(scrollOptions);
 }
 function resolveScrollTarget(view, target) {
   var _view$domAtPos;
@@ -83,7 +61,7 @@ var scrollToDecoration = exports.scrollToDecoration = function scrollToDecoratio
 
   // A grouped decoration spans a whole customer-facing edit, which can visually start with a
   // deleted-content widget rather than at the group's `from` position — see `scrollTarget` in
-  // `getScrollableDecorations`. Only set under `platform_editor_ai_show_diff_patch_1`.
+  // `getScrollableDecorations`.
   var target = (0, _decorationKeys.isDiffDecoration)(decoration) && decoration.spec.scrollTarget || decoration;
   var rafId = null;
   var cancelled = false;
@@ -91,9 +69,7 @@ var scrollToDecoration = exports.scrollToDecoration = function scrollToDecoratio
     if (view.isDestroyed) {
       return;
     }
-    if ((0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
-      updateScrollTargetMargin(view, target.from, api);
-    }
+    updateScrollTargetMargin(view, target.from, api);
     scrollToSelection(resolveScrollTarget(view, target));
   };
 

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

@@ -559,7 +559,7 @@ const calculateDiffDecorationsInner = ({
     // the other deleted-side suppressions, so the widget is never asked for a slice it can only
     // render as an empty copy of the block (EDITOR-8912). Its inserted side is untouched, and
     // the node's content change is a change of its own.
-    const hasNoDeletedContent = fg('platform_editor_ai_show_diff_patch_1') && change.deleted.length > 0 && isOpenTokenOnlyChange({
+    const hasNoDeletedContent = change.deleted.length > 0 && isOpenTokenOnlyChange({
       change,
       originalDoc
     });

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

@@ -226,14 +226,6 @@ export function buildInsertStyleExtended(colors) {
   });
 }
 
-/** Extended insert style for content within a block node (border-bottom only, no background). */
-export function buildInsertStyleInBlockExtended(colors) {
-  return convertToInlineCss({
-    borderBottom: `2px solid ${insertedInlineBorderColor(colors)}`,
-    padding: `1px 0 2px`
-  });
-}
-
 /** Active state of the extended insert style. */
 export function buildInsertStyleExtendedActive(colors) {
   var _ref2, _brand$activeBorder;

package/dist/es2019/pm-plugins/decorations/colorSchemes/getStandardDeletedTextDecorationStyle.js

@@ -1,11 +1,8 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 /**
  * The ADF strike parser recognises the `text-decoration` shorthand when a decorated NodeView is
  * reconciled. Use the visually equivalent longhand for AI suggestion diffs so presentation-only
  * styling cannot be retained as document content.
  */
-export const getStandardDeletedTextDecorationStyle = () => fg('platform_editor_ai_show_diff_patch_1') ? {
+export const getStandardDeletedTextDecorationStyle = () => ({
   textDecorationLine: 'line-through'
-} : {
-  textDecoration: 'line-through'
-};
+});

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

@@ -5,10 +5,6 @@ export const editingStyleExtended = convertToInlineCss({
   borderBottom: `2px solid ${"var(--ds-border-accent-purple, #AF59E1)"}`,
   padding: `1px 0 2px`
 });
-export const editingContentStyleInBlockExtended = convertToInlineCss({
-  borderBottom: `2px solid ${"var(--ds-border-accent-purple, #AF59E1)"}`,
-  padding: `1px 0 2px`
-});
 export const editingStyleActiveExtended = convertToInlineCss({
   background: "var(--ds-background-accent-purple-subtler-pressed, #D8A0F7)",
   borderBottom: `2px solid ${"var(--ds-border-accent-purple, #AF59E1)"}`,

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

@@ -1,6 +1,6 @@
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 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 { buildAnchorDecorationKey, buildAnchorDecorationSpec, AnchorDocMarginKey, AnchorTypeKey } from './decorationKeys';
 
@@ -45,7 +45,7 @@ const edgeCases = (doc, from, nodeOverride) => {
     beforePos
   } = resolved;
   const node = fg('platform_editor_ai_show_diff_patch_2') ? nodeOverride !== null && nodeOverride !== void 0 ? nodeOverride : resolvedNode : resolvedNode;
-  if (node.type.name === 'layoutSection' && fg('platform_editor_ai_show_diff_patch_1')) {
+  if (node.type.name === 'layoutSection') {
     // Columns extend past the node-view wrapper via negative margins (12px or 20px).
     // Measure their container so the indicator stays outside the diff outline, including
     // breakout layouts and after responsive resizing, without changing the column geometry.
@@ -399,7 +399,7 @@ export const createBlockIndicatorAnchorWidgets = ({
   const $from = doc.resolve(from);
   const parentTable = findParentNodeClosestToPos($from, ancestor => ancestor.type.name === 'table');
   const parentCellOrRow = findParentNodeClosestToPos($from, ancestor => ['tableCell', 'tableHeader', 'tableRow'].includes(ancestor.type.name));
-  const parentLayout = fg('platform_editor_ai_show_diff_patch_1') ? findParentNodeClosestToPos($from, ancestor => ancestor.type.name === 'layoutSection') : undefined;
+  const parentLayout = findParentNodeClosestToPos($from, ancestor => ancestor.type.name === 'layoutSection');
   // Layouts flatten direct widget children with display: contents. Such a wrapper has no
   // bounding box or positioning context, so measuring its top produces an offset from the
   // viewport origin and displaces the indicator into content below the editor. Keep the

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

@@ -225,7 +225,7 @@ export const createBlockChangedDecoration = ({
   });
   const styleOld = tagAnchorName ? [nodeStyle, convertToInlineCss({
     anchorName: `--${tagAnchorName}`
-  }), fg('platform_editor_ai_show_diff_patch_1') ? scrollMarginTopStyle : undefined].filter(Boolean).join(' ') : nodeStyle;
+  }), scrollMarginTopStyle].filter(Boolean).join(' ') : nodeStyle;
   const style = fg('platform_editor_ai_show_diff_patch_2') ? [nodeStyle, tagAnchorName ? convertToInlineCss({
     anchorName: `--${tagAnchorName}`
   }) : undefined,

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

@@ -44,7 +44,7 @@ const extractChangedRows = ({
   // was written for deletions only, so it used to discard every replacement and the changed row's
   // content was never rendered anywhere. The reviewer was left with just the removed side.
   const isRowDeletion = oldTableMap.height > newTableMap.height;
-  const handleRowReplacement = oldTableMap.height === newTableMap.height && fg('platform_editor_ai_show_diff_patch_1');
+  const handleRowReplacement = oldTableMap.height === newTableMap.height;
   // If no rows were changed, return empty
   if (!(isRowDeletion || handleRowReplacement) ||
   // For now ignore if there are column deletions as well
@@ -148,10 +148,8 @@ const createChangedRowDOM = ({
   }
   // 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', 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);
-  }
+  tr.setAttribute('data-testid', isInserted ? 'show-diff-changed-row' : 'show-diff-deleted-row');
+  tr.style.setProperty('scroll-margin-top', scrollMarginTopValue);
 
   // Serialize each cell in the row
   let cellIndex = 0;
@@ -295,7 +293,7 @@ export const createChangedRowDecorationWidgets = ({
     // 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 && fg('platform_editor_ai_show_diff_patch_1')) {
+    if (showIndicators) {
       rowAnchorNames.push(buildAnchorDecorationKey({
         diffId
       }));

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

@@ -183,7 +183,7 @@ export const createInlineChangedDecoration = ({
     diffId,
     mountContext: tagMountContext
   }) : undefined;
-  const inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, deletedInlineNodeAttrs === null || deletedInlineNodeAttrs === void 0 ? void 0 : deletedInlineNodeAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined, fg('platform_editor_ai_show_diff_patch_1') ? scrollMarginTopStyle : undefined].filter(Boolean).join('');
+  const inlineStyle = [style, atomicInlineAttrs === null || atomicInlineAttrs === void 0 ? void 0 : atomicInlineAttrs.styleSuffix, deletedInlineNodeAttrs === null || deletedInlineNodeAttrs === void 0 ? void 0 : deletedInlineNodeAttrs.styleSuffix, tagWidget ? stackBelowContributorTagStyle : undefined, scrollMarginTopStyle].filter(Boolean).join('');
   const decorations = [Decoration.inline(change.fromB, change.toB, {
     style: inlineStyle,
     ...(atomicInlineAttrs && {

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

@@ -98,9 +98,7 @@ const createTableCellContentWidgets = ({
     // This helper only runs for added content, so use the "changed" testid — not
     // "deleted", which page models match as removed content.
     dom.setAttribute('data-testid', 'show-diff-changed-decoration');
-    if (fg('platform_editor_ai_show_diff_patch_1')) {
-      dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
-    }
+    dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
 
     // 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.
@@ -323,7 +321,6 @@ export const createNodeChangedDecorationWidget = ({
   const replacementNode = newDoc.nodeAt(change.fromB);
   const firstReplacedNode = slice.content.firstChild;
   const lastReplacedNode = slice.content.lastChild;
-  const showDiffPatch1 = fg('platform_editor_ai_show_diff_patch_1');
   // Whether the slice's outermost textblocks still hold all of their original content.
   //
   // `openStart`/`openEnd` say whether the cut landed inside a block, but not whether it took
@@ -349,7 +346,7 @@ export const createNodeChangedDecorationWidget = ({
     const isFirst = firstReplacedNode === node;
     const isLast = lastReplacedNode === node;
     const isOpenAtSliceBoundary = isFirst && slice.openStart > 0 || isLast && slice.openEnd > 0;
-    const shouldPreserveCompleteMultiInlineBlock = showDiffPatch1 && node.isBlock && node.type.inlineContent && node.content.childCount > 1 && !isOpenAtSliceBoundary && isCompleteSameTypeReplacement;
+    const shouldPreserveCompleteMultiInlineBlock = node.isBlock && node.type.inlineContent && node.content.childCount > 1 && !isOpenAtSliceBoundary && isCompleteSameTypeReplacement;
     // A textblock is otherwise serialized as its inline content only, with no `<p>`/`<h2>` wrapper.
     // That is right when the diff cuts into an existing block — the deleted text belongs on the same
     // line as the text that replaced it — but when the whole block went away it drops the very
@@ -510,9 +507,7 @@ export const createNodeChangedDecorationWidget = ({
     });
   }
   dom.setAttribute('data-testid', 'show-diff-deleted-decoration');
-  if (fg('platform_editor_ai_show_diff_patch_1')) {
-    dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
-  }
+  dom.style.setProperty('scroll-margin-top', scrollMarginTopValue);
 
   // A block node serialized into the widget is the widget's first child, and the editor's
   // first-child reset is written against the parent element rather than the document position — so
@@ -690,9 +685,7 @@ export const createNodeChangedDecorationWidget = ({
       defaultSpacer.dataset.testid = 'show-diff-default-margin-spacer';
       defaultSpacer.style.display = 'block';
       defaultSpacer.style.marginTop = "var(--ds-space-100, 8px)";
-      if (fg('platform_editor_ai_show_diff_patch_1')) {
-        defaultSpacer.style.setProperty('scroll-margin-top', scrollMarginTopValue);
-      }
+      defaultSpacer.style.setProperty('scroll-margin-top', scrollMarginTopValue);
       decorations.push(Decoration.widget(safeInsertPos, defaultSpacer,
       // Spacing only: a diff spec would make it an untagged navigation stop.
       showContributorTags ? {} : buildDiffDecorationSpec({