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

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

@@ -10,7 +10,6 @@
  */
 import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { isExtendedEnabled } from '../../isExtendedEnabled';
 import { deletedBlockOutline, deletedBlockOutlineActive, deletedBlockOutlineRounded, deletedBlockOutlineRoundedActive, deletedContentStyleUnbounded, deletedInlineContentStyleExtended, deletedStyleQuoteNodeWithLozenge, deletedStyleQuoteNodeWithLozengeActive, editingContentStyleInBlockExtended, editingContentStyleInBlockExtendedNoUnderline, editingStyleExtended, editingStyleExtendedNoUnderline, editingStyleActiveExtended, editingStyleActiveExtendedNoUnderline, editingStyleNode, getStandardDeletedContentStyleActive, getStandardDeletedContentStyleNew, addedCellOverlayStyle, addedCellOverlayRoundedStyle, deletedCellOverlayStyle, deletedCellOverlayRoundedStyle } from '../colorSchemes/standard';
 import { deletedTraditionalBlockOutlineActive, deletedTraditionalBlockOutlineNew, deletedTraditionalBlockOutlineRoundedActive, deletedTraditionalBlockOutlineRoundedNew, deletedTraditionalContentStyleUnbounded, deletedTraditionalContentStyleUnboundedActive, getDeletedTraditionalInlineStyle, deletedTraditionalStyleQuoteNode, deletedTraditionalStyleQuoteNodeActive, traditionalInsertStyle, traditionalInsertStyleActive, traditionalStyleNodeActive, traditionalStyleNodeNew, traditionalAddedCellOverlayRoundedStyle, traditionalAddedCellOverlayStyleNew, deletedTraditionalCellOverlayStyle, deletedTraditionalCellOverlayRoundedStyle } from '../colorSchemes/traditional';
 var lozengeStyle = convertToInlineCss({
@@ -79,9 +78,8 @@ var isTextLikeBlockNode = function isTextLikeBlockNode(nodeName) {
 export var getChangedContentStyleLegacy = function getChangedContentStyleLegacy(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var diffType = arguments.length > 3 ? arguments[3] : undefined;
-  var hideAddedDiffsUnderline = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  if (isExtendedEnabled(diffType) && isInserted) {
+  var hideAddedDiffsUnderline = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  if (isInserted) {
     if (colorScheme === 'traditional') {
       return isActive ? traditionalInsertStyleActive : traditionalInsertStyle;
     }
@@ -100,10 +98,9 @@ export var getChangedContentStyleLegacy = function getChangedContentStyleLegacy(
 export var getChangedNodeStyleLegacy = function getChangedNodeStyleLegacy(nodeName, colorScheme) {
   var isInserted = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var isActive = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var diffType = arguments.length > 4 ? arguments[4] : undefined;
-  var hideAddedDiffsUnderline = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var hideAddedDiffsUnderline = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var isTraditional = colorScheme === 'traditional';
-  if (isExtendedEnabled(diffType) && isInserted) {
+  if (isInserted) {
     if (isMultiContainerBlockNode(nodeName)) {
       return hideAddedDiffsUnderline || fg('platform_editor_ai_show_diff_patch_1') ? editingContentStyleInBlockExtendedNoUnderline : editingContentStyleInBlockExtended;
     }
@@ -163,12 +160,11 @@ export var getInsertedContentStyleLegacy = function getInsertedContentStyleLegac
 /** Pre-refactor inline style for deleted content. */
 export var getDeletedContentStyleLegacy = function getDeletedContentStyleLegacy(colorScheme) {
   var isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var diffType = arguments.length > 2 ? arguments[2] : undefined;
-  var omitHighlight = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var omitHighlight = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   if (colorScheme === 'traditional') {
     return getDeletedTraditionalInlineStyle(isActive);
   }
-  if (isExtendedEnabled(diffType) && !omitHighlight) {
+  if (!omitHighlight) {
     return (isActive ? getStandardDeletedContentStyleActive() : getStandardDeletedContentStyleNew()) + deletedInlineContentStyleExtended;
   }
   return isActive ? getStandardDeletedContentStyleActive() : getStandardDeletedContentStyleNew();

package/dist/esm/pm-plugins/getDefaultDiffType.js

@@ -0,0 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+export var getDefaultDiffType = function getDefaultDiffType() {
+  return fg('platform_editor_ai_smart_diff') ? 'smart' : 'inline';
+};

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

@@ -1,12 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _typeof from "@babel/runtime/helpers/typeof";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { DiffDecorationKey, isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
-import { isExtendedEnabled } from './isExtendedEnabled';
+import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
 
 /**
  * True if `fragment` contains at least one inline node (text, hardBreak, emoji, mention, etc.).
@@ -41,9 +39,6 @@ export function isInlineDiffDecorationRenderableInDoc(doc, from, to) {
 function isRangeFullyInside(range1Start, range1End, range2Start, range2End) {
   return range2Start <= range1Start && range1End <= range2End;
 }
-function specHasDiffKeyPrefix(spec, keyPrefix) {
-  return Boolean(spec && _typeof(spec) === 'object' && 'key' in spec && typeof spec.key === 'string' && spec.key.startsWith(keyPrefix));
-}
 
 /**
  * Where a decoration paints relative to others at the same position: negative before the node at
@@ -177,26 +172,21 @@ function groupTouchingDecorations(decorations, isInlineDecoration) {
  * @param doc - Current document; when set, diff-inline ranges are validated against this doc
  * @returns Array of scrollable decorations, sorted and deduplicated
  */
-export var getScrollableDecorations = function getScrollableDecorations(set, doc, diffType) {
+export var getScrollableDecorations = function getScrollableDecorations(set, doc) {
   if (!set) {
     return [];
   }
   var isBlockDecoration = function isBlockDecoration(decoration) {
-    var _decoration$spec$key$, _decoration$spec;
-    return isExtendedEnabled(diffType) ? isDiffDecoration(decoration) && decoration.spec.decorationType === 'block' : (_decoration$spec$key$ = (_decoration$spec = decoration.spec) === null || _decoration$spec === void 0 || (_decoration$spec = _decoration$spec.key) === null || _decoration$spec === void 0 ? void 0 : _decoration$spec.startsWith(DiffDecorationKey.block)) !== null && _decoration$spec$key$ !== void 0 ? _decoration$spec$key$ : false;
+    return isDiffDecoration(decoration) && decoration.spec.decorationType === 'block';
   };
   var isInlineDecoration = function isInlineDecoration(decoration) {
-    var _decoration$spec$key$2, _decoration$spec2;
-    return isExtendedEnabled(diffType) ? isDiffDecoration(decoration) && decoration.spec.decorationType === 'inline' : (_decoration$spec$key$2 = (_decoration$spec2 = decoration.spec) === null || _decoration$spec2 === void 0 || (_decoration$spec2 = _decoration$spec2.key) === null || _decoration$spec2 === void 0 ? void 0 : _decoration$spec2.startsWith(DiffDecorationKey.inline)) !== null && _decoration$spec$key$2 !== void 0 ? _decoration$spec$key$2 : false;
+    return isDiffDecoration(decoration) && decoration.spec.decorationType === 'inline';
   };
   var isWidgetDecoration = function isWidgetDecoration(decoration) {
-    var _decoration$spec$key$3, _decoration$spec3;
-    return isExtendedEnabled(diffType) ? isDiffDecoration(decoration) && decoration.spec.decorationType === 'widget' : (_decoration$spec$key$3 = (_decoration$spec3 = decoration.spec) === null || _decoration$spec3 === void 0 || (_decoration$spec3 = _decoration$spec3.key) === null || _decoration$spec3 === void 0 ? void 0 : _decoration$spec3.startsWith(DiffDecorationKey.widget)) !== null && _decoration$spec$key$3 !== void 0 ? _decoration$spec$key$3 : false;
+    return isDiffDecoration(decoration) && decoration.spec.decorationType === 'widget';
   };
   var seenBlockKeys = new Set();
-  var allDecorations = isExtendedEnabled(diffType) ? set.find(undefined, undefined, isDiffDecorationSpec) : set.find(undefined, undefined, function (spec) {
-    return specHasDiffKeyPrefix(spec, DiffDecorationKey.inline) || specHasDiffKeyPrefix(spec, DiffDecorationKey.widget) || specHasDiffKeyPrefix(spec, DiffDecorationKey.block);
-  });
+  var allDecorations = set.find(undefined, undefined, isDiffDecorationSpec);
 
   // First pass: filter out listItem blocks and deduplicates blocks
   var filtered = allDecorations.filter(function (dec) {

package/dist/esm/pm-plugins/main.js

@@ -11,8 +11,8 @@ import { getActiveDiffAnnouncement } from '../ui/DiffNavigation/announceActiveDi
 import { calculateDiffDecorations } from './calculateDiff/calculateDiffDecorations';
 import { isDiffDecoration, isDiffDecorationSpec } from './decorations/decorationKeys';
 import { enforceCustomStepRegisters } from './enforceCustomStepRegisters';
+import { getDefaultDiffType } from './getDefaultDiffType';
 import { getScrollableDecorations } from './getScrollableDecorations';
-import { getDefaultDiffType, isExtendedEnabled } from './isExtendedEnabled';
 import { NodeViewSerializer } from './NodeViewSerializer';
 import { rebindReveal } from './revealAnimation';
 import { scrollToDecoration } from './scrollToDiff';
@@ -66,28 +66,26 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
     state: {
       init: function init(_, _state) {
         // We do initial setup after we setup the editor view
-        var defaultDiffType = getDefaultDiffType();
-        return _objectSpread({
+        return {
           steps: [],
           stepAttributions: [],
           originalDoc: undefined,
           decorations: DecorationSet.empty,
-          isDisplayingChanges: false
-        }, isExtendedEnabled(defaultDiffType) ? {
+          isDisplayingChanges: false,
           isInverted: false,
-          diffType: defaultDiffType,
+          diffType: getDefaultDiffType(),
           hideDeletedDiffs: false,
           hideAddedDiffsUnderline: false,
           showIndicators: false,
           diffDescriptors: []
-        } : {});
+        };
       },
       apply: function apply(tr, currentPluginState, oldState, newState) {
         var meta = tr.getMeta(showDiffPluginKey);
         var newPluginState = currentPluginState;
         if (meta) {
           if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'SHOW_DIFF' || (meta === null || meta === void 0 ? void 0 : meta.action) === 'REVEAL_COMPLETE') {
-            var _newPluginState$color, _newPluginState, _newPluginState2, _newPluginState3, _newPluginState4, _newPluginState5, _newPluginState6, _newPluginState7, _newPluginState8, _newPluginState9, _newPluginState0, _newPluginState1, _newPluginState10;
+            var _newPluginState$color, _newPluginState, _newPluginState2, _newPluginState3, _newPluginState4, _newPluginState5, _newPluginState6, _newPluginState7, _newPluginState8, _newPluginState9, _newPluginState0;
             // REVEAL_COMPLETE repaints with the reveal dropped, so the decorations render their
             // ordinary resting style. Without it the reveal stays in state indefinitely and the
             // next unrelated repaint re-emits the hidden, zero-width highlight with no animation
@@ -103,7 +101,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
               reveal: meta.reveal
             });
             // Calculate and store decorations in state
-            var _calculateDiffDecorat = calculateDiffDecorations(_objectSpread({
+            var _calculateDiffDecorat = calculateDiffDecorations({
                 state: newState,
                 pluginState: newPluginState,
                 nodeViewSerializer: nodeViewSerializer,
@@ -111,29 +109,26 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
                 intl: getIntl(),
                 activeIndexPos: newPluginState.activeIndexPos,
                 api: api,
-                tagMountContext: tagMountContext
-              }, isExtendedEnabled((_newPluginState2 = newPluginState) === null || _newPluginState2 === void 0 ? void 0 : _newPluginState2.diffType) ? {
-                isInverted: (_newPluginState3 = newPluginState) === null || _newPluginState3 === void 0 ? void 0 : _newPluginState3.isInverted,
-                diffType: (_newPluginState4 = newPluginState) === null || _newPluginState4 === void 0 ? void 0 : _newPluginState4.diffType,
-                hideDeletedDiffs: (_newPluginState5 = newPluginState) === null || _newPluginState5 === void 0 ? void 0 : _newPluginState5.hideDeletedDiffs,
-                hideAddedDiffsUnderline: (_newPluginState6 = newPluginState) === null || _newPluginState6 === void 0 ? void 0 : _newPluginState6.hideAddedDiffsUnderline,
-                showIndicators: (_newPluginState7 = newPluginState) === null || _newPluginState7 === void 0 ? void 0 : _newPluginState7.showIndicators,
-                smartThresholds: (_newPluginState8 = newPluginState) === null || _newPluginState8 === void 0 ? void 0 : _newPluginState8.smartThresholds,
-                deletedDiffPlacement: (_newPluginState9 = newPluginState) === null || _newPluginState9 === void 0 ? void 0 : _newPluginState9.deletedDiffPlacement,
-                inlineDeletedDiffPlacement: (_newPluginState0 = newPluginState) === null || _newPluginState0 === void 0 ? void 0 : _newPluginState0.inlineDeletedDiffPlacement,
+                tagMountContext: tagMountContext,
+                isInverted: (_newPluginState2 = newPluginState) === null || _newPluginState2 === void 0 ? void 0 : _newPluginState2.isInverted,
+                diffType: (_newPluginState3 = newPluginState) === null || _newPluginState3 === void 0 ? void 0 : _newPluginState3.diffType,
+                hideDeletedDiffs: (_newPluginState4 = newPluginState) === null || _newPluginState4 === void 0 ? void 0 : _newPluginState4.hideDeletedDiffs,
+                hideAddedDiffsUnderline: (_newPluginState5 = newPluginState) === null || _newPluginState5 === void 0 ? void 0 : _newPluginState5.hideAddedDiffsUnderline,
+                showIndicators: (_newPluginState6 = newPluginState) === null || _newPluginState6 === void 0 ? void 0 : _newPluginState6.showIndicators,
+                smartThresholds: (_newPluginState7 = newPluginState) === null || _newPluginState7 === void 0 ? void 0 : _newPluginState7.smartThresholds,
+                deletedDiffPlacement: (_newPluginState8 = newPluginState) === null || _newPluginState8 === void 0 ? void 0 : _newPluginState8.deletedDiffPlacement,
+                inlineDeletedDiffPlacement: (_newPluginState9 = newPluginState) === null || _newPluginState9 === void 0 ? void 0 : _newPluginState9.inlineDeletedDiffPlacement,
                 // SHOW_DIFF only. The scroll-to-next recalculation further down deliberately
                 // omits this so stepping through changes cannot replay the choreography.
-                reveal: (_newPluginState1 = newPluginState) === null || _newPluginState1 === void 0 ? void 0 : _newPluginState1.reveal
-              } : {})),
+                reveal: (_newPluginState0 = newPluginState) === null || _newPluginState0 === void 0 ? void 0 : _newPluginState0.reveal
+              }),
               contributorTags = _calculateDiffDecorat.contributorTags,
               decorations = _calculateDiffDecorat.decorations,
               diffDescriptors = _calculateDiffDecorat.diffDescriptors;
             // Update the decorations and their ids
             newPluginState.decorations = decorations;
             newPluginState.contributorTags = contributorTags;
-            if (isExtendedEnabled((_newPluginState10 = newPluginState) === null || _newPluginState10 === void 0 ? void 0 : _newPluginState10.diffType)) {
-              newPluginState.diffDescriptors = diffDescriptors;
-            }
+            newPluginState.diffDescriptors = diffDescriptors;
           } else if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'HIDE_DIFF') {
             newPluginState = _objectSpread(_objectSpread(_objectSpread({}, currentPluginState), meta), {}, {
               decorations: DecorationSet.empty,
@@ -142,20 +137,22 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
               contributorTags: [],
               reveal: undefined,
               // Per-call override — do not let it leak into the next, unrelated `showDiff` call.
-              colorScheme: undefined
-            }, isExtendedEnabled(currentPluginState.diffType) ? {
+              colorScheme: undefined,
+              /**
+               * Reset isInverted & diffType state when hiding diffs
+               * Otherwise this should persist for the diff-showing session
+               */
               isInverted: false,
               diffType: getDefaultDiffType(),
               hideDeletedDiffs: false,
               hideAddedDiffsUnderline: false,
               diffDescriptors: []
-            } : {});
+            });
           } else if ((meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_NEXT' || (meta === null || meta === void 0 ? void 0 : meta.action) === 'SCROLL_TO_PREVIOUS') {
-            var _newPluginState11;
             // Update the active index in plugin state and recalculate decorations
-            var _decorations = getScrollableDecorations(currentPluginState.decorations, newState.doc, (_newPluginState11 = newPluginState) === null || _newPluginState11 === void 0 ? void 0 : _newPluginState11.diffType);
+            var _decorations = getScrollableDecorations(currentPluginState.decorations, newState.doc);
             if (_decorations.length > 0) {
-              var _currentPluginState$a, _newPluginState$color2, _newPluginState12;
+              var _currentPluginState$a, _newPluginState$color2, _newPluginState1;
               // Initialize to -1 if undefined so that the first "next" scroll takes us to index 0 (first change).
               // This allows the UI to start with no selection and only highlight on first user interaction.
               var nextIndex = (_currentPluginState$a = currentPluginState.activeIndex) !== null && _currentPluginState$a !== void 0 ? _currentPluginState$a : -1;
@@ -179,16 +176,15 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
                 } : undefined
               });
               // Recalculate decorations with the new active index
-              var _calculateDiffDecorat2 = calculateDiffDecorations(_objectSpread({
+              var _calculateDiffDecorat2 = calculateDiffDecorations({
                   state: newState,
                   pluginState: newPluginState,
                   nodeViewSerializer: nodeViewSerializer,
-                  colorScheme: (_newPluginState$color2 = (_newPluginState12 = newPluginState) === null || _newPluginState12 === void 0 ? void 0 : _newPluginState12.colorScheme) !== null && _newPluginState$color2 !== void 0 ? _newPluginState$color2 : config === null || config === void 0 ? void 0 : config.colorScheme,
+                  colorScheme: (_newPluginState$color2 = (_newPluginState1 = newPluginState) === null || _newPluginState1 === void 0 ? void 0 : _newPluginState1.colorScheme) !== null && _newPluginState$color2 !== void 0 ? _newPluginState$color2 : config === null || config === void 0 ? void 0 : config.colorScheme,
                   intl: getIntl(),
                   activeIndexPos: newPluginState.activeIndexPos,
                   api: api,
-                  tagMountContext: tagMountContext
-                }, isExtendedEnabled(newPluginState.diffType) ? {
+                  tagMountContext: tagMountContext,
                   isInverted: newPluginState.isInverted,
                   diffType: newPluginState.diffType,
                   hideDeletedDiffs: newPluginState.hideDeletedDiffs,
@@ -197,15 +193,13 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
                   smartThresholds: newPluginState.smartThresholds,
                   deletedDiffPlacement: newPluginState.deletedDiffPlacement,
                   inlineDeletedDiffPlacement: newPluginState.inlineDeletedDiffPlacement
-                } : {})),
+                }),
                 updatedContributorTags = _calculateDiffDecorat2.contributorTags,
                 updatedDecorations = _calculateDiffDecorat2.decorations,
                 updatedDiffDescriptors = _calculateDiffDecorat2.diffDescriptors;
               newPluginState.decorations = updatedDecorations;
               newPluginState.contributorTags = updatedContributorTags;
-              if (isExtendedEnabled(newPluginState.diffType)) {
-                newPluginState.diffDescriptors = updatedDiffDescriptors;
-              }
+              newPluginState.diffDescriptors = updatedDiffDescriptors;
             }
           } else {
             newPluginState = _objectSpread(_objectSpread({}, currentPluginState), meta);
@@ -250,10 +244,10 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
           // Scroll to the first decoration when scrollIntoView was requested.
           // Use the same filtered/position-sorted list as the active-index path
           // so "first" reliably means the topmost scrollable diff in the document.
-          if (pluginState !== null && pluginState !== void 0 && pluginState.scrollIntoView && isExtendedEnabled(pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType)) {
+          if (pluginState !== null && pluginState !== void 0 && pluginState.scrollIntoView) {
             var _cancelPendingScrollT;
             (_cancelPendingScrollT = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT === void 0 || _cancelPendingScrollT();
-            cancelPendingScrollToDecoration = scrollToDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType), undefined, api);
+            cancelPendingScrollToDecoration = scrollToDecoration(view, getScrollableDecorations(pluginState.decorations, view.state.doc), undefined, api);
 
             // Reset the flag so we don't scroll again on subsequent updates
             view.dispatch(view.state.tr.setMeta(showDiffPluginKey, {
@@ -267,7 +261,7 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
           if ((pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex) !== undefined && activeIndexChanged) {
             var _cancelPendingScrollT2;
             (_cancelPendingScrollT2 = cancelPendingScrollToDecoration) === null || _cancelPendingScrollT2 === void 0 || _cancelPendingScrollT2();
-            var scrollableDecorations = getScrollableDecorations(pluginState.decorations, view.state.doc, pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType);
+            var scrollableDecorations = getScrollableDecorations(pluginState.decorations, view.state.doc);
             var activeDecoration = scrollableDecorations[pluginState.activeIndex];
             if (activeDecoration) {
               // EDITOR-7926: use editor-common's command instead of the expand plugin API to
@@ -280,17 +274,15 @@ export var createPlugin = function createPlugin(config, getIntl, api, onEditorVi
             // screen-reader user gets silence. Announced through the live region rather than by
             // focusing the change, since the "next change" control has to stay focused to be
             // pressed again. After the scroll above, so the announcement never precedes it.
-            if (isExtendedEnabled(pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffType)) {
-              var announcement = getActiveDiffAnnouncement({
-                activeIndex: pluginState.activeIndex,
-                contributorTags: pluginState.contributorTags,
-                decorations: scrollableDecorations,
-                intl: getIntl()
-              });
-              if (announcement) {
-                var _api$accessibilityUti;
-                api === null || api === void 0 || (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 || _api$accessibilityUti.actions.ariaNotify(announcement);
-              }
+            var announcement = getActiveDiffAnnouncement({
+              activeIndex: pluginState.activeIndex,
+              contributorTags: pluginState.contributorTags,
+              decorations: scrollableDecorations,
+              intl: getIntl()
+            });
+            if (announcement) {
+              var _api$accessibilityUti;
+              api === null || api === void 0 || (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 || _api$accessibilityUti.actions.ariaNotify(announcement);
             }
           }
         },

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

@@ -16,9 +16,19 @@ var ROVO_AGENT_TYPES = new Set(['convo-ai', 'rovo_chat']);
 var SHOW_DIFF_AGENT_BRANDS = {
   'agent-brand-claude': 'claude',
   'agent-brand-chatgpt': 'chatgpt',
+  'agent-brand-figma': 'figma',
+  'agent-brand-lovable': 'lovable',
+  'agent-brand-replit': 'replit',
   'agent-brand-rovo': 'rovo'
 };
 
+/**
+ * Brands that prefer the account's real avatar over their fixed glyph when the invoking profile
+ * has one. Claude/ChatGPT/Rovo intentionally keep their fixed glyph always (see `AGENT_KIND_ICONS`
+ * in `contributorAvatarRenderer.ts`).
+ */
+var AVATAR_ELIGIBLE_BRANDS = new Set(['figma', 'lovable', 'replit']);
+
 /** Known external agent types emitted by Confluence's agent identification service that carry
  * no `@atlaskit/agent-color` brand — a generic labelled fallback. */
 var EXTERNAL_AGENT_NAMES = {
@@ -59,19 +69,23 @@ var resolveUser = function resolveUser(userId, profilesByAccountId) {
 var resolveAgent = function resolveAgent(attribution, profilesByAccountId) {
   var _attribution$agentTyp2, _attribution$agentId2;
   var agentType = (_attribution$agentTyp2 = attribution.agentType) === null || _attribution$agentTyp2 === void 0 ? void 0 : _attribution$agentTyp2.trim().toLowerCase();
+  // `agentType` may be a named id (e.g. `mcp_lovable_agent`) or a display name (e.g. `lovable`).
   var brand = agentType ? getThirdPartyAgentColor({
+    agentNamedId: agentType,
     agentName: agentType
   }) : undefined;
   var diffBrand = brand ? SHOW_DIFF_AGENT_BRANDS[brand.scheme] : undefined;
+  var agentId = (_attribution$agentId2 = attribution.agentId) === null || _attribution$agentId2 === void 0 ? void 0 : _attribution$agentId2.trim();
+  var agentProfile = agentId ? profilesByAccountId.get(agentId) : undefined;
   if (diffBrand && brand) {
-    return {
+    return _objectSpread({
       agentKind: diffBrand,
       kind: 'agent',
       name: brand.name
-    };
+    }, AVATAR_ELIGIBLE_BRANDS.has(diffBrand) && agentProfile !== null && agentProfile !== void 0 && agentProfile.avatarUrl ? {
+      avatarUrl: agentProfile.avatarUrl
+    } : {});
   }
-  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 _objectSpread(_objectSpread({}, agentProfile.agentBrand ? {
       agentKind: agentProfile.agentBrand

package/dist/esm/showDiffPlugin.js

@@ -6,7 +6,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { UNSAFE_expValNoExposure } from '@atlaskit/platform-feature-experiments/unsafe-exp-val-no-exposure';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { areAttributionColorGatesEnabled, resolveContributors } from './pm-plugins/decorations/colorSchemes/attributions';
 import { getDeletedWidgets as _getDeletedWidgets } from './pm-plugins/getDeletedWidgets';
 import { getScrollableDecorations } from './pm-plugins/getScrollableDecorations';
@@ -75,13 +74,11 @@ export var showDiffPlugin = function showDiffPlugin(_ref3) {
     commands: {
       showDiff: function showDiff(params) {
         return function (_ref4) {
+          var _api$userIntent;
           var tr = _ref4.tr;
-          if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
-            var _api$userIntent;
-            api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || _api$userIntent.commands.setCurrentUserIntent('viewingDiff')({
-              tr: tr
-            });
-          }
+          api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || _api$userIntent.commands.setCurrentUserIntent('viewingDiff')({
+            tr: tr
+          });
           var reveal = resolveReveal(params === null || params === void 0 ? void 0 : params.reveal, editorView);
 
           // Capture snapshot BEFORE transaction dispatch (last moment outgoing DOM exists).
@@ -106,16 +103,14 @@ export var showDiffPlugin = function showDiffPlugin(_ref3) {
         };
       },
       hideDiff: function hideDiff(_ref5) {
+        var _api$userIntent2;
         var tr = _ref5.tr;
         if (editorView) {
           cancelReveal(editorView);
         }
-        if (expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
-          var _api$userIntent2;
-          api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || _api$userIntent2.commands.setCurrentUserIntent('default')({
-            tr: tr
-          });
-        }
+        api === null || api === void 0 || (_api$userIntent2 = api.userIntent) === null || _api$userIntent2 === void 0 || _api$userIntent2.commands.setCurrentUserIntent('default')({
+          tr: tr
+        });
         return tr.setMeta(showDiffPluginKey, {
           steps: [],
           stepAttributions: [],
@@ -148,9 +143,6 @@ export var showDiffPlugin = function showDiffPlugin(_ref3) {
       }];
     },
     contentComponent: function contentComponent() {
-      if (!expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true)) {
-        return null;
-      }
       // Rendered here sharing decoration anchor span DOM context (tags mount separately).
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(IndicatorBarContentComponent, {
         api: api
@@ -158,24 +150,22 @@ export var showDiffPlugin = function showDiffPlugin(_ref3) {
     },
     getSharedState: function getSharedState(editorState) {
       if (!editorState) {
-        return _objectSpread({
+        return {
           isDisplayingChanges: false,
-          activeIndex: undefined
-        }, expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
+          activeIndex: undefined,
           diffDescriptors: []
-        } : {});
+        };
       }
       var pluginState = showDiffPluginKey.getState(editorState);
       var decorationCount = getScrollableDecorations(pluginState === null || pluginState === void 0 ? void 0 : pluginState.decorations, editorState.doc);
-      return _objectSpread({
+      return {
         isDisplayingChanges: decorationCount.length > 0,
         activeIndex: pluginState === null || pluginState === void 0 ? void 0 : pluginState.activeIndex,
-        numberOfChanges: decorationCount.length
-      }, expValEquals('platform_editor_diff_plugin_extended', 'isEnabled', true) ? {
+        numberOfChanges: decorationCount.length,
         contributorTags: pluginState === null || pluginState === void 0 ? void 0 : pluginState.contributorTags,
         diffDescriptors: pluginState === null || pluginState === void 0 ? void 0 : pluginState.diffDescriptors,
         showIndicators: pluginState === null || pluginState === void 0 ? void 0 : pluginState.showIndicators
-      } : {});
+      };
     }
   };
 };

package/dist/esm/showDiffPluginType.js

@@ -19,7 +19,7 @@
 
 /** Branded agent presentations supported by contributor tags. */
 
-export var DIFF_AGENT_BRANDS = new Set(['rovo', 'claude', 'chatgpt']);
+export var DIFF_AGENT_BRANDS = new Set(['rovo', 'claude', 'chatgpt', 'figma', 'lovable', 'replit']);
 
 /** The brand id `@atlaskit/agent-color` registers each `AgentBrandColorScheme` under. */
 

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

@@ -5,11 +5,11 @@ import { convertToInlineCss } from '@atlaskit/editor-common/lazy-node-view';
 import { getContributorTagIcon } from './contributorTagIcons';
 
 /**
- * Agent kinds with a custom contributor-tag icon. The `satisfies` clause fails the build if a
- * `DiffAgentBrand` is missing an icon here; `ASSERT_DIFF_AGENT_BRANDS_ARE_REGISTERED` in
- * `showDiffPluginType.ts` similarly fails the build if a brand has no `@atlaskit/agent-color`
- * colour scheme. The declared type stays the wider `TagContributor['agentKind']` so indexing below
- * (with `'identified' | 'external'` in play too) stays safely partial.
+ * Agent kinds with a custom contributor-tag icon. Figma/Lovable/Replit have no entry here — they
+ * always render the real avatar `resolveDiffContributors` supplies, falling back to the generic
+ * `aiAgent` glyph (see `showContributorIcon`) on load failure. The declared type stays the wider
+ * `TagContributor['agentKind']` so indexing below (with `'identified' | 'external'` in play too)
+ * stays safely partial.
  */
 var AGENT_KIND_ICONS = {
   claude: 'claude',
@@ -17,6 +17,14 @@ var AGENT_KIND_ICONS = {
   rovo: 'rovoHex'
 };
 
+/**
+ * Brands that always render their fixed glyph, even when the contributor also carries an
+ * `avatarUrl`. Figma/Lovable/Replit are excluded here and use the real avatar when
+ * `resolveDiffContributors` supplies one, falling back to the generic `aiAgent` glyph on load
+ * failure.
+ */
+var FIXED_GLYPH_AGENT_KINDS = new Set(['claude', 'chatgpt', 'rovo']);
+
 /** The size `@atlaskit/avatar`'s `xxsmall` rendered at. */
 var AVATAR_SIZE = AVATAR_SIZES.xxsmall;
 /** `xxsmall` also carried a `space.025` margin — the same 2px — which is where the ring is painted. */
@@ -107,13 +115,15 @@ export var contributorAvatarRenderer = function contributorAvatarRenderer(_ref)
       shape.appendChild(fallback);
       return;
     }
-    shape.appendChild(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));
+    var icon = (_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';
+    shape.appendChild(getContributorTagIcon(icon, doc));
   };
   if (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) {
+    // Claude/ChatGPT/Rovo always use their fixed glyph, even when the profile also has an
+    // avatar URL. Other agents (e.g. Figma/Lovable/Replit) and users prefer the real avatar.
+    var usesFixedGlyph = isAgent && FIXED_GLYPH_AGENT_KINDS.has((_contributor$agentKin2 = contributor.agentKind) !== null && _contributor$agentKin2 !== void 0 ? _contributor$agentKin2 : 'external');
+    if (usesFixedGlyph) {
       showContributorIcon();
     } else {
       image = doc.createElement('img');

package/dist/esm/ui/ContributorTag/contributorTagController.js

@@ -29,9 +29,18 @@ var getTagAccent = function getTagAccent(_ref) {
 var chatgptBrandColor = getThirdPartyAgentColor({
   agentName: 'chatgpt'
 });
+var figmaBrandColor = getThirdPartyAgentColor({
+  agentName: 'figma'
+});
+var lovableBrandColor = getThirdPartyAgentColor({
+  agentName: 'lovable'
+});
+var replitBrandColor = getThirdPartyAgentColor({
+  agentName: 'replit'
+});
 
 /** Brand accents for agent kinds with no ADS token match. New agents opt in by adding an entry. */
-var AGENT_KIND_ACCENT_OVERRIDES = _objectSpread({
+var AGENT_KIND_ACCENT_OVERRIDES = _objectSpread(_objectSpread(_objectSpread(_objectSpread({
   rovo: {
     background: "var(--ds-background-neutral-bold, #292A2E)",
     text: "var(--ds-text-inverse, #FFFFFF)"
@@ -41,6 +50,21 @@ var AGENT_KIND_ACCENT_OVERRIDES = _objectSpread({
     background: chatgptBrandColor.bold,
     text: chatgptBrandColor.boldText
   }
+} : {}), figmaBrandColor ? {
+  figma: {
+    background: figmaBrandColor.bold,
+    text: figmaBrandColor.boldText
+  }
+} : {}), lovableBrandColor ? {
+  lovable: {
+    background: lovableBrandColor.bold,
+    text: lovableBrandColor.boldText
+  }
+} : {}), replitBrandColor ? {
+  replit: {
+    background: replitBrandColor.bold,
+    text: replitBrandColor.boldText
+  }
 } : {});
 
 /**
@@ -365,8 +389,9 @@ export var ContributorTagController = /*#__PURE__*/function () {
           stackIndex: stackIndex
         });
         if (index < stack.length - 1) {
-          // Overlaps the leading avatar of a connected pair onto the one it sits in front of.
-          avatar.element.style.setProperty('margin-inline-end', "var(--ds-space-negative-050, -4px)");
+          // Sits the leading avatar of a connected pair flush against the one behind it, with
+          // no overlap and no extra gap.
+          avatar.element.style.setProperty('margin-inline-end', '0');
         }
         container.appendChild(avatar.element);
         _this5.avatars.push(avatar);