@atlaskit/editor-plugin-show-diff 27.1.3 → 28.0.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 28.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 27.1.4
+
+### Patch Changes
+
+- [`a13cf337bdc67`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a13cf337bdc67) -
+  Fix a suggested table cell change showing a blank cell when the changeset trims it to the cell's
+  open tokens, and keep its indicator bar on the suggested content. Behind
+  `platform_editor_ai_show_diff_patch_2_fix`.
+
 ## 27.1.3
 
 ### Patch Changes

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

@@ -234,7 +234,8 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
         intl: intl,
         isActive: isActive,
         isInserted: isInserted,
-        leftAnchorId: leftAnchorId
+        leftAnchorId: leftAnchorId,
+        showIndicators: showIndicators
       });
     }
     return createTableCellContentWidgets({

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

@@ -14,6 +14,8 @@ var _tableNodes = require("@atlaskit/adf-schema/tableNodes");
 var _cssHelper = require("@atlaskit/editor-common/css-helper");
 var _document = require("@atlaskit/editor-common/utils/document");
 var _view = require("@atlaskit/editor-prosemirror/view");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
+var _createAnchorDecorationWidgets = require("./createAnchorDecorationWidgets");
 var _createBlockChangedDecoration = require("./createBlockChangedDecoration");
 var _createInlineChangedDecoration = require("./createInlineChangedDecoration");
 var _decorationKeys = require("./decorationKeys");
@@ -22,6 +24,26 @@ var _wrapBlockNodeView = require("./utils/wrapBlockNodeView");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var CELL_TYPE_NAMES = ['tableCell', 'tableHeader'];
+/**
+ * Whether only close tokens follow `pos` in its cell: it is at the end of its parent, and so is each
+ * ancestor up to the cell.
+ */
+var isAtEndOfCell = function isAtEndOfCell(doc, pos) {
+  var $pos = doc.resolve(pos);
+  if ($pos.parentOffset !== $pos.parent.content.size) {
+    return false;
+  }
+  for (var depth = $pos.depth; depth > 0; depth--) {
+    if (CELL_TYPE_NAMES.includes($pos.node(depth).type.name)) {
+      return true;
+    }
+    if ($pos.indexAfter(depth - 1) !== $pos.node(depth - 1).childCount) {
+      return false;
+    }
+  }
+  return false;
+};
+
 /**
  * Pairs each cell of a whole-cell replacement with the live cell it replaces, or `[]` when the slice
  * is not a run of whole cells matching the live ones. Whole-cell replacement preserves cell count and
@@ -33,7 +55,7 @@ var getReplacedCells = exports.getReplacedCells = function getReplacedCells(_ref
     fromB = _ref.fromB,
     toB = _ref.toB;
   var otherCells = slice.content.content;
-  if (slice.openStart !== 0 || slice.openEnd !== 0 || otherCells.length === 0 || !otherCells.every(function (node) {
+  if (slice.openStart !== 0 || (!(0, _fg.fg)('platform_editor_ai_show_diff_patch_2_fix') || !isAtEndOfCell(doc, toB)) && slice.openEnd !== 0 || otherCells.length === 0 || !otherCells.every(function (node) {
     return CELL_TYPE_NAMES.includes(node.type.name);
   })) {
     return [];
@@ -134,16 +156,18 @@ var createCellBackgroundLayer = function createCellBackgroundLayer(color) {
   return layer;
 };
 
-/** The other side's cell content, as blocks, for the top of the live cell. */
-var createCellContentWidget = function createCellContentWidget(_ref2) {
+/** The other side's cell content, as blocks, for the top of the live cell, with its indicator anchor. */
+var createCellContentWidgets = function createCellContentWidgets(_ref2) {
   var cell = _ref2.cell,
+    doc = _ref2.doc,
     pos = _ref2.pos,
     nodeViewSerializer = _ref2.nodeViewSerializer,
     colorScheme = _ref2.colorScheme,
     intl = _ref2.intl,
     isActive = _ref2.isActive,
     isInserted = _ref2.isInserted,
-    leftAnchorId = _ref2.leftAnchorId;
+    leftAnchorId = _ref2.leftAnchorId,
+    showIndicators = _ref2.showIndicators;
   var dom = document.createElement('div');
   cell.content.forEach(function (block) {
     var nodeView = nodeViewSerializer.tryCreateNodeView(block, 0, undefined, isInserted, colorScheme);
@@ -170,16 +194,24 @@ var createCellContentWidget = function createCellContentWidget(_ref2) {
     }
   });
   if (dom.childNodes.length === 0) {
-    return undefined;
+    return [];
   }
   dom.setAttribute('data-testid', isInserted ? 'show-diff-changed-decoration' : 'show-diff-deleted-decoration');
+  var diffId = crypto.randomUUID();
+  if (showIndicators && (0, _fg.fg)('platform_editor_ai_show_diff_patch_2_fix')) {
+    // The indicator bar of a widget anchors its top and bottom to the widget itself. Without this
+    // only the live cell's own bar resolves, which starts below the suggested content.
+    dom.style.setProperty('anchor-name', "--".concat((0, _decorationKeys.buildAnchorDecorationKey)({
+      diffId: diffId
+    })));
+  }
 
   // Before the cell's own blocks, as a block of its own, so it never lands inside a paragraph the
   // displayed side may hide.
-  return _view.Decoration.widget(pos + 1, dom, _objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
+  var widget = _view.Decoration.widget(pos + 1, dom, _objectSpread(_objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
     colorScheme: colorScheme,
     decorationType: 'widget',
-    diffId: crypto.randomUUID(),
+    diffId: diffId,
     leftAnchorId: leftAnchorId,
     isActive: isActive,
     isInserted: isInserted,
@@ -187,6 +219,16 @@ var createCellContentWidget = function createCellContentWidget(_ref2) {
   })), {}, {
     marks: []
   }));
+
+  // The bar aligns its left edge to this anchor. The live cell's inline decoration makes one too,
+  // but not when the clean view hides it, and the widget is still showing then.
+  var leftAnchor = showIndicators && (0, _fg.fg)('platform_editor_ai_show_diff_patch_2_fix') ? (0, _createAnchorDecorationWidgets.createLeftAnchorWidget)({
+    doc: doc,
+    from: pos,
+    diffId: diffId,
+    leftAnchorId: leftAnchorId
+  }) : undefined;
+  return leftAnchor ? [widget, leftAnchor] : [widget];
 };
 
 /**
@@ -203,7 +245,8 @@ var createReplacedCellWidgets = exports.createReplacedCellWidgets = function cre
     intl = _ref3.intl,
     isActive = _ref3.isActive,
     isInserted = _ref3.isInserted,
-    leftAnchorId = _ref3.leftAnchorId;
+    leftAnchorId = _ref3.leftAnchorId,
+    showIndicators = _ref3.showIndicators;
   return getReplacedCells({
     slice: slice,
     doc: newDoc,
@@ -240,24 +283,31 @@ var createReplacedCellWidgets = exports.createReplacedCellWidgets = function cre
       }));
     }
     if (!isCellContentEqual(otherCell, liveCell)) {
-      var contentWidget = createCellContentWidget({
+      var contentWidgets = createCellContentWidgets({
         cell: otherCell,
+        doc: newDoc,
         pos: liveCellPos,
         nodeViewSerializer: nodeViewSerializer,
         colorScheme: colorScheme,
         intl: intl,
         isActive: isActive,
         isInserted: isInserted,
-        leftAnchorId: leftAnchorId
+        leftAnchorId: leftAnchorId,
+        showIndicators: showIndicators
       });
-      if (contentWidget) {
-        decorations.push(contentWidget);
-      }
+      decorations.push.apply(decorations, (0, _toConsumableArray2.default)(contentWidgets));
     }
     return decorations;
   });
 };
 
+/** Whether a cell holds only blank lines: empty paragraphs or headings, with nothing to show. */
+var isBlankCell = function isBlankCell(cell) {
+  return cell.childCount > 0 && cell.children.every(function (block) {
+    return block.isTextblock && block.content.size === 0;
+  });
+};
+
 /**
  * The displayed side of a whole-cell replacement. A table cell is never removed on its own, only
  * replaced in place, so a live cell is never hidden — hiding it would leave the row a cell short. It
@@ -307,6 +357,10 @@ var createReplacedCellDecorations = exports.createReplacedCellDecorations = func
     if (isCellContentEqual(otherCell, liveCell)) {
       return decorations;
     }
+
+    // A blank live cell has no content to strike through, so the suggestion takes its place, as
+    // in the clean view, rather than leaving a blank line below it.
+    var hidesLiveCell = shouldHideDeleted || !isInserted && isBlankCell(liveCell) && (0, _fg.fg)('platform_editor_ai_show_diff_patch_2_fix');
     decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createInlineChangedDecoration.createInlineChangedDecoration)({
       attributionKey: attributionKey,
       change: _objectSpread(_objectSpread({}, change), {}, {
@@ -322,12 +376,12 @@ var createReplacedCellDecorations = exports.createReplacedCellDecorations = func
       isInserted: isInserted,
       leftAnchorId: leftAnchorId,
       reveal: reveal,
-      shouldHideDeleted: shouldHideDeleted,
+      shouldHideDeleted: hidesLiveCell,
       showContributorTags: showContributorTags,
       showIndicators: showIndicators,
       tagMountContext: tagMountContext
     })));
-    if (shouldHideDeleted) {
+    if (hidesLiveCell) {
       liveCell.forEach(function (block, offset) {
         var blockPos = liveCellPos + 1 + offset;
         decorations.push.apply(decorations, (0, _toConsumableArray2.default)((0, _createBlockChangedDecoration.createBlockChangedDecoration)({
@@ -341,7 +395,7 @@ var createReplacedCellDecorations = exports.createReplacedCellDecorations = func
           isActive: isActive,
           isInserted: isInserted,
           leftAnchorId: leftAnchorId,
-          shouldHideDeleted: shouldHideDeleted
+          shouldHideDeleted: hidesLiveCell
         })));
       });
     }

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

@@ -226,7 +226,8 @@ export const createNodeChangedDecorationWidget = ({
         intl,
         isActive,
         isInserted,
-        leftAnchorId
+        leftAnchorId,
+        showIndicators
       });
     }
     return createTableCellContentWidgets({

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

@@ -5,12 +5,34 @@ import { getCellDomAttrs } from '@atlaskit/adf-schema/tableNodes';
 import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from './createBlockChangedDecoration';
 import { createInlineChangedDecoration } from './createInlineChangedDecoration';
-import { buildDiffDecorationSpec } from './decorationKeys';
+import { buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
 import { isCellAttrChanged, isCellBackgroundChanged, normalizeCellBackground } from './utils/cellAttrs';
 import { injectInnerWrapper, wrapBlockNodeView } from './utils/wrapBlockNodeView';
 const CELL_TYPE_NAMES = ['tableCell', 'tableHeader'];
+/**
+ * Whether only close tokens follow `pos` in its cell: it is at the end of its parent, and so is each
+ * ancestor up to the cell.
+ */
+const isAtEndOfCell = (doc, pos) => {
+  const $pos = doc.resolve(pos);
+  if ($pos.parentOffset !== $pos.parent.content.size) {
+    return false;
+  }
+  for (let depth = $pos.depth; depth > 0; depth--) {
+    if (CELL_TYPE_NAMES.includes($pos.node(depth).type.name)) {
+      return true;
+    }
+    if ($pos.indexAfter(depth - 1) !== $pos.node(depth - 1).childCount) {
+      return false;
+    }
+  }
+  return false;
+};
+
 /**
  * Pairs each cell of a whole-cell replacement with the live cell it replaces, or `[]` when the slice
  * is not a run of whole cells matching the live ones. Whole-cell replacement preserves cell count and
@@ -23,7 +45,7 @@ export const getReplacedCells = ({
   toB
 }) => {
   const otherCells = slice.content.content;
-  if (slice.openStart !== 0 || slice.openEnd !== 0 || otherCells.length === 0 || !otherCells.every(node => CELL_TYPE_NAMES.includes(node.type.name))) {
+  if (slice.openStart !== 0 || (!fg('platform_editor_ai_show_diff_patch_2_fix') || !isAtEndOfCell(doc, toB)) && slice.openEnd !== 0 || otherCells.length === 0 || !otherCells.every(node => CELL_TYPE_NAMES.includes(node.type.name))) {
     return [];
   }
   const liveCells = [];
@@ -119,16 +141,18 @@ const createCellBackgroundLayer = color => {
   return layer;
 };
 
-/** The other side's cell content, as blocks, for the top of the live cell. */
-const createCellContentWidget = ({
+/** The other side's cell content, as blocks, for the top of the live cell, with its indicator anchor. */
+const createCellContentWidgets = ({
   cell,
+  doc,
   pos,
   nodeViewSerializer,
   colorScheme,
   intl,
   isActive,
   isInserted,
-  leftAnchorId
+  leftAnchorId,
+  showIndicators
 }) => {
   const dom = document.createElement('div');
   cell.content.forEach(block => {
@@ -156,17 +180,25 @@ const createCellContentWidget = ({
     }
   });
   if (dom.childNodes.length === 0) {
-    return undefined;
+    return [];
   }
   dom.setAttribute('data-testid', isInserted ? 'show-diff-changed-decoration' : 'show-diff-deleted-decoration');
+  const diffId = crypto.randomUUID();
+  if (showIndicators && fg('platform_editor_ai_show_diff_patch_2_fix')) {
+    // The indicator bar of a widget anchors its top and bottom to the widget itself. Without this
+    // only the live cell's own bar resolves, which starts below the suggested content.
+    dom.style.setProperty('anchor-name', `--${buildAnchorDecorationKey({
+      diffId
+    })}`);
+  }
 
   // Before the cell's own blocks, as a block of its own, so it never lands inside a paragraph the
   // displayed side may hide.
-  return Decoration.widget(pos + 1, dom, {
+  const widget = Decoration.widget(pos + 1, dom, {
     ...buildDiffDecorationSpec({
       colorScheme,
       decorationType: 'widget',
-      diffId: crypto.randomUUID(),
+      diffId,
       leftAnchorId,
       isActive,
       isInserted,
@@ -174,6 +206,16 @@ const createCellContentWidget = ({
     }),
     marks: []
   });
+
+  // The bar aligns its left edge to this anchor. The live cell's inline decoration makes one too,
+  // but not when the clean view hides it, and the widget is still showing then.
+  const leftAnchor = showIndicators && fg('platform_editor_ai_show_diff_patch_2_fix') ? createLeftAnchorWidget({
+    doc,
+    from: pos,
+    diffId,
+    leftAnchorId
+  }) : undefined;
+  return leftAnchor ? [widget, leftAnchor] : [widget];
 };
 
 /**
@@ -190,7 +232,8 @@ export const createReplacedCellWidgets = ({
   intl,
   isActive,
   isInserted,
-  leftAnchorId
+  leftAnchorId,
+  showIndicators
 }) => getReplacedCells({
   slice,
   doc: newDoc,
@@ -228,23 +271,26 @@ export const createReplacedCellWidgets = ({
     }));
   }
   if (!isCellContentEqual(otherCell, liveCell)) {
-    const contentWidget = createCellContentWidget({
+    const contentWidgets = createCellContentWidgets({
       cell: otherCell,
+      doc: newDoc,
       pos: liveCellPos,
       nodeViewSerializer,
       colorScheme,
       intl,
       isActive,
       isInserted,
-      leftAnchorId
+      leftAnchorId,
+      showIndicators
     });
-    if (contentWidget) {
-      decorations.push(contentWidget);
-    }
+    decorations.push(...contentWidgets);
   }
   return decorations;
 });
 
+/** Whether a cell holds only blank lines: empty paragraphs or headings, with nothing to show. */
+const isBlankCell = cell => cell.childCount > 0 && cell.children.every(block => block.isTextblock && block.content.size === 0);
+
 /**
  * The displayed side of a whole-cell replacement. A table cell is never removed on its own, only
  * replaced in place, so a live cell is never hidden — hiding it would leave the row a cell short. It
@@ -295,6 +341,10 @@ export const createReplacedCellDecorations = ({
   if (isCellContentEqual(otherCell, liveCell)) {
     return decorations;
   }
+
+  // A blank live cell has no content to strike through, so the suggestion takes its place, as
+  // in the clean view, rather than leaving a blank line below it.
+  const hidesLiveCell = shouldHideDeleted || !isInserted && isBlankCell(liveCell) && fg('platform_editor_ai_show_diff_patch_2_fix');
   decorations.push(...createInlineChangedDecoration({
     attributionKey,
     change: {
@@ -311,12 +361,12 @@ export const createReplacedCellDecorations = ({
     isInserted,
     leftAnchorId,
     reveal,
-    shouldHideDeleted,
+    shouldHideDeleted: hidesLiveCell,
     showContributorTags,
     showIndicators,
     tagMountContext
   }));
-  if (shouldHideDeleted) {
+  if (hidesLiveCell) {
     liveCell.forEach((block, offset) => {
       const blockPos = liveCellPos + 1 + offset;
       decorations.push(...createBlockChangedDecoration({
@@ -330,7 +380,7 @@ export const createReplacedCellDecorations = ({
         isActive,
         isInserted,
         leftAnchorId,
-        shouldHideDeleted
+        shouldHideDeleted: hidesLiveCell
       }));
     });
   }

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

@@ -228,7 +228,8 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
         intl: intl,
         isActive: isActive,
         isInserted: isInserted,
-        leftAnchorId: leftAnchorId
+        leftAnchorId: leftAnchorId,
+        showIndicators: showIndicators
       });
     }
     return createTableCellContentWidgets({

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

@@ -9,12 +9,34 @@ import { getCellDomAttrs } from '@atlaskit/adf-schema/tableNodes';
 import { convertToInlineCss } from '@atlaskit/editor-common/css-helper';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { createLeftAnchorWidget } from './createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from './createBlockChangedDecoration';
 import { createInlineChangedDecoration } from './createInlineChangedDecoration';
-import { buildDiffDecorationSpec } from './decorationKeys';
+import { buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
 import { isCellAttrChanged, isCellBackgroundChanged, normalizeCellBackground } from './utils/cellAttrs';
 import { injectInnerWrapper, wrapBlockNodeView } from './utils/wrapBlockNodeView';
 var CELL_TYPE_NAMES = ['tableCell', 'tableHeader'];
+/**
+ * Whether only close tokens follow `pos` in its cell: it is at the end of its parent, and so is each
+ * ancestor up to the cell.
+ */
+var isAtEndOfCell = function isAtEndOfCell(doc, pos) {
+  var $pos = doc.resolve(pos);
+  if ($pos.parentOffset !== $pos.parent.content.size) {
+    return false;
+  }
+  for (var depth = $pos.depth; depth > 0; depth--) {
+    if (CELL_TYPE_NAMES.includes($pos.node(depth).type.name)) {
+      return true;
+    }
+    if ($pos.indexAfter(depth - 1) !== $pos.node(depth - 1).childCount) {
+      return false;
+    }
+  }
+  return false;
+};
+
 /**
  * Pairs each cell of a whole-cell replacement with the live cell it replaces, or `[]` when the slice
  * is not a run of whole cells matching the live ones. Whole-cell replacement preserves cell count and
@@ -26,7 +48,7 @@ export var getReplacedCells = function getReplacedCells(_ref) {
     fromB = _ref.fromB,
     toB = _ref.toB;
   var otherCells = slice.content.content;
-  if (slice.openStart !== 0 || slice.openEnd !== 0 || otherCells.length === 0 || !otherCells.every(function (node) {
+  if (slice.openStart !== 0 || (!fg('platform_editor_ai_show_diff_patch_2_fix') || !isAtEndOfCell(doc, toB)) && slice.openEnd !== 0 || otherCells.length === 0 || !otherCells.every(function (node) {
     return CELL_TYPE_NAMES.includes(node.type.name);
   })) {
     return [];
@@ -127,16 +149,18 @@ var createCellBackgroundLayer = function createCellBackgroundLayer(color) {
   return layer;
 };
 
-/** The other side's cell content, as blocks, for the top of the live cell. */
-var createCellContentWidget = function createCellContentWidget(_ref2) {
+/** The other side's cell content, as blocks, for the top of the live cell, with its indicator anchor. */
+var createCellContentWidgets = function createCellContentWidgets(_ref2) {
   var cell = _ref2.cell,
+    doc = _ref2.doc,
     pos = _ref2.pos,
     nodeViewSerializer = _ref2.nodeViewSerializer,
     colorScheme = _ref2.colorScheme,
     intl = _ref2.intl,
     isActive = _ref2.isActive,
     isInserted = _ref2.isInserted,
-    leftAnchorId = _ref2.leftAnchorId;
+    leftAnchorId = _ref2.leftAnchorId,
+    showIndicators = _ref2.showIndicators;
   var dom = document.createElement('div');
   cell.content.forEach(function (block) {
     var nodeView = nodeViewSerializer.tryCreateNodeView(block, 0, undefined, isInserted, colorScheme);
@@ -163,16 +187,24 @@ var createCellContentWidget = function createCellContentWidget(_ref2) {
     }
   });
   if (dom.childNodes.length === 0) {
-    return undefined;
+    return [];
   }
   dom.setAttribute('data-testid', isInserted ? 'show-diff-changed-decoration' : 'show-diff-deleted-decoration');
+  var diffId = crypto.randomUUID();
+  if (showIndicators && fg('platform_editor_ai_show_diff_patch_2_fix')) {
+    // The indicator bar of a widget anchors its top and bottom to the widget itself. Without this
+    // only the live cell's own bar resolves, which starts below the suggested content.
+    dom.style.setProperty('anchor-name', "--".concat(buildAnchorDecorationKey({
+      diffId: diffId
+    })));
+  }
 
   // Before the cell's own blocks, as a block of its own, so it never lands inside a paragraph the
   // displayed side may hide.
-  return Decoration.widget(pos + 1, dom, _objectSpread(_objectSpread({}, buildDiffDecorationSpec({
+  var widget = Decoration.widget(pos + 1, dom, _objectSpread(_objectSpread({}, buildDiffDecorationSpec({
     colorScheme: colorScheme,
     decorationType: 'widget',
-    diffId: crypto.randomUUID(),
+    diffId: diffId,
     leftAnchorId: leftAnchorId,
     isActive: isActive,
     isInserted: isInserted,
@@ -180,6 +212,16 @@ var createCellContentWidget = function createCellContentWidget(_ref2) {
   })), {}, {
     marks: []
   }));
+
+  // The bar aligns its left edge to this anchor. The live cell's inline decoration makes one too,
+  // but not when the clean view hides it, and the widget is still showing then.
+  var leftAnchor = showIndicators && fg('platform_editor_ai_show_diff_patch_2_fix') ? createLeftAnchorWidget({
+    doc: doc,
+    from: pos,
+    diffId: diffId,
+    leftAnchorId: leftAnchorId
+  }) : undefined;
+  return leftAnchor ? [widget, leftAnchor] : [widget];
 };
 
 /**
@@ -196,7 +238,8 @@ export var createReplacedCellWidgets = function createReplacedCellWidgets(_ref3)
     intl = _ref3.intl,
     isActive = _ref3.isActive,
     isInserted = _ref3.isInserted,
-    leftAnchorId = _ref3.leftAnchorId;
+    leftAnchorId = _ref3.leftAnchorId,
+    showIndicators = _ref3.showIndicators;
   return getReplacedCells({
     slice: slice,
     doc: newDoc,
@@ -233,24 +276,31 @@ export var createReplacedCellWidgets = function createReplacedCellWidgets(_ref3)
       }));
     }
     if (!isCellContentEqual(otherCell, liveCell)) {
-      var contentWidget = createCellContentWidget({
+      var contentWidgets = createCellContentWidgets({
         cell: otherCell,
+        doc: newDoc,
         pos: liveCellPos,
         nodeViewSerializer: nodeViewSerializer,
         colorScheme: colorScheme,
         intl: intl,
         isActive: isActive,
         isInserted: isInserted,
-        leftAnchorId: leftAnchorId
+        leftAnchorId: leftAnchorId,
+        showIndicators: showIndicators
       });
-      if (contentWidget) {
-        decorations.push(contentWidget);
-      }
+      decorations.push.apply(decorations, _toConsumableArray(contentWidgets));
     }
     return decorations;
   });
 };
 
+/** Whether a cell holds only blank lines: empty paragraphs or headings, with nothing to show. */
+var isBlankCell = function isBlankCell(cell) {
+  return cell.childCount > 0 && cell.children.every(function (block) {
+    return block.isTextblock && block.content.size === 0;
+  });
+};
+
 /**
  * The displayed side of a whole-cell replacement. A table cell is never removed on its own, only
  * replaced in place, so a live cell is never hidden — hiding it would leave the row a cell short. It
@@ -300,6 +350,10 @@ export var createReplacedCellDecorations = function createReplacedCellDecoration
     if (isCellContentEqual(otherCell, liveCell)) {
       return decorations;
     }
+
+    // A blank live cell has no content to strike through, so the suggestion takes its place, as
+    // in the clean view, rather than leaving a blank line below it.
+    var hidesLiveCell = shouldHideDeleted || !isInserted && isBlankCell(liveCell) && fg('platform_editor_ai_show_diff_patch_2_fix');
     decorations.push.apply(decorations, _toConsumableArray(createInlineChangedDecoration({
       attributionKey: attributionKey,
       change: _objectSpread(_objectSpread({}, change), {}, {
@@ -315,12 +369,12 @@ export var createReplacedCellDecorations = function createReplacedCellDecoration
       isInserted: isInserted,
       leftAnchorId: leftAnchorId,
       reveal: reveal,
-      shouldHideDeleted: shouldHideDeleted,
+      shouldHideDeleted: hidesLiveCell,
       showContributorTags: showContributorTags,
       showIndicators: showIndicators,
       tagMountContext: tagMountContext
     })));
-    if (shouldHideDeleted) {
+    if (hidesLiveCell) {
       liveCell.forEach(function (block, offset) {
         var blockPos = liveCellPos + 1 + offset;
         decorations.push.apply(decorations, _toConsumableArray(createBlockChangedDecoration({
@@ -334,7 +388,7 @@ export var createReplacedCellDecorations = function createReplacedCellDecoration
           isActive: isActive,
           isInserted: isInserted,
           leftAnchorId: leftAnchorId,
-          shouldHideDeleted: shouldHideDeleted
+          shouldHideDeleted: hidesLiveCell
         })));
       });
     }

package/dist/types/pm-plugins/decorations/createReplacedCellDecorations.d.ts

@@ -29,7 +29,7 @@ export declare const getReplacedCells: ({ slice, doc, fromB, toB, }: {
  * shape: each live cell takes the other cell's background when it differs, and its content when that
  * differs. A cell whose content did not change has nothing to diff.
  */
-export declare const createReplacedCellWidgets: ({ slice, newDoc, change, nodeViewSerializer, colorScheme, intl, isActive, isInserted, leftAnchorId, }: {
+export declare const createReplacedCellWidgets: ({ slice, newDoc, change, nodeViewSerializer, colorScheme, intl, isActive, isInserted, leftAnchorId, showIndicators, }: {
     change: Pick<Change, 'fromB' | 'toB'>;
     colorScheme?: ColorScheme;
     intl: IntlShape;
@@ -38,6 +38,7 @@ export declare const createReplacedCellWidgets: ({ slice, newDoc, change, nodeVi
     leftAnchorId?: string;
     newDoc: PMNode;
     nodeViewSerializer: NodeViewSerializer;
+    showIndicators?: boolean;
     slice: Slice;
 }) => Decoration[];
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "27.1.3",
+	"version": "28.0.0",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,10 +29,10 @@
 		"@atlaskit/agent-color": "^1.0.0",
 		"@atlaskit/avatar": "^30.0.0",
 		"@atlaskit/custom-steps": "^1.1.0",
-		"@atlaskit/editor-plugin-accessibility-utils": "^29.0.0",
-		"@atlaskit/editor-plugin-analytics": "^29.0.0",
-		"@atlaskit/editor-plugin-limited-mode": "^26.0.0",
-		"@atlaskit/editor-plugin-user-intent": "^27.0.0",
+		"@atlaskit/editor-plugin-accessibility-utils": "^30.0.0",
+		"@atlaskit/editor-plugin-analytics": "^30.0.0",
+		"@atlaskit/editor-plugin-limited-mode": "^27.0.0",
+		"@atlaskit/editor-plugin-user-intent": "^28.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.6.0",
 		"@atlaskit/editor-tables": "^3.2.0",
@@ -53,25 +53,25 @@
 		"@atlaskit/button": "^25.6.0",
 		"@atlaskit/css": "^1.1.0",
 		"@atlaskit/dropdown-menu": "^21.0.0",
-		"@atlaskit/editor-core": "^240.1.0",
+		"@atlaskit/editor-core": "^241.0.0",
 		"@atlaskit/editor-json-transformer": "^10.0.0",
 		"@atlaskit/editor-plugins": "^16.2.0",
-		"@atlaskit/form": "^18.2.0",
+		"@atlaskit/form": "^18.3.0",
 		"@atlaskit/section-message": "^10.2.0",
 		"@atlaskit/textarea": "^10.2.0",
 		"@atlaskit/textfield": "^10.2.0",
 		"@atlaskit/util-data-test": "^19.1.0",
 		"@atlassian/confluence-presets": "workspace:^",
 		"@atlassian/content-reconciliation": "^0.1.3506",
-		"@atlassian/editor-ai-injected-editors": "^44.0.0",
-		"@atlassian/editor-plugin-ai": "^83.7.0",
+		"@atlassian/editor-ai-injected-editors": "^45.0.0",
+		"@atlassian/editor-plugin-ai": "^84.0.0",
 		"@atlassian/structured-docs-types": "workspace:^",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^133.7.0",
+		"@atlaskit/editor-common": "^134.0.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -93,6 +93,9 @@
 		"platform_editor_ai_show_diff_patch_2": {
 			"type": "boolean"
 		},
+		"platform_editor_ai_show_diff_patch_2_fix": {
+			"type": "boolean"
+		},
 		"platform_editor_ai_smart_diff": {
 			"type": "boolean"
 		},