@atlaskit/editor-plugin-show-diff 17.0.1 → 17.1.0

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wrapBlockNodeView = exports.injectInnerWrapper = exports.createContentWrapper = void 0;
+exports.wrapBlockNodeView = exports.injectInnerWrapper = exports.createRemovedLozenge = exports.createContentWrapper = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lazyNodeView = require("@atlaskit/editor-common/lazy-node-view");
 var _messages = require("@atlaskit/editor-common/messages");
@@ -13,10 +13,10 @@ var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-ex
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _isExtendedEnabled = require("../../isExtendedEnabled");
-var _revealStyles = require("../revealStyles");
 var _createInlineChangedDecoration = require("../createInlineChangedDecoration");
-var _tableCellEdgeAttrs = require("./tableCellEdgeAttrs");
+var _revealStyles = require("../revealStyles");
 var _getAttrChangeRanges = require("./getAttrChangeRanges");
+var _tableCellEdgeAttrs = require("./tableCellEdgeAttrs");
 var _wrapBlockNodeViewStyles = require("./wrapBlockNodeViewStyles");
 var shouldShowRemovedLozenge = function shouldShowRemovedLozenge(nodeName) {
   switch (nodeName) {
@@ -148,26 +148,37 @@ var applyCellOverlayStyles = function applyCellOverlayStyles(_ref4) {
 /**
  * Creates a "Removed" lozenge to be displayed at the top right corner of deleted block nodes
  */
-var createRemovedLozenge = function createRemovedLozenge(intl) {
+var createRemovedLozenge = exports.createRemovedLozenge = function createRemovedLozenge(intl) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var colorScheme = arguments.length > 2 ? arguments[2] : undefined;
+  var inCell = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var container = document.createElement('span');
   var containerStyle = (0, _lazyNodeView.convertToInlineCss)({
     position: 'absolute',
     top: "var(--ds-space-075, 6px)",
     right: "var(--ds-space-075, 6px)",
-    zIndex: 2,
+    // Rounded table-cell overlays use z-index 2 and are appended after the cell content.
+    // Keep the lozenge above them so the overlay cannot tint or obscure it.
+    zIndex: 3,
     pointerEvents: 'none',
     display: 'flex'
   });
-  container.setAttribute('style', containerStyle);
-  container.setAttribute('data-testid', 'show-diff-removed-lozenge');
 
   // Create vanilla HTML lozenge element with Atlaskit Lozenge styling (visual refresh)
   var lozengeElement = document.createElement('span');
-  var lozengeInnerStyle = (0, _wrapBlockNodeViewStyles.resolveRemovedLozengeStyle)(colorScheme, isActive);
+
+  // A column label sits over an already-grey deleted cell, so use the red Removed treatment.
+  var lozengeInnerStyle = (0, _wrapBlockNodeViewStyles.resolveRemovedLozengeStyle)(colorScheme, inCell || isActive);
   lozengeElement.setAttribute('style', lozengeInnerStyle);
   lozengeElement.textContent = intl.formatMessage(_messages.trackChangesMessages.removed).toUpperCase();
+  if (inCell) {
+    lozengeElement.setAttribute('style', "".concat(lozengeInnerStyle, ";").concat(containerStyle));
+    lozengeElement.setAttribute('data-testid', 'show-diff-removed-lozenge');
+    lozengeElement.contentEditable = 'false';
+    return lozengeElement;
+  }
+  container.setAttribute('style', containerStyle);
+  container.setAttribute('data-testid', 'show-diff-removed-lozenge');
   container.appendChild(lozengeElement);
   return container;
 };

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

@@ -97,12 +97,13 @@ var resolveAgent = function resolveAgent(attribution, profilesByAccountId) {
   var agentId = (_attribution$agentId2 = attribution.agentId) === null || _attribution$agentId2 === void 0 ? void 0 : _attribution$agentId2.trim();
   var agentProfile = agentId ? profilesByAccountId.get(agentId) : undefined;
   if (agentProfile) {
-    return {
-      agentKind: 'identified',
+    return _objectSpread(_objectSpread({}, agentProfile.agentBrand ? {
+      agentKind: agentProfile.agentBrand
+    } : {}), {}, {
       avatarUrl: agentProfile.avatarUrl,
       kind: 'agent',
       name: agentProfile.name
-    };
+    });
   }
 
   // Unknown types keep an empty name for the tag's localised "External agent" label.

package/dist/cjs/pm-plugins/utils/emptyTextBlocks.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.emptyTextBlockContentPositions = exports.countEmptyTextBlockOnlySlice = void 0;
+/**
+ * The textblock types whose empty form is a blank line the author put there deliberately, and so
+ * worth marking when a change removes it.
+ *
+ * Deliberately not every textblock: an empty `codeBlock` is an empty code block, which renders as a
+ * visible box of its own and needs no stand-in.
+ */
+var BLANK_LINE_NODE_NAMES = new Set(['paragraph', 'heading']);
+
+/**
+ * Structurally empty: no children at all, not merely no measurable content. The two coincide for a
+ * real node, and testing both keeps a node whose children report no size from passing as blank.
+ */
+var isEmptyTextBlock = function isEmptyTextBlock(node) {
+  return BLANK_LINE_NODE_NAMES.has(node.type.name) && node.content.childCount === 0 && node.content.size === 0;
+};
+
+/**
+ * How many empty textblocks a slice holds, or 0 unless that is *all* it holds.
+ *
+ * Counted rather than tested for one, because a run of adjacent blank lines is reported as a single
+ * change covering all of them — the case that made a single-block test miss.
+ */
+var countEmptyTextBlockOnlySlice = exports.countEmptyTextBlockOnlySlice = function countEmptyTextBlockOnlySlice(slice) {
+  var _slice$content$childC;
+  var childCount = (_slice$content$childC = slice === null || slice === void 0 ? void 0 : slice.content.childCount) !== null && _slice$content$childC !== void 0 ? _slice$content$childC : 0;
+  if (!slice || childCount === 0) {
+    return 0;
+  }
+  for (var index = 0; index < childCount; index++) {
+    if (!isEmptyTextBlock(slice.content.child(index))) {
+      return 0;
+    }
+  }
+  return childCount;
+};
+
+/**
+ * The content position of every empty textblock lying wholly within `[from, to]`.
+ *
+ * Used to place a marker on each blank line a change removes. Partially covered blocks are skipped:
+ * the change only took part of one, so it still has text of its own, which the inline decoration
+ * already marks.
+ */
+var emptyTextBlockContentPositions = exports.emptyTextBlockContentPositions = function emptyTextBlockContentPositions(doc, from, to) {
+  var positions = [];
+  doc.nodesBetween(from, to, function (node, pos) {
+    if (node.isTextblock) {
+      if (isEmptyTextBlock(node) && pos >= from && pos + node.nodeSize <= to) {
+        // +1 steps over the block's own open token, into its (empty) content.
+        positions.push(pos + 1);
+      }
+      // A textblock holds inline content only, so there is nothing below it to visit.
+      return false;
+    }
+    // Keep descending: blank lines nest inside cells, columns and panels.
+    return true;
+  });
+  return positions;
+};

package/dist/cjs/showDiffPluginType.js

@@ -2,4 +2,90 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+exports.DIFF_AGENT_BRANDS = void 0;
+/**
+ * `'standard'` (purple insertions, default) and `'traditional'` (green/red) are the two
+ * plugin-configured schemes. The remaining accent names are the attribution palette used for
+ * per-contributor colouring (`stepsWithAttribution`) — callers of the imperative `showDiff`
+ * command (see `PMDiffParams.colorScheme`) can also pass one of these directly to match a
+ * specific contributor's colour outside of attribution mode, for example matching a Review
+ * moment diff to the streaming highlight of the agent that produced it.
+ */
+
+/**
+ * Attribution for a ProseMirror step.
+ *
+ * `userId` is the primary actor identity. `agentId` distinguishes multiple agents (or an agent
+ * from its user) when they share that user ID, with `agentType` used as a fallback when `agentId`
+ * is empty. `wasOffline` preserves additional provenance without affecting identity.
+ */
+
+/** Keeps a step and its attribution coupled through mapping and filtering. */
+
+/** Branded agent presentations supported by contributor tags. */
+
+var DIFF_AGENT_BRANDS = exports.DIFF_AGENT_BRANDS = new Set(['rovo', 'claude', 'chatgpt']);
+
+/** A complete identity for one of the accounts named by a step attribution. */
+
+/** Agent presentation: branded, identified by profile, or a generic external agent. */
+
+/**
+ * A contributor the plugin has resolved from a step attribution and a supplied profile. Internal:
+ * never re-exported from an entry point and not reachable from any public type. Same for
+ * `DiffContributors`.
+ */
+
+/** Where two contributors share an identity, the last wins. */
+
+/** A contributor stripped of its attributions, as a tag presents it. Internal. */
+
+/**
+ * Everything a contributor tag renders, resolved by the plugin so the tag UI does no lookups.
+ * Declared here rather than beside `extractContributorTags` so the shared state below can name it
+ * without importing back out of this file. Internal, like `TagContributor`.
+ */
+
+/**
+ * Where node/paragraph-level deleted content is rendered relative to the new (replacement)
+ * content in the `smart` diffType:
+ * - `'top'` (default): the deleted content is anchored above the new content.
+ * - `'bottom'`: the deleted content is anchored below the new content.
+ */
+
+/**
+ * Where inline-level (and sentence-level) deleted content is rendered relative to the new
+ * (replacement) content in the `smart` diffType. This is independent of the node/paragraph-level
+ * `deletedDiffPlacement` option:
+ * - `'before'` (default): the deleted content is anchored before the new content.
+ * - `'after'`: the deleted content is anchored after the new content.
+ */
+
+/**
+ * A rendered deleted-content widget: the DOM element show-diff renders for a piece of deleted
+ * content, together with the document position it is anchored at. Deleted content is rendered as
+ * widget decorations rather than document nodes, so this is how consumers recover the element and
+ * its position — via the `getDeletedWidgets` action — without reaching into the plugin's internal
+ * state.
+ */
+
+// Re-export the canonical `SmartDiffThresholds` declaration (single source of truth) so the
+// public plugin types stay in sync with the smart-diff implementation.
+
+/**
+ * How the diff is revealed when it is painted.
+ *
+ * - `phased` — the two-phase choreography used when opening the diff from a clean "new state":
+ *   the outgoing state cross-fades to the incoming one while the agent highlight wipes out to the
+ *   right, then every highlight wipes back in from the left.
+ *
+ * Deliberately separate from {@link DiffType}: that describes how changes are computed and grouped,
+ * this describes how the result is presented over time. Folding one into the other would make every
+ * `DiffType` consumer — version history, track-changes, publish diff — care about presentation.
+ */
+
+/**
+ * Attributed alternative to `PMDiffParams`. When agent colouring is enabled, changes are grouped
+ * by `userId`, with `agentId` used as a tie-breaker.
+ */

package/dist/cjs/ui/ContributorTag/contributorAvatarRenderer.js

@@ -12,6 +12,7 @@ var _contributorTagIcons = require("./contributorTagIcons");
 /** Agent kinds with a custom contributor-tag icon. */
 var AGENT_KIND_ICONS = {
   claude: 'claude',
+  chatgpt: 'chatgpt',
   rovo: 'rovoHex'
 };
 
@@ -91,7 +92,7 @@ var contributorAvatarRenderer = exports.contributorAvatarRenderer = function con
   }
   var image;
   var unbindImageError;
-  var showFallback = function showFallback() {
+  var showContributorIcon = function showContributorIcon() {
     var _unbindImageError, _image, _AGENT_KIND_ICONS, _contributor$agentKin;
     (_unbindImageError = unbindImageError) === null || _unbindImageError === void 0 || _unbindImageError();
     unbindImageError = undefined;
@@ -107,20 +108,27 @@ var contributorAvatarRenderer = exports.contributorAvatarRenderer = function con
     shape.appendChild((0, _contributorTagIcons.getContributorTagIcon)((_AGENT_KIND_ICONS = AGENT_KIND_ICONS[(_contributor$agentKin = contributor.agentKind) !== null && _contributor$agentKin !== void 0 ? _contributor$agentKin : 'external']) !== null && _AGENT_KIND_ICONS !== void 0 ? _AGENT_KIND_ICONS : 'aiAgent', doc));
   };
   if (contributor.avatarUrl) {
-    image = doc.createElement('img');
-    image.alt = '';
-    image.decoding = 'async';
-    image.draggable = false;
-    image.loading = 'lazy';
-    image.setAttribute('style', imageStyle);
-    unbindImageError = (0, _bindEventListener.bind)(image, {
-      type: 'error',
-      listener: showFallback
-    });
-    shape.appendChild(image);
-    image.src = contributor.avatarUrl;
+    var _contributor$agentKin2;
+    // Known brands use their fixed glyph even when the profile also has an avatar URL.
+    var brandedAgentIcon = isAgent ? AGENT_KIND_ICONS[(_contributor$agentKin2 = contributor.agentKind) !== null && _contributor$agentKin2 !== void 0 ? _contributor$agentKin2 : 'external'] : undefined;
+    if (brandedAgentIcon) {
+      showContributorIcon();
+    } else {
+      image = doc.createElement('img');
+      image.alt = '';
+      image.decoding = 'async';
+      image.draggable = false;
+      image.loading = 'lazy';
+      image.setAttribute('style', imageStyle);
+      unbindImageError = (0, _bindEventListener.bind)(image, {
+        type: 'error',
+        listener: showContributorIcon
+      });
+      shape.appendChild(image);
+      image.src = contributor.avatarUrl;
+    }
   } else {
-    showFallback();
+    showContributorIcon();
   }
   var setRingColor = function setRingColor(nextRingColor) {
     if (isAgent) {

package/dist/cjs/ui/ContributorTag/contributorTagIcons.js

@@ -33,9 +33,13 @@ var ROVO_HEX_ICON_SVG = "<svg width=\"16\" height=\"16\" viewBox=\"0 0 24 24\" r
 
 /** ClaudeLogo from ai-mate/studio-browse-kit, inset to fit the agent hexagon. */
 var CLAUDE_ICON_SVG = "<svg width=\"12\" height=\"12\" viewBox=\"8 8 32 32\" role=\"presentation\" style=\"display:block\"><path fill=\"#FFFFFF\" d=\"M14.2785 29.274L20.5732 25.7445L20.6785 25.4369L20.5732 25.2669H20.2653L19.2122 25.2021L15.6152 25.105L12.4962 24.9755L9.47443 24.8136L8.71291 24.6517L8 23.7126L8.07291 23.2431L8.71291 22.8141L9.62835 22.895L11.6537 23.0326L14.6916 23.2431L16.8952 23.3726L20.16 23.7126H20.6785L20.7514 23.5022L20.5732 23.3726L20.4354 23.2431L17.2922 21.1141L13.8896 18.8636L12.1073 17.5684L11.1433 16.9127L10.6572 16.2975L10.4466 14.9537L11.3215 13.9904L12.4962 14.0713L12.7959 14.1523L13.9868 15.067L16.5306 17.0342L19.8522 19.4789L20.3382 19.8836L20.5327 19.746L20.557 19.6489L20.3382 19.2846L18.5316 16.0223L16.6035 12.7033L15.7448 11.3271L15.518 10.5014C15.437 10.1614 15.3803 9.87807 15.3803 9.52998L16.3767 8.17809L16.9276 8L18.2562 8.17809L18.8152 8.6638L19.6415 10.55L20.9782 13.5209L23.0522 17.5603L23.6597 18.7584L23.9838 19.8674L24.1053 20.2074H24.3159V20.0132L24.4861 17.7384L24.802 14.9456L25.1099 11.3514L25.2152 10.3395L25.7175 9.12522L26.7139 8.46952L27.4916 8.84189L28.1316 9.75664L28.0425 10.3476L27.6618 12.8166L26.9165 16.6861L26.4304 19.2765H26.7139L27.038 18.9527L28.3504 17.2122L30.5539 14.4599L31.5261 13.3671L32.6603 12.1609L33.3894 11.5861H34.7666L35.7792 13.0918L35.3256 14.6461L33.9079 16.4432L32.7332 17.9651L31.0481 20.2317L29.9949 22.045L30.0922 22.1907L30.3433 22.1665L34.1509 21.3569L36.2086 20.9846L38.6633 20.5636L39.7732 21.0817L39.8947 21.6079L39.4572 22.6845L36.8324 23.3322L33.7539 23.9474L29.1686 25.0321L29.1119 25.0726L29.1767 25.1536L31.2425 25.3478L32.1256 25.3964H34.2886L38.3149 25.6959L39.3681 26.3921L40 27.2421L39.8947 27.8897L38.2744 28.7154L36.0871 28.1973L30.9833 26.9831L29.2334 26.5459H28.9904V26.6916L30.4486 28.1164L33.122 30.5287L36.4678 33.6372L36.638 34.4063L36.2086 35.0134L35.7549 34.9486L32.8142 32.7387L31.68 31.743L29.1119 29.5816H28.9418V29.8082L29.5332 30.6744L32.6603 35.3696L32.8223 36.8105L32.5954 37.28L31.7853 37.5634L30.8942 37.4015L29.0633 34.8353L27.1757 31.9454L25.6527 29.3549L25.4663 29.4602L24.5671 39.1338L24.1458 39.6276L23.1737 40L22.3635 39.3848L21.9342 38.3891L22.3635 36.422L22.882 33.8558L23.3033 31.8158L23.6841 29.2821L23.9109 28.4402L23.8947 28.3835L23.7084 28.4078L21.7965 31.0306L18.8881 34.9567L16.5873 37.4177L16.0365 37.6362L15.0805 37.1424L15.1696 36.2601L15.7043 35.4748L18.8881 31.4273L20.8081 28.9178L22.0476 27.4688L22.0395 27.2583H21.9666L13.5089 32.7468L12.002 32.9411L11.3539 32.3339L11.4349 31.3382L11.7428 31.0144L14.2866 29.2659L14.2785 29.274Z\"/></svg>";
+
+/** ChatGPT Presence avatar from Confluence's `ChatGptPresenceIcon`, at 16px. */
+var CHATGPT_ICON_SVG = '<svg width="16" height="16" viewBox="1 1.5328 16 16" overflow="visible" fill="none" role="presentation" style="display:block"><path d="M7.24707 0.973022C8.33116 0.344106 9.66865 0.342238 10.7539 0.969116L15.751 3.85583C16.8334 4.48117 17.5 5.63699 17.5 6.88708V12.1801C17.5 13.4301 16.8334 14.586 15.751 15.2113L10.751 18.1C9.66769 18.7258 8.33231 18.7258 7.24902 18.1L2.24902 15.2113C1.16658 14.586 0.5 13.4301 0.5 12.1801V6.90271C0.5 5.65489 1.1648 4.50153 2.24414 3.87537L7.24707 0.973022Z" fill="#14120B" stroke="#FFFFFF" stroke-width="1"/><svg x="4" y="4.53355" width="10" height="10" viewBox="10 12.0281 24 24" overflow="visible"><path d="M32.2119 21.2917C32.7552 19.256 32.2283 16.9938 30.6312 15.3967C29.0342 13.7997 26.7722 13.2728 24.7362 13.8161C23.2447 12.3277 21.0224 11.6529 18.8407 12.2376C16.6589 12.8221 15.0717 14.5177 14.5243 16.5524C12.4896 17.0999 10.794 18.6873 10.2094 20.8688C9.62493 23.0506 10.2996 25.2728 11.7881 26.7644C11.2448 28.8002 11.7718 31.0623 13.3688 32.6594C14.9658 34.2564 17.2278 34.7834 19.2638 34.2401C20.7553 35.7284 22.9778 36.4032 25.1593 35.8187C27.3411 35.2342 28.9283 33.5386 29.4757 31.5039C31.5105 30.9564 33.206 29.3691 33.7905 27.1874C34.3751 25.0058 33.7005 22.7834 32.2119 21.2919V21.2917ZM29.6507 16.3775C30.7329 17.4598 31.1792 18.937 30.9897 20.3453L25.9072 17.4108C25.6929 17.2871 25.4289 17.2871 25.2148 17.4108L19.2638 20.8466V18.5936C19.2638 18.4356 19.3485 18.2877 19.4854 18.2087L24.017 15.5924C25.8125 14.5895 28.1246 14.8514 29.6508 16.3775H29.6507ZM22 20.8685L24.7364 22.4483V25.608L22 27.1878L19.2636 25.608V22.4483L22 20.8685ZM15.7028 18.0636C15.732 16.0073 17.1149 14.1359 19.1997 13.5772C20.678 13.1811 22.1806 13.5333 23.3053 14.4014L18.2226 17.3357C18.0084 17.4594 17.8764 17.6881 17.8764 17.9353V24.8069L15.9253 23.6804C15.7885 23.6014 15.7028 23.454 15.7028 23.2959V18.0634V18.0636ZM11.549 21.2278C11.9451 19.7495 13.0014 18.6242 14.3156 18.0843V23.9532C14.3156 24.2004 14.4476 24.4291 14.6618 24.5528L20.6128 27.9886L18.6617 29.1151C18.5249 29.1941 18.3544 29.1946 18.2175 29.1156L13.6859 26.4993C11.9196 25.4459 10.9905 23.3124 11.549 21.2278ZM14.3494 31.6788C13.2671 30.5965 12.8208 29.1193 13.0103 27.7111L18.0928 30.6455C18.3071 30.7692 18.5711 30.7692 18.7852 30.6455L24.7362 27.2098V29.4626C24.7362 29.6207 24.6516 29.7682 24.5146 29.8477L19.983 32.4639C18.1875 33.4667 15.8754 33.2049 14.3492 31.6788H14.3494ZM28.2972 29.9927C28.268 32.049 26.8851 33.9205 24.8003 34.4791C23.322 34.8752 21.8194 34.523 20.6947 33.6549L25.7774 30.7205C25.9917 30.5969 26.1236 30.3682 26.1236 30.1209V23.2494L28.0747 24.3759C28.2115 24.4549 28.2972 24.6023 28.2972 24.7604V29.9929V29.9927ZM32.451 26.8285C32.0549 28.3068 30.9986 29.4321 29.6844 29.972V24.1031C29.6844 23.8559 29.5525 23.6272 29.3382 23.5035L23.3872 20.0678L25.3383 18.9412C25.4751 18.8622 25.6456 18.8617 25.7825 18.9407L30.314 21.5569C32.0804 22.6105 33.0095 24.7439 32.451 26.8285Z" fill="#FFFFFF"/></svg></svg>';
 var markup = {
   aiAgent: AI_AGENT_ICON_SVG,
   aiBot: AI_BOT_ICON_SVG,
+  chatgpt: CHATGPT_ICON_SVG,
   claude: CLAUDE_ICON_SVG,
   person: PERSON_ICON_SVG,
   rovoHex: ROVO_HEX_ICON_SVG

package/dist/es2019/entry-points/calculate-diff.js

@@ -1,2 +1,3 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
+
 export { computeDiffChanges } from '../pm-plugins/calculateDiff/computeDiffChanges';

package/dist/es2019/entry-points/show-diff-plugin-type.js

@@ -0,0 +1,3 @@
+/* eslint-disable @atlaskit/editor/no-re-export */
+
+export { DIFF_AGENT_BRANDS } from '../showDiffPluginType';

package/dist/es2019/entry-points/show-diff-plugin.js

@@ -1,2 +1,3 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
+
 export { showDiffPlugin } from '../showDiffPlugin';

package/dist/es2019/pm-plugins/NodeViewSerializer.js

@@ -1,5 +1,5 @@
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
+import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 
 /**
  * Utilities for working with ProseMirror node views and DOM serialization within the

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

@@ -4,23 +4,28 @@ import { ChangeSet, simplifyChanges } from 'prosemirror-changeset';
 import { areDocsEqualByBlockStructureAndText } from '@atlaskit/editor-common/utils/areDocsEqualByBlockStructureAndText';
 import { areNodesEqualIgnoreAttrs } from '@atlaskit/editor-common/utils/document';
 import { Mapping } from '@atlaskit/editor-prosemirror/transform';
-import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
+import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { createAttributionColorMap, getAttributionKey, getAttributionKeyForChange, getColorSchemeForChange, isAttributionColoringEnabled, isContributorTagsEnabled } from '../decorations/colorSchemes/attributions';
 import { createDocMarginAnchorWidget } from '../decorations/createAnchorDecorationWidgets';
 import { createBlockChangedDecoration } from '../decorations/createBlockChangedDecoration';
 import { createInlineChangedDecoration } from '../decorations/createInlineChangedDecoration';
 import { createNodeChangedDecorationWidget } from '../decorations/createNodeChangedDecorationWidget';
-import { createAttributionColorMap, getAttributionKey, getAttributionKeyForChange, getColorSchemeForChange, isAttributionColoringEnabled, isContributorTagsEnabled } from '../decorations/colorSchemes/attributions';
 import { extractDiffDescriptors } from '../decorations/decorationKeys';
 import { extractContributorTags } from '../decorations/extractContributorTags';
+import { createDeletedLineBreakDecoration } from '../decorations/utils/createDeletedLineBreakWidget';
 import { getAttrChangeRanges, stepIsValidAttrChange } from '../decorations/utils/getAttrChangeRanges';
 import { getMarkChangeRanges } from '../decorations/utils/getMarkChangeRanges';
+import { createRemovedLozenge } from '../decorations/utils/wrapBlockNodeView';
 import { getScrollableDecorations } from '../getScrollableDecorations';
 import { getDefaultDiffType, isExtendedEnabled } from '../isExtendedEnabled';
+import { emptyTextBlockContentPositions } from '../utils/emptyTextBlocks';
 import { diffBySteps } from './diffBySteps';
 import { groupChangesByBlock } from './groupChangesByBlock';
+import { CELL_CONTENT_OFFSET, groupDeletedColumnChanges } from './groupDeletedColumnChanges';
 import { isMarkOnlyChange } from './isMarkOnlyChange';
 import { isOpenTokenOnlyChange } from './isOpenTokenOnlyChange';
 import { optimizeChanges } from './optimizeChanges';
@@ -459,7 +464,7 @@ const calculateDiffDecorationsInner = ({
 
     // Still colours-only: a tags-only diff keeps the plain colour scheme.
     if (attributionColoringEnabled) {
-      attributionColors = createAttributionColorMap(simplifiedStepAttributions);
+      attributionColors = createAttributionColorMap(simplifiedStepAttributions, contributors);
     }
   } else {
     const changeset = ChangeSet.create(originalDoc, undefined, tokenEncoder).addSteps(steppedDoc, stepMaps, tr.doc);
@@ -485,10 +490,32 @@ const calculateDiffDecorationsInner = ({
 
   // Our default operations are insertions, so it should match the opposite of isInverted.
   const isInserted = !isInverted;
+  if (isExtendedEnabled(diffType)) {
+    changes = groupDeletedColumnChanges(changes, originalDoc, tr.doc, new Mapping(stepMaps), isInverted);
+  }
+  // A whole-table change owns every mark and attribute range inside its bounds, so those ranges
+  // do not also get their own decoration.
+  const tableChanges = changes.filter(change => change.deletedColumns !== undefined);
+  const isHandledByTable = (from, to) => tableChanges.some(change => from >= change.fromB && to <= change.toB);
   const createDecorationsForChange = change => {
     const changeColorScheme = attributionColors ? getColorSchemeForChange(change, attributedChanges, attributionColors, colorScheme) : colorScheme;
     const attributionKey = showContributorTags ? getAttributionKeyForChange(change, attributedChanges) : undefined;
     const isActive = isRangeActive(activeIndexPos, change.fromB, change.toB);
+    const {
+      deletedColumns
+    } = change;
+    // On an inverted diff the table that lost columns is the one in `tr.doc`, so the column
+    // indices address it directly and each label anchors inside its own cell.
+    const table = tr.doc.nodeAt(change.fromB);
+    if (isInverted && !hideDeletedDiffs && deletedColumns !== null && deletedColumns !== void 0 && deletedColumns.length && (table === null || table === void 0 ? void 0 : table.type.name) === 'table') {
+      const tableMap = TableMap.get(table);
+      deletedColumns.forEach(column => {
+        const offset = tableMap.positionAt(0, column, table);
+        decorations.push(Decoration.widget(change.fromB + CELL_CONTENT_OFFSET + offset, () => createRemovedLozenge(intl, isActive, changeColorScheme, true), {
+          side: -1
+        }));
+      });
+    }
 
     // The deleted side of a mark-only change is a byte-identical copy of the new text, so it is
     // suppressed in the clean view. `hideDeletedDiffs` is load-bearing: when false the reviewer
@@ -522,6 +549,32 @@ const calculateDiffDecorationsInner = ({
       // On an inverted diff the inserted side is visually the deleted side.
       const shouldHideDeleted = isExtendedEnabled(diffType) ? isInverted && hideDeletedDiffs : false;
 
+      // A removed blank line — an empty paragraph or heading — has nothing to mark up. On an
+      // inverted diff, the shape AI suggested edits renders, the block is still in the displayed
+      // document, so the removal lands here on the inserted side rather than on the deleted side,
+      // and both the inline and the block decoration paint nothing: an empty textblock has no
+      // inline content to cover, and block decorations return no style for a paragraph or heading.
+      // The reviewer sees an unmarked blank line. Stand the struck-through return glyph in for each
+      // one, anchored inside the block so it renders on the blank line itself.
+      //
+      // One decoration per blank line rather than one per change: a run of adjacent blank lines is
+      // reported as a single change spanning all of them.
+      //
+      // Withheld in the clean view, where removals are hidden rather than struck through.
+      if (fg('platform_editor_ai_show_diff_patch_2') && !isInserted && !shouldHideDeleted) {
+        for (const pos of emptyTextBlockContentPositions(tr.doc, change.fromB, change.toB)) {
+          decorations.push(createDeletedLineBreakDecoration({
+            attributionKey,
+            colorScheme: changeColorScheme,
+            diffType,
+            isActive,
+            pos,
+            reveal,
+            side: -1
+          }));
+        }
+      }
+
       // For `smart` NODE-level promotions the change range spans a whole container
       // (e.g. an entire list/table/layout, using outer node bounds). Applying a SINGLE
       // inline decoration across that whole range would paint the inserted style across
@@ -630,6 +683,7 @@ const calculateDiffDecorationsInner = ({
       });
       if (!shouldHideDeleted) {
         decorations.push(...createNodeChangedDecorationWidget({
+          deletedColumns,
           // The deleted side has no inline decoration, so the widget carries the actor.
           attributionKey,
           // Extended pipeline only, matching the inline path: the non-extended styles have no
@@ -665,6 +719,9 @@ const calculateDiffDecorationsInner = ({
   getMarkChangeRanges(simplifiedSteps, simplifiedStepAttributions, fg('confluence_ncs_step_diffing_version_history') ? stepMaps : undefined).filter(({
     fromB,
     toB
+  }) => !isHandledByTable(fromB, toB)).filter(({
+    fromB,
+    toB
   }) => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
     var _attributionColors$ge, _attributionColors;
     const changeColorScheme = change.attributionKey ? (_attributionColors$ge = (_attributionColors = attributionColors) === null || _attributionColors === void 0 ? void 0 : _attributionColors.get(change.attributionKey)) !== null && _attributionColors$ge !== void 0 ? _attributionColors$ge : colorScheme : colorScheme;
@@ -686,6 +743,9 @@ const calculateDiffDecorationsInner = ({
   getAttrChangeRanges(tr.doc, attrStepContexts, originalDoc).filter(({
     fromB,
     toB
+  }) => !isHandledByTable(fromB, toB)).filter(({
+    fromB,
+    toB
   }) => !fg('confluence_ncs_step_diffing_version_history') || !changes.some(change => change.fromB === fromB && change.toB === toB)).forEach(change => {
     var _attributionColors$ge2, _attributionColors2;
     const changeColorScheme = change.attributionKey ? (_attributionColors$ge2 = (_attributionColors2 = attributionColors) === null || _attributionColors2 === void 0 ? void 0 : _attributionColors2.get(change.attributionKey)) !== null && _attributionColors$ge2 !== void 0 ? _attributionColors$ge2 : colorScheme : colorScheme;