@atlaskit/editor-plugin-show-diff 16.0.12 → 16.0.13

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-show-diff
 
+## 16.0.13
+
+### Patch Changes
+
+- [`7d1a41f1575e5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7d1a41f1575e5) -
+  Reserve red for deletions in show-diff attribution: an actor hashing to a red palette slot now
+  takes the next colour instead. Gated on confluence_ncs_step_diffing_version_history and
+  platform_editor_show_diff_color_scheme_refactor.
+- [`19e336d422584`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/19e336d422584) -
+  Fix whole-row table replacements rendering no diff for the new content.
+  `createChangedRowDecorationWidgets` only handled row deletions, so a `replaceNode` on a `tableRow`
+  (as AI suggested edits emits) left the reviewer with just the removed side — or an empty row in
+  the clean view.
+
+  Also give the changed-row widget an indicator anchor, so the indicator bar spans both the proposed
+  and replaced rows instead of only the row being changed. This affects row deletions too, whose
+  deleted-row bar previously had no anchor to resolve against.
+
+  Both behind `platform_editor_ai_show_diff_patch_1`.
+
+- Updated dependencies
+
 ## 16.0.12
 
 ### Patch Changes

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

@@ -25,15 +25,40 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 
 /** Maps the shared 18-slot telepointer palette onto the ten bolder diff colours. */
 var HASHED_PARTICIPANT_COLOR_SCHEMES = [].concat((0, _toConsumableArray2.default)(_types.PARTICIPANT_COLOR_SCHEMES), ['blue', 'red', 'orange', 'yellow', 'green', 'teal', 'purple', 'magenta']);
+
+/**
+ * Red means "deleted" in both public schemes, so it never identifies an actor. Reserving it here
+ * covers every path into an attribution colour; `createAttributionColorMap` is the only caller, and
+ * it is gated on `confluence_ncs_step_diffing_version_history` plus
+ * `platform_editor_show_diff_color_scheme_refactor`.
+ */
+var RESERVED_ATTRIBUTION_COLORS = new Set(['red']);
+var isAssignable = function isAssignable(color) {
+  return !RESERVED_ATTRIBUTION_COLORS.has(color);
+};
+
+/** Projects a telepointer slot onto its diff hue, advancing past a hue reserved for deletion. */
+var getSlotColor = function getSlotColor(index) {
+  for (var offset = 0; offset < HASHED_PARTICIPANT_COLOR_SCHEMES.length; offset++) {
+    var color = HASHED_PARTICIPANT_COLOR_SCHEMES[(index + offset) % HASHED_PARTICIPANT_COLOR_SCHEMES.length];
+    if (color && isAssignable(color)) {
+      return color;
+    }
+  }
+  return undefined;
+};
 var getAvailableColor = function getAvailableColor(hashedColor, allocatedColors) {
+  var _PARTICIPANT_COLOR_SC;
   var startIndex = _types.PARTICIPANT_COLOR_SCHEMES.indexOf(hashedColor);
   for (var offset = 0; offset < _types.PARTICIPANT_COLOR_SCHEMES.length; offset++) {
     var color = _types.PARTICIPANT_COLOR_SCHEMES[(startIndex + offset) % _types.PARTICIPANT_COLOR_SCHEMES.length];
-    if (color && !allocatedColors.has(color)) {
+    if (color && isAssignable(color) && !allocatedColors.has(color)) {
       return color;
     }
   }
-  return hashedColor;
+
+  // Every assignable hue is taken, so a duplicate is unavoidable — but never the reserved hue.
+  return isAssignable(hashedColor) ? hashedColor : (_PARTICIPANT_COLOR_SC = _types.PARTICIPANT_COLOR_SCHEMES.find(isAssignable)) !== null && _PARTICIPANT_COLOR_SC !== void 0 ? _PARTICIPANT_COLOR_SC : hashedColor;
 };
 
 /**
@@ -133,7 +158,8 @@ var createAttributionColorMap = exports.createAttributionColorMap = function cre
   var colors = new Map();
   var allocatedColors = new Set();
 
-  // Reserve shared brand colours before hashing other actors, regardless of step order.
+  // Reserve shared brand colours before hashing other actors, regardless of step order. A brand
+  // slot is pinned deliberately, so it is taken verbatim rather than through `getSlotColor`.
   var _iterator2 = _createForOfIteratorHelper(stepAttributions),
     _step2;
   try {
@@ -168,7 +194,7 @@ var createAttributionColorMap = exports.createAttributionColorMap = function cre
       }
       var _getParticipantColor2 = (0, _utils.getParticipantColor)(_identity.colorSeed, _attribution === null || _attribution === void 0 ? void 0 : _attribution.agentType),
         _index = _getParticipantColor2.index;
-      var hashedColor = HASHED_PARTICIPANT_COLOR_SCHEMES[_index];
+      var hashedColor = getSlotColor(_index);
       if (!hashedColor) {
         continue;
       }

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

@@ -12,10 +12,12 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _isExtendedEnabled = require("../isExtendedEnabled");
 var _factory = require("./colorSchemes/factory");
 var _schemes = require("./colorSchemes/schemes");
+var _createAnchorDecorationWidgets = require("./createAnchorDecorationWidgets");
 var _createChangedRowDecorationWidgetsStyles = require("./createChangedRowDecorationWidgets.styles.legacy");
 var _decorationKeys = require("./decorationKeys");
 var _findSafeInsertPos = require("./utils/findSafeInsertPos");
@@ -54,8 +56,14 @@ var extractChangedRows = function extractChangedRows(_ref) {
     return changedRows;
   }
   var newTableMap = _tableMap.TableMap.get(tableNew.node);
+  // A row DELETION makes the table shorter. An in-place whole-row REPLACEMENT (`replaceNode` on a
+  // `tableRow`, which AI suggested edits emits) leaves the row count untouched — and this helper
+  // 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');
   // If no rows were changed, return empty
-  if (oldTableMap.height <= newTableMap.height ||
+  if (!(isRowDeletion || handleRowReplacement) ||
   // For now ignore if there are column deletions as well
   oldTableMap.width !== newTableMap.width) {
     return changedRows;
@@ -99,6 +107,15 @@ var extractChangedRows = function extractChangedRows(_ref) {
 
   // Filter changes that never truly got deleted
   return changedRows.filter(function (changedRow) {
+    // A replacement leaves every sibling row in place, so asking "does this row still exist
+    // ANYWHERE in the new table?" can drop a genuinely rewritten row that happens to match a
+    // sibling. Compare it against the row at the same index instead. Deletions must keep the
+    // whole-table `some()`: their indices shift, so an index comparison would let every
+    // surviving row through and draw a widget for each one.
+    if (handleRowReplacement) {
+      var counterpart = tableNew.node.maybeChild(changedRow.rowIndex);
+      return !counterpart || !(0, _document.areNodesEqualIgnoreAttrs)(counterpart, changedRow.rowNode);
+    }
     return !tableNew.node.children.some(function (newRow) {
       return (0, _document.areNodesEqualIgnoreAttrs)(newRow, changedRow.rowNode);
     });
@@ -142,7 +159,10 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
   if (!(0, _isExtendedEnabled.isExtendedEnabled)(diffType) || !isInserted) {
     tr.setAttribute('style', (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_show_diff_color_scheme_refactor') ? (0, _factory.buildDeletedRowStyle)(colors) : (0, _createChangedRowDecorationWidgetsStyles.resolveDeletedRowStyleLegacy)((0, _schemes.getLegacyColorScheme)(colorScheme)));
   }
-  tr.setAttribute('data-testid', 'show-diff-deleted-row');
+  // 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
+  // removed content (same reasoning as `createTableCellContentWidgets`).
+  tr.setAttribute('data-testid', (0, _isExtendedEnabled.isExtendedEnabled)(diffType) && isInserted && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1') ? 'show-diff-changed-row' : 'show-diff-deleted-row');
 
   // Serialize each cell in the row
   var cellIndex = 0;
@@ -222,7 +242,9 @@ var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidget
     colorScheme = _ref3.colorScheme,
     _ref3$isInserted = _ref3.isInserted,
     isInserted = _ref3$isInserted === void 0 ? false : _ref3$isInserted,
-    diffType = _ref3.diffType;
+    diffType = _ref3.diffType,
+    _ref3$showIndicators = _ref3.showIndicators,
+    showIndicators = _ref3$showIndicators === void 0 ? false : _ref3$showIndicators;
   // First, expand the changes to include complete deleted rows
   var changedRows = expandDiffForChangedRows({
     changes: changes.filter(function (change) {
@@ -232,7 +254,7 @@ var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidget
     newDoc: newDoc,
     diffType: diffType
   });
-  return changedRows.map(function (changedRow) {
+  return changedRows.flatMap(function (changedRow) {
     var rowDOM = createChangedRowDOM(changedRow.rowNode, changedRow.cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType);
 
     // Find safe insertion position for the deleted row
@@ -240,13 +262,37 @@ var createChangedRowDecorationWidgets = exports.createChangedRowDecorationWidget
     // -1 to find the first safe position from the table
     originalDoc.slice(changedRow.fromA, changedRow.toA));
     var diffId = crypto.randomUUID();
-    return _view.Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
+    var decorations = [];
+
+    // `IndicatorBarContentComponent` renders a bar for every widget descriptor and anchors its
+    // top and bottom to `anchor-<diffId>`. Without an element carrying that anchor name the bar
+    // 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, _isExtendedEnabled.isExtendedEnabled)(diffType) && (0, _fg.fg)('platform_editor_ai_show_diff_patch_1')) {
+      rowDOM.style.setProperty('anchor-name', "--".concat((0, _decorationKeys.buildAnchorDecorationKey)({
+        diffId: diffId
+      })));
+
+      // A table's content can extend past the doc margin, so the bar also needs a left anchor
+      // measured against the table itself or it is clipped once the table is resized.
+      var leftAnchor = (0, _createAnchorDecorationWidgets.createLeftAnchorWidget)({
+        doc: newDoc,
+        from: safeInsertPos,
+        diffId: diffId
+      });
+      if (leftAnchor) {
+        decorations.push(leftAnchor);
+      }
+    }
+    decorations.push(_view.Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, (0, _decorationKeys.buildDiffDecorationSpec)({
       colorScheme: colorScheme,
       decorationType: 'widget',
       diffId: diffId,
       isActive: false,
       isInserted: isInserted,
       diffType: diffType
-    })));
+    }))));
+    return decorations;
   });
 };

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

@@ -172,7 +172,10 @@ var createNodeChangedDecorationWidget = exports.createNodeChangedDecorationWidge
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,
       isInserted: isInserted,
-      diffType: diffType
+      diffType: diffType,
+      // Needed for the row's own indicator anchor; this path returns before the
+      // `anchor-name` assignment further down.
+      showIndicators: showIndicators
     });
   }
   var serializer = nodeViewSerializer;

package/dist/cjs/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.2 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.1 */
 "use strict";
 
 var _typeof = require("@babel/runtime/helpers/typeof");

package/dist/cjs/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");

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

@@ -9,15 +9,38 @@ import { PARTICIPANT_COLOR_SCHEMES } from './types';
 
 /** Maps the shared 18-slot telepointer palette onto the ten bolder diff colours. */
 const HASHED_PARTICIPANT_COLOR_SCHEMES = [...PARTICIPANT_COLOR_SCHEMES, 'blue', 'red', 'orange', 'yellow', 'green', 'teal', 'purple', 'magenta'];
+
+/**
+ * Red means "deleted" in both public schemes, so it never identifies an actor. Reserving it here
+ * covers every path into an attribution colour; `createAttributionColorMap` is the only caller, and
+ * it is gated on `confluence_ncs_step_diffing_version_history` plus
+ * `platform_editor_show_diff_color_scheme_refactor`.
+ */
+const RESERVED_ATTRIBUTION_COLORS = new Set(['red']);
+const isAssignable = color => !RESERVED_ATTRIBUTION_COLORS.has(color);
+
+/** Projects a telepointer slot onto its diff hue, advancing past a hue reserved for deletion. */
+const getSlotColor = index => {
+  for (let offset = 0; offset < HASHED_PARTICIPANT_COLOR_SCHEMES.length; offset++) {
+    const color = HASHED_PARTICIPANT_COLOR_SCHEMES[(index + offset) % HASHED_PARTICIPANT_COLOR_SCHEMES.length];
+    if (color && isAssignable(color)) {
+      return color;
+    }
+  }
+  return undefined;
+};
 const getAvailableColor = (hashedColor, allocatedColors) => {
+  var _PARTICIPANT_COLOR_SC;
   const startIndex = PARTICIPANT_COLOR_SCHEMES.indexOf(hashedColor);
   for (let offset = 0; offset < PARTICIPANT_COLOR_SCHEMES.length; offset++) {
     const color = PARTICIPANT_COLOR_SCHEMES[(startIndex + offset) % PARTICIPANT_COLOR_SCHEMES.length];
-    if (color && !allocatedColors.has(color)) {
+    if (color && isAssignable(color) && !allocatedColors.has(color)) {
       return color;
     }
   }
-  return hashedColor;
+
+  // Every assignable hue is taken, so a duplicate is unavoidable — but never the reserved hue.
+  return isAssignable(hashedColor) ? hashedColor : (_PARTICIPANT_COLOR_SC = PARTICIPANT_COLOR_SCHEMES.find(isAssignable)) !== null && _PARTICIPANT_COLOR_SC !== void 0 ? _PARTICIPANT_COLOR_SC : hashedColor;
 };
 
 /**
@@ -104,7 +127,8 @@ export const createAttributionColorMap = stepAttributions => {
   const colors = new Map();
   const allocatedColors = new Set();
 
-  // Reserve shared brand colours before hashing other actors, regardless of step order.
+  // Reserve shared brand colours before hashing other actors, regardless of step order. A brand
+  // slot is pinned deliberately, so it is taken verbatim rather than through `getSlotColor`.
   for (const attribution of stepAttributions) {
     const identity = getAttributionIdentity(attribution);
     if (!identity) {
@@ -128,7 +152,7 @@ export const createAttributionColorMap = stepAttributions => {
     const {
       index
     } = getParticipantColor(identity.colorSeed, attribution === null || attribution === void 0 ? void 0 : attribution.agentType);
-    const hashedColor = HASHED_PARTICIPANT_COLOR_SCHEMES[index];
+    const hashedColor = getSlotColor(index);
     if (!hashedColor) {
       continue;
     }

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

@@ -3,12 +3,14 @@ import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 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';
 import { resolveCellOverlayStyleLegacy, resolveDeletedRowStyleLegacy } from './createChangedRowDecorationWidgets.styles.legacy';
-import { buildDiffDecorationSpec } from './decorationKeys';
+import { buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
 import { applyCellEdgeAttrs, getRowCellEdgeAttrs, getTableTopAndBottomCellEdgeAttrs } from './utils/tableCellEdgeAttrs';
 /**
@@ -37,8 +39,14 @@ const extractChangedRows = ({
     return changedRows;
   }
   const newTableMap = TableMap.get(tableNew.node);
+  // A row DELETION makes the table shorter. An in-place whole-row REPLACEMENT (`replaceNode` on a
+  // `tableRow`, which AI suggested edits emits) leaves the row count untouched — and this helper
+  // 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');
   // If no rows were changed, return empty
-  if (oldTableMap.height <= newTableMap.height ||
+  if (!(isRowDeletion || handleRowReplacement) ||
   // For now ignore if there are column deletions as well
   oldTableMap.width !== newTableMap.width) {
     return changedRows;
@@ -80,6 +88,15 @@ const extractChangedRows = ({
 
   // Filter changes that never truly got deleted
   return changedRows.filter(changedRow => {
+    // A replacement leaves every sibling row in place, so asking "does this row still exist
+    // ANYWHERE in the new table?" can drop a genuinely rewritten row that happens to match a
+    // sibling. Compare it against the row at the same index instead. Deletions must keep the
+    // whole-table `some()`: their indices shift, so an index comparison would let every
+    // surviving row through and draw a widget for each one.
+    if (handleRowReplacement) {
+      const counterpart = tableNew.node.maybeChild(changedRow.rowIndex);
+      return !counterpart || !areNodesEqualIgnoreAttrs(counterpart, changedRow.rowNode);
+    }
     return !tableNew.node.children.some(newRow => areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode));
   });
 };
@@ -121,7 +138,10 @@ const createChangedRowDOM = (rowNode, cellEdgeAttrs, nodeViewSerializer, colorSc
   if (!isExtendedEnabled(diffType) || !isInserted) {
     tr.setAttribute('style', isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? buildDeletedRowStyle(colors) : resolveDeletedRowStyleLegacy(getLegacyColorScheme(colorScheme)));
   }
-  tr.setAttribute('data-testid', 'show-diff-deleted-row');
+  // 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
+  // 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');
 
   // Serialize each cell in the row
   let cellIndex = 0;
@@ -192,7 +212,8 @@ export const createChangedRowDecorationWidgets = ({
   nodeViewSerializer,
   colorScheme,
   isInserted = false,
-  diffType
+  diffType,
+  showIndicators = false
 }) => {
   // First, expand the changes to include complete deleted rows
   const changedRows = expandDiffForChangedRows({
@@ -201,7 +222,7 @@ export const createChangedRowDecorationWidgets = ({
     newDoc,
     diffType
   });
-  return changedRows.map(changedRow => {
+  return changedRows.flatMap(changedRow => {
     const rowDOM = createChangedRowDOM(changedRow.rowNode, changedRow.cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType);
 
     // Find safe insertion position for the deleted row
@@ -209,7 +230,30 @@ export const createChangedRowDecorationWidgets = ({
     // -1 to find the first safe position from the table
     originalDoc.slice(changedRow.fromA, changedRow.toA));
     const diffId = crypto.randomUUID();
-    return Decoration.widget(safeInsertPos, rowDOM, {
+    const decorations = [];
+
+    // `IndicatorBarContentComponent` renders a bar for every widget descriptor and anchors its
+    // top and bottom to `anchor-<diffId>`. Without an element carrying that anchor name the bar
+    // 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')) {
+      rowDOM.style.setProperty('anchor-name', `--${buildAnchorDecorationKey({
+        diffId
+      })}`);
+
+      // A table's content can extend past the doc margin, so the bar also needs a left anchor
+      // measured against the table itself or it is clipped once the table is resized.
+      const leftAnchor = createLeftAnchorWidget({
+        doc: newDoc,
+        from: safeInsertPos,
+        diffId
+      });
+      if (leftAnchor) {
+        decorations.push(leftAnchor);
+      }
+    }
+    decorations.push(Decoration.widget(safeInsertPos, rowDOM, {
       ...buildDiffDecorationSpec({
         colorScheme,
         decorationType: 'widget',
@@ -218,6 +262,7 @@ export const createChangedRowDecorationWidgets = ({
         isInserted,
         diffType
       })
-    });
+    }));
+    return decorations;
   });
 };

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

@@ -156,7 +156,10 @@ export const createNodeChangedDecorationWidget = ({
       nodeViewSerializer,
       colorScheme,
       isInserted,
-      diffType
+      diffType,
+      // Needed for the row's own indicator anchor; this path returns before the
+      // `anchor-name` assignment further down.
+      showIndicators
     });
   }
   const serializer = nodeViewSerializer;

package/dist/es2019/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.2 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.1 */
 import "./IndicatorBar.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";

package/dist/es2019/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';

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

@@ -19,15 +19,40 @@ import { PARTICIPANT_COLOR_SCHEMES } from './types';
 
 /** Maps the shared 18-slot telepointer palette onto the ten bolder diff colours. */
 var HASHED_PARTICIPANT_COLOR_SCHEMES = [].concat(_toConsumableArray(PARTICIPANT_COLOR_SCHEMES), ['blue', 'red', 'orange', 'yellow', 'green', 'teal', 'purple', 'magenta']);
+
+/**
+ * Red means "deleted" in both public schemes, so it never identifies an actor. Reserving it here
+ * covers every path into an attribution colour; `createAttributionColorMap` is the only caller, and
+ * it is gated on `confluence_ncs_step_diffing_version_history` plus
+ * `platform_editor_show_diff_color_scheme_refactor`.
+ */
+var RESERVED_ATTRIBUTION_COLORS = new Set(['red']);
+var isAssignable = function isAssignable(color) {
+  return !RESERVED_ATTRIBUTION_COLORS.has(color);
+};
+
+/** Projects a telepointer slot onto its diff hue, advancing past a hue reserved for deletion. */
+var getSlotColor = function getSlotColor(index) {
+  for (var offset = 0; offset < HASHED_PARTICIPANT_COLOR_SCHEMES.length; offset++) {
+    var color = HASHED_PARTICIPANT_COLOR_SCHEMES[(index + offset) % HASHED_PARTICIPANT_COLOR_SCHEMES.length];
+    if (color && isAssignable(color)) {
+      return color;
+    }
+  }
+  return undefined;
+};
 var getAvailableColor = function getAvailableColor(hashedColor, allocatedColors) {
+  var _PARTICIPANT_COLOR_SC;
   var startIndex = PARTICIPANT_COLOR_SCHEMES.indexOf(hashedColor);
   for (var offset = 0; offset < PARTICIPANT_COLOR_SCHEMES.length; offset++) {
     var color = PARTICIPANT_COLOR_SCHEMES[(startIndex + offset) % PARTICIPANT_COLOR_SCHEMES.length];
-    if (color && !allocatedColors.has(color)) {
+    if (color && isAssignable(color) && !allocatedColors.has(color)) {
       return color;
     }
   }
-  return hashedColor;
+
+  // Every assignable hue is taken, so a duplicate is unavoidable — but never the reserved hue.
+  return isAssignable(hashedColor) ? hashedColor : (_PARTICIPANT_COLOR_SC = PARTICIPANT_COLOR_SCHEMES.find(isAssignable)) !== null && _PARTICIPANT_COLOR_SC !== void 0 ? _PARTICIPANT_COLOR_SC : hashedColor;
 };
 
 /**
@@ -127,7 +152,8 @@ export var createAttributionColorMap = function createAttributionColorMap(stepAt
   var colors = new Map();
   var allocatedColors = new Set();
 
-  // Reserve shared brand colours before hashing other actors, regardless of step order.
+  // Reserve shared brand colours before hashing other actors, regardless of step order. A brand
+  // slot is pinned deliberately, so it is taken verbatim rather than through `getSlotColor`.
   var _iterator2 = _createForOfIteratorHelper(stepAttributions),
     _step2;
   try {
@@ -162,7 +188,7 @@ export var createAttributionColorMap = function createAttributionColorMap(stepAt
       }
       var _getParticipantColor2 = getParticipantColor(_identity.colorSeed, _attribution === null || _attribution === void 0 ? void 0 : _attribution.agentType),
         _index = _getParticipantColor2.index;
-      var hashedColor = HASHED_PARTICIPANT_COLOR_SCHEMES[_index];
+      var hashedColor = getSlotColor(_index);
       if (!hashedColor) {
         continue;
       }

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

@@ -10,12 +10,14 @@ import { findParentNodeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 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';
 import { resolveCellOverlayStyleLegacy, resolveDeletedRowStyleLegacy } from './createChangedRowDecorationWidgets.styles.legacy';
-import { buildDiffDecorationSpec } from './decorationKeys';
+import { buildAnchorDecorationKey, buildDiffDecorationSpec } from './decorationKeys';
 import { findSafeInsertPos } from './utils/findSafeInsertPos';
 import { applyCellEdgeAttrs, getRowCellEdgeAttrs, getTableTopAndBottomCellEdgeAttrs } from './utils/tableCellEdgeAttrs';
 /**
@@ -47,8 +49,14 @@ var extractChangedRows = function extractChangedRows(_ref) {
     return changedRows;
   }
   var newTableMap = TableMap.get(tableNew.node);
+  // A row DELETION makes the table shorter. An in-place whole-row REPLACEMENT (`replaceNode` on a
+  // `tableRow`, which AI suggested edits emits) leaves the row count untouched — and this helper
+  // 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 && fg('platform_editor_ai_show_diff_patch_1');
   // If no rows were changed, return empty
-  if (oldTableMap.height <= newTableMap.height ||
+  if (!(isRowDeletion || handleRowReplacement) ||
   // For now ignore if there are column deletions as well
   oldTableMap.width !== newTableMap.width) {
     return changedRows;
@@ -92,6 +100,15 @@ var extractChangedRows = function extractChangedRows(_ref) {
 
   // Filter changes that never truly got deleted
   return changedRows.filter(function (changedRow) {
+    // A replacement leaves every sibling row in place, so asking "does this row still exist
+    // ANYWHERE in the new table?" can drop a genuinely rewritten row that happens to match a
+    // sibling. Compare it against the row at the same index instead. Deletions must keep the
+    // whole-table `some()`: their indices shift, so an index comparison would let every
+    // surviving row through and draw a widget for each one.
+    if (handleRowReplacement) {
+      var counterpart = tableNew.node.maybeChild(changedRow.rowIndex);
+      return !counterpart || !areNodesEqualIgnoreAttrs(counterpart, changedRow.rowNode);
+    }
     return !tableNew.node.children.some(function (newRow) {
       return areNodesEqualIgnoreAttrs(newRow, changedRow.rowNode);
     });
@@ -135,7 +152,10 @@ var createChangedRowDOM = function createChangedRowDOM(rowNode, cellEdgeAttrs, n
   if (!isExtendedEnabled(diffType) || !isInserted) {
     tr.setAttribute('style', isExperimentEnabled('platform_editor_show_diff_color_scheme_refactor') ? buildDeletedRowStyle(colors) : resolveDeletedRowStyleLegacy(getLegacyColorScheme(colorScheme)));
   }
-  tr.setAttribute('data-testid', 'show-diff-deleted-row');
+  // 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
+  // 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');
 
   // Serialize each cell in the row
   var cellIndex = 0;
@@ -215,7 +235,9 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     colorScheme = _ref3.colorScheme,
     _ref3$isInserted = _ref3.isInserted,
     isInserted = _ref3$isInserted === void 0 ? false : _ref3$isInserted,
-    diffType = _ref3.diffType;
+    diffType = _ref3.diffType,
+    _ref3$showIndicators = _ref3.showIndicators,
+    showIndicators = _ref3$showIndicators === void 0 ? false : _ref3$showIndicators;
   // First, expand the changes to include complete deleted rows
   var changedRows = expandDiffForChangedRows({
     changes: changes.filter(function (change) {
@@ -225,7 +247,7 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     newDoc: newDoc,
     diffType: diffType
   });
-  return changedRows.map(function (changedRow) {
+  return changedRows.flatMap(function (changedRow) {
     var rowDOM = createChangedRowDOM(changedRow.rowNode, changedRow.cellEdgeAttrs, nodeViewSerializer, colorScheme, isInserted, diffType);
 
     // Find safe insertion position for the deleted row
@@ -233,13 +255,37 @@ export var createChangedRowDecorationWidgets = function createChangedRowDecorati
     // -1 to find the first safe position from the table
     originalDoc.slice(changedRow.fromA, changedRow.toA));
     var diffId = crypto.randomUUID();
-    return Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, buildDiffDecorationSpec({
+    var decorations = [];
+
+    // `IndicatorBarContentComponent` renders a bar for every widget descriptor and anchors its
+    // top and bottom to `anchor-<diffId>`. Without an element carrying that anchor name the bar
+    // 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')) {
+      rowDOM.style.setProperty('anchor-name', "--".concat(buildAnchorDecorationKey({
+        diffId: diffId
+      })));
+
+      // A table's content can extend past the doc margin, so the bar also needs a left anchor
+      // measured against the table itself or it is clipped once the table is resized.
+      var leftAnchor = createLeftAnchorWidget({
+        doc: newDoc,
+        from: safeInsertPos,
+        diffId: diffId
+      });
+      if (leftAnchor) {
+        decorations.push(leftAnchor);
+      }
+    }
+    decorations.push(Decoration.widget(safeInsertPos, rowDOM, _objectSpread({}, buildDiffDecorationSpec({
       colorScheme: colorScheme,
       decorationType: 'widget',
       diffId: diffId,
       isActive: false,
       isInserted: isInserted,
       diffType: diffType
-    })));
+    }))));
+    return decorations;
   });
 };

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

@@ -165,7 +165,10 @@ export var createNodeChangedDecorationWidget = function createNodeChangedDecorat
       nodeViewSerializer: nodeViewSerializer,
       colorScheme: colorScheme,
       isInserted: isInserted,
-      diffType: diffType
+      diffType: diffType,
+      // Needed for the row's own indicator anchor; this path returns before the
+      // `anchor-name` assignment further down.
+      showIndicators: showIndicators
     });
   }
   var serializer = nodeViewSerializer;

package/dist/esm/ui/IndicatorBar/IndicatorBar.js

@@ -1,4 +1,4 @@
-/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.2 */
+/* IndicatorBar.tsx generated by @compiled/babel-plugin v3.0.1 */
 import "./IndicatorBar.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";

package/dist/esm/ui/IndicatorBar/IndicatorBarContentComponent.js

@@ -1,4 +1,4 @@
-/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.2 */
+/* IndicatorBarContentComponent.tsx generated by @compiled/babel-plugin v3.0.1 */
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';

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

@@ -8,7 +8,7 @@ type SimpleChange = Pick<Change, 'fromA' | 'toA' | 'fromB' | 'deleted'>;
 /**
  * Main function to handle deleted rows - computes diff and creates decorations
  */
-export declare const createChangedRowDecorationWidgets: ({ changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isInserted, diffType, }: {
+export declare const createChangedRowDecorationWidgets: ({ changes, originalDoc, newDoc, nodeViewSerializer, colorScheme, isInserted, diffType, showIndicators, }: {
     changes: SimpleChange[];
     colorScheme?: ColorScheme;
     diffType?: DiffType;
@@ -16,5 +16,6 @@ export declare const createChangedRowDecorationWidgets: ({ changes, originalDoc,
     newDoc: PMNode;
     nodeViewSerializer: NodeViewSerializer;
     originalDoc: PMNode;
+    showIndicators?: boolean;
 }) => Decoration[];
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-show-diff",
-	"version": "16.0.12",
+	"version": "16.0.13",
 	"description": "ShowDiff plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -64,7 +64,7 @@
 		"react-intl": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^122.7.0",
+		"@atlaskit/editor-common": "^122.8.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"